dm-serializer 1.1.0.rc2 → 1.1.0.rc3

data/Gemfile

@@ -5,7 +5,7 @@ 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.rc2'
+DM_VERSION     = '~> 1.1.0.rc3'
 DO_VERSION     = '~> 0.10.2'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 

data/VERSION

@@ -1 +1 @@
-1.1.0.rc2
+1.1.0.rc3

data/dm-serializer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-serializer}
-  s.version = "1.1.0.rc2"
+  s.version = "1.1.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{2011-03-01}
+  s.date = %q{2011-03-10}
   s.description = %q{DataMapper plugin for serializing Resources and Collections}
   s.email = %q{vandenberg.guy [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -33,10 +33,10 @@ Gem::Specification.new do |s|
     "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",
+    "lib/dm-serializer/xml.rb",
+    "lib/dm-serializer/xml/libxml.rb",
+    "lib/dm-serializer/xml/nokogiri.rb",
+    "lib/dm-serializer/xml/rexml.rb",
     "spec/fixtures/cow.rb",
     "spec/fixtures/planet.rb",
     "spec/fixtures/quan_tum_cat.rb",
@@ -57,7 +57,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/datamapper/dm-serializer}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{DataMapper plugin for serializing Resources and Collections}
   s.test_files = [
     "spec/fixtures/cow.rb",
@@ -77,27 +77,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.1.0.rc2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
       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.rc2"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.1.0.rc3"])
       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.1.0.rc2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
       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.rc2"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc3"])
       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.1.0.rc2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
     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.rc2"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc3"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])
     s.add_dependency(%q<rspec>, ["~> 1.3.1"])

data/lib/dm-serializer.rb

@@ -2,3 +2,13 @@ require 'dm-serializer/to_json'
 require 'dm-serializer/to_xml'
 require 'dm-serializer/to_yaml'
 require 'dm-serializer/to_csv'
+
+module DataMapper
+  # Define the `Serialize` constant for backwards compatibility.
+  #
+  # @note
+  #   The `Serialize` constant will be removed soon, please use
+  #   {Serializer} instead.
+  #
+  Serialize = Serializer
+end

data/lib/dm-serializer/common.rb

@@ -1,25 +1,16 @@
-begin
-  require 'active_support/ordered_hash'
-rescue LoadError
-  require 'extlib/dictionary'
-  module ActiveSupport
-    OrderedHash = Dictionary unless defined?(OrderedHash)
-  end
-end
-
 require 'dm-core'
 
 module DataMapper
-  module Serialize
-
+  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
+    # Returns propreties to serialize based on :only or :exclude arrays,
+    # if provided :only takes precendence over :exclude
     #
-    # @return <Array> properties that need to be serialized
+    # @return [Array]
+    #   Properties that need to be serialized.
     def properties_to_serialize(options)
       only_properties     = Array(options[:only])
       excluded_properties = Array(options[:exclude])
@@ -28,11 +19,13 @@ module DataMapper
         if only_properties.include? p.name
           false
         else
-          excluded_properties.include?(p.name) || !(only_properties.empty? || only_properties.include?(p.name))
+          excluded_properties.include?(p.name) ||
+          !(only_properties.empty? ||
+          only_properties.include?(p.name))
         end
       end
     end
-
   end
-  Model.append_inclusions(Serialize)
+
+  Model.append_inclusions(Serializer)
 end

data/lib/dm-serializer/to_csv.rb

@@ -13,13 +13,17 @@ else
 end
 
 module DataMapper
-  module Serialize
+  module Serializer
     # Serialize a Resource to comma-separated values (CSV).
     #
     # @return <String> a CSV representation of the Resource
-    def to_csv(writer = '')
-      CSV.generate(writer) do |csv|
-        row = model.properties(repository.name).map do |property|
+    def to_csv(*args)
+      options = args.first || {}
+      options = options.to_h if options.respond_to?(:to_h)
+      options[:writer] = '' unless options.has_key? :writer
+
+      CSV.generate(options[:writer]) do |csv|
+        row = properties_to_serialize(options).map do |property|
           __send__(property.name).to_s
         end
         csv << row
