dm-serializer 1.0.2 → 1.1.0.rc1

data/Gemfile

@@ -1,115 +1,52 @@
-# If you're working on more than one datamapper gem at a time, then it's
-# recommended to create a local Gemfile and use this instead of the git
-# sources. This will make sure that you are  developing against your
-# other local datamapper sources that you currently work on. Gemfile.local
-# will behave identically to the standard Gemfile apart from the fact that
-# it fetches the datamapper gems from local paths. This means that you can use
-# the same environment variables, like ADAPTER(S) or PLUGIN(S) when running
-# bundle commands. Gemfile.local is added to .gitignore, so you don't need to
-# worry about accidentally checking local development paths into git.
-# In order to create a local Gemfile, all you need to do is run:
-#
-#   bundle exec rake local_gemfile
-#
-# This will give you a Gemfile.local file that points to your local clones of
-# the various datamapper gems. It's assumed that all datamapper repo clones
-# reside in the same directory. You can use the Gemfile.local like so for
-# running any bundle command:
-#
-#   BUNDLE_GEMFILE=Gemfile.local bundle foo
-#
-# You can also specify which adapter(s) should be part of the bundle by setting
-# an environment variable. This of course also works when using the Gemfile.local
-#
-#   bundle foo                        # dm-sqlite-adapter
-#   ADAPTER=mysql bundle foo          # dm-mysql-adapter
-#   ADAPTERS=sqlite,mysql bundle foo  # dm-sqlite-adapter and dm-mysql-adapter
-#
-# Of course you can also use the ADAPTER(S) variable when using the Gemfile.local
-# and running specs against selected adapters.
-#
-# For easily working with adapters supported on your machine, it's recommended
-# that you first install all adapters that you are planning to use or work on
-# by doing something like
-#
-#   ADAPTERS=sqlite,mysql,postgres bundle install
-#
-# This will clone the various repositories and make them available to bundler.
-# Once you have them installed you can easily switch between adapters for the
-# various development tasks. Running something like
-#
-#   ADAPTER=mysql bundle exec rake spec
-#
-# will make sure that the dm-mysql-adapter is part of the bundle, and will be used
-# when running the specs.
-#
-# You can also specify which plugin(s) should be part of the bundle by setting
-# an environment variable. This also works when using the Gemfile.local
-#
-#   bundle foo                                 # dm-migrations
-#   PLUGINS=dm-validations bundle foo          # dm-migrations and dm-validations
-#   PLUGINS=dm-validations,dm-types bundle foo # dm-migrations, dm-validations and dm-types
-#
-# Of course you can combine the PLUGIN(S) and ADAPTER(S) env vars to run specs
-# for certain adapter/plugin combinations.
-#
-# Finally, to speed up running specs and other tasks, it's recommended to run
-#
-#   bundle lock
-#
-# after running 'bundle install' for the first time. This will make 'bundle exec' run
-# a lot faster compared to the unlocked version. With an unlocked bundle you would
-# typically just run 'bundle install' from time to time to fetch the latest sources from
-# upstream. When you locked your bundle, you need to run
-#
-#   bundle install --relock
-#
-# to make sure to fetch the latest updates and then lock the bundle again. Gemfile.lock
-# is added to the .gitignore file, so you don't need to worry about accidentally checking
-# it into version control.
+require 'pathname'
 
 source 'http://rubygems.org'
 
-DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.2'
+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.rc1'
 
-group :runtime do # Runtime dependencies (as in the gemspec)
+group :runtime do
 
   if ENV['EXTLIB']
-    gem 'extlib',        '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git"
+    gem 'extlib', '~> 0.9.15', SOURCE => "#{DATAMAPPER}/extlib#{REPO_POSTFIX}", :require => nil
   else
-    gem 'activesupport', '~> 3.0.0',  :git => 'git://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
+    gem 'activesupport', '~> 3.0.4', :require => nil
+    gem 'i18n',          '~> 0.5.0'
   end
 
-  gem 'dm-core',   DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
+  gem 'dm-core',   DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
   gem 'fastercsv', '~> 1.5.3'
