active_model_archive 1.1.1 → 1.1.2

data/active_model_archive.gemspec

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

data/lib/active_model_archive/file_manager.rb

@@ -26,11 +26,15 @@ module ActiveModelArchive
 
     def create_file
       self.file_number += 1
+      
+      if items_per_file == UNLIMITED_PER_FILE
+        filename = base_filename
+      else
+        extension = File.extname(base_filename)
+        filename = "#{base_filename.chomp(extension)}.#{file_number}#{extension}"
+      end
 
-      filename = items_per_file == UNLIMITED_PER_FILE ? base_filename : "#{base_filename}.#{file_number}"
-      file = File.open(filename, "w")
-
-      file
+      File.open(filename, "w")
     end
 
     def flush

data/test/file_manager_test.rb

@@ -19,7 +19,7 @@ class ActiveModelArchive::FileManagerTest < MiniTest::Spec
     assert_equal object.to_archive, File.read('tmp/wtf')
   end
 
-  def test_items_per_file
+  def test_items_per_file_without_extension
     file_manager = ActiveModelArchive::FileManager.new('tmp/wtf', 2) do |file_manager|
       file_manager.add(TestModel.new)
       file_manager.add(TestModel.new)
@@ -28,4 +28,14 @@ class ActiveModelArchive::FileManagerTest < MiniTest::Spec
 
     assert_equal ["tmp/wtf.1", "tmp/wtf.2"], Dir.glob('tmp/wtf*')
   end
+
+  def test_items_per_file_with_extension
+    file_manager = ActiveModelArchive::FileManager.new('tmp/wtf.csv', 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.csv", "tmp/wtf.2.csv"], 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: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: active_model_archive
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Dump and restore activemodel objects