roxml 3.2.1 → 3.2.2

data/History.txt

@@ -6,8 +6,6 @@
     (fixes gh issue #27)
   * change the way we monkey patch Nokogiri to leave the original
     behaviour of the search() method unchanged (fixes gh issue #16)
-  * Unofficial release by James Healy, empact has stepped back from maintaining
-    roxml
 
 == 3.1.5 (December 18, 2009)
 

data/Rakefile

@@ -32,8 +32,8 @@ task :libxml => ['test:libxml', 'spec:libxml']
 task :nokogiri => ['test:nokogiri', 'spec:nokogiri']
 
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   if File.exist?('VERSION')
     version = File.read('VERSION')
   else

data/VERSION

@@ -1 +1 @@
-3.2.1
+3.2.2

data/examples/person.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+require_relative './../spec/spec_helper'
+
+class Person
+	include ROXML
+	
+	xml_accessor :name, :from => 'name'
+
+	xml_accessor :lat, :from => 'latitude',   :in => 'location/coordinates'
+	xml_accessor :long, :from => 'longitude', :in => 'location/coordinates'
+
+	xml_accessor :street, :from => 'street', :in => 'location/address'
+	xml_accessor :city, :from => 'city', :in => 'location/address'
+	xml_accessor :zip, :from => 'zip', :in => 'location/address'
+end
+
+unless defined?(RSpec) 
+	p = Person.new
+	p.name = 'John Doe'
+
+	p.lat = '40.715224'
+	p.long = '-74.005966'
+	p.street = 'Evergreen Terrace'
+	p.city = 'Springfield'
+	p.zip = '2342'
+
+	puts p.to_xml.to_s
+end

data/examples/xml/person.xml

@@ -0,0 +1,14 @@
+<person>
+  <name>John Doe</name>
+  <location>
+    <coordinates>
+      <latitude>40.715224</latitude>
+      <longitude>-74.005966</longitude>
+    </coordinates>
+    <address>
+      <street>Evergreen Terrace</street>
+      <city>Springfield</city>
+      <zip>2342</zip>
+    </address>
+  </location>
+</person>

data/lib/roxml.rb

@@ -1,7 +1,7 @@
 require 'uri'
 
 require 'active_support'
-if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3')
+if Gem.loaded_specs['activesupport'] && Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3')
   require 'active_support/inflector'
   require 'active_support/core_ext/object/duplicable'
   require 'active_support/core_ext/module/delegation'
@@ -14,7 +14,7 @@ require 'roxml/definition'
 require 'roxml/xml'
 
 module ROXML # :nodoc:
-  VERSION = '3.1.5'
+  VERSION = '3.2.1'
 
   def self.included(base) # :nodoc:
     base.class_eval do

data/lib/roxml/xml/references.rb

@@ -90,17 +90,20 @@ module ROXML
 
     def wrap(xml, opts = {:always_create => false})
       wrap_with = @auto_vals ? auto_wrapper : wrapper
-
+      
       return xml if !wrap_with || xml.name == wrap_with
-      if !opts[:always_create] && (child = xml.children.find {|c| c.name == wrap_with })
-       return child
-      end
 
       wraps = wrap_with.to_s.split('/')
-      wraps.inject(xml){|node,wrap| XML.add_node(node, wrap)}
+      wraps.inject(xml) do |node,wrap| 
+        if !opts[:always_create] && (child = node.children.find {|c| c.name == wrap }) 
+          child
+        else
+          XML.add_node(node, wrap)    
+        end
+      end    
+    
     end
 
-
     def nodes_in(xml)
       @default_namespace = xml.default_namespace
       vals = xml.roxml_search(xpath, @instance.class.roxml_namespaces)

data/roxml.gemspec

@@ -4,19 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{roxml}
-  s.version = "3.2.1"
+  s.name = "roxml"
+  s.version = "3.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Ben Woosley}, %q{Zak Mandhro}, %q{Anders Engstrom}, %q{Russ Olsen}]
-  s.date = %q{2012-01-05}
-  s.description = %q{ROXML is a Ruby library designed to make it easier for Ruby developers to work with XML.
-Using simple annotations, it enables Ruby classes to be mapped to XML. ROXML takes care
-of the marshalling and unmarshalling of mapped attributes so that developers can focus on
-building first-class Ruby classes. As a result, ROXML simplifies the development of
-RESTful applications, Web Services, and XML-RPC.
-}
-  s.email = %q{ben.woosley@gmail.com}
+  s.authors = ["Ben Woosley", "Zak Mandhro", "Anders Engstrom", "Russ Olsen"]
+  s.date = "2012-01-30"
+  s.description = "ROXML is a Ruby library designed to make it easier for Ruby developers to work with XML.\nUsing simple annotations, it enables Ruby classes to be mapped to XML. ROXML takes care\nof the marshalling and unmarshalling of mapped attributes so that developers can focus on\nbuilding first-class Ruby classes. As a result, ROXML simplifies the development of\nRESTful applications, Web Services, and XML-RPC.\n"
+  s.email = "ben.woosley@gmail.com"
   s.extra_rdoc_files = [
     "History.txt",
     "README.rdoc"
@@ -37,6 +32,7 @@ RESTful applications, Web Services, and XML-RPC.
     "examples/dashed_elements.rb",
     "examples/library.rb",
     "examples/library_with_fines.rb",
+    "examples/person.rb",
     "examples/posts.rb",
     "examples/rails.rb",
     "examples/twitter.rb",
@@ -45,6 +41,7 @@ RESTful applications, Web Services, and XML-RPC.
     "examples/xml/current_weather.xml",
     "examples/xml/dashed_elements.xml",
     "examples/xml/library_with_fines.xml",
+    "examples/xml/person.xml",
     "examples/xml/posts.xml",
     "examples/xml/twitter.xml",
     "lib/roxml.rb",
@@ -62,6 +59,7 @@ RESTful applications, Web Services, and XML-RPC.
     "spec/examples/dashed_elements_spec.rb",
     "spec/examples/library_spec.rb",
     "spec/examples/library_with_fines_spec.rb",
+    "spec/examples/person_spec.rb",
     "spec/examples/post_spec.rb",
     "spec/examples/twitter_spec.rb",
     "spec/reference_spec.rb",
@@ -130,11 +128,11 @@ RESTful applications, Web Services, and XML-RPC.
     "test/unit/xml_text_test.rb",
     "website/index.html"
   ]
-  s.homepage = %q{http://roxml.rubyforge.org}
-  s.require_paths = [%q{lib}]
-  s.rubyforge_project = %q{roxml}
-  s.rubygems_version = %q{1.8.8}
-  s.summary = %q{Ruby Object to XML mapping library}
+  s.homepage = "http://roxml.rubyforge.org"
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "roxml"
+  s.rubygems_version = "1.8.10"
+  s.summary = "Ruby Object to XML mapping library"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/examples/person_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require_relative './../../examples/person'
+
+describe Person do
+	
+	before do
+		@person = Person.new
+		@person.name = 'John Doe'
+		@person.lat = '40.715224'
+		@person.long = '-74.005966'
+		@person.street = 'Evergreen Terrace'
+		@person.city = 'Springfield'
+		@person.zip = '2342'
+	end
+
+	it 'should only contain one location element' do
+		@person.to_xml.roxml_search('location').count.should == 1
+	end
+
+	describe '#to_xml' do
+		before do
+			@xml_generated = @person.to_xml.to_s.gsub("\n",'').squeeze(' ')
+		end
+
+		it 'should generate the expected xml' do
+			xml_file = File.read(xml_for('person')).gsub("\n",'').squeeze(' ')
+			xml_file.should == @xml_generated
+		end
+
+		it 'should generate identical xml after a full roundtrip' do	
+			p = Person.from_xml(@xml_generated)
+			xml_roundtrip = p.to_xml.to_s.gsub("\n",'').squeeze(' ')
+			xml_roundtrip.should == @xml_generated
+		end
+	end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roxml
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000Z
+date: 2012-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2165456080 !ruby/object:Gem::Requirement
+  requirement: &70164162904540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165456080
+  version_requirements: *70164162904540
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2165455600 !ruby/object:Gem::Requirement
+  requirement: &70164162900300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2165455600
+  version_requirements: *70164162900300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2165455120 !ruby/object:Gem::Requirement
+  requirement: &70164162909420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165455120
+  version_requirements: *70164162909420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2165454640 !ruby/object:Gem::Requirement
+  requirement: &70164162927020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165454640
+  version_requirements: *70164162927020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165454160 !ruby/object:Gem::Requirement
+  requirement: &70164162923220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *2165454160
+  version_requirements: *70164162923220
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2165453680 !ruby/object:Gem::Requirement
+  requirement: &70164162944020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: 1.2.4
   type: :development
   prerelease: false
-  version_requirements: *2165453680
+  version_requirements: *70164162944020
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2165453200 !ruby/object:Gem::Requirement
+  requirement: &70164162960820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,7 +90,7 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *2165453200
+  version_requirements: *70164162960820
 description: ! 'ROXML is a Ruby library designed to make it easier for Ruby developers
   to work with XML.
 
@@ -128,6 +128,7 @@ files:
 - examples/dashed_elements.rb
 - examples/library.rb
 - examples/library_with_fines.rb
+- examples/person.rb
 - examples/posts.rb
 - examples/rails.rb
 - examples/twitter.rb
@@ -136,6 +137,7 @@ files:
 - examples/xml/current_weather.xml
 - examples/xml/dashed_elements.xml
 - examples/xml/library_with_fines.xml
+- examples/xml/person.xml
 - examples/xml/posts.xml
 - examples/xml/twitter.xml
 - lib/roxml.rb
@@ -153,6 +155,7 @@ files:
 - spec/examples/dashed_elements_spec.rb
 - spec/examples/library_spec.rb
 - spec/examples/library_with_fines_spec.rb
+- spec/examples/person_spec.rb
 - spec/examples/post_spec.rb
 - spec/examples/twitter_spec.rb
 - spec/reference_spec.rb
@@ -240,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: roxml
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby Object to XML mapping library