active_model_archive 0.9.6 → 1.0.0

data/active_model_archive.gemspec

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

data/lib/active_model_archive/archiver/csv.rb

@@ -0,0 +1,28 @@
+require 'csv'
+
+module ActiveModelArchive
+  module Archiver
+    class Csv
+      def header(object)
+        object.archive_attributes.to_csv
+      end
+
+      def encode(object)
+        object.as_archive.values_at(*object.archive_attributes).to_csv
+      end
+
+      def parse(io)
+        first_line = true
+        header = []
+        io.each do |line|
+          if first_line
+            first_line = false
+            header = line.parse_csv
+          else
+            yield Hash[header.zip(line.parse_csv)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_model_archive/archiver/json.rb

@@ -0,0 +1,16 @@
+module ActiveModelArchive
+  module Archiver
+    class Json
+      def header(object)
+      end
+
+      def encode(object)
+        (@encoder ||= Yajl::Encoder.new).encode(object.as_archive) + "\n"
+      end
+
+      def parse(io, &block)
+        (@parser ||= Yajl::Parser.new).parse(io, &block)
+      end
+    end
+  end
+end

data/lib/active_model_archive/attributes.rb

@@ -0,0 +1,25 @@
+module ActiveModelArchive
+  module Attributes
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def archive_attributes
+        @archive_attributes ||= (new.as_archive.keys)
+      end
+    end
+    
+    def archive_attributes
+      self.class.archive_attributes
+    end
+
+    def as_archive
+      attributes.dup.update('id' => id)
+    end
+
+    def to_archive
+      archiver.encode(self).tap do |encoded|
+        encoded.force_encoding('UTF-8')
+      end
+    end
+  end
+end

data/lib/active_model_archive/dump.rb

@@ -24,9 +24,5 @@ module ActiveModelArchive
         file_manager.item_count
       end
     end
-
-    def as_archive
-      attributes.dup.update('id' => id)
-    end
   end
 end

data/lib/active_model_archive/file_manager.rb

@@ -20,10 +20,7 @@ module ActiveModelArchive
 
       self.item_count += 1
 
-      encoder.encode(object.as_archive, nil) do |json|
-        json.force_encoding('UTF-8')
-        @current_file.puts(json)
-      end
+      @current_file.write(object.to_archive)
     end
 
     def create_file
@@ -40,9 +37,5 @@ module ActiveModelArchive
         @current_file.close
       end
     end
-    
-    def encoder
-      @encoder ||= Yajl::Encoder.new
-    end
   end
 end

data/lib/active_model_archive/restore.rb

@@ -13,7 +13,7 @@ module ActiveModelArchive
       def each_instance(io)
         each_archive(io) do |hash|
           attributes = {}
-          valid_archive_keys.each { |key| attributes[key] = hash[key] }
+          archive_attributes.each { |key| attributes[key] = hash[key] }
           yield new(attributes)
         end
       end
@@ -26,19 +26,14 @@ module ActiveModelArchive
 
       def each_archive(io)
         count = 0
-        parser = Yajl::Parser.new
 
-        parser.parse(io) do |hash|
+        archiver.parse(io) do |hash|
           count += 1
           yield hash
         end
 
         count
       end
-
-      def valid_archive_keys
-        @valid_archive_keys ||= (new.attributes.keys + ['id'])
-      end
     end
   end
 end

data/lib/active_model_archive.rb

@@ -1,13 +1,24 @@
 require 'active_support/dependencies/autoload'
 require 'active_support/concern'
+require 'active_support/core_ext/class/attribute'
+require 'active_support/inflector'
+
 require 'yajl'
 
 module ActiveModelArchive
   extend ActiveSupport::Autoload
 
+  autoload :Attributes
   autoload :FileManager
   autoload :Dump
   autoload :Restore
+
+  module Archiver
+    extend ActiveSupport::Autoload
+
+    autoload :Csv
+    autoload :Json
+  end
 end
 
 module ActiveModel
@@ -15,8 +26,20 @@ module ActiveModel
     extend ActiveSupport::Concern
 
     included do
+      class_attribute :archiver
+      self.archiver_type = :json
+
+      include ActiveModelArchive::Attributes
       include ActiveModelArchive::Dump
       include ActiveModelArchive::Restore
     end
+
+    module ClassMethods
+      # Widget.archiver_type = :json
+      # Widget.archiver_type = :csv
+      def archiver_type=(type)
+        self.archiver = "ActiveModelArchive::Archiver::#{type.to_s.camelize}".constantize.new
+      end
+    end
   end
 end

data/test/archiver/csv_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+class ActiveModelArchive::Archiver::CsvTest < MiniTest::Spec
+  def test_header
+    model = TestModel.new
+    assert_equal "color,id\n", archiver.header(model)
+  end
+
+  def test_encode
+    model = TestModel.new(id: 5, color: 'blue')
+    assert_equal "blue,5\n", archiver.encode(model)
+  end
+
+  def test_parse
+    io = StringIO.new(
+      "id,color\n" +
+      "3,red\n" +
+      "4,green\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::Csv.new
+    end
+end

data/test/attributes_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+
+class ActiveModelArchive::AttributesTest < MiniTest::Spec
+  def test_as_archive
+    model = TestModel.new(id: 5, color: 'blue')
+    assert_equal(
+      {'id' => 5, 'color' => 'blue'},
+      model.as_archive
+    )
+  end
+
+  def test_to_archive
+    model = TestModel.new(id: 5, color: 'blue')
+    assert_equal(
+      model.class.archiver.encode(model),
+      model.to_archive
+    )
+  end
+end

data/test/dump_test.rb

@@ -1,11 +1,5 @@
 require 'test_helper'
 
 class ActiveModelArchive::DumpTest < MiniTest::Spec
-  def test_as_archive
-    model = TestModel.new(id: 5, color: 'blue')
-    assert_equal(
-      {'id' => 5, 'color' => 'blue'},
-      model.as_archive
-    )
-  end
+
 end

data/test/file_manager_test.rb

@@ -16,7 +16,7 @@ class ActiveModelArchive::FileManagerTest < MiniTest::Spec
       file_manager.add(object)
     end
 
-    assert_equal file_manager.encoder.encode(object.as_archive), File.read('tmp/wtf')
+    assert_equal object.to_archive, File.read('tmp/wtf')
   end
 
   def test_items_per_file

data/test/restore_test.rb

@@ -68,13 +68,6 @@ class ActiveModelArchive::RestoreTest < MiniTest::Spec
     assert_equal 'green', results.first.color
   end
 
-  def test_valid_archive_keys
-    assert_equal(
-      ['color', 'id'],
-      TestModel.valid_archive_keys
-    )
-  end
-
   def test_restore!
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_archive
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -56,9 +56,14 @@ files:
 - Rakefile
 - active_model_archive.gemspec
 - lib/active_model_archive.rb
+- lib/active_model_archive/archiver/csv.rb
+- lib/active_model_archive/archiver/json.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/attributes_test.rb
 - test/dump_test.rb
 - test/file_manager_test.rb
 - test/restore_test.rb
@@ -88,6 +93,8 @@ signing_key:
 specification_version: 3
 summary: Dump and restore activemodel objects
 test_files:
+- test/archiver/csv_test.rb
+- test/attributes_test.rb
 - test/dump_test.rb
 - test/file_manager_test.rb
 - test/restore_test.rb