om 3.0.3 → 3.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1506c83ba270fd799906372dec5dad78bf22e15b
+  data.tar.gz: 52421f44573d4dd6dbccf317999992739b06a0d8
+SHA512:
+  metadata.gz: b6708395c67ab5aae28ff0f2019320869de2b6c528fbe83c6a62cef25342467eda7e2eca2917a828f4361448f68a16f917184397966eee55e9285154b41d13bc
+  data.tar.gz: 8dc39146fa979e0acbab1915f73217868247629ff7a66c9b7200a85338969b89f8b683361afad740df704afc3896863725eea21da7650db999cc3c9450d16477

data/CONTRIBUTING.md

@@ -0,0 +1,113 @@
+# How to Contribute
+
+We want your help to make Project Hydra great.
+There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
+
+## Hydra Project Intellectual Property Licensing and Ownership
+
+All code contributors must have an Individual Contributor License Agreement (iCLA) on file with the Hydra Project Steering Group.
+If the contributor works for an institution, the institution must have a Corporate Contributor License Agreement (cCLA) on file.
+
+https://wiki.duraspace.org/display/hydra/Hydra+Project+Intellectual+Property+Licensing+and+Ownership
+
+You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
+
+## Contribution Tasks
+
+* Reporting Issues
+* Making Changes
+* Submitting Changes
+* Merging Changes
+
+### Reporting Issues
+
+* Make sure you have a [GitHub account](https://github.com/signup/free)
+* Submit a [Github issue](./issues) by:
+  * Clearly describing the issue
+    * Provide a descriptive summary
+    * Explain the expected behavior
+    * Explain the actual behavior
+    * Provide steps to reproduce the actual behavior
+
+### Making Changes
+
+* Fork the repository on GitHub
+* Create a topic branch from where you want to base your work.
+  * This is usually the master branch.
+  * To quickly create a topic branch based on master; `git branch fix/master/my_contribution master`
+  * Then checkout the new branch with `git checkout fix/master/my_contribution`.
+  * Please avoid working directly on the `master` branch.
+  * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
+* Make commits of logical units.
+  * Your commit should include a high level description of your work in HISTORY.textile 
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+* If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages)
+
+```
+    Present tense short summary (50 characters or less)
+
+    More detailed description, if necessary. It should be wrapped to 72
+    characters. Try to be as descriptive as you can, even if you think that
+    the commit content is obvious, it may not be obvious to others. You
+    should add such description also if it's already present in bug tracker,
+    it should not be necessary to visit a webpage to check the history.
+
+    Include Closes #<issue-number> when relavent.
+
+    Description can have multiple paragraphs and you can use code examples
+    inside, just indent it with 4 spaces:
+
+        class PostsController
+          def index
+            respond_with Post.limit(10)
+          end
+        end
+
+    You can also add bullet points:
+
+    - you can use dashes or asterisks
+
+    - also, try to indent next line of a point for readability, if it's too
+      long to fit in 72 characters
+```
+
+* Make sure you have added the necessary tests for your changes.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+* When you are ready to submit a pull request
+
+### Submitting Changes
+
+[Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
+
+* Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
+* Make sure your branch is up to date with its parent branch (i.e. master)
+  * `git checkout master`
+  * `git pull --rebase`
+  * `git checkout <your-branch>`
+  * `git rebase master`
+  * It is likely a good idea to run your tests again.
+* Squash the commits for your branch into one commit
+  * `git rebase --interactive HEAD~<number-of-commits>` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  * To determine the number of commits on your branch: `git log master..<your-branch> --oneline | wc -l`
+  * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
+* Push your changes to a topic branch in your fork of the repository.
+* Submit a pull request from your fork to the project.
+
+### Merging Changes
+
+* It is considered "poor from" to merge your own request.
+* Please take the time to review the changes and get a sense of what is being changed. Things to consider:
+  * Does the commit message explain what is going on?
+  * Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_
+  * Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
+  * Did the Travis tests complete successfully?
+* If you are uncertain, bring other contributors into the conversation by creating a comment that includes their @username.
+* If you like the pull request, but want others to chime in, create a +1 comment and tag a user.
+
+# Additional Resources
+
+* [General GitHub documentation](http://help.github.com/)
+* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+* [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
+* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/History.textile

@@ -1,9 +1,3 @@
-h3. 3.0.3 (19 Jul 2013)
-  Fix overly-aggressive template inheritance bug introduced in 3.0.2
-
-h3. 3.0.2 (15 Jul 2013)
-  Add terminology and template inheritance
-
 h3. 3.0.1 (25 Jun 2013)
   Fix bug where values that were the same as the existing values were 
     removed from the update list

data/README.md

@@ -0,0 +1,41 @@
+[![Build Status](https://travis-ci.org/projecthydra/om.png?branch=master)](https://travis-ci.org/projecthydra/om)
+[![Gem Version](https://badge.fury.io/rb/om.png)](http://badge.fury.io/rb/om)
+
+# om (Opinionated Metadata)
+
+A library to help you tame sprawling XML schemas like MODS.
+
+OM allows you to define a "terminology" to ease translation between XML and ruby objects – you can query the xml for Nodes or node values without ever writing a line of XPath.
+
+OM "terms" are ruby symbols you define (in the terminology) that map specific XML content into ruby object attributes.
+
+## Tutorials & Reference
+
+* [Tame Your XML with OM](https://github.com/projecthydra/om/wiki/Tame-your-XML-with-OM)
+* [Common OM Patterns](https://github.com/projecthydra/om/blob/master/COMMON_OM_PATTERNS.textile)
+
+### Solrizing Documents
+
+The solrizer gem provides support for indexing XML documents into Solr based on OM Terminologies.  
+That process is documented in the [solrizer README](https://github.com/projecthydra/solrizer)
+
+## OM in the Wild
+
+We have a page on the Hydra wiki with a list of OM Terminologies in active use: 
+[OM Terminologies in the Wild](https://wiki.duraspace.org/display/hydra/OM+Terminologies+in+the+Wild)
+
+## Acknowledgments
+
+### Creator
+
+Matt Zumwalt ([MediaShelf](http://yourmediashelf.com)
+
+### Thanks To
+
+* Bess Sadler, who enabled us to take knowledge gleaned from developing Blacklight and apply it to OM metadata indexing
+* Ross Singer
+* Those who participated in the Opinionated MODS breakout session at Code4Lib 2010
+
+## Copyright
+
+Copyright (c) 2010 Matt Zumwalt. See LICENSE for details.

data/gemfiles/gemfile.rails4

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec :path=>"../"
 
-gem 'activemodel', '4.0.0.rc1'
+gem 'activemodel', '~> 4.0.0'
 
 group :development, :test do
   gem 'simplecov', :platform => :mri_19

data/lib/om/version.rb

@@ -1,3 +1,3 @@
 module Om
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

data/lib/om/xml/document.rb

@@ -24,7 +24,12 @@ module OM::XML::Document
     end
 
     def terminology_builder
-      @terminology_builder ||= OM::XML::Terminology::Builder.new
+      return @terminology_builder if @terminology_builder
+      @terminology_builder = if superclass.respond_to? :terminology_builder
+        superclass.terminology_builder.dup
+      else
+        OM::XML::Terminology::Builder.new
+      end
     end
 
     def template_registry

data/lib/om/xml/dynamic_node.rb

@@ -119,7 +119,7 @@ module OM
       end
 
       def ==(other)
-        val == other
+        other == val
       end
 
       def eql?(other)

data/lib/om/xml/term_builder.rb

@@ -93,7 +93,7 @@ module OM::XML::TermBuilder
     # @param [OM::XML::Terminology] terminology that this Term is being built for
     def build(terminology=nil)
       self.resolve_refs!
-      if term.self.settings.has_key?(:proxy)
+      if settings.has_key?(:proxy)
         term = OM::XML::NamedTermProxy.new(self.name, self.settings[:proxy], terminology, self.settings)
       else
         term = OM::XML::Term.new(self.name, {}, terminology)
@@ -118,14 +118,45 @@ module OM::XML::TermBuilder
       return self
     end
 
+    def root_term= val
+      @settings[:is_root_term] = val
+    end
 
-    # Any unknown method calls will add an entry to the settings hash and return the current object
-    def method_missing method, *args, &block
-      if args.length == 1
-        args = args.first
-      end
-      @settings[method] = args
-      return self
+    def index_as= val
+      @settings[:index_as] = val
+    end
+
+    def required= val
+      @settings[:required] = val
+    end
+
+    def ref= val
+      @settings[:ref] = val
+    end
+
+    def attributes= val
+      @settings[:attributes] = val
+    end
+
+    def proxy= val
+      @settings[:proxy] = val
+    end
+
+    def type= val
+      @settings[:type] = val
+    end
+
+    def path= val
+      @settings[:path] = val
     end
+
+    def variant_of= val
+      @settings[:variant_of] = val
+    end
+
+    def default_content_path= val
+      @settings[:default_content_path] = val
+    end
+
   end
 end

data/lib/om/xml/terminology.rb

@@ -51,7 +51,10 @@ class OM::XML::Terminology
           @namespaces["oxns"] = ns_pair.last
         end
       end
-      root_term_builder = OM::XML::Term::Builder.new(opts.fetch(:path,:root).to_s.sub(/[_!]$/, '')).is_root_term(true)
+      path = opts.fetch(:path,:root).to_s.sub(/[_!]$/, '')
+      root_term_builder = OM::XML::Term::Builder.new(path).tap do |t|
+        t.root_term= true
+      end
       term_opts = opts.dup
       term_opts.delete(:schema)
       root_term_builder.settings.merge!(term_opts)

data/lib/om/xml/terminology_based_solrizer.rb

@@ -15,7 +15,7 @@ module OM::XML::TerminologyBasedSolrizer
     def solrize(doc, solr_doc=Hash.new, field_mapper = nil)
       unless doc.class.terminology.nil?
         doc.class.terminology.terms.each_pair do |term_name,term|
-          doc.solrize_term(term, solr_doc, field_mapper)
+          doc.solrize_term(term, solr_doc, field_mapper) unless term.is_root_term?
         end
       end
 

data/om.gemspec

@@ -32,8 +32,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.extra_rdoc_files = [
-    "LICENSE",
-    "README.textile"
+    "LICENSE"
   ]
   s.require_paths = ["lib"]
 end

data/spec/integration/subclass_terminology_spec.rb

@@ -12,6 +12,9 @@ describe "Inherited terminology" do
       end
 
       class ConcreteTerminology < AbstractTerminology
+        extend_terminology do |t|
+          t.bar
+        end
       end
     end
 
@@ -20,7 +23,7 @@ describe "Inherited terminology" do
       Object.send(:remove_const, :AbstractTerminology)
     end
 
-    describe "on the subclass" do
+    describe "the subclass" do
       subject do
         xml = '<root xmlns="asdf"><foo>fooval</foo><bar>barval</bar></root>'
         ConcreteTerminology.from_xml(xml)
@@ -30,9 +33,14 @@ describe "Inherited terminology" do
         subject.foo = "Test value"
         subject.foo.should == ["Test value"]
       end
+
+      it "should have extended terminology" do
+        subject.bar = "Test value"
+        subject.bar.should == ["Test value"]
+      end
     end
 
-    describe "on the superclass" do
+    describe "the superclass" do
       subject do
         xml = '<root xmlns="asdf"><foo>fooval</foo><bar>barval</bar></root>'
         AbstractTerminology.from_xml(xml)
@@ -42,6 +50,10 @@ describe "Inherited terminology" do
         subject.foo = "Test value"
         subject.foo.should == ["Test value"]
       end
+
+      it "should not have extended terminology" do
+        expect { subject.bar }.to raise_error NoMethodError
+      end
     end
   end
 

data/spec/unit/container_spec.rb

@@ -54,7 +54,7 @@ describe "OM::XML::Container" do
     
     it 'should accept an optional Nokogiri::XML Document as an argument and insert its fields into that (mocked test)' do
       doc = Nokogiri::XML::Document.parse("<test_xml/>")
-      mock_new_node = mock("new node")
+      mock_new_node = double("new node")
       doc.root.should_receive(:add_child).with(subject.ng_xml.root).and_return(mock_new_node)
       result = subject.to_xml(doc)
     end
@@ -65,7 +65,7 @@ describe "OM::XML::Container" do
     end
     
     it 'should add to root of Nokogiri::XML::Documents, but add directly to the elements if a Nokogiri::XML::Node is passed in' do
-      mock_new_node = mock("new node")
+      mock_new_node = double("new node")
       mock_new_node.stub(:to_xml).and_return("foo")
       
       doc = Nokogiri::XML::Document.parse("<test_document/>")

data/spec/unit/dynamic_node_spec.rb

@@ -161,6 +161,20 @@ describe "OM::XML::DynamicNode" do
         @article.journal.title_info = %W(six seven)
         @article.journal.title_info.should == ["six", "seven"]
       end
+
+      describe '==' do
+        it "returns true when values of dynamic nodes are equal." do
+          @article.name(0).last_name = "Steven"
+          @article.name(0).first_name = "Steven"
+          (@article.name(0).last_name == @article.name(0).first_name).should == true
+        end
+
+        it 'returns false when values of dynamic nodes are not equal.' do
+          @article.name(0).first_name = "Horatio"
+          @article.name(0).last_name = "Hogginobble"
+          (@article.name(0).last_name == @article.name(0).first_name).should == false
+        end
+      end 
     end
   end
 end

data/spec/unit/term_builder_spec.rb

@@ -33,7 +33,7 @@ describe "OM::XML::Term::Builder" do
   
   describe '#new' do
    it "should set terminology_builder attribute if provided" do
-     mock_terminology_builder = mock("TerminologyBuilder")
+     mock_terminology_builder = double("TerminologyBuilder")
      OM::XML::Term::Builder.new("term1", mock_terminology_builder).terminology_builder.should == mock_terminology_builder
    end
   end
@@ -41,17 +41,19 @@ describe "OM::XML::Term::Builder" do
   describe "configuration methods" do
     it "should set the corresponding .settings value return the mapping object" do
       [:path, :index_as, :required, :type, :variant_of, :path, :attributes, :default_content_path].each do |method_name|
-        @test_builder.send(method_name, "#{method_name.to_s}foo").should == @test_builder
+        @test_builder.send("#{method_name}=".to_sym, "#{method_name.to_s}foo")
         @test_builder.settings[method_name].should == "#{method_name.to_s}foo"
       end
     end
-    it "should be chainable" do
-      test_builder = OM::XML::Term::Builder.new("chainableTerm").index_as(:facetable, :searchable, :sortable, :displayable).required(true).type(:text)  
-      resulting_settings = test_builder.settings
-      resulting_settings[:index_as].should == [:facetable, :searchable, :sortable, :displayable]
-      resulting_settings[:required].should == true 
-      resulting_settings[:type].should == :text
-    end
+    # it "should be chainable" do
+    #   test_builder = OM::XML::Term::Builder.new("chainableTerm").tap do |t|
+    #     t.index_as = [:facetable, :searchable, :sortable, :displayable).required(true).type(:text)  
+    #   end
+    #   resulting_settings = test_builder.settings
+    #   resulting_settings[:index_as].should == [:facetable, :searchable, :sortable, :displayable]
+    #   resulting_settings[:required].should == true 
+    #   resulting_settings[:type].should == :text
+    # end
   end
 
   describe "settings" do
@@ -70,7 +72,6 @@ describe "OM::XML::Term::Builder" do
     it "should insert the given Term Builder into the current Term Builder's children" do
       @test_builder.add_child(@test_builder_2)
       @test_builder.children[@test_builder_2.name].should == @test_builder_2
-      @test_builder.ancestors.should include(@test_builder_2)
     end
   end
   describe ".retrieve_child" do
@@ -88,7 +89,11 @@ describe "OM::XML::Term::Builder" do
   
   describe ".build" do
     it "should build a Term with the given settings and generate its xpath values" do
-      test_builder = OM::XML::Term::Builder.new("requiredTextFacet").index_as([:facetable, :searchable, :sortable, :displayable]).required(true).type(:text)  
+      test_builder = OM::XML::Term::Builder.new("requiredTextFacet").tap do |t|
+        t.index_as = [:facetable, :searchable, :sortable, :displayable]
+        t.required = true
+        t.type = :text
+      end
       result = test_builder.build
       result.should be_instance_of OM::XML::Term
       result.index_as.should == [:facetable, :searchable, :sortable, :displayable]
@@ -100,7 +105,9 @@ describe "OM::XML::Term::Builder" do
       result.xpath_relative.should == OM::XML::TermXpathGenerator.generate_relative_xpath(result)
     end
     it "should create proxy terms if :proxy is set" do
-      test_builder = OM::XML::Term::Builder.new("my_proxy").proxy([:foo, :bar])
+      test_builder = OM::XML::Term::Builder.new("my_proxy").tap do |t|
+        t.proxy = [:foo, :bar]
+      end
       result = test_builder.build
       result.should be_kind_of OM::XML::NamedTermProxy
     end
@@ -113,8 +120,8 @@ describe "OM::XML::Term::Builder" do
       built_child1 = OM::XML::Term.new("child1")
       built_child2 = OM::XML::Term.new("child2")
 
-      mock1 = mock("Builder1", :build => built_child1 )
-      mock2 = mock("Builder2", :build => built_child2 )
+      mock1 = double("Builder1", :build => built_child1 )
+      mock2 = double("Builder2", :build => built_child2 )
       mock1.stub(:name).and_return("child1")
       mock2.stub(:name).and_return("child2")
 
@@ -137,10 +144,17 @@ describe "OM::XML::Term::Builder" do
 	    @almond.lookup_refs.should == [@peach, @stone_fruit]
 	  end
   	it "should raise an error if the TermBuilder does not have a reference to a terminology builder" do
-  	  lambda { OM::XML::Term::Builder.new("referrer").ref("bongos").lookup_refs }.should raise_error(StandardError,"Cannot perform lookup_ref for the referrer builder.  It doesn't have a reference to any terminology builder")
+  	  lambda { 
+        OM::XML::Term::Builder.new("referrer").tap do |t|
+          t.ref="bongos"
+          t.lookup_refs 
+        end
+      }.should raise_error(StandardError,"Cannot perform lookup_ref for the referrer builder.  It doesn't have a reference to any terminology builder")
 	  end
     it "should raise an error if the referece points to a nonexistent term builder" do
-      tb = OM::XML::Term::Builder.new("mork",@test_terminology_builder).ref(:characters, :aliens)
+      tb = OM::XML::Term::Builder.new("mork",@test_terminology_builder).tap do |t|
+        t.ref = [:characters, :aliens]
+      end
       lambda { tb.lookup_refs }.should raise_error(OM::XML::Terminology::BadPointerError,"This TerminologyBuilder does not have a root TermBuilder defined that corresponds to \":characters\"")
     end
     it "should raise an error with informative error when given circular references" do
@@ -158,7 +172,9 @@ describe "OM::XML::Term::Builder" do
       @test_builder.children.should == children_pre
     end
     it "should should look up the referenced TermBuilder, use its settings and duplicate its children without changing the name" do
-      term_builder = OM::XML::Term::Builder.new("orange",@test_terminology_builder).ref(:fruit_trees, :citrus)
+      term_builder = OM::XML::Term::Builder.new("orange",@test_terminology_builder).tap do |b|
+        b.ref = [:fruit_trees, :citrus]
+      end
       term_builder.resolve_refs!
       # Make sure children and settings were copied
       term_builder.settings.should == @citrus.settings.merge(:path=>"citrus")
@@ -174,7 +190,9 @@ describe "OM::XML::Term::Builder" do
       @almond.settings[:path].should == "prunus"
     end
     it "should set path based on the first ref's name if no path is set" do
-      orange_builder = OM::XML::Term::Builder.new("orange",@test_terminology_builder).ref(:fruit_trees, :citrus)
+      orange_builder = OM::XML::Term::Builder.new("orange",@test_terminology_builder).tap do |b|
+        b.ref= [:fruit_trees, :citrus]
+      end
       orange_builder.resolve_refs!
       orange_builder.settings[:path].should == "citrus"
     end
@@ -182,7 +200,11 @@ describe "OM::XML::Term::Builder" do
     it "should result in clean trees of Terms after building" 
     
   	it "should preserve any extra settings specific to this builder (for variant terms)" do
-  	  tb = OM::XML::Term::Builder.new("orange",@test_terminology_builder).ref(:fruit_trees, :citrus).attributes(:color=>"orange").required(true)
+  	  tb = OM::XML::Term::Builder.new("orange",@test_terminology_builder).tap do |b|
+        b.ref= [:fruit_trees, :citrus]
+        b.attributes = {color: "orange"}
+        b.required =true
+      end
   	  tb.resolve_refs!
   	  tb.settings.should == {:path=>"citrus", :attributes=>{"citric_acid"=>"true", :color=>"orange"}, :required=>true, :type=>:string, :index_as=>[:facetable]}
 	  end

data/spec/unit/term_spec.rb

@@ -75,8 +75,8 @@ describe OM::XML::Term do
 
     describe ".retrieve_term" do
       it "should crawl down into mapper children to find the desired term" do
-        mock_role = mock("mapper", :children =>{:text=>"the target"})
-        mock_conference = mock("mapper", :children =>{:role=>mock_role})
+        mock_role = double("mapper", :children =>{:text=>"the target"})
+        mock_conference = double("mapper", :children =>{:role=>mock_role})
         @test_name_part.should_receive(:children).and_return({:conference=>mock_conference})
         @test_name_part.retrieve_term(:conference, :role, :text).should == "the target"
       end
@@ -185,7 +185,7 @@ describe OM::XML::Term do
         @test_volume.xpath_constrained.should == '//detail[@type="volume" and contains(number, "#{constraint_value}")]'.gsub('"', '\"')
       end
       it "should trigger update on any child objects" do
-        mock_child = mock("child term")
+        mock_child = double("child term")
         mock_child.should_receive(:generate_xpath_queries!).exactly(3).times
         @test_name_part.should_receive(:children).and_return({1=>mock_child, 2=>mock_child, 3=>mock_child})
         @test_name_part.generate_xpath_queries!

data/spec/unit/term_xpath_generator_spec.rb

@@ -68,7 +68,7 @@ describe "OM::XML::TermXpathGeneratorSpec" do
       OM::XML::TermXpathGenerator.generate_absolute_xpath(@test_term).should == '//namePart[@type="termsOfAddress"]'
     end
     it "should prepend the xpath for any parent nodes" do
-      mock_parent_mapper = mock("Term", :xpath_absolute=>'//name[@type="conference"]/role')
+      mock_parent_mapper = double("Term", :xpath_absolute=>'//name[@type="conference"]/role')
       @test_role_text.stub(:parent => mock_parent_mapper)
       OM::XML::TermXpathGenerator.generate_absolute_xpath(@test_role_text).should == '//name[@type="conference"]/role/roleTerm[@type="text"]'
     end

data/spec/unit/xml_terminology_based_solrizer_spec.rb

@@ -29,6 +29,7 @@ describe OM::XML::TerminologyBasedSolrizer do
       solr_doc = Hash.new
       @mods_article.field_mapper = Solrizer::FieldMapper.new
       Samples::ModsArticle.terminology.terms.each_pair do |k,v|
+        next if k == :mods # we don't index the root node
         @mods_article.should_receive(:solrize_term).with(v, solr_doc, @mods_article.field_mapper)
       end
       @mods_article.to_solr(solr_doc)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: om
 version: !ruby/object:Gem::Version
-  version: 3.0.3
-  prerelease: 
+  version: 3.0.4
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,44 +9,39 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: solrizer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,55 +56,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
   prerelease: false
   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: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -119,7 +105,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -127,100 +112,88 @@ dependencies:
 - !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: yard
   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: rdoc
   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: RedCloth
   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: awesome_print
   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: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.4
   type: :development
   prerelease: false
   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
+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'
@@ -229,19 +202,19 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE
-- README.textile
 files:
 - .document
 - .gitignore
 - .travis.yml
 - COMMON_OM_PATTERNS.textile
+- CONTRIBUTING.md
 - GETTING_FANCY.textile
 - GETTING_STARTED.textile
 - Gemfile
 - History.textile
 - LICENSE
 - QUERYING_DOCUMENTS.textile
-- README.textile
+- README.md
 - Rakefile
 - UPDATING_DOCUMENTS.textile
 - container_spec.rb
@@ -309,28 +282,27 @@ files:
 - spec/unit/xml_terminology_based_solrizer_spec.rb
 homepage: http://github.com/projecthydra/om
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: ! 'OM (Opinionated Metadata): A library to help you tame sprawling XML schemas
+specification_version: 4
+summary: 'OM (Opinionated Metadata): A library to help you tame sprawling XML schemas
   like MODS.'
 test_files:
 - spec/fixtures/CBF_MODS/ARS0025_016.xml

data/README.textile

@@ -1,36 +0,0 @@
-!https://travis-ci.org/projecthydra/om.png!:https://travis-ci.org/projecthydra/om
-
-h1. om (Optinionated Metadata)
-
-A library to help you tame sprawling XML schemas like MODS.
-
-OM allows you to define a “terminology” to ease translation between XML and ruby objects – you can query the xml for Nodes or node values without ever writing a line of XPath.
-
-OM “terms” are ruby symbols you define (in the terminology) that map specific XML content into ruby object attributes.
-
-h2. Tutorials & Reference
-
-* "Tame Your XML with OM":https://github.com/projecthydra/om/wiki/Tame-your-XML-with-OM
-* "Common OM Patterns":https://github.com/projecthydra/om/blob/master/COMMON_OM_PATTERNS.textile
-
-h3. Solrizing Documents
-
-The solrizer gem provides support for indexing XML documents into Solr based on OM Terminologies.  That process is documented in the "solrizer documentation":http://rdoc.info/github/projecthydra/solrizer
-
-h2. OM in the Wild
-
-We have a page on the Hydra wiki with a list of OM Terminologies in active use: "OM Terminologies in the Wild":https://wiki.duraspace.org/display/hydra/OM+Terminologies+in+the+Wild
-
-h2. Acknowledgements
-
-Creator: Matt Zumwalt ("MediaShelf":http://yourmediashelf.com)
-
-Thanks to 
-
-Bess Sadler, who enabled us to take knowledge gleaned from developing Blacklight and apply it to OM metadata indexing
-Ross Singer
-Those who participated in the Opinionated MODS breakout session at Code4Lib 2010
-
-h2. Copyright
-
-Copyright (c) 2010 Matt Zumwalt. See LICENSE for details.