objectify-xml 0.2.0 → 0.2.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.1 / 2009-03-02
+
+* Minor update to support the latest version of Nokogiri (1.2.1)
+
 === 0.2.0 / 2009-02-24
 
 * Initial public release.

data/Rakefile

@@ -3,13 +3,25 @@
 require 'rubygems'
 require 'hoe'
 require './lib/objectify_xml.rb'
+require 'spec/rake/spectask'
 
 Hoe.new('objectify-xml', Objectify::Xml::VERSION) do |p|
   p.rubyforge_name = 'objectify-xml' # if different than lowercase project name
   p.developer('pangloss', 'darrick@innatesoftware.com')
   p.extra_deps = %w[nokogiri activesupport]
-  #p.extra_dev_deps = []
+  p.testlib = 'spec'
+  p.test_globs = 'spec/**/*_spec.rb'
   p.url = 'http://github.com/pangloss/objectify_xml'
+  p.remote_rdoc_dir = ''
 end
 
+desc "Run all specifications"
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.libs = ['lib', 'spec']
+  t.spec_opts = ['--colour', '--format', 'specdoc']
+end
+
+Rake::Task[:default].clear
+task :default => [:spec]
+
 # vim: syntax=Ruby

data/lib/objectify_xml.rb

@@ -8,7 +8,7 @@ require File.join(File.dirname(__FILE__), 'objectify_xml/element_parser')
 
 module Objectify
   class Xml
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
 
     # When child nodes are created, they are given the name of the node
     # that created them which is available here.
@@ -31,7 +31,7 @@ module Objectify
       end
       # skip the <?xml?> tag
       xml = xml.child if xml.class == Nokogiri::XML::Document
-      while xml.class == Nokogiri::XML::Node
+      while xml and xml.class != Nokogiri::XML::Element
         # skips past things like xml-stylesheet declarations.
         xml = xml.next
       end

data/spec/objectify_xml_spec.rb

@@ -9,7 +9,35 @@ describe Objectify::Xml do
     public :xml_text_to_value
   end
 
+  describe 'first_element' do
+    it 'should return the first element, skipping processing instructions' do
+      xml_string = <<-exml
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/css" href="http://en.wikipedia.org/skins-1.5/common/feed.css?206xx"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en"></feed>
+      exml
+      Xml.first_element(xml_string).name.should == 'feed'
+    end
+
+    it 'should handle nil xml' do
+      Xml.first_element(nil).should be_nil
+    end
+
+    it 'should handle blank xml' do
+      Xml.first_element('').should be_nil
+    end
+
+    it 'should return the first element of simple xml data' do
+      Xml.first_element('<foo><bar>no</bar></foo>').name.should == 'foo'
+    end
+  end
+
   describe 'initialize' do
+    it 'should call first_element' do
+      Xml.expects(:first_element).with('the xml').returns(nil)
+      Xml.new('the xml')
+    end
+
     describe 'with nil' do
       it 'should handle nil string' do
         Xml.new(nil) do |x|
@@ -26,24 +54,6 @@ describe Objectify::Xml do
       end
     end
 
-    describe 'with multiple nodes before the first element' do
-      it 'should call parse_xml with the first element' do
-        xml_string = <<-exml
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/css" href="http://en.wikipedia.org/skins-1.5/common/feed.css?206xx"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en"></feed>
-        exml
-        xml = Nokogiri::XML(xml_string).child.next
-        x = Xml.new(xml_string) do |x|
-          def x.primary_xml_element(xml)
-            xml.name.should == 'feed'
-            @parent = :called
-          end
-        end
-        x.parent.should == :called
-      end
-    end
-
     describe 'with ""' do
       it 'should not call primary_xml_element' do
         Xml.new('') do |x|
@@ -51,6 +61,7 @@ describe Objectify::Xml do
         end
       end
     end
+
     describe 'with valid xml' do
       it 'should call primary_xml_element with a Nokogiri XML object' do
         Xml.new('<foo><bar>no</bar></foo>') do |x|

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '../lib/objectify_xml
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/objectify_xml/atom'))
 require 'spec'
 require 'mocha'
+require 'pp'
 
 def sample_feed(name)
   open(File.join(File.dirname(__FILE__), File.join('sample', name)))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: objectify-xml
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - pangloss
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-26 00:00:00 -05:00
+date: 2009-03-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
+        version: 1.9.0
     version: 
 description: Provides an easy to use DSL resembling ActiveRecord for defining objects representing any XML document, including deeply nested ones. This project was extracted from my ruby-picasa gem. You can find ruby-picasa at http://github.com/pangloss/ruby_picasa or available as a gem.  The project also has significant (if not complete) Atom support.
 email: 
@@ -97,5 +97,9 @@ rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Provides an easy to use DSL resembling ActiveRecord for defining objects representing any XML document, including deeply nested ones
-test_files: []
-
+test_files: 
+- spec/atom_spec.rb
+- spec/document_parser_spec.rb
+- spec/dsl_spec.rb
+- spec/element_parser_spec.rb
+- spec/objectify_xml_spec.rb