dm-serializer 1.1.0 → 1.2.0.rc1

data/Gemfile

@@ -5,20 +5,22 @@ source 'http://rubygems.org'
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION     = '~> 1.1.0'
-DO_VERSION     = '~> 0.10.2'
+DM_VERSION     = '~> 1.2.0.rc1'
+DO_VERSION     = '~> 0.10.6'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
-gem 'dm-core',   DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
-gem 'fastercsv', '~> 1.5.4'
-gem 'json',      '~> 1.4.6'
+gem 'dm-core',    DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
+gem 'fastercsv',  '~> 1.5.4'
+gem 'multi_json', '~> 1.0.3'
+gem 'json',       '~> 1.5.4', :platforms => [ :ruby_18, :jruby ]
+gem 'json_pure',  '~> 1.5.4', :platforms => [ :mswin ]
 
 group :development do
 
   gem 'dm-validations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-validations#{REPO_POSTFIX}"
-  gem 'jeweler',        '~> 1.5.2'
-  gem 'rake',           '~> 0.8.7'
-  gem 'rspec',          '~> 1.3.1'
+  gem 'jeweler',        '~> 1.6.4'
+  gem 'rake',           '~> 0.9.2'
+  gem 'rspec',          '~> 1.3.2'
 
 end
 
@@ -32,9 +34,9 @@ end
 platforms :mri_18 do
   group :quality do
 
-    gem 'rcov',      '~> 0.9.9'
-    gem 'yard',      '~> 0.6'
-    gem 'yardstick', '~> 0.2'
+    gem 'rcov',      '~> 0.9.10'
+    gem 'yard',      '~> 0.7.2'
+    gem 'yardstick', '~> 0.4'
 
   end
 end

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.5.2'
+  gem 'jeweler', '~> 1.6.4'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -21,5 +21,5 @@ begin
 
   FileList['tasks/**/*.rake'].each { |task| import task }
 rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.5.2'
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.6.4'
 end

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0.rc1

data/dm-serializer.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{dm-serializer}
-  s.version = "1.1.0"
+  s.name = "dm-serializer"
+  s.version = "1.2.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guy van den Berg"]
-  s.date = %q{2011-03-16}
-  s.description = %q{DataMapper plugin for serializing Resources and Collections}
-  s.email = %q{vandenberg.guy [a] gmail [d] com}
+  s.date = "2011-09-09"
+  s.description = "DataMapper plugin for serializing Resources and Collections"
+  s.email = "vandenberg.guy [a] gmail [d] com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -22,8 +22,6 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "autotest/discover.rb",
-    "autotest/dmserializer_rspec.rb",
     "benchmarks/to_json.rb",
     "benchmarks/to_xml.rb",
     "dm-serializer.gemspec",
@@ -54,53 +52,46 @@ Gem::Specification.new do |s|
     "tasks/yard.rake",
     "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-serializer}
