om 1.6.0 → 1.6.1

data/spec/unit/container_spec.rb

@@ -1,6 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "nokogiri"
-require "om"
+require 'spec_helper'
 
 describe "OM::XML::Container" do
   
@@ -75,4 +73,4 @@ describe "OM::XML::Container" do
     end
   end
   
-end
+end

data/spec/unit/document_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "om"
+require 'spec_helper'
 
 describe "OM::XML::Document" do
   
@@ -160,4 +159,4 @@ describe "OM::XML::Document" do
     end
   end
    
-end
+end

data/spec/unit/dynamic_node_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "om"
+require 'spec_helper'
 
 describe "OM::XML::DynamicNode" do
   describe do

data/spec/unit/named_term_proxy_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "om"
+require 'spec_helper'
 
 describe "OM::XML::NamedTermProxy" do
   

data/spec/unit/node_generator_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "om"
+require 'spec_helper'
 
 describe "OM::XML::NodeGenerator" do
   
@@ -24,4 +23,4 @@ describe "OM::XML::NodeGenerator" do
     end
   end
   
-end
+end

data/spec/unit/nokogiri_sanity_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "om"
+require 'spec_helper'
 
 describe "OM::XML::TermValueOperators" do
   
@@ -72,4 +71,4 @@ describe "OM::XML::TermValueOperators" do
   
 
   
-end
+end

data/spec/unit/om_spec.rb

@@ -1,6 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "nokogiri"
-require "om"
+require 'spec_helper'
 
 describe "OM" do
   
@@ -11,4 +9,4 @@ describe "OM" do
     end
   end
   
-end
+end

data/spec/unit/template_registry_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "om"
+require 'spec_helper'
 
 describe "OM::XML::TemplateRegistry" do
 

data/spec/unit/term_builder_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "om"
+require 'spec_helper'
 
 describe "OM::XML::Term::Builder" do
   
@@ -192,4 +191,4 @@ describe "OM::XML::Term::Builder" do
 	    @almond.settings[:attributes].should == {:genus=>"Prunus",:subgenus=>"Amygdalus", :species=>"Prunus dulcis"}
     end
   end
-end
+end

data/spec/unit/term_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "om"
+require 'spec_helper'
 
 describe "OM::XML::Term" do
 

data/spec/unit/term_value_operators_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "om"
+require 'spec_helper'
 
 describe "OM::XML::TermValueOperators" do
   
@@ -220,7 +219,7 @@ describe "OM::XML::TermValueOperators" do
       @article.term_values(:name,:name_content).should == ["Describes a person"]
       @article.update_values({[:name, :name_content]=>"Test text"})
       @article.term_values(:name,:name_content).should == ["Test text"]
-      @article.find_by_terms(:name).children.length().should == 30
+      @article.find_by_terms(:name).children.length().should == 35
     end
     
   end

data/spec/unit/term_xpath_generator_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "om"
+require 'spec_helper'
 
 describe "OM::XML::TermXpathGeneratorSpec" do
 

data/spec/unit/terminology_builder_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "om"
+require 'spec_helper'
 
 describe "OM::XML::Terminology::Builder" do
   

data/spec/unit/terminology_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "om"
+require 'spec_helper'
 
 describe "OM::XML::Terminology" do
 

data/spec/unit/validation_spec.rb

@@ -1,6 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "nokogiri"
-require "om"
+require 'spec_helper'
 
 describe "OM::XML::Validation" do
   
@@ -79,4 +77,4 @@ describe "OM::XML::Validation" do
       lambda {ValidationTest.send(:file_from_url, "http://fedora-commons.org/nonexistent_file")}.should raise_error(RuntimeError, "Could not retrieve file from http://fedora-commons.org/nonexistent_file. Error: 404 Not Found")  
     end
   end
-end
+end

data/spec/unit/xml_serialization_spec.rb

@@ -1,6 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "om"
-require "om/samples"
+require 'spec_helper'
 
 describe "OM::XML::Terminology.to_xml" do
   before(:all) do
@@ -60,4 +58,4 @@ describe "OM::XML::Term.to_xml" do
   it "should skip children if :children=>false" do
     @person.to_xml(:children=>false).xpath("children").should be_empty
   end
-end
+end

data/spec/unit/xml_spec.rb

@@ -1,6 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "nokogiri"
-require "om"
+require 'spec_helper'
 
 describe "OM::XML::Container" do
   
@@ -21,4 +19,4 @@ describe "OM::XML::Container" do
     end
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: om
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70348835252740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70348835252740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: mediashelf-loggable
-  requirement: &70348835252320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348835252320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70348835281960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,31 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70348835281960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70348835281460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +85,15 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70348835281460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70348835281000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +101,12 @@ dependencies:
         version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *70348835281000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 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
@@ -121,7 +162,14 @@ files:
 - spec/fixtures/mods_articles/hydrangea_article1.xml
 - spec/fixtures/no_namespace.xml
 - spec/fixtures/test_dummy_mods.xml
+- spec/integration/differentiated_elements_spec.rb
+- spec/integration/element_value_spec.rb
+- spec/integration/proxies_and_ref_spec.rb
+- spec/integration/querying_documents_spec.rb
 - spec/integration/rights_metadata_integration_example_spec.rb
+- spec/integration/selective_querying_spec.rb
+- spec/integration/set_reentrant_terminology_spec.rb
+- spec/integration/xpathy_stuff_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/container_spec.rb
@@ -161,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: ! 'OM (Opinionated Metadata): A library to help you tame sprawling XML schemas
@@ -174,7 +222,14 @@ test_files:
 - spec/fixtures/mods_articles/hydrangea_article1.xml
 - spec/fixtures/no_namespace.xml
 - spec/fixtures/test_dummy_mods.xml
+- spec/integration/differentiated_elements_spec.rb
+- spec/integration/element_value_spec.rb
+- spec/integration/proxies_and_ref_spec.rb
+- spec/integration/querying_documents_spec.rb
 - spec/integration/rights_metadata_integration_example_spec.rb
+- spec/integration/selective_querying_spec.rb
+- spec/integration/set_reentrant_terminology_spec.rb
+- spec/integration/xpathy_stuff_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/container_spec.rb