om 1.2.0 → 1.2.1

data/Gemfile

@@ -8,5 +8,5 @@ group :development, :test do
   gem "rspec", "<2.0.0"
   gem "mocha", ">= 0.9.8"
   gem "ruby-debug"
-  gem "equivalent-xml", ">= 0.1.6"
+  gem "equivalent-xml", ">= 0.2.4"
 end

data/Gemfile.lock

@@ -2,8 +2,8 @@ GEM
   remote: http://rubygems.org/
   specs:
     columnize (0.3.2)
-    equivalent-xml (0.1.6)
-      nokogiri
+    equivalent-xml (0.2.4)
+      nokogiri (>= 1.4.3)
     facets (2.9.1)
     git (1.2.5)
     jeweler (1.5.2)
@@ -25,7 +25,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  equivalent-xml (>= 0.1.6)
+  equivalent-xml (>= 0.2.4)
   facets
   jeweler
   mocha (>= 0.9.8)

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/om/xml/document.rb

@@ -73,6 +73,10 @@ module OM::XML::Document
     self.class.template_registry
   end
   
+  def template(node_type, *args)
+    template_registry.instantiate(node_type, *args)
+  end
+  
   # Instantiate a +node_type+ template and add it as a child of +target_node+, where +target_node+ is one of:
   # * a Nokogiri::XML::Node
   # * a single-element Nokogiri::XML::NodeSet
@@ -80,44 +84,44 @@ module OM::XML::Document
   # Additional arguments will be passed to the template unaltered.
   #
   # Returns the new Nokogiri::XML::Node.
-  def add_child_node(target_node, node_type, *args)
-    manipulate_node(:add_child, target_node, node_type, *args)
+  def add_child_node(target_node, node_type, *args, &block)
+    manipulate_node(:add_child, target_node, node_type, *args, &block)
   end
   
   # Instantiate a +node_type+ template and insert it as the following sibling of +target_node+. 
   # Returns the new Nokogiri::XML::Node.
-  def add_next_sibling_node(target_node, node_type, *args)
-    manipulate_node(:add_next_sibling, target_node, node_type, *args)
+  def add_next_sibling_node(target_node, node_type, *args, &block)
+    manipulate_node(:add_next_sibling, target_node, node_type, *args, &block)
   end
 
   # Instantiate a +node_type+ template and insert it as the preceding sibling of +target_node+.
   # Returns the new Nokogiri::XML::Node.
-  def add_previous_sibling_node(target_node, node_type, *args)
-    manipulate_node(:add_previous_sibling, target_node, node_type, *args)
+  def add_previous_sibling_node(target_node, node_type, *args, &block)
+    manipulate_node(:add_previous_sibling, target_node, node_type, *args, &block)
   end
 
   # Instantiate a +node_type+ template and insert it as the following sibling of +target_node+.
   # Returns +target_node+.
-  def after_node(target_node, node_type, *args)
-    manipulate_node(:after, target_node, node_type, *args)
+  def after_node(target_node, node_type, *args, &block)
+    manipulate_node(:after, target_node, node_type, *args, &block)
   end
 
   # Instantiate a +node_type+ template and insert it as the preceding sibling of +target_node+.
   # Returns +target_node+.
-  def before_node(target_node, node_type, *args)
-    manipulate_node(:before, target_node, node_type, *args)
+  def before_node(target_node, node_type, *args, &block)
+    manipulate_node(:before, target_node, node_type, *args, &block)
   end
 
   # Instantiate a +node_type+ template and replace +target_node+ with it.
   # Returns the new Nokogiri::XML::Node.
-  def replace_node(target_node, node_type, *args)
-    manipulate_node(:replace, target_node, node_type, *args)
+  def replace_node(target_node, node_type, *args, &block)
+    manipulate_node(:replace, target_node, node_type, *args, &block)
   end
 
   # Instantiate a +node_type+ template and replace +target_node+ with it.
   # Returns +target_node+.
-  def swap_node(target_node, node_type, *args)
-    manipulate_node(:swap, target_node, node_type, *args)
+  def swap_node(target_node, node_type, *args, &block)
+    manipulate_node(:swap, target_node, node_type, *args, &block)
   end
   
   # Returns a hash combining the current documents namespaces (provided by nokogiri) and any namespaces that have been set up by your Terminology.