@@ -28,8 +32,12 @@ module DataMapper
 
     module ValidationErrors
       module ToCsv
-        def to_csv(writer = '')
-          CSV.generate(writer) do |csv|
+        def to_csv(*args)
+          options = args.first || {}
+          options = options.to_h if options.respond_to?(:to_h)
+          options[:writer] = '' unless options.has_key? :writer
+
+          CSV.generate(options[:writer]) do |csv|
             errors.each do |key, value|
               value.each do |error|
                 row = []
@@ -45,20 +53,20 @@ module DataMapper
   end
 
   class Collection
-    def to_csv
+    def to_csv(*args)
       result = ''
       each do |item|
-        result << item.to_csv + "\n"
+        result << item.to_csv(args.first) + "\n"
       end
       result
     end
   end
 
-  if Serialize.dm_validations_loaded?
+  if Serializer.dm_validations_loaded?
 
     module Validations
       class ValidationErrors
-        include DataMapper::Serialize::ValidationErrors::ToCsv
+        include DataMapper::Serializer::ValidationErrors::ToCsv
       end
     end
 

data/lib/dm-serializer/to_json.rb

@@ -3,7 +3,7 @@ require 'dm-serializer/common'
 require 'json'
 
 module DataMapper
-  module Serialize
+  module Serializer
     #
     # Converts the resource into a hash of properties.
     #
@@ -31,13 +31,19 @@ module DataMapper
         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 |relationship_name, opts|
-        next unless respond_to?(relationship_name)
-        result[relationship_name] = __send__(relationship_name).to_json(opts.merge(:to_json => false))
+      # Note: if you want to include a whole other model via relation, use
+      # :methods:
+      #
+      #   comments.to_json(:relationships=>{:user=>{:include=>[:first_name],:methods=>[:age]}})
+      #
+      # TODO: This needs tests and also needs to be ported to #to_xml and
+      # #to_yaml
+      if options[:relationships]
+        options[:relationships].each do |relationship_name, opts|
+          if respond_to?(relationship_name)
+            result[relationship_name] = __send__(relationship_name).to_json(opts.merge(:to_json => false))
+          end
+        end
       end
 
       result
@@ -63,7 +69,7 @@ module DataMapper
     module ValidationErrors
       module ToJson
         def to_json(*args)
-          errors.to_hash.to_json
+          DataMapper::Ext::Array.to_hash(errors).to_json
         end
       end
     end
@@ -87,11 +93,11 @@ module DataMapper
     end
   end
 
-  if Serialize.dm_validations_loaded?
+  if Serializer.dm_validations_loaded?
 
     module Validations
       class ValidationErrors
-        include DataMapper::Serialize::ValidationErrors::ToJson
+        include DataMapper::Serializer::ValidationErrors::ToJson
       end
     end
 

data/lib/dm-serializer/to_xml.rb

@@ -1,31 +1,46 @@
 require 'dm-serializer/common'
-require 'dm-serializer/xml_serializers'
-require 'rexml/document'
+require 'dm-serializer/xml'
 
 module DataMapper
-  module Serialize
-    # Serialize a Resource to XML
+  module Serializer
+    # Serialize a Resource to XML.
+    #
+    # @return [LibXML::Document, Nokogiri::Document, REXML::Document]
+    #   An XML representation of this Resource.
     #
-    # @return <REXML::Document> an XML representation of this Resource
     def to_xml(opts = {})
-      xml = XMLSerializers::SERIALIZER
+      xml = XML.serializer
       xml.output(to_xml_document(opts)).to_s
     end
 
-    # This method requires certain methods to be implemented in the individual
-    # serializer library subclasses:
-    # new_document
-    # root_node
-    # add_property_node
-    # add_node
+    # This method requires certain methods to be implemented in the
+    # individual  serializer library subclasses:
+    #
+    # * new_document
+    # * root_node
+    # * add_property_node
+    # * add_node
     def to_xml_document(opts={}, doc = nil)
-      xml = XMLSerializers::SERIALIZER
+      xml = XML.serializer
       doc ||= xml.new_document