-  gem 'json_pure', '~> 1.4.3'
+  gem 'json',      '~> 1.5.1'
 
 end
 
-group(:development) do # Development dependencies (as in the gemspec)
-
-  gem 'dm-validations', DM_VERSION, :git => "#{DATAMAPPER}/dm-validations.git"
-  gem 'nokogiri',       '~> 1.4.1'
+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', :git => 'git://github.com/snusnu/rspec', :branch => 'heckle_fix_plus_gemfile'
-  gem 'jeweler',        '~> 1.4'
+  gem 'rspec',          '~> 1.3.1'
+
+end
+
+group :testing do
+
+  gem 'nokogiri',    '~> 1.4.1'
+  gem 'libxml-ruby', '~> 1.1.4', :platforms => [ :mri, :mswin ]
 
 end
 
-group :quality do # These gems contain rake tasks that check the quality of the source code
+group :quality do
 
-  gem 'metric_fu',      '~> 1.3'
-  gem 'rcov',           '~> 0.9.8'
-  gem 'reek',           '~> 1.2.8'
-  gem 'roodi',          '~> 2.1'
-  gem 'yard',           '~> 0.5'
-  gem 'yardstick',      '~> 0.1'
+  gem 'rcov',      '~> 0.9.9', :platforms => :mri_18
+  gem 'yard',      '~> 0.6'
+  gem 'yardstick', '~> 0.2'
 
 end
 
-group :datamapper do # We need this because we want to pin these dependencies to their git master sources
+group :datamapper do
 
   adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
   adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
@@ -119,27 +56,27 @@ group :datamapper do # We need this because we want to pin these dependencies to
 
   if (do_adapters = DM_DO_ADAPTERS & adapters).any?
     options = {}
-    options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
+    options[:git] = "#{DATAMAPPER}/do#{REPO_POSTFIX}" if ENV['DO_GIT'] == 'true'
 
-    gem 'data_objects',  DO_VERSION, options.dup
+    gem 'data_objects', DO_VERSION, options.dup
 
     do_adapters.each do |adapter|
       adapter = 'sqlite3' if adapter == 'sqlite'
       gem "do_#{adapter}", DO_VERSION, options.dup
     end
 
-    gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
+    gem 'dm-do-adapter', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}"
   end
 
   adapters.each do |adapter|
-    gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
+    gem "dm-#{adapter}-adapter", DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}"
   end
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']
   plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
 
   plugins.each do |plugin|
-    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+    gem plugin, DM_VERSION, SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}"
   end
 
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Guy van den Berg
+Copyright (c) 2011 Guy van den Berg
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.4'
+  gem 'jeweler', '~> 1.5.2'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -15,20 +15,11 @@ begin
     gem.has_rdoc    = 'yard'
 
     gem.rubyforge_project = 'datamapper'
-
-    gem.add_dependency 'dm-core',   '~> 1.0.2'
-    gem.add_dependency 'fastercsv', '~> 1.5.3'
-    gem.add_dependency 'json_pure', '~> 1.4'
-
-    gem.add_development_dependency 'rspec',          '~> 1.3'
-    gem.add_development_dependency 'dm-validations', '~> 1.0.2'
-    gem.add_development_dependency 'nokogiri',       '~> 1.4.3'
-#    gem.add_development_dependency 'libxml-ruby',    '~> 1.1.4'  # not available on JRuby
   end
 
   Jeweler::GemcutterTasks.new
 
   FileList['tasks/**/*.rake'].each { |task| import task }
 rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.5.2'
 end

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0.rc1

data/dm-serializer.gemspec

