active_model_archive 0.0.1 → 0.0.2

data/lib/active_model_archive/version.rb

@@ -1,3 +1,3 @@
 module ActiveModelArchive
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/active_model_archive.rb

@@ -79,6 +79,16 @@ module ActiveModel
       # executes the block with each restored record if given
       # the block can be used to log progress and warn about invalid objects
       def restore!(stream, options={}, &block)
+
+        # for each hash read, create an object
+        each_archive(stream) do |hash|
+          o = from_archive(hash)
+          o.save(:validate => !!options[:validate])
+          yield o if block_given?
+        end
+      end
+
+      def each_archive(stream, &block)
         # check magic byte
         magic = archive_read_int(stream)
         raise "Not an archive stream" unless magic == MAGIC
@@ -89,21 +99,7 @@ module ActiveModel
 
         count = 0
         parser = Yajl::Parser.new
-
-        if options[:check]
-          # if we are just checking, increment but do not create anything
-          parser.on_parse_complete = lambda do |hash|
-            count += 1
-          end
-        else
-          # for each hash read, create an object
-          parser.on_parse_complete = lambda do |hash|
-            o = from_archive(hash)
-            o.save(:validate => !!options[:validate])
-            block.call(o) if block_given?
-            count += 1
-          end
-        end
+        parser.on_parse_complete = block if block_given?
 
         # loop through records until a null is read
         record_size = archive_read_int(stream)
@@ -126,7 +122,7 @@ module ActiveModel
       # returns true if the archive is valid
       def valid_archive?(stream)
         begin
-          restore!(stream, :check => true)
+          each_archive(stream)
         rescue
           return false
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_archive
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-09 00:00:00.000000000 -08:00
+date: 2011-03-16 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &14070060 !ruby/object:Gem::Requirement
+  requirement: &23233620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *14070060
+  version_requirements: *23233620
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &14069320 !ruby/object:Gem::Requirement
+  requirement: &23232860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14069320
+  version_requirements: *23232860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14068620 !ruby/object:Gem::Requirement
+  requirement: &23232140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *14068620
+  version_requirements: *23232140
 description: Adds dump and restore functionality to activemodel classes
 email:
 - grantr@gmail.com