active_model_archive 1.1.0 → 1.1.1

data/active_model_archive.gemspec

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

data/lib/active_model_archive.rb

@@ -18,6 +18,7 @@ module ActiveModelArchive
 
     autoload :Csv
     autoload :Json
+    autoload :Tabs
   end
 end
 

data/lib/active_model_archive/archiver/csv.rb

@@ -3,25 +3,30 @@ require 'csv'
 module ActiveModelArchive
   module Archiver
     class Csv
+      class_attribute :separator
+      self.separator = ','
+
       def header(object)
-        object.archive_attributes.to_csv
+        object.archive_attributes.to_csv(col_sep: separator)
       end
 
       def encode(object)
         object.as_archive.values_at(*object.archive_attributes).map do |value|
           value.respond_to?(:any?) && value.any? ? ActiveSupport::JSON.encode(value) : value
-        end.to_csv
+        end.to_csv(col_sep: separator)
       end
 
       def parse(io)
         first_line = true
         header = []
         io.each do |line|
+          values = line.parse_csv(col_sep: separator)
+
           if first_line
             first_line = false
-            header = line.parse_csv
+            header = values
           else
-            values = line.parse_csv.map do |value|
+            values.map! do |value|
               begin ActiveSupport::JSON.decode(value) rescue value end
             end
             yield Hash[header.zip(values)]

data/lib/active_model_archive/archiver/tabs.rb

@@ -0,0 +1,7 @@
+module ActiveModelArchive
+  module Archiver
+    class Tabs < Csv
+      self.separator = "\t"
+    end
+  end
+end

data/lib/active_model_archive/attributes.rb

@@ -13,7 +13,7 @@ module ActiveModelArchive
     end
 
     def as_archive
-      attributes.dup.update('id' => id)
+      attributes
     end
 
     def to_archive

data/test/archiver/csv_test.rb

@@ -3,12 +3,12 @@ require 'test_helper'
 class ActiveModelArchive::Archiver::CsvTest < MiniTest::Spec
   def test_header
     model = TestModel.new
-    assert_equal "color,id\n", archiver.header(model)
+    assert_equal "id,color\n", archiver.header(model)
   end
 
   def test_encode
     model = TestModel.new(id: 5, color: 'blue')
-    assert_equal "blue,5\n", archiver.encode(model)
+    assert_equal "5,blue\n", archiver.encode(model)
   end
 
   def test_parse

data/test/archiver/tabs_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+class ActiveModelArchive::Archiver::TabsTest < MiniTest::Spec
+  def test_header
+    model = TestModel.new
+    assert_equal "id\tcolor\n", archiver.header(model)
+  end
+
+  def test_encode
+    model = TestModel.new(id: 5, color: 'blue')
+    assert_equal "5\tblue\n", archiver.encode(model)
+  end
+
+  def test_parse
+    io = StringIO.new(
+      "id\tcolor\n" +
+      "3\tred\n" +
+      "4\tgreen\n"
+    )
+
+    results = []
+
+    archiver.parse(io) do |attributes|
+      results << attributes
+    end
+
+    expected = [
+      {'id' => '3', 'color' => 'red'},
+      {'id' => '4', 'color' => 'green'}
+    ]
+    assert_equal expected, results
+  end
+
+  private
+    def archiver
+      @archiver ||= ActiveModelArchive::Archiver::Tabs.new
+    end
+end

data/test/test_helper.rb

@@ -42,6 +42,7 @@ class TestModel
 
   def attributes
     {
+      'id'    => id,
       'color' => color
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_archive
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70140718024440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70140718024440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70140718023620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70140718023620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adds dump and restore functionality to activemodel classes
 email:
 - grantr@gmail.com
@@ -48,11 +58,13 @@ files:
 - lib/active_model_archive.rb
 - lib/active_model_archive/archiver/csv.rb
 - lib/active_model_archive/archiver/json.rb
+- lib/active_model_archive/archiver/tabs.rb
 - lib/active_model_archive/attributes.rb
 - lib/active_model_archive/dump.rb
 - lib/active_model_archive/file_manager.rb
 - lib/active_model_archive/restore.rb
 - test/archiver/csv_test.rb
+- test/archiver/tabs_test.rb
 - test/attributes_test.rb
 - test/dump_test.rb
 - test/file_manager_test.rb
@@ -78,12 +90,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: active_model_archive
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Dump and restore activemodel objects
 test_files:
 - test/archiver/csv_test.rb
+- test/archiver/tabs_test.rb
 - test/attributes_test.rb
 - test/dump_test.rb
 - test/file_manager_test.rb