@@ -1,108 +1,112 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dm-serializer}
-  s.version = "1.0.2"
+  s.version = "1.1.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{2010-09-07}
+  s.date = %q{2011-02-28}
   s.description = %q{DataMapper plugin for serializing Resources and Collections}
   s.email = %q{vandenberg.guy [a] gmail [d] com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "autotest/discover.rb",
-     "autotest/dmserializer_rspec.rb",
-     "benchmarks/to_json.rb",
-     "benchmarks/to_xml.rb",
-     "dm-serializer.gemspec",
-     "lib/dm-serializer.rb",
-     "lib/dm-serializer/common.rb",
-     "lib/dm-serializer/to_csv.rb",
-     "lib/dm-serializer/to_json.rb",
-     "lib/dm-serializer/to_xml.rb",
-     "lib/dm-serializer/to_yaml.rb",
-     "lib/dm-serializer/xml_serializers.rb",
-     "lib/dm-serializer/xml_serializers/libxml.rb",
-     "lib/dm-serializer/xml_serializers/nokogiri.rb",
-     "lib/dm-serializer/xml_serializers/rexml.rb",
-     "spec/fixtures/cow.rb",
-     "spec/fixtures/planet.rb",
-     "spec/fixtures/quan_tum_cat.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/rcov.opts",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "tasks/ci.rake",
-     "tasks/local_gemfile.rake",
-     "tasks/metrics.rake",
-     "tasks/spec.rake",
-     "tasks/yard.rake",
-     "tasks/yardstick.rake"
+    "Gemfile",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "autotest/discover.rb",
+    "autotest/dmserializer_rspec.rb",
+    "benchmarks/to_json.rb",
+    "benchmarks/to_xml.rb",
+    "dm-serializer.gemspec",
+    "lib/dm-serializer.rb",
+    "lib/dm-serializer/common.rb",
+    "lib/dm-serializer/to_csv.rb",
+    "lib/dm-serializer/to_json.rb",
+    "lib/dm-serializer/to_xml.rb",
+    "lib/dm-serializer/to_yaml.rb",
+    "lib/dm-serializer/xml_serializers.rb",
+    "lib/dm-serializer/xml_serializers/libxml.rb",
+    "lib/dm-serializer/xml_serializers/nokogiri.rb",
+    "lib/dm-serializer/xml_serializers/rexml.rb",
+    "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/rcov.opts",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "tasks/spec.rake",
+    "tasks/yard.rake",
+    "tasks/yardstick.rake"
   ]
-  s.has_rdoc = %q{yard}
   s.homepage = %q{http://github.com/datamapper/dm-serializer}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.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/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"
+    "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"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     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.0.2"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.4"])
+      s.add_runtime_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
       s.add_runtime_dependency(%q<fastercsv>, ["~> 1.5.3"])