-      default_xml_element_name = lambda { DataMapper::Inflector.underscore(model.name).tr("/", "-") }
-      root = xml.root_node(doc, opts[:element_name] || default_xml_element_name[])
+
+      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)
-        attrs = (property.primitive == String) ? {} : {'type' => property.primitive.to_s.downcase}
+        attrs = {}
+
+        unless property.primitive == String
+          attrs['type'] = property.primitive.to_s.downcase
+        end
+
         xml.add_node(root, property.name.to_s, value, attrs)
       end
 
@@ -33,6 +48,7 @@ module DataMapper
         if self.respond_to?(meth)
           xml_name = meth.to_s.gsub(/[^a-z0-9_]/, '')
           value = __send__(meth)
+
           unless value.nil?
             if value.respond_to?(:to_xml_document)
               xml.add_xml(root, value.to_xml_document)
@@ -42,6 +58,7 @@ module DataMapper
           end
         end
       end
+
       doc
     end
 
@@ -52,13 +69,14 @@ module DataMapper
         end
 
         def to_xml_document(opts = {})
-          xml = DataMapper::Serialize::XMLSerializers::SERIALIZER
+          xml = DataMapper::Serializer::XML.serializer
           doc = xml.new_document
           root = xml.root_node(doc, "errors", {'type' => 'hash'})
 
           errors.each do |key, value|
             property = xml.add_node(root, key.to_s, nil, {'type' => 'array'})
             property.attributes["type"] = 'array'
+
             value.each do |error|
               xml.add_node(property, "error", error)
             end
@@ -77,22 +95,32 @@ module DataMapper
     end
 
     def to_xml_document(opts = {})
-      xml = DataMapper::Serialize::XMLSerializers::SERIALIZER
+      xml = DataMapper::Serializer::XML.serializer
       doc = xml.new_document
-      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'})
+
+      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)
       end
+
       doc
     end
   end
 
-  if Serialize.dm_validations_loaded?
+  if Serializer.dm_validations_loaded?
 
     module Validations
       class ValidationErrors
-        include DataMapper::Serialize::ValidationErrors::ToXml
+        include DataMapper::Serializer::ValidationErrors::ToXml
       end
     end
 

data/lib/dm-serializer/to_yaml.rb

@@ -1,12 +1,13 @@
 require 'dm-serializer/common'
 
 module DataMapper
-  module Serialize
+  module Serializer
     # Serialize a Resource to YAML
     #
-    # @return <YAML> a YAML representation of this Resource
+    # @return [YAML]
+    #   A YAML representation of this Resource.
     def to_yaml(opts_or_emitter = {})
-      if !opts_or_emitter.is_a?(Hash)
+      unless opts_or_emitter.is_a?(Hash)
         emitter = opts_or_emitter
         opts = {}
       else
@@ -14,20 +15,22 @@ module DataMapper
         opts = opts_or_emitter
       end
 
-      YAML::quick_emit(object_id,emitter) do |out|
+      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
-          (instance_variable_get("@yaml_addes") || []).each do |k,v|
-            map.add(k.to_s,v)
+
+          if (additions = instance_variable_get("@yaml_addes"))
+            additions.each { |k,v| map.add(k.to_s,v) }
           end
         end
       end
@@ -36,7 +39,7 @@ module DataMapper
     module ValidationErrors
       module ToYaml
         def to_yaml(*args)
-          errors.to_hash.to_yaml(*args)
+          DataMapper::Ext::Array.to_hash(errors).to_yaml(*args)
         end
       end
     end
@@ -45,20 +48,20 @@ module DataMapper
 
   class Collection
     def to_yaml(opts_or_emitter = {})
-      if !opts_or_emitter.is_a?(Hash)
+      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
+        to_a.collect { |x| YAML.load(x.to_yaml(opts_or_emitter)) }.to_yaml
       end
     end
   end
 
-  if Serialize.dm_validations_loaded?
+  if Serializer.dm_validations_loaded?
 
     module Validations
       class ValidationErrors
-        include DataMapper::Serialize::ValidationErrors::ToYaml
+        include DataMapper::Serializer::ValidationErrors::ToYaml
       end
     end
 

data/lib/dm-serializer/xml.rb

