active_model_archive 0.9.3 → 0.9.4

data/.gitignore

@@ -1,4 +1,4 @@
 *.gem
 .bundle
 Gemfile.lock
-pkg/*
+tmp/

data/active_model_archive.gemspec

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

data/lib/active_model_archive/dump.rb

@@ -5,23 +5,22 @@ module ActiveModelArchive
     module ClassMethods
       def dump!(filename, options = {})
         query = options[:query]
-        per_file = options[:per_file]
+        per_file = options[:per_file] ? options[:per_file].to_i : nil
 
-        file_manager = FileManager.new(filename, per_file)
-
-        if query.blank?
-          find_each do |object|
-            yield(object) if block_given?
-            file_manager.add(object)
-          end
-        else
-          paginated_each(query) do |object|
-            yield(object) if block_given?
-            file_manager.add(object)
+        file_manager = FileManager.new(filename, per_file) do |file_manager|
+          if query.blank?
+            find_each do |object|
+              yield(object) if block_given?
+              file_manager.add(object)
+            end
+          else
+            paginated_each(query) do |object|
+              yield(object) if block_given?
+              file_manager.add(object)
+            end
           end
         end
 
-        file_manager.flush
         file_manager.item_count
       end
     end

data/lib/active_model_archive/file_manager.rb

@@ -2,11 +2,14 @@ module ActiveModelArchive
   class FileManager
     UNLIMITED_PER_FILE = 999999999
     attr_accessor :item_count, :file_number, :base_filename, :items_per_file
-    def initialize(base_filename, items_per_file)
+    def initialize(base_filename, items_per_file = nil)
       @item_count = 0
       @file_number = 0
       @base_filename = base_filename
-      @items_per_file = (items_per_file.presence || UNLIMITED_PER_FILE).to_i
+      @items_per_file = items_per_file || UNLIMITED_PER_FILE
+
+      yield(self)
+      flush
     end
 
     def add(object)
@@ -25,7 +28,7 @@ module ActiveModelArchive
 
     def create_file
       self.file_number += 1
-      
+
       filename = items_per_file == UNLIMITED_PER_FILE ? base_filename : "#{base_filename}.#{file_number}"
       file = File.open(filename, "w")
 

data/test/file_manager_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+class ActiveModelArchive::FileManagerTest < MiniTest::Spec
+  def setup
+    FileUtils.mkpath('tmp')
+  end
+
+  def teardown
+    FileUtils.rm_rf('tmp')
+  end
+
+  def test_add
+    object = TestModel.new(id: 'foo', color: 'red')
+
+    file_manager = ActiveModelArchive::FileManager.new('tmp/wtf') do |file_manager|
+      file_manager.add(object)
+    end
+
+    assert_equal file_manager.encoder.encode(object.as_archive), File.read('tmp/wtf')
+  end
+
+  def test_items_per_file
+    file_manager = ActiveModelArchive::FileManager.new('tmp/wtf', 2) do |file_manager|
+      file_manager.add(TestModel.new)
+      file_manager.add(TestModel.new)
+      file_manager.add(TestModel.new)
+    end
+
+    assert_equal ["tmp/wtf.1", "tmp/wtf.2"], Dir.glob('tmp/wtf*')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_archive
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000 Z
+date: 2011-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70119318295040 !ruby/object:Gem::Requirement
+  requirement: &70165958779720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70119318295040
+  version_requirements: *70165958779720
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70119318293880 !ruby/object:Gem::Requirement
+  requirement: &70165958779240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70119318293880
+  version_requirements: *70165958779240
 description: Adds dump and restore functionality to activemodel classes
 email:
 - grantr@gmail.com
@@ -50,6 +50,7 @@ files:
 - lib/active_model_archive/file_manager.rb
 - lib/active_model_archive/restore.rb
 - test/dump_test.rb
+- test/file_manager_test.rb
 - test/restore_test.rb
 - test/test_helper.rb
 homepage: ''
@@ -78,5 +79,6 @@ specification_version: 3
 summary: Dump and restore activemodel objects
 test_files:
 - test/dump_test.rb
+- test/file_manager_test.rb
 - test/restore_test.rb
 - test/test_helper.rb