dm-serializer 0.9.9 → 0.9.10

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.9.10 / 2009-01-19
+
+* 1 minor enhancement:
+
+  * Don't emit XML prologue when using libxml or nokogiri
+
+* 1 bug fix:
+
+  * libxml and nokogiri no longer output an xml prologue
+
 === 0.9.9 / 2009-01-04
 
 * 1 major enhancement:

data/benchmarks/to_xml.rb

@@ -1,7 +1,7 @@
 require "rubygems"
 require 'pathname'
 
-gem 'dm-core', '~>0.9.9'
+gem 'dm-core', '~>0.9.10'
 require 'dm-core'
 
 spec_dir_path = Pathname(__FILE__).dirname.expand_path

data/lib/dm-serializer/to_csv.rb

@@ -1,10 +1,15 @@
 require 'dm-serializer/common'
 
-begin
-  gem('fastercsv')
-  require 'faster_csv'
-rescue LoadError
-  nil
+if RUBY_VERSION >= '1.9.0'
+ require 'csv'
+else
+  begin
+    gem 'fastercsv', '~>1.4.0'
+    require 'fastercsv'
+    CSV = FasterCSV
+  rescue LoadError
+    nil
+  end
 end
 
 module DataMapper
@@ -13,10 +18,10 @@ module DataMapper
     #
     # @return <String> a CSV representation of the Resource
     def to_csv(writer = '')
-      FasterCSV.generate(writer) do |csv|
+      CSV.generate(writer) do |csv|
         row = []
         self.class.properties(repository.name).each do |property|
-         row << send(property.name).to_s
+          row << send(property.name).to_s
         end
         csv << row
       end

data/lib/dm-serializer/to_xml.rb

@@ -36,7 +36,7 @@ module DataMapper
           xml.add_node(root, xml_name, value.to_s) unless value.nil?
         end
       end
-      doc
+      xml.output(doc)
     end
   end
 

data/lib/dm-serializer/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Serializer
-    VERSION = '0.9.9'
+    VERSION = '0.9.10'
   end
 end

data/lib/dm-serializer/xml_serializers/libxml.rb

@@ -23,6 +23,10 @@ module DataMapper
           end
           parent << node
         end
+
+        def self.output(doc)
+          doc.root.to_s
+        end
       end
     end
   end

data/lib/dm-serializer/xml_serializers/nokogiri.rb

@@ -22,6 +22,10 @@ module DataMapper
           parent << node
           node
         end
+
+        def self.output(doc)
+          doc.root.to_s
+        end
       end
     end
   end

data/lib/dm-serializer/xml_serializers/rexml.rb

@@ -16,8 +16,11 @@ module DataMapper
           node << ::REXML::Text.new(value.to_s) unless value.nil?
           node
         end
-      end
 
+        def self.output(doc)
+          doc.to_s
+        end
+      end
     end
   end
 end

data/spec/public/to_csv_spec.rb

@@ -28,8 +28,8 @@ describe DataMapper::Serialize, '#to_csv' do
 
   it "should serialize a collection to CSV" do
     result = @collection.to_csv.gsub(/[[:space:]]+\n/, "\n")
-    result.to_a[0].split(',')[0..3].should == ['1','2','Betsy','Jersey']
-    result.to_a[1].split(',')[0..3].should == ['10','20','Berta','Guernsey']
+    result.split("\n")[0].split(',')[0..3].should == ['1','2','Betsy','Jersey']
+    result.split("\n")[1].split(',')[0..3].should == ['10','20','Berta','Guernsey']
   end
 
   describe "multiple repositories" do

data/spec/public/to_xml_spec.rb

@@ -59,6 +59,12 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
     it_should_behave_like "A serialization method"
 
+    it "should not include the XML prologue, so that the result can be embedded in other XML documents" do
+      planet = Planet.new
+      xml = planet.to_xml(:element_name => "aplanet")
+      xml.starts_with?("<?xml").should == false
+    end
+
     describe ':element_name option for Resource' do
       it 'should be used as the root node name by #to_xml' do
         planet = Planet.new

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 require 'rubygems'
 
-gem 'dm-core', '~>0.9.9'
+gem 'dm-core', '~>0.9.10'
 require 'dm-core'
 
 spec_dir_path = Pathname(__FILE__).dirname.expand_path
@@ -37,6 +37,6 @@ end
 require spec_dir_path + 'lib/serialization_method_shared_spec'
 
 # require fixture resources
-Dir[spec_dir_path + "fixtures/*.rb"].each do |fixture_file|
+Dir[(spec_dir_path + "fixtures/*.rb").to_s].each do |fixture_file|
   require fixture_file
 end

data/tasks/spec.rb

@@ -8,7 +8,7 @@ begin
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-serializer
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-04 00:00:00 -08:00
+date: 2009-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.9.10
     version: 
 description: DataMapper plugin for serializing DataMapper objects
 email: