dm-serializer 1.2.0 → 1.2.1

data/Gemfile

@@ -16,8 +16,8 @@ gem 'dm-core', DM_VERSION,
 
 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 ]
+gem 'json',       '~> 1.6.1', :platforms => [ :ruby_18, :jruby ]
+gem 'json_pure',  '~> 1.6.1', :platforms => [ :mswin ]
 
 group :development do
 

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/dm-serializer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dm-serializer"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guy van den Berg"]
-  s.date = "2011-10-09"
+  s.date = "2011-10-24"
   s.description = "DataMapper plugin for serializing Resources and Collections"
   s.email = "vandenberg.guy [a] gmail [d] com"
   s.extra_rdoc_files = [
@@ -65,8 +65,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<fastercsv>, ["~> 1.5.4"])
       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_runtime_dependency(%q<json>, ["~> 1.6.1"])
+      s.add_runtime_dependency(%q<json_pure>, ["~> 1.6.1"])
       s.add_development_dependency(%q<dm-validations>, ["~> 1.2.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
@@ -75,8 +75,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<dm-core>, ["~> 1.2.0"])
       s.add_dependency(%q<fastercsv>, ["~> 1.5.4"])
       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<json>, ["~> 1.6.1"])
+      s.add_dependency(%q<json_pure>, ["~> 1.6.1"])
       s.add_dependency(%q<dm-validations>, ["~> 1.2.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rake>, ["~> 0.9.2"])
@@ -86,8 +86,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<dm-core>, ["~> 1.2.0"])
     s.add_dependency(%q<fastercsv>, ["~> 1.5.4"])
     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<json>, ["~> 1.6.1"])
+    s.add_dependency(%q<json_pure>, ["~> 1.6.1"])
     s.add_dependency(%q<dm-validations>, ["~> 1.2.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rake>, ["~> 0.9.2"])

data/lib/dm-serializer/to_json.rb

@@ -86,7 +86,7 @@ module DataMapper
 
       # default to making JSON
       if options.fetch(:to_json, true)
-        collection.to_json
+        MultiJson.encode(collection)
       else
         collection
       end

metadata

@@ -1,176 +1,123 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dm-serializer
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.2.1
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Guy van den Berg
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: dm-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70365218042700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fastercsv
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70365218042700
+- !ruby/object:Gem::Dependency
+  name: fastercsv
+  requirement: &70365218041980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 5
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.5.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70365218041980
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70365218026560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 0
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70365218026560
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70365218025020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 5
-        - 4
-        version: 1.5.4
+      - !ruby/object:Gem::Version
+        version: 1.6.1
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json_pure
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70365218025020
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: &70365218024460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 5
-        - 4
-        version: 1.5.4
+      - !ruby/object:Gem::Version
+        version: 1.6.1
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: dm-validations
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70365218024460
+- !ruby/object:Gem::Dependency
+  name: dm-validations
+  requirement: &70365218023940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70365218023940
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70365218022900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70365218022900
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70365218022040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70365218022040
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70365218021300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: *70365218021300
 description: DataMapper plugin for serializing Resources and Collections
 email: vandenberg.guy [a] gmail [d] com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -207,36 +154,26 @@ files:
 - tasks/yardstick.rake
 homepage: http://github.com/datamapper/dm-serializer
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: datamapper
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin for serializing Resources and Collections
 test_files: []
-