-      s.add_runtime_dependency(%q<json_pure>, ["~> 1.4"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
-      s.add_development_dependency(%q<dm-validations>, ["~> 1.0.2"])
-      s.add_development_dependency(%q<nokogiri>, ["~> 1.4.3"])
+      s.add_runtime_dependency(%q<json>, ["~> 1.5.1"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.1.0.rc1"])
+      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"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
+      s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
       s.add_dependency(%q<fastercsv>, ["~> 1.5.3"])
-      s.add_dependency(%q<json_pure>, ["~> 1.4"])
-      s.add_dependency(%q<rspec>, ["~> 1.3"])
-      s.add_dependency(%q<dm-validations>, ["~> 1.0.2"])
-      s.add_dependency(%q<nokogiri>, ["~> 1.4.3"])
+      s.add_dependency(%q<json>, ["~> 1.5.1"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
+    s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
     s.add_dependency(%q<fastercsv>, ["~> 1.5.3"])
-    s.add_dependency(%q<json_pure>, ["~> 1.4"])
-    s.add_dependency(%q<rspec>, ["~> 1.3"])
-    s.add_dependency(%q<dm-validations>, ["~> 1.0.2"])
-    s.add_dependency(%q<nokogiri>, ["~> 1.4.3"])
+    s.add_dependency(%q<json>, ["~> 1.5.1"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
   end
 end
 

data/lib/dm-serializer/to_json.rb

@@ -15,12 +15,14 @@ module DataMapper
     #
     # @since 1.0.1
     #
-    def as_json(options={})
-      result = {}
+    def as_json(options = {})
+      options = {} if options.nil?
+      result  = {}
 
       properties_to_serialize(options).each do |property|
         property_name = property.name
-        result[property_name] = __send__(property_name)
+        value = __send__(property_name)
+        result[property_name] = value.kind_of?(DataMapper::Model) ? value.name : value
       end
 
       # add methods
@@ -45,8 +47,8 @@ module DataMapper
     #
     # @return <String> a JSON representation of the Resource
     def to_json(*args)
-      options = args.first || {}
-      options = options.to_h if options.respond_to?(:to_h)
+      options = args.first
+      options = {} unless options.kind_of?(Hash)
 
       result = as_json(options)
 
@@ -68,33 +70,16 @@ module DataMapper
 
   end
 
-
-  module Associations
-    # the json gem adds Object#to_json, which breaks the DM proxies, since it
-    # happens *after* the proxy has been blank slated. This code removes the added
-    # method, so it is delegated correctly to the Collection
-    proxies = []
-
-    proxies << ManyToMany::Proxy if defined?(ManyToMany::Proxy)
-    proxies << OneToMany::Proxy  if defined?(OneToMany::Proxy)
-    proxies << ManyToOne::Proxy  if defined?(ManyToOne::Proxy)
-
-    proxies.each do |proxy|
-      if proxy.public_instance_methods.any? { |m| m.to_sym == :to_json }
-        proxy.send(:undef_method, :to_json)
-      end
-    end
-  end
-
   class Collection
     def to_json(*args)
-      opts = args.first || {}
+      options = args.first
+      options = {} unless options.kind_of?(Hash)
 
-      options = opts.merge(:to_json => false)
-      collection = map { |e| e.to_json(options) }
+      resource_options = options.merge(:to_json => false)
+      collection = map { |resource| resource.to_json(resource_options) }
 
       # default to making JSON
-      if opts.fetch(:to_json, true)
+      if options.fetch(:to_json, true)
         collection.to_json
       else
         collection

data/lib/dm-serializer/to_xml.rb

@@ -29,7 +29,7 @@ module DataMapper
         xml.add_node(root, property.name.to_s, value, attrs)
       end
 
-      (opts[:methods] || []).each do |meth|
+      Array(opts[:methods]).each do |meth|
         if self.respond_to?(meth)
           xml_name = meth.to_s.gsub(/[^a-z0-9_]/, '')
           value = __send__(meth)

data/lib/dm-serializer/to_yaml.rb

@@ -21,7 +21,7 @@ module DataMapper
             map.add(property.name, value.is_a?(Class) ? value.to_s : value)
           end
           # add methods
-          (opts[:methods] || []).each do |meth|
+          Array(opts[:methods]).each do |meth|
             if respond_to?(meth)
               map.add(meth.to_sym, __send__(meth))
             end

data/spec/fixtures/vehicle.rb

@@ -0,0 +1,14 @@
+class Vehicle
+  include DataMapper::Resource
+  property :id, Serial
+  property :name, String
+  property :type, Discriminator
+end
+
+class Car < Vehicle
+
+end
+
+class Motorcycle < Vehicle
+
+end

data/spec/lib/serialization_method_shared_spec.rb

@@ -102,7 +102,7 @@ share_examples_for 'A serialization method' do
       result.values_at("name", "aphelion").should == ["Mars", nil]
     end
 
-    it "should serialize values returned by methods given to :methods option" do
+    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
@@ -114,6 +114,16 @@ share_examples_for 'A serialization method' do
       result.values_at("category", boolean_method_name).should == ["terrestrial", false]
     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"]
+    end
+
     it "should only include properties given to :only option" do
       planet = Planet.new(
         :name     => "Mars",

data/spec/public/to_json_spec.rb

@@ -57,4 +57,19 @@ describe DataMapper::Serialize, '#to_json' do
 
   it "has :repository option to override used repository"
 
+  it "can be serialized within a Hash" do
+    hash = { 'cows' => Cow.all }
+    JSON.parse(hash.to_json).should == hash
+  end
+
+end
+
+describe DataMapper::Serialize, '#as_json' do
+  it "handles nil for options" do
+    expect { Cow.new.as_json(nil) }.to_not raise_error
+  end
+
+  it "serializes Discriminator types as strings" do
+    Motorcycle.new.as_json[:type].should == "Motorcycle"
+  end
 end

data/tasks/spec.rake

@@ -35,7 +35,4 @@ rescue LoadError
   end
 end
 
-task :spec => :check_dependencies
-task :rcov => :check_dependencies
-
 task :default => :spec

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dm-serializer
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  prerelease: 6
+  version: 1.1.0.rc1
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -14,97 +10,108 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 -07:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
+  name: activesupport
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
+        version: 3.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: fastercsv
-  prerelease: false
+  name: i18n
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 3
-        version: 1.5.3
+        version: 0.5.0
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json_pure
-  prerelease: false
+  name: dm-core
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+        version: 1.1.0.rc1
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: fastercsv
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  type: :development
+        version: 1.5.3
+  type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: dm-validations
-  prerelease: false
+  name: json
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
-  type: :development
+        version: 1.5.1
+  type: :runtime
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
+  name: dm-validations
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 3
-        version: 1.4.3
+        version: 1.1.0.rc1
   type: :development
+  prerelease: false
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *id009
 description: DataMapper plugin for serializing Resources and Collections
 email: vandenberg.guy [a] gmail [d] com
 executables: []
@@ -115,7 +122,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -139,6 +145,7 @@ 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
@@ -148,19 +155,16 @@ files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/ci.rake
-- tasks/local_gemfile.rake
-- tasks/metrics.rake
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: yard
+has_rdoc: true
 homepage: http://github.com/datamapper/dm-serializer
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -168,21 +172,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin for serializing Resources and Collections
@@ -190,6 +190,7 @@ 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

data/.gitignore

@@ -1,37 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## Rubinius
-*.rbc
-
-## PROJECT::GENERAL
-*.gem
-coverage
-rdoc
-pkg
-tmp
-doc
-log
-.yardoc
-measurements
-
-## BUNDLER
-.bundle
-Gemfile.local
-Gemfile.lock
-Gemfile.local.lock
-
-## PROJECT::SPECIFIC
-spec/db/

data/tasks/ci.rake

@@ -1 +0,0 @@
-task :ci => [ :verify_measurements, 'metrics:all' ]

data/tasks/local_gemfile.rake

@@ -1,16 +0,0 @@
-desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
-task :local_gemfile do |t|
-
-  root       = Pathname(__FILE__).dirname.parent
-  datamapper = root.parent
-
-  root.join('Gemfile.local').open('w') do |f|
-    root.join('Gemfile').open.each do |line|
-      line.sub!(/DATAMAPPER = 'git:\/\/github.com\/datamapper'/, "DATAMAPPER = '#{datamapper}'")
-      line.sub!(/:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  ':path => "#{DATAMAPPER}/\1"')
-      line.sub!(/do_options\[:git\] = \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  'do_options[:path] = "#{DATAMAPPER}/\1"')
-      f.puts line
-    end
-  end
-
-end

data/tasks/metrics.rake

@@ -1,36 +0,0 @@
-begin
-  require 'metric_fu'
-rescue LoadError
-  namespace :metrics do
-    task :all do
-      abort 'metric_fu is not available. In order to run metrics:all, you must: gem install metric_fu'
-    end
-  end
-end
-
-begin
-  require 'reek/adapters/rake_task'
-
-  Reek::RakeTask.new do |t|
-    t.fail_on_error = true
-    t.verbose       = false
-    t.source_files  = 'lib/**/*.rb'
-  end
-rescue LoadError
-  task :reek do
-    abort 'Reek is not available. In order to run reek, you must: gem install reek'
-  end
-end
-
-begin
-  require 'roodi'
-  require 'roodi_task'
-
-  RoodiTask.new do |t|
-    t.verbose = false
-  end
-rescue LoadError
-  task :roodi do
-    abort 'Roodi is not available. In order to run roodi, you must: gem install roodi'
-  end
-end