dm-serializer 1.0.0.rc2 → 1.0.0.rc3

data/Gemfile

@@ -71,7 +71,7 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0.rc2'
+DM_VERSION = '~> 1.0.0.rc3'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Guy van den Berg
+Copyright (c) 2010 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

@@ -10,19 +10,19 @@ begin
     gem.summary     = 'DataMapper plugin for serializing Resources and Collections'
     gem.description = gem.summary
     gem.email       = 'vandenberg.guy [a] gmail [d] com'
-    gem.homepage    = 'http://github.com/datamapper/dm-serializer'
+    gem.homepage    = 'http://github.com/datamapper/%s' % gem.name
     gem.authors     = [ 'Guy van den Berg' ]
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core',   '~> 1.0.0.rc2'
+    gem.add_dependency 'dm-core',   '~> 1.0.0.rc3'
     gem.add_dependency 'fastercsv', '~> 1.5.3'
     gem.add_dependency 'json_pure', '~> 1.4.3'
 
-#    gem.add_development_dependency 'libxml-ruby',    '~> 1.1.4'  # not available on JRuby
-    gem.add_development_dependency 'dm-validations', '~> 1.0.0.rc2'
-    gem.add_development_dependency 'nokogiri',       '~> 1.4.1'
     gem.add_development_dependency 'rspec',          '~> 1.3'
+    gem.add_development_dependency 'dm-validations', '~> 1.0.0.rc3'
+    gem.add_development_dependency 'nokogiri',       '~> 1.4.1'
+#    gem.add_development_dependency 'libxml-ruby',    '~> 1.1.4'  # not available on JRuby
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.0.0.rc2
+1.0.0.rc3

data/benchmarks/to_json.rb

@@ -2,7 +2,7 @@ require "rubygems"
 require 'pathname'
 require 'better-benchmark'
 
-gem 'dm-core', '1.0.0.rc2'
+gem 'dm-core', '1.0.0.rc3'
 require 'dm-core'
 
 spec_dir_path = Pathname(__FILE__).dirname.expand_path

data/benchmarks/to_xml.rb

@@ -1,7 +1,7 @@
 require "rubygems"
 require 'pathname'
 
-gem 'dm-core', '1.0.0.rc2'
+gem 'dm-core', '1.0.0.rc3'
 require 'dm-core'
 
 spec_dir_path = Pathname(__FILE__).dirname.expand_path

data/dm-serializer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-serializer}
-  s.version = "1.0.0.rc2"
+  s.version = "1.0.0.rc3"
 
   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-05-19}
