acts_as_serializable 0.1.2 → 0.1.5

data/Rakefile

@@ -60,7 +60,7 @@ begin
 
   task :test do
     Rake::Task[:spec].invoke
-    Rake::Task[:features].invoke
+#   Rake::Task[:features].invoke
   end
 
   desc "Run tests with RCov"

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.5

data/acts_as_serializable.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_serializable}
-  s.version = "0.1.2"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Birkir A. Barkarson"]
-  s.date = %q{2009-06-11}
+  s.date = %q{2009-06-16}
   s.description = %q{Easy versioning of serialization methods}
   s.email = %q{birkirb@stoicviking.net}
   s.extra_rdoc_files = [
@@ -20,12 +20,12 @@ Gem::Specification.new do |s|
      "acts_as_serializable.gemspec",
      "init.rb",
      "lib/acts_as_serializable.rb",
-     "lib/version.rb",
-     "lib/versions.rb",
+     "lib/serializable/version.rb",
+     "lib/serializable/versions.rb",
      "spec/acts_as_serializable_spec.rb",
-     "spec/app/serializations/test_rails_model/test_rails_model/version_1_0_0.rb",
-     "spec/app/serializations/test_rails_model/test_rails_model/version_1_5.rb",
-     "spec/app/serializations/test_rails_model/test_rails_model/version_2_1.rb",
+     "spec/app/serializations/test_rails_model/version_1_0_0.rb",
+     "spec/app/serializations/test_rails_model/version_1_5.rb",
+     "spec/app/serializations/test_rails_model/version_2_1.rb",
      "spec/serializations/test_model/version_1_0_0.rb",
      "spec/serializations/test_model/version_1_5.rb",
      "spec/serializations/test_model/version_2_1.rb",
@@ -48,9 +48,9 @@ Gem::Specification.new do |s|
      "spec/serializations/test_model/version_1_0_0.rb",
      "spec/serializations/test_model/version_2_1.rb",
      "spec/serializations/test_model/version_1_5.rb",
-     "spec/app/serializations/test_rails_model/test_rails_model/version_1_0_0.rb",
-     "spec/app/serializations/test_rails_model/test_rails_model/version_2_1.rb",
-     "spec/app/serializations/test_rails_model/test_rails_model/version_1_5.rb"
+     "spec/app/serializations/test_rails_model/version_1_0_0.rb",
+     "spec/app/serializations/test_rails_model/version_2_1.rb",
+     "spec/app/serializations/test_rails_model/version_1_5.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/acts_as_serializable.rb

@@ -1,4 +1,3 @@
-require 'builder/xmlmarkup'
 require 'jsonbuilder'
 require 'active_support'
 require 'find'
@@ -33,7 +32,7 @@ module Serializable
       Find.find(serialization_directory) do |path|
         if File.file?(path) && versioned_klass = path.match(SERIALIZED_CLASS_NAME_REGEXP)
           require path
-          klass = Serializable.const_get("#{klass_name}").const_get("Version_#{versioned_klass[1]}")
+          klass = Serializations.const_get("#{klass_name}").const_get("Version_#{versioned_klass[1]}")
           if klass && klass.respond_to?(:serialize)
             define_local_serialization_method(versioned_klass[1])
           end
@@ -72,7 +71,7 @@ module Serializable
     def define_local_serialization_method(method_version)
       class_eval <<-EOV
         def serialize_to_version_#{method_version}(builder, options)
-          Serializable::#{self.name}::Version_#{method_version}.serialize(self, builder, options)
+          Serializations::#{self.name}::Version_#{method_version}.serialize(self, builder, options)
         end
       EOV
       @serialization_versions << Version.new(method_version)
@@ -92,11 +91,11 @@ module Serializable
   # This module contains instance methods
   module InstanceMethods
     def to_hash(options = {})
-      serialize(Builder::Hash.new, options)
+      serialize(Builder::HashStructure.new, options)
     end
 
     def to_json(options = {})
-      serialize(Builder::Json.new, options)
+      serialize(Builder::JsonFormat.new, options).to_json
     end
 
     def to_xml(options = {})
@@ -118,6 +117,10 @@ module Serializable
         end
       end
     end
+
+    def serialize_for(builder, options = {})
+      self.send(builder.serialization_method!, options)
+    end
   end
 
 end

data/spec/acts_as_serializable_spec.rb

@@ -23,7 +23,7 @@ class WithSerialize < SerializableObject
   acts_as_serializable
 
   def serialize(builder, options)
-    builder
+    builder.test('value')
   end
 end
 
@@ -65,22 +65,21 @@ describe Serializable, 'if included in a class, then that class' do
 
   context 'with the serialized method overriden to return the builder' do
 
-    it '#to_xml should return an Builder::XmlMarkup' do
+    it '#to_xml should return an Builder::XmlMarkup serialization' do
       klass = WithSerialize.new
-      klass.to_xml.test.should == "<test/>"
+      klass.to_xml.should == "<test>value</test>"
     end
 
-    it '#to_hash should return an Builder::Hash' do
+    it '#to_hash should return an Builder::HashStructure serialization' do
       klass = WithSerialize.new
-      klass.to_hash.test('value').should == 'value'
+      klass.to_hash.should == 'value'
     end
 
-    it '#to_json should return an Builder::Json' do
+    it '#to_json should return an Builder::JsonFormat serialization' do
       klass = WithSerialize.new
-      klass.to_json.test('value').should == '"value"'
+      klass.to_json.should == '"value"'
     end
   end
-
 end
 
 describe Serializable, 'when included in a class that has multiple versioned serialization methods' do
@@ -91,7 +90,7 @@ describe Serializable, 'when included in a class that has multiple versioned ser
       klass = SerializableObject.new
 
       klass.to_xml(:version => '1.0.0').should == "This is version 1.0.0"
-      klass.to_json(:version => '1.5.0').should == "This is version 1.5.0"
+      klass.to_json(:version => '1.5.0').should == "\"This is version 1.5.0\""
       klass.to_hash(:version => '2.1.0').should == "This is version 2.1"
     end
 
@@ -99,7 +98,7 @@ describe Serializable, 'when included in a class that has multiple versioned ser
       klass = SerializableObject.new
 
       klass.to_xml(:version => '1.4.0').should == "This is version 1.0.0"
-      klass.to_json(:version => '3.1.0').should == "This is version 2.1"
+      klass.to_json(:version => '3.1.0').should == "\"This is version 2.1\""
     end
 
     it 'should raise an error if no corresponding version exists' do
@@ -107,6 +106,14 @@ describe Serializable, 'when included in a class that has multiple versioned ser
 
       lambda { klass.to_hash(:version => '0.1.0') }.should raise_error(RuntimeError, "Version 0.1.0 given but no serialization method found")
     end
+
+    it '#serialize_for should call a to_format methods for a given builder' do
+      klass = SerializableObject.new
+
+      klass.serialize_for(Builder::XmlMarkup.new).should == "This is version 2.1"
+      klass.serialize_for(Builder::JsonFormat.new).should == "\"This is version 2.1\""
+      klass.serialize_for(Builder::HashStructure.new).should == "This is version 2.1"
+    end
   end
 
   context 'and a to_format method is called with no version option' do
@@ -140,7 +147,7 @@ describe Serializable, 'when included in a class that has multiple serialization
       klass = TestModel.new
 
       klass.to_xml(:version => '1.0.0').should == "This is version 1.0.0 for TestModel"
-      klass.to_json(:version => '1.5.0').should == "This is version 1.5.0 for TestModel"
+      klass.to_json(:version => '1.5.0').should == "\"This is version 1.5.0 for TestModel\""
       klass.to_hash(:version => '2.1.0').should == "This is version 2.1 for TestModel"
     end
 
@@ -148,7 +155,7 @@ describe Serializable, 'when included in a class that has multiple serialization
       klass = TestModel.new
 
       klass.to_xml(:version => '1.4.0').should == "This is version 1.0.0 for TestModel"
-      klass.to_json(:version => '3.1.0').should == "This is version 2.1 for TestModel"
+      klass.to_json(:version => '3.1.0').should == "\"This is version 2.1 for TestModel\""
     end
 
     it 'should raise an error if no corresponding version exists' do
@@ -177,7 +184,7 @@ describe Serializable, 'when included in a class that has multiple serialization
       klass = TestRailsModel.new
 
       klass.to_xml(:version => '1.0.0').should == "This is version 1.0.0 for TestRailsModel"
-      klass.to_json(:version => '1.5.0').should == "This is version 1.5.0 for TestRailsModel"
+      klass.to_json(:version => '1.5.0').should == "\"This is version 1.5.0 for TestRailsModel\""
       klass.to_hash(:version => '2.1.0').should == "This is version 2.1 for TestRailsModel"
     end
   end

data/spec/app/serializations/test_rails_model/{test_rails_model/version_1_0_0.rb → version_1_0_0.rb}

@@ -1,4 +1,4 @@
-module Serializable
+module Serializations
   module TestRailsModel
     class Version_1_0_0
       def self.serialize(test_model, builder, options)

data/spec/app/serializations/test_rails_model/{test_rails_model/version_1_5.rb → version_1_5.rb}

@@ -1,4 +1,4 @@
-module Serializable
+module Serializations
   module TestRailsModel
     class Version_1_5
       def self.serialize(test_model, builder, options)

data/spec/app/serializations/test_rails_model/{test_rails_model/version_2_1.rb → version_2_1.rb}

@@ -1,4 +1,4 @@
-module Serializable
+module Serializations
   module TestRailsModel
     class Version_2_1
       def self.serialize(test_model, builder, options)

data/spec/serializations/test_model/version_1_0_0.rb

@@ -1,4 +1,4 @@
-module Serializable
+module Serializations
   module TestModel
     class Version_1_0_0
       def self.serialize(test_model, builder, options)

data/spec/serializations/test_model/version_1_5.rb

@@ -1,4 +1,4 @@
-module Serializable
+module Serializations
   module TestModel
     class Version_1_5
       def self.serialize(test_model, builder, options)

data/spec/serializations/test_model/version_2_1.rb

@@ -1,4 +1,4 @@
-module Serializable
+module Serializations
   module TestModel
     class Version_2_1
       def self.serialize(test_model, builder, options)

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'spec'
 
-require 'lib/version'
-require 'lib/versions'
+require 'lib/serializable/version'
+require 'lib/serializable/versions'
 require 'lib/acts_as_serializable'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_serializable
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors: 
 - Birkir A. Barkarson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-11 00:00:00 +09:00
+date: 2009-06-16 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,12 +48,12 @@ files:
 - acts_as_serializable.gemspec
 - init.rb
 - lib/acts_as_serializable.rb
-- lib/version.rb
-- lib/versions.rb
+- lib/serializable/version.rb
+- lib/serializable/versions.rb
 - spec/acts_as_serializable_spec.rb
-- spec/app/serializations/test_rails_model/test_rails_model/version_1_0_0.rb
-- spec/app/serializations/test_rails_model/test_rails_model/version_1_5.rb
-- spec/app/serializations/test_rails_model/test_rails_model/version_2_1.rb
+- spec/app/serializations/test_rails_model/version_1_0_0.rb
+- spec/app/serializations/test_rails_model/version_1_5.rb
+- spec/app/serializations/test_rails_model/version_2_1.rb
 - spec/serializations/test_model/version_1_0_0.rb
 - spec/serializations/test_model/version_1_5.rb
 - spec/serializations/test_model/version_2_1.rb
@@ -94,6 +94,6 @@ test_files:
 - spec/serializations/test_model/version_1_0_0.rb
 - spec/serializations/test_model/version_2_1.rb
 - spec/serializations/test_model/version_1_5.rb
-- spec/app/serializations/test_rails_model/test_rails_model/version_1_0_0.rb
-- spec/app/serializations/test_rails_model/test_rails_model/version_2_1.rb
-- spec/app/serializations/test_rails_model/test_rails_model/version_1_5.rb
+- spec/app/serializations/test_rails_model/version_1_0_0.rb
+- spec/app/serializations/test_rails_model/version_2_1.rb
+- spec/app/serializations/test_rails_model/version_1_5.rb