dm-serializer 0.9.2 → 0.9.3

data/History.txt

@@ -0,0 +1 @@
+

data/Manifest.txt

@@ -0,0 +1,20 @@
+History.txt
+LICENSE
+Manifest.txt
+README.txt
+Rakefile
+TODO
+autotest/discover.rb
+autotest/dmserializer_rspec.rb
+lib/dm-serializer.rb
+lib/dm-serializer/version.rb
+spec/fixtures/cow.rb
+spec/fixtures/planet.rb
+spec/fixtures/quatum_cat.rb
+spec/spec.opts
+spec/spec_helper.rb
+spec/unit/serializer_spec.rb
+spec/unit/to_csv_spec.rb
+spec/unit/to_json_spec.rb
+spec/unit/to_xml_spec.rb
+spec/unit/to_yaml_spec.rb

data/{README → README.txt}

@@ -1,4 +1,3 @@
-dm-serializer
-=============
+= dm-serializer
 
 DataMapper plugin for serializing DataMapper objects.

data/Rakefile

@@ -1,51 +1,44 @@
 require 'rubygems'
 require 'spec'
-require 'rake/clean'
-require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 require 'pathname'
 
-CLEAN.include '{log,pkg}/'
+ROOT = Pathname(__FILE__).dirname.expand_path
+require ROOT + 'lib/dm-serializer/version'
 
-spec = Gem::Specification.new do |s|
-  s.name             = 'dm-serializer'
-  s.version          = '0.9.2'
-  s.platform         = Gem::Platform::RUBY
-  s.has_rdoc         = true
-  s.extra_rdoc_files = %w[ README LICENSE TODO ]
-  s.summary          = 'DataMapper plugin for serializing DataMapper objects'
-  s.description      = s.summary
-  s.author           = 'Guy van den Berg'
-  s.email            = 'vandenberg.guy@gmail.com'
-  s.homepage         = 'http://github.com/sam/dm-more/tree/master/dm-serializer'
-  s.require_path     = 'lib'
-  s.files            = FileList[ '{lib,spec}/**/*.rb', 'spec/spec.opts', 'Rakefile', *s.extra_rdoc_files ]
-  s.add_dependency('dm-core', "=#{s.version}")
-end
+AUTHOR = "Guy van den Berg"
+EMAIL  = "vandenberg.guy@gmail.com"
+GEM_NAME = "dm-serializer"
+GEM_VERSION = DataMapper::Serializer::VERSION
+GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
+GEM_CLEAN = ["log", "pkg", "coverage"]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
+
+PROJECT_NAME = "datamapper"
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/dm-serializer"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = "DataMapper plugin for serializing DataMapper objects"
+
+require ROOT.parent + 'tasks/hoe'
 
 task :default => [ :spec ]
 
 WIN32 = (RUBY_PLATFORM =~ /win32|mingw|cygwin/) rescue nil
 SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Install #{spec.name} #{spec.version} (default ruby)"
+desc "Install #{GEM_NAME} #{GEM_VERSION} (default ruby)"
 task :install => [ :package ] do
-  sh "#{SUDO} gem install --local pkg/#{spec.name}-#{spec.version} --no-update-sources", :verbose => false
+  sh "#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources", :verbose => false
 end
 
-desc "Uninstall #{spec.name} #{spec.version} (default ruby)"
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
 task :uninstall => [ :clobber ] do
-  sh "#{SUDO} gem uninstall #{spec.name} -v#{spec.version} -I -x", :verbose => false
+  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
 end
 
 namespace :jruby do
-  desc "Install #{spec.name} #{spec.version} with JRuby"
+  desc "Install #{GEM_NAME} #{GEM_VERSION} with JRuby"
   task :install => [ :package ] do
