Rails 5

Appraisals

@@ -3,10 +3,11 @@ appraise "rails-4" do
   gem 'bigdecimal', '~> 1.4'
 end
 
-# appraise "rails-5" do
-#   gem 'activemodel', '~> 5.0.7'
-#   gem 'bigdecimal'
-# end
+appraise "rails-5" do
+  gem 'activemodel', '~> 5.2'
+  gem 'bigdecimal'
+  gem 'alias_method_chain'
+end
 
 # appraise "rails-6" do
 #   gem 'activemodel', '~> 6.0.1'

gemfiles/rails_5.gemfile

@@ -2,10 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "akami", "~> 1.3.2"
-gem "nokogiri", "~> 1.15.6"
-gem "wasabi", ">= 3.7"
-gem "activemodel", "~> 5.0.7"
+gem "activemodel", "~> 5.2"
 gem "bigdecimal"
+gem "alias_method_chain"
 
 gemspec path: "../"

lib/zuora/attributes.rb

@@ -1,5 +1,11 @@
 module Zuora
   module Attributes
+
+    # If Rails 5.2 is used, alias_method_chain is required
+    if Gem.loaded_specs['activemodel'].version >= Gem::Version.new('5.2')
+      require 'alias_method_chain'
+    end
+
     def self.included(base)
       base.send(:include, ActiveModel::Naming)
       base.send(:include, ActiveModel::Conversion)
@@ -39,9 +45,6 @@ def define_attributes(&block)
         # generate association overrides for complex object handling
         # and cache the objects so that they may be modified and updated
         class_variable_get(:@@complex_attributes).each do |var, scope|
-          # set up the instance variable for the new assoc collection
-          # for new records, but call the original one for existing
-          # records and cache/return the result for subsequent calls.
           class_eval <<-EVAL
             def #{scope}_with_complex
               if new_record? || @#{scope}_cached
@@ -52,6 +55,14 @@ def #{scope}_with_complex
               end
             end
             alias_method_chain :#{scope}, :complex
+
+            # if method_defined?(:#{scope})
+            #   prepend Module.new {
+            #     super
+            #     # alias_method :#{scope}_without_complex, :#{scope}
+            #     # alias_method :#{scope}, :#{scope}_with_complex
+            #   }
+            # end
           EVAL
         end
       end
@@ -209,8 +220,10 @@ def attributes
 
     # remove all dirty tracking for the object and return self for chaining.
     def clear_changed_attributes!
-      @changed_attributes = {}
+      clear_changes_information
       self
+      # @changed_attributes = {}
+      # self
     end
 
     # the name to use when referencing remote Zuora objects

lib/zuora/objects/amendment.rb

@@ -42,7 +42,8 @@ def apply_response(response_hash, type)
         self.invoice_id = result[:invoice_id]
         self.payment_transaction_number = result[:payment_transaction_number]
         @previously_changed = changes
-        @changed_attributes.clear
+        # @changed_attributes.clear
+        clear_changes_information
         return true
       else
         self.errors.add(:base, result[:errors][:message])

lib/zuora/objects/base.rb

@@ -44,7 +44,8 @@ def reload!
         self.send("#{k}=", v)
       }
       @previously_changed = changes
-      @changed_attributes.clear
+      # @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new
+      clear_changes_information
       self
     end
 
@@ -84,9 +85,9 @@ def self.select(select)
     def self.all
       keys = (attributes - unselectable_attributes).map(&:to_s).map(&:zuora_camelize)
       sql = "select #{keys.join(', ')} from #{remote_name}"
- 
+
       result = self.connector.query(sql)
- 
+
       generate(result.to_hash, :query_response)
     end
 
@@ -191,7 +192,9 @@ def apply_response(response_hash, type)
       if result[:success]
         self.id = result[:id]
         @previously_changed = changes
-        @changed_attributes.clear
+        # require 'pry'; binding.pry
+        # @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new
+        clear_changes_information
         return true
       else
         raise StandardError.new(result[:errors][:message])

lib/zuora/objects/subscribe_request.rb

@@ -55,7 +55,8 @@ def apply_response(response_hash, type)
         subscription.name = result[:subscription_number]
         subscription.clear_changed_attributes!
         @previously_changed = changes
-        @changed_attributes.clear
+        # @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new
+        clear_changes_information
       else
         self.errors.add(:base, result[:errors][:message])
       end

zuora.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'yard', '~> 0.7.5'
 
-  s.add_dependency 'activemodel', '< 5.0.0'
+  s.add_dependency 'activemodel'#, '< 5.0.0'
  # s.add_dependency 'activesupport', '< 5.0.0'
   s.add_dependency 'httpi', '~> 3.0'
   s.add_dependency 'rack', '< 3.0'