@@ -0,0 +1,56 @@
+module DataMapper
+  module Serializer
+    module XML
+      # The supported XML Serializers
+      SERIALIZERS = {
+        :libxml => 'LibXML',
+        :nokogiri => 'Nokogiri',
+        :rexml => 'REXML'
+      }
+
+      #
+      # The current XML Serializer.
+      #
+      # @return [Module]
+      #   The module within {DataMapper::Serialize::XML}.
+      #
+      # @since 1.1.0
+      #
+      def self.serializer
+        @serializer
+      end
+
+      #
+      # Sets the XML Serializer to use.
+      #
+      # @param [Symbol] name
+      #   The name of the serializer to use. Must be either `:libxml`,
+      #   `:nokogiri` or `:rexml`.
+      #
+      # @return [Module]
+      #   The module within {DataMapper::Serialize::XML}.
+      #
+      # @since 1.1.0
+      #
+      def self.serializer=(name)
+        serializer_const = SERIALIZERS[name]
+
+        unless serializer_const
+          raise(ArgumentError,"unsupported XML Serializer #{name}")
+        end
+
+        require "dm-serializer/xml/#{name}"
+        @serializer = const_get(serializer_const)
+      end
+
+      [:nokogiri, :libxml, :rexml].each do |name|
+        # attempt to load the first available XML Serializer
+        begin
+          self.serializer = name
+          break
+        rescue LoadError
+        end
+      end
+    end
+  end
+end

data/lib/dm-serializer/{xml_serializers → xml}/libxml.rb

@@ -1,6 +1,8 @@
+require 'libxml'
+
 module DataMapper
-  module Serialize
-    module XMLSerializers
+  module Serializer
+    module XML
       module LibXML
         def self.new_document
           ::LibXML::XML::Document.new
@@ -8,9 +10,11 @@ module DataMapper
 
         def self.root_node(doc, name, attrs = {})
           root = ::LibXML::XML::Node.new(name)
+
           attrs.each do |attr_name, attr_val|
             root[attr_name] = attr_val
           end
+
           doc.root.nil? ? doc.root = root : doc.root << root
           root
         end
@@ -18,9 +22,11 @@ module DataMapper
         def self.add_node(parent, name, value, attrs = {})
           value_str = value.to_s unless value.nil?
           node = ::LibXML::XML::Node.new(name, value_str)
+
           attrs.each do |attr_name, attr_val|
             node[attr_name] = attr_val
           end
+
           parent << node
           node
         end

data/lib/dm-serializer/{xml_serializers → xml}/nokogiri.rb

@@ -1,6 +1,8 @@
+require 'nokogiri'
+
 module DataMapper
-  module Serialize
-    module XMLSerializers
+  module Serializer
+    module XML
       module Nokogiri
         def self.new_document
           ::Nokogiri::XML::Document.new
@@ -8,9 +10,11 @@ module DataMapper
 
         def self.root_node(doc, name, attrs = {})
           root = ::Nokogiri::XML::Node.new(name, doc)
+
           attrs.each do |attr_name, attr_val|
             root[attr_name] = attr_val
           end
+
           doc.root.nil? ? doc.root = root : doc.root << root
           root
         end
@@ -18,7 +22,11 @@ module DataMapper
         def self.add_node(parent, name, value, attrs = {})
           node = ::Nokogiri::XML::Node.new(name, parent.document)
           node << ::Nokogiri::XML::Text.new(value.to_s, parent.document) unless value.nil?
-          attrs.each {|attr_name, attr_val| node[attr_name] = attr_val }
+
+          attrs.each do |attr_name, attr_val|
+            node[attr_name] = attr_val
+          end
+
           parent << node
           node
         end

data/lib/dm-serializer/{xml_serializers → xml}/rexml.rb

@@ -1,6 +1,8 @@
+require 'rexml/document'
+
 module DataMapper
-  module Serialize
-    module XMLSerializers
+  module Serializer
+    module XML
       module REXML
         def self.new_document
           ::REXML::Document.new
@@ -12,7 +14,11 @@ module DataMapper
 
         def self.add_node(parent, name, value, attrs = {})
           node = parent.add_element(name)