-    sh %{#{SUDO} jruby -S gem install --local pkg/#{spec.name}-#{spec.version} --no-update-sources}, :verbose => false
+    sh %{#{SUDO} jruby -S gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
   end
 end
 

data/autotest/discover.rb

@@ -0,0 +1,3 @@
+Autotest.add_discovery do
+  "dmserializer"
+end

data/autotest/dmserializer_rspec.rb

@@ -0,0 +1,108 @@
+require 'autotest'
+
+$VERBOSE = false
+
+class RspecCommandError < StandardError; end
+
+# Autotest has no full-blown snake_case to CamelCase
+class Autotest::DmserializerRspec < Autotest
+  WHOLE_SUITE_REGEXP = %r{^spec/(unit|integration)/.*_spec\.rb}
+
+  Autotest.add_hook :initialize do |at|
+    at.clear_mappings
+    at.add_exception(/\.git|TAGS/)
+
+    # Updating a spec runs that spec.
+    at.add_mapping(%r{^spec/.*_spec\.rb$}) do |filename, _|
+      filename
+    end
+
+    # Updating spec helper runs the whole suite.
+    at.add_mapping(%r{^spec/spec_helper\.rb}) do |_, m|
+      at.files_matching WHOLE_SUITE_REGEXP
+    end
+
+    # Updating of library file runs the whole suite.
+    at.add_mapping(%r{^lib/.*\.rb}) do |_, m|
+      at.files_matching WHOLE_SUITE_REGEXP
+    end
+
+    # Updating of fixture resources runs the whole suite.
+    at.add_mapping(%r{^spec/fixtures/.*\.rb}) do |_, m|
+      at.files_matching WHOLE_SUITE_REGEXP
+    end
+  end
+
+
+  def initialize(kernel = Kernel, separator = File::SEPARATOR, alt_separator = File::ALT_SEPARATOR) # :nodoc:
+    super() # need parens so that Ruby doesn't pass our args
+    # to the superclass version which takes none..
+
+    @kernel, @separator, @alt_separator = kernel, separator, alt_separator
+    @spec_command = spec_command
+  end
+
+  attr_accessor :failures
+
+  def failed_results(results)
+    results.scan(/^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m)
+  end
+
+  def handle_results(results)
+    @failures = failed_results(results)
+    @files_to_test = consolidate_failures @failures
+    unless $TESTING
+      if @files_to_test.empty?
+        hook :green
+      else
+        hook :red
+      end
+    end
+    @tainted = true unless @files_to_test.empty?
+  end
+
+  def consolidate_failures(failed)
+    filters = Hash.new { |h,k| h[k] = [] }
+    failed.each do |spec, failed_trace|
+      find_files.keys.select { |f| f =~ /spec\// }.each do |f|
+        if failed_trace =~ Regexp.new(f)
+          filters[f] << spec
+          break
+        end
+      end
+    end
+    filters
+  end
+
+  def make_test_cmd(files_to_test)
+    "#{ruby} -S #{@spec_command} #{test_cmd_options} #{files_to_test.keys.flatten.join(' ')}"
+  end
+
+  def test_cmd_options
+    # '-O specs/spec.opts' if File.exist?('specs/spec.opts')
+  end
+
+  # Finds the proper spec command to use. Precendence is set in the
+  # lazily-evaluated method spec_commands.  Alias + Override that in
+  # ~/.autotest to provide a different spec command then the default
+  # paths provided.
+  def spec_command(separator=File::ALT_SEPARATOR)
+    unless defined?(@spec_command)
+      @spec_command = spec_commands.find { |cmd| File.exists?(cmd) }
+
+      raise RspecCommandError, "No spec command could be found" unless @spec_command
+
+      @spec_command.gsub!(File::SEPARATOR, separator) if separator
+    end
+    @spec_command
+  end
+
+  # Autotest will look for spec commands in the following
+  # locations, in this order:
+  #
+  #   * default spec bin/loader installed in Rubygems
+  #   * any spec command found in PATH
+  def spec_commands
+    [File.join(Config::CONFIG['bindir'], 'spec'), 'spec']
+  end
+end

data/lib/dm-serializer/version.rb

@@ -0,0 +1,5 @@
+module DataMapper
+  module Serializer
+    VERSION = "0.9.3"
+  end
+end

data/lib/dm-serializer.rb

@@ -23,20 +23,22 @@ module DataMapper
       fields = []
 
       # FIXME: this should go into bunch of protected methods shared with other serialization methods
-      only_properties     = options[:only]    || []
-      excluded_properties = options[:exclude] || []
+      only_properties     = Array(options[:only])
+      excluded_properties = Array(options[:exclude])
       exclude_read_only   = options[:without_read_only_attributes] || false
 
-      propset = self.class.properties(repository.name)
+      propset = self.class.properties(repository.name).reject do |p|
+        next if only_properties.include? p.name
+        excluded_properties.include?(p.name) || !(only_properties.empty? || only_properties.include?(p.name))
+      end
 
-      # FIXME: this ugly condition is here because PropertySet does not support reject/select yet.
-      unless only_properties.empty?
-        propset.each do |property|
-          fields << "#{property.name.to_json}: #{send(property.getter).to_json}" if only_properties.include?(property.name.to_sym)
-        end
-      else
-        propset.each do |property|
-          fields << "#{property.name.to_json}: #{send(property.getter).to_json}" unless excluded_properties.include?(property.name.to_sym)
+      fields += propset.map do |property|
+        "#{property.name.to_json}: #{send(property.getter).to_json}"
+      end
+      
+      if self.respond_to?(:serialize_properties)
+        self.serialize_properties.each do |k,v|
+          fields << "#{k.to_json}: #{v.to_json}"
         end
       end
 
@@ -75,6 +77,7 @@ module DataMapper
     #
     # @return <REXML::Document> an XML representation of this Resource
     def to_xml(opts = {})
+      
       to_xml_document(opts).to_s
     end
 
@@ -108,8 +111,8 @@ module DataMapper
     # Return a REXML::Document representing this Resource
     #
     # @return <REXML::Document> an XML representation of this Resource
-    def to_xml_document(opts={})
-      doc = REXML::Document.new
+    def to_xml_document(opts={}, doc=nil)
+      doc ||= REXML::Document.new
       root = doc.add_element(xml_element_name)
 
       #TODO old code base was converting single quote to double quote on attribs
@@ -117,7 +120,7 @@ module DataMapper
       self.class.properties(repository.name).each do |property|
           value = send(property.name)
           node = root.add_element(property.name.to_s)
-          if property.key?
+          unless property.type == String
             node.attributes["type"] = property.type.to_s.downcase
           end
           node << REXML::Text.new(value.to_s) unless value.nil?
@@ -140,12 +143,8 @@ module DataMapper
       "[" << map {|e| e.to_json(opts)}.join(",") << "]"
     end
 
-    def to_xml
-      result = ""
-      each do |item|
-        result << item.to_xml + "\n"
-      end
-      result
+    def to_xml(opts = {})
+      to_xml_document(opts).to_s
     end
 
     def to_csv
@@ -155,6 +154,21 @@ module DataMapper
       end
       result
     end
+    
+    protected
+    def xml_element_name
+      Extlib::Inflection.tableize(self.model.to_s)
+    end
+    
+    def to_xml_document(opts={})
+      doc = REXML::Document.new
+      root = doc.add_element(xml_element_name)
+      root.attributes["type"] = 'array'
+      each do |item|
+        item.send(:to_xml_document, opts, root)
+      end
+      doc
+    end
   end
 
 end # module DataMapper

data/spec/fixtures/cow.rb

@@ -5,4 +5,8 @@ class Cow
   property :composite, Integer, :key => true
   property :name,      String
   property :breed,     String
+  
+  def serialize_properties
+    {:extra => "Extra", :another => 42}
+  end
 end

data/spec/fixtures/quatum_cat.rb

@@ -0,0 +1,11 @@
+class QuantumCat 
+  include DataMapper::Resource
+  
+  property :id, Serial
+  property :name, String
+  property :location, String
+  
+  repository(:alternate) do
+    property :is_dead, Boolean
+  end 
+end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'pathname'
 
-gem 'dm-core', '=0.9.2'
+gem 'dm-core', '=0.9.3'
 require 'dm-core'
 
 spec_dir_path = Pathname(__FILE__).dirname.expand_path
@@ -13,10 +13,11 @@ def load_driver(name, default_uri)
   lib = "do_#{name}"
 
   begin
-    gem lib, '=0.9.2'
+    gem lib, '=0.9.3'
     require lib
     DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
     DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]
+    DataMapper::Repository.adapters[:alternate] = DataMapper::Repository.adapters[name]
     true
   rescue Gem::LoadError => e
     warn "Could not load #{lib}: #{e}"

data/spec/unit/to_csv_spec.rb

@@ -31,4 +31,18 @@ describe DataMapper::Serialize, '#to_csv' do
       "1,2,Betsy,Jersey\n" +
       "10,20,Berta,Guernsey\n"
   end
+  
+  describe "multiple repositories" do
+    before(:all) do
+      QuantumCat.auto_migrate!
+      repository(:alternate){QuantumCat.auto_migrate!}
+    end
+    
+    it "should use the repsoitory for the model" do
+      gerry = QuantumCat.create(:name => "gerry")
+      george = repository(:alternate){QuantumCat.create(:name => "george", :is_dead => false)}
+      gerry.to_csv.should_not match(/false/)
+      george.to_csv.should match(/false/)
+    end
+  end
 end

data/spec/unit/to_json_spec.rb

@@ -51,6 +51,13 @@ describe DataMapper::Serialize, '#to_json' do
     berta["breed"].should     == "Guernsey"
   end
 
+  it "handles extra properties" do
+    deserialized_hash = JSON.parse(Cow.new(:id => 1, :name => "Harry", :breed => "Angus").to_json)
+
+    deserialized_hash["extra"].should == "Extra"
+    deserialized_hash["another"].should == 42
+  end
+
   it "handles empty collections just fine" do
     deserialized_collection = JSON.parse(@empty_collection.to_json)
     deserialized_collection.should be_empty
@@ -99,7 +106,21 @@ describe DataMapper::Serialize, '#to_json' do
     deserialized_hash["name"].should be(nil)
     deserialized_hash["aphelion"].should == 249_209_300.4
   end
-
+  
+  describe "multiple repositories" do
+    before(:all) do
+      QuantumCat.auto_migrate!
+      repository(:alternate){QuantumCat.auto_migrate!}
+    end
+    
+    it "should use the repsoitory for the model" do
+      gerry = QuantumCat.create(:name => "gerry")
+      george = repository(:alternate){QuantumCat.create(:name => "george", :is_dead => false)}
+      gerry.to_json.should_not match(/is_dead/)
+      george.to_json.should match(/is_dead/)
+    end
+  end
+  
   it "supports :include option for one level depth"
 
   it "supports :include option for more than one level depth"

data/spec/unit/to_xml_spec.rb

@@ -8,6 +8,9 @@ describe DataMapper::Serialize, '#to_xml' do
 
   before(:all) do
     query = DataMapper::Query.new(DataMapper::repository(:default), Cow)
+    
+    @time = DateTime.now
+    
 
     @collection = DataMapper::Collection.new(query) do |c|
       c.load([1, 2, 'Betsy', 'Jersey'])
@@ -35,8 +38,36 @@ describe DataMapper::Serialize, '#to_xml' do
   end
 
   it "should serialize a collection to XML" do
-    @collection.to_xml.gsub(/[[:space:]]+\n/, "\n").should ==
-      "<cow><id type='integer'>1</id><composite type='integer'>2</composite><name>Betsy</name><breed>Jersey</breed></cow>\n" +
-      "<cow><id type='integer'>10</id><composite type='integer'>20</composite><name>Berta</name><breed>Guernsey</breed></cow>\n"
+    @collection.to_xml.should == <<-EOS.compress_lines(false)
+      <cows type='array'>
+        <cow>
+          <id type='integer'>1</id>
+          <composite type='integer'>2</composite>
+          <name>Betsy</name>
+          <breed>Jersey</breed>
+        </cow>
+        <cow>
+          <id type='integer'>10</id>
+          <composite type='integer'>20</composite>
+          <name>Berta</name>
+          <breed>Guernsey</breed>
+        </cow>
+      </cows>
+  EOS
   end
+  
+  describe "multiple repositories" do
+    before(:all) do
+      QuantumCat.auto_migrate!
+      repository(:alternate){QuantumCat.auto_migrate!}
+    end
+    
+    it "should use the repsoitory for the model" do
+      gerry = QuantumCat.create(:name => "gerry")
+      george = repository(:alternate){QuantumCat.create(:name => "george", :is_dead => false)}
+      gerry.to_xml.should_not match(/is_dead/)
+      george.to_xml.should match(/is_dead/)
+    end
+  end
+
 end

data/spec/unit/to_yaml_spec.rb

@@ -58,5 +58,19 @@ describe DataMapper::Serialize, '#to_yaml' do
   it "handles empty collections just fine" do
     YAML.load(@empty_collection.to_yaml).should be_empty
   end
+  
+  describe "multiple repositories" do
+    before(:all) do
+      QuantumCat.auto_migrate!
+      repository(:alternate){QuantumCat.auto_migrate!}
+    end
+    
+    it "should use the repsoitory for the model" do
+      gerry = QuantumCat.create(:name => "gerry")
+      george = repository(:alternate){QuantumCat.create(:name => "george", :is_dead => false)}
+      gerry.to_yaml.should_not match(/is_dead/)
+      george.to_yaml.should match(/is_dead/)
+    end
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-serializer
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -9,48 +9,67 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-25 00:00:00 -05:00
+date: 2008-07-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
     version: 
 description: DataMapper plugin for serializing DataMapper objects
-email: vandenberg.guy@gmail.com
+email: 
+- vandenberg.guy@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.txt
 - LICENSE
 - TODO
 files: 
+- History.txt
+- LICENSE
+- Manifest.txt
+- README.txt
+- Rakefile
+- TODO
+- autotest/discover.rb
+- autotest/dmserializer_rspec.rb
 - lib/dm-serializer.rb
+- lib/dm-serializer/version.rb
 - spec/fixtures/cow.rb
 - spec/fixtures/planet.rb
+- spec/fixtures/quatum_cat.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/serializer_spec.rb
 - spec/unit/to_csv_spec.rb
 - spec/unit/to_json_spec.rb
 - spec/unit/to_xml_spec.rb
 - spec/unit/to_yaml_spec.rb
-- spec/spec.opts
-- Rakefile
-- README
-- LICENSE
-- TODO
 has_rdoc: true
 homepage: http://github.com/sam/dm-more/tree/master/dm-serializer
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -67,8 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
+rubyforge_project: datamapper
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: DataMapper plugin for serializing DataMapper objects