active_model_archive 0.9.0 → 0.9.1

data/active_model_archive.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "active_model_archive"
-  s.version     = '0.9.0'
+  s.version     = '0.9.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Grant Rodgers"]
   s.email       = ["grantr@gmail.com"]

data/lib/active_model_archive/restore.rb

@@ -12,7 +12,9 @@ module ActiveModelArchive
 
       def each_instance(io)
         each_archive(io) do |hash|
-          yield new(hash)
+          attributes = {}
+          valid_archive_keys.each { |key| attributes[key] = hash[key] }
+          yield new(attributes)
         end
       end
 
@@ -33,6 +35,10 @@ module ActiveModelArchive
 
         count
       end
+
+      def valid_archive_keys
+        @valid_archive_keys ||= new.attributes.keys
+      end
     end
   end
 end

data/test/restore_test.rb

@@ -33,20 +33,39 @@ class ActiveModelArchive::RestoreTest < MiniTest::Spec
 
   def test_each_instance
     json_io = StringIO.new %{
-       {
-         "id":     42,
-         "color": "green"
-       }
-     }
+      {
+        "id":     42,
+        "color": "green"
+      }
+    }
+    
+    results = []
+    TestModel.each_instance(json_io) do |object|
+      results << object
+    end
+    
+    assert_equal 1, results.size
+    assert_equal 42, results.first.id
+    assert_equal 'green', results.first.color
+  end
 
-     results = []
-     TestModel.each_instance(json_io) do |object|
-       results << object
-     end
+  def test_each_instance_slices_attributes
+    assert_raises NoMethodError do
+      TestModel.new foo: 'bar', color: 'green'
+    end
+    
+    json_io = StringIO.new %{
+      {
+        "foo":   "bar",
+        "color": "green"
+      }
+    }
 
-     assert_equal 1, results.size
-     assert_equal 42, results.first.id
-     assert_equal 'green', results.first.color
+    results = []
+    TestModel.each_instance(json_io) do |object|
+      results << object
+    end
+    assert_equal 'green', results.first.color
   end
 
   def test_restore!

data/test/test_helper.rb

@@ -14,6 +14,7 @@ class TestModel
 
   def initialize(attrs = {})
     @attributes = {}
+    
     self.attributes = attrs
   end
 
@@ -21,16 +22,28 @@ class TestModel
     @attributes['id']
   end
 
+  def id=(val)
+    @attributes['id'] = val
+  end
+
   def color
     @attributes['color']
   end
 
+  def color=(val)
+    @attributes['color'] = val
+  end
+
   def attributes=(attrs)
-    @attributes['color'] = attrs[:color] || attrs['color']
-    @attributes['id'] = attrs[:id] || attrs['id']
+    attrs.each do |key, value|
+      send("#{key}=", value)
+    end
   end
 
   def attributes
-    @attributes
+    {
+      'id'    => id,
+      'color' => color
+    }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_archive
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70251111770820 !ruby/object:Gem::Requirement
+  requirement: &70351174947160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70251111770820
+  version_requirements: *70351174947160
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70251111770120 !ruby/object:Gem::Requirement
+  requirement: &70351174946320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70251111770120
+  version_requirements: *70351174946320
 description: Adds dump and restore functionality to activemodel classes
 email:
 - grantr@gmail.com