-          attrs.each {|attr_name, attr_val| node.attributes[attr_name] = attr_val}
+
+          attrs.each do |attr_name, attr_val|
+            node.attributes[attr_name] = attr_val
+          end
+
           node << ::REXML::Text.new(value.to_s) unless value.nil?
           node
         end

data/spec/public/to_json_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DataMapper::Serialize, '#to_json' do
+describe DataMapper::Serializer, '#to_json' do
   #
   # ==== ajaxy JSON
   #
@@ -64,7 +64,7 @@ describe DataMapper::Serialize, '#to_json' do
 
 end
 
-describe DataMapper::Serialize, '#as_json' do
+describe DataMapper::Serializer, '#as_json' do
   it "handles nil for options" do
     expect { Cow.new.as_json(nil) }.to_not raise_error
   end

data/spec/public/to_xml_spec.rb

@@ -1,25 +1,20 @@
 require 'spec_helper'
+require 'rexml/document'
 
-{
-  'REXML'    => [],
-  'LibXML'   => [ 'libxml-ruby', 'libxml'   ],
-  'Nokogiri' => [ 'nokogiri',    'nokogiri' ],
-}.each do |lib, (gem_name, file_to_require)|
+[:rexml, :libxml, :nokogiri].each do |lib|
   begin
-    require file_to_require if file_to_require
-  rescue LoadError
-    warn "[WARNING] Cannot find gem '#{gem_name}', not running #to_xml specs for #{lib}"
+    DataMapper::Serializer::XML.serializer = lib
+  rescue LoadError => e
+    warn "[WARNING] #{e.message}"
+    warn "[WARNING] Not running #to_xml specs for #{lib}"
     next
   end
 
-  describe DataMapper::Serialize, "#to_xml using #{lib}" do
-    #
-    # ==== enterprisey XML
-    #
-
+  describe DataMapper::Serializer, "#to_xml using #{lib}" do
     before(:all) do
       DataMapper.finalize
-      @harness = Class.new(SerializerTestHarness) do
+
+      @harness = Class.new(SerializerTestHarness) {
         def method_name
           :to_xml
         end
@@ -58,9 +53,7 @@ require 'spec_helper'
           value = value.to_i if value && ["integer", "datamapper::types::serial"].include?(type)
           value
         end
-      end.new
-      DataMapper::Serialize::XMLSerializers.instance_eval { remove_const('SERIALIZER') }
-      DataMapper::Serialize::XMLSerializers::SERIALIZER = DataMapper::Serialize::XMLSerializers::const_get(lib)
+      }.new
     end
 
     it_should_behave_like "A serialization method"

data/spec/public/to_yaml_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DataMapper::Serialize, '#to_yaml' do
+describe DataMapper::Serializer, '#to_yaml' do
   #
   # ==== yummy YAML
   #

data/spec/spec_helper.rb

@@ -7,6 +7,12 @@ 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 }

metadata

@@ -2,7 +2,7 @@
 name: dm-serializer
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.rc2
+  version: 1.1.0.rc3
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0.rc2
+        version: 1.1.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -53,7 +53,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0.rc2
+        version: 1.1.0.rc3
   type: :development
   prerelease: false
   version_requirements: *id004
@@ -116,10 +116,10 @@ files:
 - 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
+- lib/dm-serializer/xml.rb
+- lib/dm-serializer/xml/libxml.rb
+- lib/dm-serializer/xml/nokogiri.rb
+- lib/dm-serializer/xml/rexml.rb
 - spec/fixtures/cow.rb
 - spec/fixtures/planet.rb
 - spec/fixtures/quan_tum_cat.rb
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin for serializing Resources and Collections

data/lib/dm-serializer/xml_serializers.rb

@@ -1,17 +0,0 @@
-require 'dm-serializer/xml_serializers/rexml'
-require 'dm-serializer/xml_serializers/nokogiri'
-require 'dm-serializer/xml_serializers/libxml'
-
-module DataMapper
-  module Serialize
-    module XMLSerializers
-      SERIALIZER = if defined?(::LibXML)
-                     LibXML
-                   elsif defined?(::Nokogiri)
-                     Nokogiri
-                   else
-                     REXML
-                   end
-    end
-  end
-end