@@ -127,10 +131,10 @@ module OM::XML::Document
   end
 
   private
-  def manipulate_node(method, target, *args)
+  def manipulate_node(method, target, *args, &block)
     if target.is_a?(Array)
       target = self.find_by_terms(*target)
     end
-    template_registry.send(method, target, *args)
+    template_registry.send(method, target, *args, &block)
   end
 end

data/lib/om/xml/template_registry.rb

@@ -1,3 +1,35 @@
+# Extend an OM::XML::Document with reusable templates, then use them to add content to 
+# instance documents.
+#
+# Example:
+#
+#   require 'om/samples/mods_article'
+# 
+#   class OM::Samples::ModsArticle
+#     define_template :personalName do |xml, family, given, address|
+#       xml.name(:type => 'personal') do
+#         xml.namePart(:type => 'family') { xml.text(family) }
+#         xml.namePart(:type => 'given') { xml.text(given) }
+#         xml.namePart(:type => 'termsOfAddress') { xml.text(address) }
+#       end
+#     end
+# 
+#     define_template :role do |xml, text, attrs|
+#       xml.role do
+#         attrs = { :type => 'text' }.merge(attrs)
+#         xml.roleTerm(attrs) { xml.text(text) }
+#       end
+#     end
+#   end
+# 
+#   mods = OM::Samples::ModsArticle.from_xml(File.read('./spec/fixtures/CBF_MODS/ARS0025_016.xml'))
+# 
+#   mods.add_previous_sibling_node([:person => 0], :personalName, 'Shmoe', 'Joseph', 'Dr.') { |person|
+#     person.add_child(mods.template(:role, 'author', :authority => 'marcrelator'))
+#     person.add_child(mods.template(:role, 'sub', :authority => 'local', :type => 'code'))
+#     person
+#   }
+
 class OM::XML::TemplateRegistry
 
   def initialize
@@ -54,44 +86,44 @@ class OM::XML::TemplateRegistry
 
   # +instantiate+ a node and add it as a child of the [Nokogiri::XML::Node] specified by +target_node+
   # @return the new [Nokogiri::XML::Node]
-  def add_child(target_node, node_type, *args)
-    attach_node(:add_child, target_node, :self, node_type, *args)
+  def add_child(target_node, node_type, *args, &block)
+    attach_node(:add_child, target_node, :self, node_type, *args, &block)
   end
 
   # +instantiate+ a node and add it as a following sibling of the [Nokogiri::XML::Node] specified by +target_node+
   # @return the new [Nokogiri::XML::Node]
-  def add_next_sibling(target_node, node_type, *args)
-    attach_node(:add_next_sibling, target_node, :parent, node_type, *args)
+  def add_next_sibling(target_node, node_type, *args, &block)
+    attach_node(:add_next_sibling, target_node, :parent, node_type, *args, &block)
   end
 
   # +instantiate+ a node and add it as a preceding sibling of the [Nokogiri::XML::Node] specified by +target_node+
   # @return the new [Nokogiri::XML::Node]
-  def add_previous_sibling(target_node, node_type, *args)
-    attach_node(:add_previous_sibling, target_node, :parent, node_type, *args)
+  def add_previous_sibling(target_node, node_type, *args, &block)
+    attach_node(:add_previous_sibling, target_node, :parent, node_type, *args, &block)
   end
 
   # +instantiate+ a node and add it as a following sibling of the [Nokogiri::XML::Node] specified by +target_node+
   # @return +target_node+
-  def after(target_node, node_type, *args)
-    attach_node(:after, target_node, :parent, node_type, *args)
+  def after(target_node, node_type, *args, &block)
+    attach_node(:after, target_node, :parent, node_type, *args, &block)
   end
 
   # +instantiate+ a node and add it as a preceding sibling of the [Nokogiri::XML::Node] specified by +target_node+
   # @return +target_node+
-  def before(target_node, node_type, *args)
-    attach_node(:before, target_node, :parent, node_type, *args)
+  def before(target_node, node_type, *args, &block)
+    attach_node(:before, target_node, :parent, node_type, *args, &block)
   end
 
   # +instantiate+ a node replace the [Nokogiri::XML::Node] specified by +target_node+ with it
   # @return the new [Nokogiri::XML::Node]