+  s.date = %q{2010-05-27}
   s.description = %q{DataMapper plugin for serializing Resources and Collections}
   s.email = %q{vandenberg.guy [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -81,27 +81,27 @@ Gem::Specification.new do |s|
     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.0.rc2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
       s.add_runtime_dependency(%q<fastercsv>, ["~> 1.5.3"])
       s.add_runtime_dependency(%q<json_pure>, ["~> 1.4.3"])
-      s.add_development_dependency(%q<dm-validations>, ["~> 1.0.0.rc2"])
-      s.add_development_dependency(%q<nokogiri>, ["~> 1.4.1"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.0.0.rc3"])
+      s.add_development_dependency(%q<nokogiri>, ["~> 1.4.1"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
       s.add_dependency(%q<fastercsv>, ["~> 1.5.3"])
       s.add_dependency(%q<json_pure>, ["~> 1.4.3"])
-      s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc2"])
-      s.add_dependency(%q<nokogiri>, ["~> 1.4.1"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc3"])
+      s.add_dependency(%q<nokogiri>, ["~> 1.4.1"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
     s.add_dependency(%q<fastercsv>, ["~> 1.5.3"])
     s.add_dependency(%q<json_pure>, ["~> 1.4.3"])
-    s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc2"])
-    s.add_dependency(%q<nokogiri>, ["~> 1.4.1"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc3"])
+    s.add_dependency(%q<nokogiri>, ["~> 1.4.1"])
   end
 end
 

data/lib/dm-serializer/to_json.rb

@@ -9,30 +9,28 @@ 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)
 
       result = {}
 
-      propset = properties_to_serialize(options)
-
-      propset.each do |property|
-        result[property.name] = __send__(property.name)
+      properties_to_serialize(options).each do |property|
+        property_name = property.name
+        result[property_name] = __send__(property_name)
       end
 
       # add methods
-      (options[:methods] || []).each do |meth|
-        if self.respond_to?(meth)
-          result[meth] = __send__(meth)
-        end
+      Array(options[:methods]).each do |method|
+        next unless respond_to?(method)
+        result[method] = __send__(method)
       end
 
       # Note: if you want to include a whole other model via relation, use :methods
       # comments.to_json(:relationships=>{:user=>{:include=>[:first_name],:methods=>[:age]}})
       # add relationships
       # TODO: This needs tests and also needs to be ported to #to_xml and #to_yaml
-      (options[:relationships] || {}).each do |rel,opts|
-        if self.respond_to?(rel)
-          result[rel] = send(rel).to_json(opts.merge(:to_json => false))
-        end
+      (options[:relationships] || {}).each do |relationship_name, opts|
+        next unless respond_to?(relationship_name)
+        result[relationship_name] = __send__(relationship_name).to_json(opts.merge(:to_json => false))
       end
 
       # default to making JSON

data/spec/lib/serialization_method_shared_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 share_examples_for 'A serialization method that also serializes core classes' do
   # This spec ensures that we don't break any serialization methods attached
   # to core classes, such as Array
@@ -12,7 +10,7 @@ share_examples_for 'A serialization method that also serializes core classes' do
   end
 
   before(:each) do
-    DataMapper::Model.descendants.each { |model| model.all.destroy! }
+    DataMapper::Model.descendants.each { |model| model.destroy! }
   end
 
   it 'serializes an array of extended objects' do
@@ -55,7 +53,7 @@ share_examples_for 'A serialization method' do
   end
 
   before(:each) do
-    DataMapper::Model.descendants.each { |model| model.all.destroy! }
+    DataMapper::Model.descendants.each { |model| model.destroy! }
   end
 
   describe '(serializing single resources)' do
@@ -241,7 +239,7 @@ share_examples_for 'A serialization method' do
         [ :default, :alternate ].each do |repository_name|
           DataMapper.repository(repository_name) do
             QuanTum::Cat.auto_migrate!
-            QuanTum::Cat.all.destroy!
+            QuanTum::Cat.destroy!
           end
         end
       end

data/spec/public/to_csv_spec.rb

@@ -7,6 +7,7 @@ if defined?(::CSV)
     #
 
     before(:all) do
+      DataMapper.finalize
       query = DataMapper::Query.new(DataMapper::repository(:default), Cow)
 
       resources = [
@@ -49,8 +50,9 @@ if defined?(::CSV)
         before(:all) do
           [ :default, :alternate ].each do |repository_name|
             DataMapper.repository(repository_name) do
+              DataMapper.finalize
               QuanTum::Cat.auto_migrate!
-              QuanTum::Cat.all.destroy!
+              QuanTum::Cat.destroy!
             end
           end
         end

data/spec/public/to_json_spec.rb

@@ -6,6 +6,7 @@ describe DataMapper::Serialize, '#to_json' do
   #
 
   before(:all) do
+    DataMapper.finalize
     DataMapper.auto_migrate!
     query = DataMapper::Query.new(DataMapper::repository(:default), Cow)
 

data/spec/public/to_xml_spec.rb

@@ -18,6 +18,7 @@ require 'spec_helper'
     #
 
     before(:all) do
+      DataMapper.finalize
       @harness = Class.new(SerializerTestHarness) do
         def method_name
           :to_xml

data/spec/public/to_yaml_spec.rb

@@ -6,6 +6,7 @@ describe DataMapper::Serialize, '#to_yaml' do
   #
 
   before(:all) do
+    DataMapper.finalize
     @harness = Class.new(SerializerTestHarness) do
       def method_name
         :to_yaml

data/spec/rcov.opts

@@ -1,4 +1,4 @@
---exclude "spec"
+--exclude "spec,^/"
 --sort coverage
 --callsites
 --xrefs

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'dm-validations' # FIXME: must be required before dm-serializer
 require 'dm-serializer'
 require 'dm-migrations'
 
-require 'spec/lib/serialization_method_shared_spec'
+require File.expand_path('spec/lib/serialization_method_shared_spec')
 
 # require fixture resources
 SPEC_ROOT = Pathname(__FILE__).dirname.expand_path

data/tasks/spec.rake

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-serializer
 version: !ruby/object:Gem::Version 
-  hash: 977940575
+  hash: 977940572
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - rc2
-  version: 1.0.0.rc2
+  - rc3
+  version: 1.0.0.rc3
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -07:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +27,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -69,51 +69,51 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: dm-validations
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 9
         segments: 
         - 1
-        - 0
-        - 0
-        - rc2
-        version: 1.0.0.rc2
+        - 3
+        version: "1.3"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: dm-validations
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 977940572
         segments: 
         - 1
-        - 4
-        - 1
-        version: 1.4.1
+        - 0
+        - 0
+        - rc3
+        version: 1.0.0.rc3
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: nokogiri
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 5
         segments: 
         - 1
-        - 3
-        version: "1.3"
+        - 4
+        - 1
+        version: 1.4.1
   type: :development
   version_requirements: *id006
 description: DataMapper plugin for serializing Resources and Collections