dm-serializer 1.0.0 → 1.0.1

data/.gitignore

@@ -31,6 +31,7 @@ measurements
 .bundle
 Gemfile.local
 Gemfile.lock
+Gemfile.local.lock
 
 ## PROJECT::SPECIFIC
 spec/db/

data/Gemfile

@@ -71,14 +71,14 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0'
+DM_VERSION = '~> 1.0.1'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 
   if ENV['EXTLIB']
-    gem 'extlib',        '~> 0.9.15',      :git => "#{DATAMAPPER}/extlib.git"
+    gem 'extlib',        '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git"
   else
-    gem 'activesupport', '~> 3.0.0.beta3', :git => 'git://github.com/rails/rails.git', :require => nil
+    gem 'activesupport', '~> 3.0.0',  :git => 'git://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
   end
 
   gem 'dm-core',   DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
@@ -93,7 +93,7 @@ group(:development) do # Development dependencies (as in the gemspec)
   gem 'nokogiri',       '~> 1.4.1'
 
   gem 'rake',           '~> 0.8.7'
-  gem 'rspec',          '~> 1.3'
+  gem 'rspec',          '~> 1.3', :git => 'git://github.com/snusnu/rspec', :branch => 'heckle_fix_plus_gemfile'
   gem 'jeweler',        '~> 1.4'
 
 end
@@ -112,32 +112,31 @@ end
 group :datamapper do # We need this because we want to pin these dependencies to their git master sources
 
   adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
-  adapters = adapters.to_s.gsub(',',' ').split(' ') - ['in_memory']
+  adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
 
-  unless adapters.empty?
+  DO_VERSION     = '~> 0.10.2'
+  DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
-    DO_VERSION     = '~> 0.10.3'
-    DM_DO_ADAPTERS = %w[sqlite postgres mysql oracle sqlserver]
+  if (do_adapters = DM_DO_ADAPTERS & adapters).any?
+    options = {}
+    options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
 
-    gem 'data_objects',  DO_VERSION, :git => "#{DATAMAPPER}/do.git"
+    gem 'data_objects',  DO_VERSION, options.dup
 
-    adapters.each do |adapter|
-      if DM_DO_ADAPTERS.any? { |dm_do_adapter| dm_do_adapter =~ /#{adapter}/  }
-        adapter = 'sqlite3' if adapter == 'sqlite'
-        gem "do_#{adapter}", DO_VERSION, :git => "#{DATAMAPPER}/do.git"
-      end
+    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"
+  end
 
-    adapters.each do |adapter|
-      gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
-    end
-
+  adapters.each do |adapter|
+    gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
   end
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']
-  plugins = (plugins.to_s.gsub(',',' ').split(' ') + ['dm-migrations']).uniq
+  plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
 
   plugins.each do |plugin|
     gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"

data/Rakefile

@@ -15,13 +15,13 @@ begin
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core',   '~> 1.0.0'
+    gem.add_dependency 'dm-core',   '~> 1.0.1'
     gem.add_dependency 'fastercsv', '~> 1.5.3'
-    gem.add_dependency 'json_pure', '~> 1.4.3'
+    gem.add_dependency 'json_pure', '~> 1.4'
 
     gem.add_development_dependency 'rspec',          '~> 1.3'
-    gem.add_development_dependency 'dm-validations', '~> 1.0.0'
-    gem.add_development_dependency 'nokogiri',       '~> 1.4.1'
+    gem.add_development_dependency 'dm-validations', '~> 1.0.1'
+    gem.add_development_dependency 'nokogiri',       '~> 1.4.3'
 #    gem.add_development_dependency 'libxml-ruby',    '~> 1.1.4'  # not available on JRuby
   end
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/dm-serializer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-serializer}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guy van den Berg"]
-  s.date = %q{2010-06-08}
+  s.date = %q{2010-09-07}
   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"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.1"])
       s.add_runtime_dependency(%q<fastercsv>, ["~> 1.5.3"])