-  def replace(target_node, node_type, *args)
-    attach_node(:replace, target_node, :parent, node_type, *args)
+  def replace(target_node, node_type, *args, &block)
+    attach_node(:replace, target_node, :parent, node_type, *args, &block)
   end
 
   # +instantiate+ a node replace the [Nokogiri::XML::Node] specified by +target_node+ with it
   # @return +target_node+
-  def swap(target_node, node_type, *args)
-    attach_node(:swap, target_node, :parent, node_type, *args)
+  def swap(target_node, node_type, *args, &block)
+    attach_node(:swap, target_node, :parent, node_type, *args, &block)
   end
   
   def methods
@@ -123,7 +155,7 @@ class OM::XML::TemplateRegistry
     builder_node.elements.last.remove
   end
 
-  def attach_node(method, target_node, builder_node_offset, node_type, *args)
+  def attach_node(method, target_node, builder_node_offset, node_type, *args, &block)
     if target_node.is_a?(Nokogiri::XML::NodeSet) and target_node.length == 1
       target_node = target_node.first
     end
@@ -136,7 +168,11 @@ class OM::XML::TemplateRegistry
         node.namespace = nil
       end
     }
-    return result
+    if block_given?
+      yield result
+    else
+      return result
+    end
   end
   
   def empty_root_node

