active_remote 1.5.2 → 1.5.4

data/lib/active_remote/base.rb

@@ -34,8 +34,9 @@ module ActiveRemote
     define_model_callbacks :initialize, :only => :after
 
     def initialize(*)
+      @attributes ||= {}
+
       run_callbacks :initialize do
-        @attributes ||= {}
         super
       end
     end

data/lib/active_remote/dirty.rb

@@ -7,6 +7,8 @@ module ActiveRemote
     def self.included(klass)
       klass.class_eval do
         include ActiveModel::Dirty
+
+        attr_accessor :_active_remote_track_changes
       end
     end
 
@@ -39,15 +41,20 @@ module ActiveRemote
       end
     end
 
-    # Override #serialize_records so that we can clear changes after
+    # Override #serialize_records so that we can skip dirty tracking while
     # initializing records returned from a search.
     #
-    def serialize_records(*)
-      if serialized_records = super
-        serialized_records.each do |record|
-          record.previous_changes.try(:clear)
-          record.changed_attributes.try(:clear)
-        end
+    def serialize_records
+      return nil unless last_response.respond_to?(:records)
+
+      last_response.records.map do |record|
+        remote = self.class.new
+
+        remote._active_remote_track_changes = false
+        remote.assign_attributes(record.to_hash)
+        remote._active_remote_track_changes = true
+
+        remote
       end
     end
 
@@ -55,18 +62,24 @@ module ActiveRemote
     # ActiveModel::Dirty.
     #
     def write_attribute(name, value)
-      __send__("#{name}_will_change!") unless value == self[name]
+      __send__("#{name}_will_change!") if _active_remote_track_changes? && value != self[name]
       super
     end
     alias_method :[]=, :write_attribute
 
   private
 
+    # Wether or not changes are currently being tracked for this class.
+    #
+    def _active_remote_track_changes?
+      @_active_remote_track_changes != false
+    end
+
     # Override ActiveAttr's attribute= method so we can provide support for
     # ActiveModel::Dirty.
     #
     def attribute=(name, value)
-      __send__("#{name}_will_change!") unless value == self[name]
+      __send__("#{name}_will_change!") if _active_remote_track_changes? && value != self[name]
       super
     end
 

data/lib/active_remote/version.rb

@@ -1,3 +1,3 @@
 module ActiveRemote
-  VERSION = "1.5.2"
+  VERSION = "1.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_remote
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -221,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -883417827179456580
+      hash: -651201959748601196
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -230,10 +230,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -883417827179456580
+      hash: -651201959748601196
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Active Record for your platform