-      s.add_runtime_dependency(%q<json_pure>, ["~> 1.4.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.0"])
-      s.add_development_dependency(%q<nokogiri>, ["~> 1.4.1"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.0.1"])
+      s.add_development_dependency(%q<nokogiri>, ["~> 1.4.3"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.1"])
       s.add_dependency(%q<fastercsv>, ["~> 1.5.3"])
-      s.add_dependency(%q<json_pure>, ["~> 1.4.3"])
+      s.add_dependency(%q<json_pure>, ["~> 1.4"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
-      s.add_dependency(%q<dm-validations>, ["~> 1.0.0"])
-      s.add_dependency(%q<nokogiri>, ["~> 1.4.1"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.0.1"])
+      s.add_dependency(%q<nokogiri>, ["~> 1.4.3"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.1"])
     s.add_dependency(%q<fastercsv>, ["~> 1.5.3"])
-    s.add_dependency(%q<json_pure>, ["~> 1.4.3"])
+    s.add_dependency(%q<json_pure>, ["~> 1.4"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
-    s.add_dependency(%q<dm-validations>, ["~> 1.0.0"])
-    s.add_dependency(%q<nokogiri>, ["~> 1.4.1"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.0.1"])
+    s.add_dependency(%q<nokogiri>, ["~> 1.4.3"])
   end
 end
 

data/lib/dm-serializer/to_json.rb

@@ -4,13 +4,18 @@ require 'json'
 
 module DataMapper
   module Serialize
-    # Serialize a Resource to JavaScript Object Notation (JSON; RFC 4627)
     #
-    # @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)
-
+    # Converts the resource into a hash of properties.
+    #
+    # @param [Hash] options
+    #   Additional options.
+    #
+    # @return [Hash{String => String}]
+    #   The hash of resources properties.
+    #
+    # @since 1.0.1
+    #
+    def as_json(options={})
       result = {}
 
       properties_to_serialize(options).each do |property|
@@ -33,6 +38,18 @@ module DataMapper
         result[relationship_name] = __send__(relationship_name).to_json(opts.merge(:to_json => false))
       end
 
+      result
+    end
+
+    # Serialize a Resource to JavaScript Object Notation (JSON; RFC 4627)
+    #
+    # @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 = as_json(options)
+
       # default to making JSON
       if options.fetch(:to_json, true)
         result.to_json

data/lib/dm-serializer/to_xml.rb

@@ -21,7 +21,7 @@ module DataMapper
     def to_xml_document(opts={}, doc = nil)
       xml = XMLSerializers::SERIALIZER
       doc ||= xml.new_document
-      default_xml_element_name = lambda { ActiveSupport::Inflector.underscore(model.name).tr("/", "-") }
+      default_xml_element_name = lambda { DataMapper::Inflector.underscore(model.name).tr("/", "-") }
       root = xml.root_node(doc, opts[:element_name] || default_xml_element_name[])
       properties_to_serialize(opts).each do |property|
         value = __send__(property.name)
@@ -79,7 +79,7 @@ module DataMapper
     def to_xml_document(opts = {})
       xml = DataMapper::Serialize::XMLSerializers::SERIALIZER
       doc = xml.new_document
-      default_collection_element_name = lambda {ActiveSupport::Inflector.pluralize(ActiveSupport::Inflector.underscore(self.model.to_s)).tr("/", "-")}
+      default_collection_element_name = lambda {DataMapper::Inflector.pluralize(DataMapper::Inflector.underscore(self.model.to_s)).tr("/", "-")}
       root = xml.root_node(doc, opts[:collection_element_name] || default_collection_element_name[], {'type' => 'array'})
       self.each do |item|
         item.to_xml_document(opts, doc)

data/tasks/local_gemfile.rake

@@ -1,16 +1,14 @@
 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
-
-  source_regex     = /DATAMAPPER = 'git:\/\/github.com\/datamapper'/
-  gem_source_regex = /:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/
+  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!(source_regex,     "DATAMAPPER = '#{datamapper}'")
-      line.sub!(gem_source_regex, ':path => "#{DATAMAPPER}/\1"')
+      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

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-serializer
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -07:00
+date: 2010-09-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 1
         - 5
@@ -58,12 +55,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 4
-        - 3
-        version: 1.4.3
+        version: "1.4"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,7 +69,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 1
         - 3
@@ -89,12 +83,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 1.0.1
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -105,12 +98,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 1
         - 4
-        - 1
-        version: 1.4.1
+        - 3
+        version: 1.4.3
   type: :development
   version_requirements: *id006
 description: DataMapper plugin for serializing Resources and Collections
@@ -176,7 +168,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -185,7 +176,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"