+  s.homepage = "http://github.com/datamapper/dm-serializer"
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{DataMapper plugin for serializing Resources and Collections}
-  s.test_files = [
-    "spec/fixtures/cow.rb",
-    "spec/fixtures/planet.rb",
-    "spec/fixtures/quan_tum_cat.rb",
-    "spec/fixtures/vehicle.rb",
-    "spec/lib/serialization_method_shared_spec.rb",
-    "spec/public/serializer_spec.rb",
-    "spec/public/to_csv_spec.rb",
-    "spec/public/to_json_spec.rb",
-    "spec/public/to_xml_spec.rb",
-    "spec/public/to_yaml_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubyforge_project = "datamapper"
+  s.rubygems_version = "1.8.10"
+  s.summary = "DataMapper plugin for serializing Resources and Collections"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
       s.add_runtime_dependency(%q<fastercsv>, ["~> 1.5.4"])
-      s.add_runtime_dependency(%q<json>, ["~> 1.4.6"])
-      s.add_development_dependency(%q<dm-validations>, ["~> 1.1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_runtime_dependency(%q<multi_json>, ["~> 1.0.3"])
+      s.add_runtime_dependency(%q<json>, ["~> 1.5.4"])
+      s.add_runtime_dependency(%q<json_pure>, ["~> 1.5.4"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.2.0.rc1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
+      s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
       s.add_dependency(%q<fastercsv>, ["~> 1.5.4"])
-      s.add_dependency(%q<json>, ["~> 1.4.6"])
-      s.add_dependency(%q<dm-validations>, ["~> 1.1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_dependency(%q<multi_json>, ["~> 1.0.3"])
+      s.add_dependency(%q<json>, ["~> 1.5.4"])
+      s.add_dependency(%q<json_pure>, ["~> 1.5.4"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.2.0.rc1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.2"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
+    s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
     s.add_dependency(%q<fastercsv>, ["~> 1.5.4"])
-    s.add_dependency(%q<json>, ["~> 1.4.6"])
-    s.add_dependency(%q<dm-validations>, ["~> 1.1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+    s.add_dependency(%q<multi_json>, ["~> 1.0.3"])
+    s.add_dependency(%q<json>, ["~> 1.5.4"])
+    s.add_dependency(%q<json_pure>, ["~> 1.5.4"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.2.0.rc1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rake>, ["~> 0.9.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.2"])
   end
 end
 

data/lib/dm-serializer/common.rb

@@ -2,9 +2,6 @@ require 'dm-core'
 
 module DataMapper
   module Serializer
-    def self.dm_validations_loaded?
-      DataMapper.const_defined?("Validations")
-    end
 
     # Returns propreties to serialize based on :only or :exclude arrays,
     # if provided :only takes precendence over :exclude

data/lib/dm-serializer/to_csv.rb

@@ -4,7 +4,6 @@ if RUBY_VERSION >= '1.9.0'
  require 'csv'
 else
   begin
-    gem 'fastercsv', '~>1.5.0'
     require 'fastercsv'
     CSV = FasterCSV
   rescue LoadError
@@ -62,14 +61,11 @@ module DataMapper
     end
   end
 
-  if Serializer.dm_validations_loaded?
-
+  if const_defined?(:Validations)
     module Validations
       class ValidationErrors
         include DataMapper::Serializer::ValidationErrors::ToCsv
       end
     end
-
   end
-
 end

data/lib/dm-serializer/to_json.rb

@@ -1,6 +1,6 @@
 require 'dm-serializer/common'
 
-require 'json'
+require 'multi_json'
 
 module DataMapper
   module Serializer
@@ -60,7 +60,7 @@ module DataMapper
 
       # default to making JSON
       if options.fetch(:to_json, true)
-        result.to_json
+        MultiJson.encode(result)
       else
         result
       end
@@ -69,7 +69,7 @@ module DataMapper
     module ValidationErrors
       module ToJson
         def to_json(*args)
-          DataMapper::Ext::Array.to_hash(errors).to_json
+          MultiJson.encode(Hash[ errors ])
         end
       end
     end
@@ -93,14 +93,11 @@ module DataMapper
     end
   end
 
-  if Serializer.dm_validations_loaded?
-
+  if const_defined?(:Validations)
     module Validations
       class ValidationErrors
         include DataMapper::Serializer::ValidationErrors::ToJson
       end
     end
-
   end
-
 end

data/lib/dm-serializer/to_xml.rb

@@ -116,13 +116,11 @@ module DataMapper
     end
   end
 
-  if Serializer.dm_validations_loaded?
-
+  if const_defined?(:Validations)
     module Validations
       class ValidationErrors
         include DataMapper::Serializer::ValidationErrors::ToXml
       end
     end
-
   end
 end

data/lib/dm-serializer/to_yaml.rb

@@ -2,68 +2,159 @@ require 'dm-serializer/common'
 
 module DataMapper
   module Serializer
-    # Serialize a Resource to YAML
+    TAG_NAME = "ruby/DataMapper,#{DataMapper::VERSION}".freeze
+
+    # Include a callback to register the YAML output
+    #
+    # @param [DataMapper::Model] descendant
+    #
+    # @return [undefined]
     #
-    # @return [YAML]
-    #   A YAML representation of this Resource.
-    def to_yaml(opts_or_emitter = {})
-      unless opts_or_emitter.is_a?(Hash)
-        emitter = opts_or_emitter
-        opts = {}
-      else
-        emitter = {}
-        opts = opts_or_emitter
+    # @api private
+    def self.included(descendant)
+      YAML.add_domain_type(TAG_NAME, descendant.name) do |_tag, values|
+        values
       end
+    end
 
-      YAML.quick_emit(object_id,emitter) do |out|
-        out.map(nil,to_yaml_style) do |map|
-          properties_to_serialize(opts).each do |property|
-            value = __send__(property.name.to_sym)
-            map.add(property.name, value.is_a?(Class) ? value.to_s : value)
-          end
-
-          # add methods
-          Array(opts[:methods]).each do |meth|
-            if respond_to?(meth)
-              map.add(meth.to_sym, __send__(meth))
-            end
-          end
-
-          if (additions = instance_variable_get("@yaml_addes"))
-            additions.each { |k,v| map.add(k.to_s,v) }
-          end
+    # Serialize a Resource to YAML
+    #
+    # @example
+    #   yaml = resource.to_yaml  # => a valid YAML string
+    #
+    # @param [Hash] options
+    #
+    # @return [String]
+    #
+    # @api public
+    def to_yaml(options = {})
+      YAML.quick_emit(object_id, options) do |out|
+        out.map(to_yaml_type, to_yaml_style) do |map|
+          encode_with(map, options.kind_of?(Hash) ? options : {})
         end
       end
+    end unless YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck?
+
+    # A callback to encode the resource in the YAML stream
+    #
+    # @param [#add] coder
+    #   handles adding the values to the output
+    #
+    # @param [Hash] options
+    #   optional Hash configuring the output
+    #
+    # @return [undefined]
+    #
+    # @api public
+    def encode_with(coder, options = {})
+      coder.tag   = to_yaml_type  if coder.respond_to?(:tag=)
+      coder.style = to_yaml_style if coder.respond_to?(:style=)
+
+      methods = []
+
+      methods.concat properties_to_serialize(options).map { |property| property.name }
+      methods.concat Array(options[:methods])
+
+      methods.each do |method|
+        coder.add(method.to_s, __send__(method))
+      end
     end
 
+  private
+
+    # Return the YAML type to use for the output
+    #
+    # @return [String]
+    #
+    # @api private
+    def to_yaml_type
+      "!#{TAG_NAME}:#{model.name}"
+    end
+
+    # Return the YAML style to use for the output
+    #
+    # @return [Integer]
+    #
+    # @api private
+    def to_yaml_style
+      Psych::Nodes::Mapping::ANY
+    end if YAML.const_defined?(:ENGINE) && YAML::ENGINE.yamler == 'psych'
+
     module ValidationErrors
       module ToYaml
+
+        # Serialize the errors to YAML
+        #
+        # @example
+        #   yaml = errors.to_yaml  # => a valid YAML string
+        #
+        # @param [Hash] options
+        #
+        # @return [String]
+        #
+        # @api public
         def to_yaml(*args)
-          DataMapper::Ext::Array.to_hash(errors).to_yaml(*args)
+          Hash[errors].to_yaml(*args)
         end
-      end
-    end
 
-  end
+        # A callback to encode the errors in the YAML stream
+        #
+        # @param [#add] coder
+        #   handles adding the values to the output
+        #
+        # @return [undefined]
+        #
+        # @api public
+        def encode_with(coder)
+          coder.map = Hash[errors]
+        end
 
-  class Collection
-    def to_yaml(opts_or_emitter = {})
-      unless opts_or_emitter.is_a?(Hash)
-        to_a.to_yaml(opts_or_emitter)
-      else
-        # FIXME: Don't double handle the YAML (remove the YAML.load)
-        to_a.collect { |x| YAML.load(x.to_yaml(opts_or_emitter)) }.to_yaml
-      end
-    end
-  end
+      end # module ToYaml
+    end # module ValidationErrors
+
+    module Collection
+      module ToYaml
+
+        # Serialize the collection to YAML
+        #
+        # @example
+        #   yaml = collection.to_yaml  # => a valid YAML string
+        #
+        # @param [Hash] options
+        #
+        # @return [String]
+        #
+        # @api public
+        def to_yaml(*args)
+          to_a.to_yaml(*args)
+        end
+
+        # A callback to encode the collection in the YAML stream
+        #
+        # @param [#add] coder
+        #   handles adding the values to the output
+        #
+        # @return [undefined]
+        #
+        # @api public
+        def encode_with(coder)
+          coder.seq = to_a
+        end
 
-  if Serializer.dm_validations_loaded?
+      end # module ToYaml
+    end # module Collection
+  end # module Serializer
 
+  class Collection
+    include Serializer::Collection::ToYaml
+  end # class Collection
+
+  if const_defined?(:Validations)
     module Validations
       class ValidationErrors
         include DataMapper::Serializer::ValidationErrors::ToYaml
-      end
-    end
-
+      end # class ValidationErrors
+    end # module Validations
   end
-end
+
+end # module DataMapper

data/spec/lib/serialization_method_shared_spec.rb

@@ -31,8 +31,8 @@ share_examples_for 'A serialization method that also serializes core classes' do
     keys = %w[ id composite name breed ]
 
     resources = [
-      keys.zip([  1,  2, 'Betsy', 'Jersey'   ]).to_hash,
-      keys.zip([ 89, 34, 'Berta', 'Guernsey' ]).to_hash,
+      Hash[ keys.zip([  1,  2, 'Betsy', 'Jersey'   ]) ],
+      Hash[ keys.zip([ 89, 34, 'Berta', 'Guernsey' ]) ],
     ]
 
     collection = DataMapper::Collection.new(query, query.model.load(resources, query))
@@ -93,73 +93,87 @@ share_examples_for 'A serialization method' do
     end
 
     it "should only includes properties given to :only option" do
-      planet = Planet.new(
-        :name     => "Mars",
-        :aphelion => 249_209_300.4
-      )
-
-      result = @harness.test(planet, :only => [:name])
-      result.values_at("name", "aphelion").should == ["Mars", nil]
+      pending_if 'Psych provides no way to pass in parameters', @ruby_192 && @to_yaml do
+        planet = Planet.new(
+          :name     => "Mars",
+          :aphelion => 249_209_300.4
+        )
+
+        result = @harness.test(planet, :only => [:name])
+        result.values_at("name", "aphelion").should == ["Mars", nil]
+      end
     end
 
     it "should serialize values returned by an array of methods given to :methods option" do
-      planet = Planet.new(
-        :name     => "Mars",
-        :aphelion => 249_209_300.4
-      )
-
-      result = @harness.test(planet, :methods => [:category, :has_known_form_of_life?])
-      # XML currently can't serialize ? at the end of method names
-      boolean_method_name = @harness.method_name == :to_xml ? "has_known_form_of_life" : "has_known_form_of_life?"
-      result.values_at("category", boolean_method_name).should == ["terrestrial", false]
+      pending_if 'Psych provides no way to pass in parameters', @ruby_192 && @to_yaml do
+        planet = Planet.new(
+          :name     => "Mars",
+          :aphelion => 249_209_300.4
+        )
+
+        result = @harness.test(planet, :methods => [:category, :has_known_form_of_life?])
+        # XML currently can't serialize ? at the end of method names
+        boolean_method_name = @harness.method_name == :to_xml ? "has_known_form_of_life" : "has_known_form_of_life?"
+        result.values_at("category", boolean_method_name).should == ["terrestrial", false]
+      end
     end
 
     it "should serialize values returned by a single method given to :methods option" do
-      planet = Planet.new(
-        :name     => "Mars",
-        :aphelion => 249_209_300.4
-      )
-
-      result = @harness.test(planet, :methods => :category)
-      result.values_at("category").should == ["terrestrial"]
+      pending_if 'Psych provides no way to pass in parameters', @ruby_192 && @to_yaml do
+        planet = Planet.new(
+          :name     => "Mars",
+          :aphelion => 249_209_300.4
+        )
+
+        result = @harness.test(planet, :methods => :category)
+        result.values_at("category").should == ["terrestrial"]
+      end
     end
 
     it "should only include properties given to :only option" do
-      planet = Planet.new(
-        :name     => "Mars",
-        :aphelion => 249_209_300.4
-      )
-
-      result = @harness.test(planet, :only => [:name])
-      result.values_at("name", "aphelion").should == ["Mars", nil]
+      pending_if 'Psych provides no way to pass in parameters', @ruby_192 && @to_yaml do
+        planet = Planet.new(
+          :name     => "Mars",
+          :aphelion => 249_209_300.4
+        )
+
+        result = @harness.test(planet, :only => [:name])
+        result.values_at("name", "aphelion").should == ["Mars", nil]
+      end
     end
 
     it "should exclude properties given to :exclude option" do
-      planet = Planet.new(
-        :name     => "Mars",
-        :aphelion => 249_209_300.4
-      )
-
-      result = @harness.test(planet, :exclude => [:aphelion])
-      result.values_at("name", "aphelion").should == ["Mars", nil]
+      pending_if 'Psych provides no way to pass in parameters', @ruby_192 && @to_yaml do
+        planet = Planet.new(
+          :name     => "Mars",
+          :aphelion => 249_209_300.4
+        )
+
+        result = @harness.test(planet, :exclude => [:aphelion])
+        result.values_at("name", "aphelion").should == ["Mars", nil]
+      end
     end
 
     it "should give higher precendence to :only option over :exclude" do
-      planet = Planet.new(
-        :name     => "Mars",
-        :aphelion => 249_209_300.4
-      )
-
-      result = @harness.test(planet, :only => [:name], :exclude => [:name])
-      result.values_at("name", "aphelion").should == ["Mars", nil]
+      pending_if 'Psych provides no way to pass in parameters', @ruby_192 && @to_yaml do
+        planet = Planet.new(
+          :name     => "Mars",
+          :aphelion => 249_209_300.4
+        )
+
+        result = @harness.test(planet, :only => [:name], :exclude => [:name])
+        result.values_at("name", "aphelion").should == ["Mars", nil]
+      end
     end
 
     it 'should support child associations included via the :methods parameter' do
-      solar_system = SolarSystem.create(:name => "one")
-      planet = Planet.new(:name => "earth")
-      planet.solar_system = solar_system
-      result = @harness.test(planet, :methods => [:solar_system])
-      result['solar_system'].values_at('name', 'id').should == ['one', 1]
+      pending_if 'Psych provides no way to pass in parameters', @ruby_192 && @to_yaml do
+        solar_system = SolarSystem.create(:name => "one")
+        planet = Planet.new(:name => "earth")
+        planet.solar_system = solar_system
+        result = @harness.test(planet, :methods => [:solar_system])
+        result['solar_system'].values_at('name', 'id').should == ['one', 1]
+      end
     end
   end
 
@@ -183,8 +197,8 @@ share_examples_for 'A serialization method' do
       keys = %w[ id composite name breed ]
 
       resources = [
-        keys.zip([  1,  2, 'Betsy', 'Jersey'   ]).to_hash,
-        keys.zip([ 10, 20, 'Berta', 'Guernsey' ]).to_hash,
+        Hash[ keys.zip([  1,  2, 'Betsy', 'Jersey'   ]) ],
+        Hash[ keys.zip([ 10, 20, 'Berta', 'Guernsey' ]) ],
       ]
 
       collection = DataMapper::Collection.new(query, query.model.load(resources, query))
@@ -269,8 +283,8 @@ share_examples_for 'A serialization method' do
     planet = Planet.create(:name => 'a')
     results = @harness.test(planet.errors)
     results.should == {
-      "name"            => planet.errors[:name],
-      "solar_system_id" => planet.errors[:solar_system_id]
+      "name"            => planet.errors[:name].map { |e| e.to_s },
+      "solar_system_id" => planet.errors[:solar_system_id].map { |e| e.to_s }
     }
   end
 end

data/spec/public/to_json_spec.rb

@@ -13,8 +13,8 @@ describe DataMapper::Serializer, '#to_json' do
     keys = %w[ id composite name breed ]
 
     resources = [
-      keys.zip([  1,  2, 'Betsy', 'Jersey'   ]).to_hash,
-      keys.zip([ 10, 20, 'Berta', 'Guernsey' ]).to_hash,
+      Hash[ keys.zip([  1,  2, 'Betsy', 'Jersey'   ]) ],
+      Hash[ keys.zip([ 10, 20, 'Berta', 'Guernsey' ]) ],
     ]
 
     @collection = DataMapper::Collection.new(query, query.model.load(resources, query))

data/spec/public/to_yaml_spec.rb

@@ -26,6 +26,9 @@ describe DataMapper::Serializer, '#to_yaml' do
         process[result]
       end
     end.new
+
+    @ruby_192 = RUBY_VERSION >= '1.9.2'
+    @to_yaml  = true
   end
 
   it_should_behave_like 'A serialization method'

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'dm-core/spec/setup'
 require 'dm-core/spec/lib/adapter_helpers'
+require 'dm-core/spec/lib/pending_helpers'
 
 require 'dm-validations' # FIXME: must be required before dm-serializer
 require 'dm-serializer'
@@ -7,12 +8,6 @@ require 'dm-migrations'
 
 require File.expand_path('spec/lib/serialization_method_shared_spec')
 
-class Array
-  def to_hash
-    DataMapper::Ext::Array.to_hash(self)
-  end
-end
-
 # require fixture resources
 SPEC_ROOT = Pathname(__FILE__).dirname.expand_path
 Pathname.glob((SPEC_ROOT + 'fixtures/**/*.rb').to_s).each { |file| require file }
@@ -27,4 +22,5 @@ DataMapper::Spec.setup
 
 Spec::Runner.configure do |config|
   config.extend(DataMapper::Spec::Adapters::Helpers)
+  config.include(DataMapper::Spec::PendingHelpers)
 end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: dm-serializer
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.0
+  hash: 15424023
+  prerelease: 6
+  segments: 
+  - 1
+  - 2
+  - 0
+  - rc
+  - 1
+  version: 1.2.0.rc1
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -10,86 +17,156 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -07:00
-default_executable: 
+date: 2011-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :runtime
+        hash: 15424023
+        segments: 
+        - 1
+        - 2
+        - 0
+        - rc
+        - 1
+        version: 1.2.0.rc1
   prerelease: false
-  version_requirements: *id001
+  requirement: *id001
+  name: dm-core
 - !ruby/object:Gem::Dependency 
-  name: fastercsv
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 5
+        - 4
         version: 1.5.4
-  type: :runtime
   prerelease: false
-  version_requirements: *id002
+  requirement: *id002
+  name: fastercsv
 - !ruby/object:Gem::Dependency 
-  name: json
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.4.6
-  type: :runtime
+        hash: 17
+        segments: 
+        - 1
+        - 0
+        - 3
+        version: 1.0.3
   prerelease: false
-  version_requirements: *id003
+  requirement: *id003
+  name: multi_json
 - !ruby/object:Gem::Dependency 
-  name: dm-validations
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :development
+        hash: 11
+        segments: 
+        - 1
+        - 5
+        - 4
+        version: 1.5.4
   prerelease: false
-  version_requirements: *id004
+  requirement: *id004
+  name: json
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
+        hash: 11
+        segments: 
+        - 1
+        - 5
+        - 4
+        version: 1.5.4
   prerelease: false
-  version_requirements: *id005
+  requirement: *id005
+  name: json_pure
 - !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.7
+        hash: 15424023
+        segments: 
+        - 1
+        - 2
+        - 0
+        - rc
+        - 1
+        version: 1.2.0.rc1
+  prerelease: false
+  requirement: *id006
+  name: dm-validations
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
   prerelease: false
-  version_requirements: *id006
+  requirement: *id007
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  prerelease: false
+  requirement: *id008
+  name: rake
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
   prerelease: false
-  version_requirements: *id007
+  requirement: *id009
+  name: rspec
 description: DataMapper plugin for serializing Resources and Collections
 email: vandenberg.guy [a] gmail [d] com
 executables: []
@@ -105,8 +182,6 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- autotest/discover.rb
-- autotest/dmserializer_rspec.rb
 - benchmarks/to_json.rb
 - benchmarks/to_xml.rb
 - dm-serializer.gemspec
@@ -136,7 +211,6 @@ files:
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: true
 homepage: http://github.com/datamapper/dm-serializer
 licenses: []
 
@@ -150,29 +224,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin for serializing Resources and Collections
-test_files: 
-- spec/fixtures/cow.rb
-- spec/fixtures/planet.rb
-- spec/fixtures/quan_tum_cat.rb
-- spec/fixtures/vehicle.rb
-- spec/lib/serialization_method_shared_spec.rb
-- spec/public/serializer_spec.rb
-- spec/public/to_csv_spec.rb
-- spec/public/to_json_spec.rb
-- spec/public/to_xml_spec.rb
-- spec/public/to_yaml_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/autotest/discover.rb

@@ -1,3 +0,0 @@
-Autotest.add_discovery do
-  "dmserializer"
-end

data/autotest/dmserializer_rspec.rb

@@ -1,108 +0,0 @@
-require 'autotest'
-
-$VERBOSE = false
-
-class RspecCommandError < StandardError; end
-
-# Autotest has no full-blown snake_case to CamelCase
-class Autotest::DmserializerRspec < Autotest
-  WHOLE_SUITE_REGEXP = %r{^spec/(unit|integration)/.*_spec\.rb}
-
-  Autotest.add_hook :initialize do |at|
-    at.clear_mappings
-    at.add_exception(/\.git|TAGS/)
-
-    # Updating a spec runs that spec.
-    at.add_mapping(%r{^spec/.*_spec\.rb$}) do |filename, _|
-      filename
-    end
-
-    # Updating spec helper runs the whole suite.
-    at.add_mapping(%r{^spec/spec_helper\.rb}) do |_, m|
-      at.files_matching WHOLE_SUITE_REGEXP
-    end
-
-    # Updating of library file runs the whole suite.
-    at.add_mapping(%r{^lib/.*\.rb}) do |_, m|
-      at.files_matching WHOLE_SUITE_REGEXP
-    end
-
-    # Updating of fixture resources runs the whole suite.
-    at.add_mapping(%r{^spec/fixtures/.*\.rb}) do |_, m|
-      at.files_matching WHOLE_SUITE_REGEXP
-    end
-  end
-
-
-  def initialize(kernel = Kernel, separator = File::SEPARATOR, alt_separator = File::ALT_SEPARATOR) # :nodoc:
-    super() # need parens so that Ruby doesn't pass our args
-    # to the superclass version which takes none..
-
-    @kernel, @separator, @alt_separator = kernel, separator, alt_separator
-    @spec_command = spec_command
-  end
-
-  attr_accessor :failures
-
-  def failed_results(results)
-    results.scan(/^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m)
-  end
-
-  def handle_results(results)
-    @failures = failed_results(results)
-    @files_to_test = consolidate_failures @failures
-    unless $TESTING
-      if @files_to_test.empty?
-        hook :green
-      else
-        hook :red
-      end
-    end
-    @tainted = true unless @files_to_test.empty?
-  end
-
-  def consolidate_failures(failed)
-    filters = Hash.new { |h,k| h[k] = [] }
-    failed.each do |spec, failed_trace|
-      find_files.keys.select { |f| f =~ /spec\// }.each do |f|
-        if failed_trace =~ Regexp.new(f)
-          filters[f] << spec
-          break
-        end
-      end
-    end
-    filters
-  end
-
-  def make_test_cmd(files_to_test)
-    "#{ruby} -S #{@spec_command} #{test_cmd_options} #{files_to_test.keys.flatten.join(' ')}"
-  end
-
-  def test_cmd_options
-    # '-O specs/spec.opts' if File.exist?('specs/spec.opts')
-  end
-
-  # Finds the proper spec command to use. Precendence is set in the
-  # lazily-evaluated method spec_commands.  Alias + Override that in
-  # ~/.autotest to provide a different spec command then the default
-  # paths provided.
-  def spec_command(separator=File::ALT_SEPARATOR)
-    unless defined?(@spec_command)
-      @spec_command = spec_commands.find { |cmd| File.exists?(cmd) }
-
-      raise RspecCommandError, "No spec command could be found" unless @spec_command
-
-      @spec_command.gsub!(File::SEPARATOR, separator) if separator
-    end
-    @spec_command
-  end
-
-  # Autotest will look for spec commands in the following
-  # locations, in this order:
-  #
-  #   * default spec bin/loader installed in Rubygems
-  #   * any spec command found in PATH
-  def spec_commands
-    [File.join(Config::CONFIG['bindir'], 'spec'), 'spec']
-  end
-end