data/om.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{om}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt"]
-  s.date = %q{2011-03-22}
+  s.date = %q{2011-03-23}
   s.description = %q{OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS.  Wraps Nokogiri documents in objects with miscellaneous helper methods for doing things like retrieve generated xpath queries or look up properties based on a simplified DSL}
   s.email = %q{matt.zumwalt@yourmediashelf.com}
   s.extra_rdoc_files = [
@@ -70,7 +70,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/mediashelf/om}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS.}
   s.test_files = [
     "spec/integration/rights_metadata_integration_example_spec.rb",
@@ -92,7 +92,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -102,7 +101,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<equivalent-xml>, [">= 0.1.6"])
+      s.add_development_dependency(%q<equivalent-xml>, [">= 0.2.4"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.2"])
       s.add_runtime_dependency(%q<facets>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
@@ -115,7 +114,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["< 2.0.0"])
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<equivalent-xml>, [">= 0.1.6"])
+      s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
       s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
       s.add_dependency(%q<facets>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
@@ -129,7 +128,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["< 2.0.0"])
     s.add_dependency(%q<mocha>, [">= 0.9.8"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<equivalent-xml>, [">= 0.1.6"])
+    s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
     s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
     s.add_dependency(%q<facets>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'om'
 require 'spec'
 require 'spec/autorun'
+require 'equivalent-xml/rspec_matchers'
 require 'ruby-debug'
 
 Spec::Runner.configure do |config|

data/spec/unit/template_registry_spec.rb

@@ -1,6 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require "om"
-require 'equivalent-xml'
 
 describe "OM::XML::TemplateRegistry" do
 
@@ -57,19 +56,13 @@ describe "OM::XML::TemplateRegistry" do
     it "should instantiate a detached node from a template" do
       node = RegistryTest.template_registry.instantiate(:zombie, 'Zeke')
       expectation = Nokogiri::XML('<monster wants="braaaaainz">Zeke</monster>').root
-      EquivalentXml.equivalent?(node, expectation).should == true
+      node.should be_equivalent_to(expectation)
     end
     
     it "should raise an error when trying to instantiate an unknown node_type" do
       lambda { RegistryTest.template_registry.instantiate(:demigod, 'Hercules') }.should raise_error(NameError)
     end
     
-    it "should instantiate a detached node from a template using the template name as a method" do
-      node = RegistryTest.template_registry.zombie('Zeke')
-      expectation = Nokogiri::XML('<monster wants="braaaaainz">Zeke</monster>').root
-      EquivalentXml.equivalent?(node, expectation).should == true
-    end
-    
     it "should raise an exception if a missing method name doesn't match a node_type" do
       lambda { RegistryTest.template_registry.demigod('Hercules') }.should raise_error(NameError)
     end
@@ -105,48 +98,63 @@ describe "OM::XML::TemplateRegistry" do
       @test_document.ng_xml.root.elements.length.should == 2
     end
     
+    it "should instantiate a detached node from a template using the template name as a method" do
+      node = RegistryTest.template_registry.person('Odin', 'All-Father')
+      expectation = Nokogiri::XML('<person title="All-Father">Odin</person>').root
+      node.should be_equivalent_to(expectation)
+    end
+    
     it "should add_child" do
       return_value = @test_document.template_registry.add_child(@test_document.ng_xml.root, :person, 'Bob', 'Builder')
       return_value.should == @test_document.find_by_terms(:person => 1).first
-      EquivalentXml.equivalent?(@test_document.ng_xml, @expectations[:after], :element_order => true).should == true
+      @test_document.ng_xml.should be_equivalent_to(@expectations[:after]).respecting_element_order
     end
     
     it "should add_next_sibling" do
       return_value = @test_document.template_registry.add_next_sibling(@test_document.find_by_terms(:person => 0), :person, 'Bob', 'Builder')
       return_value.should == @test_document.find_by_terms(:person => 1).first
-      EquivalentXml.equivalent?(@test_document.ng_xml, @expectations[:after], :element_order => true).should == true
+      @test_document.ng_xml.should be_equivalent_to(@expectations[:after]).respecting_element_order
     end
 
     it "should add_previous_sibling" do
       return_value = @test_document.template_registry.add_previous_sibling(@test_document.find_by_terms(:person => 0), :person, 'Bob', 'Builder')
       return_value.should == @test_document.find_by_terms(:person => 0).first
-      EquivalentXml.equivalent?(@test_document.ng_xml, @expectations[:before], :element_order => true).should == true
+      @test_document.ng_xml.should be_equivalent_to(@expectations[:before]).respecting_element_order
     end
 
     it "should after" do
       return_value = @test_document.template_registry.after(@test_document.find_by_terms(:person => 0), :person, 'Bob', 'Builder')
       return_value.should == @test_document.find_by_terms(:person => 0).first
-      EquivalentXml.equivalent?(@test_document.ng_xml, @expectations[:after], :element_order => true).should == true
+      @test_document.ng_xml.should be_equivalent_to(@expectations[:after]).respecting_element_order
     end
 
     it "should before" do
       return_value = @test_document.template_registry.before(@test_document.find_by_terms(:person => 0), :person, 'Bob', 'Builder')
       return_value.should == @test_document.find_by_terms(:person => 1).first
-      EquivalentXml.equivalent?(@test_document.ng_xml, @expectations[:before], :element_order => true).should == true
+      @test_document.ng_xml.should be_equivalent_to(@expectations[:before]).respecting_element_order
     end
 
     it "should replace" do
       target_node = @test_document.find_by_terms(:person => 0).first
       return_value = @test_document.template_registry.replace(target_node, :person, 'Bob', 'Builder')
       return_value.should == @test_document.find_by_terms(:person => 0).first
-      EquivalentXml.equivalent?(@test_document.ng_xml, @expectations[:instead], :element_order => true).should == true
+      @test_document.ng_xml.should be_equivalent_to(@expectations[:instead]).respecting_element_order
     end
 
     it "should swap" do
       target_node = @test_document.find_by_terms(:person => 0).first
       return_value = @test_document.template_registry.swap(target_node, :person, 'Bob', 'Builder')
       return_value.should == target_node
-      EquivalentXml.equivalent?(@test_document.ng_xml, @expectations[:instead], :element_order => true).should == true
+      @test_document.ng_xml.should be_equivalent_to(@expectations[:instead]).respecting_element_order
+    end
+    
+    it "should yield the result if a block is given" do
+      target_node = @test_document.find_by_terms(:person => 0).first
+      expectation = Nokogiri::XML('<person xmlns="urn:registry-test" title="Actor">Alice</person>').root
+      @test_document.template_registry.swap(target_node, :person, 'Bob', 'Builder') { |old_node|
+        old_node.should be_equivalent_to(expectation)
+        old_node
+      }.should be_equivalent_to(expectation)
     end
   end
     
@@ -166,48 +174,54 @@ describe "OM::XML::TemplateRegistry" do
       @test_document.ng_xml.root.elements.length.should == 2
     end
     
+    it "should instantiate a detached node from a template" do
+      node = @test_document.template(:person, 'Odin', 'All-Father')
+      expectation = Nokogiri::XML('<person title="All-Father">Odin</person>').root
+      node.should be_equivalent_to(expectation)
+    end
+
     it "should add_child_node" do
       return_value = @test_document.add_child_node(@test_document.ng_xml.root, :person, 'Bob', 'Builder')
       return_value.should == @test_document.find_by_terms(:person => 1).first
-      EquivalentXml.equivalent?(@test_document.ng_xml, @expectations[:after], :element_order => true).should == true
+      @test_document.ng_xml.should be_equivalent_to(@expectations[:after]).respecting_element_order
     end
     
     it "should add_next_sibling_node" do
       return_value = @test_document.add_next_sibling_node([:person => 0], :person, 'Bob', 'Builder')
       return_value.should == @test_document.find_by_terms(:person => 1).first
-      EquivalentXml.equivalent?(@test_document.ng_xml, @expectations[:after], :element_order => true).should == true
+      @test_document.ng_xml.should be_equivalent_to(@expectations[:after]).respecting_element_order
     end
 
     it "should add_previous_sibling_node" do
       return_value = @test_document.add_previous_sibling_node([:person => 0], :person, 'Bob', 'Builder')
       return_value.should == @test_document.find_by_terms(:person => 0).first
-      EquivalentXml.equivalent?(@test_document.ng_xml, @expectations[:before], :element_order => true).should == true
+      @test_document.ng_xml.should be_equivalent_to(@expectations[:before]).respecting_element_order
     end
 
     it "should after_node" do
       return_value = @test_document.after_node([:person => 0], :person, 'Bob', 'Builder')
       return_value.should == @test_document.find_by_terms(:person => 0).first
-      EquivalentXml.equivalent?(@test_document.ng_xml, @expectations[:after], :element_order => true).should == true
+      @test_document.ng_xml.should be_equivalent_to(@expectations[:after]).respecting_element_order
     end
 
     it "should before_node" do
       return_value = @test_document.before_node([:person => 0], :person, 'Bob', 'Builder')
       return_value.should == @test_document.find_by_terms(:person => 1).first
-      EquivalentXml.equivalent?(@test_document.ng_xml, @expectations[:before], :element_order => true).should == true
+      @test_document.ng_xml.should be_equivalent_to(@expectations[:before]).respecting_element_order
     end
 
     it "should replace_node" do
       target_node = @test_document.find_by_terms(:person => 0).first
       return_value = @test_document.replace_node(target_node, :person, 'Bob', 'Builder')
       return_value.should == @test_document.find_by_terms(:person => 0).first
-      EquivalentXml.equivalent?(@test_document.ng_xml, @expectations[:instead], :element_order => true).should == true
+      @test_document.ng_xml.should be_equivalent_to(@expectations[:instead]).respecting_element_order
     end
 
     it "should swap_node" do
       target_node = @test_document.find_by_terms(:person => 0).first
       return_value = @test_document.swap_node(target_node, :person, 'Bob', 'Builder')
       return_value.should == target_node
-      EquivalentXml.equivalent?(@test_document.ng_xml, @expectations[:instead], :element_order => true).should == true
+      @test_document.ng_xml.should be_equivalent_to(@expectations[:instead]).respecting_element_order
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: om
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,14 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 -07:00
+date: 2011-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: nokogiri
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +30,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
+  name: nokogiri
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: facets
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
+  name: facets
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
+  name: jeweler
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: rspec
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -75,12 +74,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id004
+  name: rspec
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: mocha
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,12 +90,12 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
-  requirement: *id005
+  name: mocha
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: ruby-debug
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -105,28 +104,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  name: ruby-debug
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: equivalent-xml
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 31
         segments: 
         - 0
-        - 1
-        - 6
-        version: 0.1.6
-  requirement: *id007
+        - 2
+        - 4
+        version: 0.2.4
+  name: equivalent-xml
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: nokogiri
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -137,12 +136,12 @@ dependencies:
         - 4
         - 2
         version: 1.4.2
-  requirement: *id008
+  name: nokogiri
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: facets
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,12 +150,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
+  name: facets
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: rspec
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -167,12 +166,12 @@ dependencies:
         - 2
         - 9
         version: 1.2.9
-  requirement: *id010
+  name: rspec
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: mocha
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -183,12 +182,12 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
-  requirement: *id011
+  name: mocha
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: ruby-debug
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -197,7 +196,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id012
+  name: ruby-debug
+  version_requirements: *id012
 description: "OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS.  Wraps Nokogiri documents in objects with miscellaneous helper methods for doing things like retrieve generated xpath queries or look up properties based on a simplified DSL"
 email: matt.zumwalt@yourmediashelf.com
 executables: []
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: "OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS."