om 1.2.3 → 1.2.4

data/History.textile

@@ -1,16 +1,20 @@
-h3.1.2.3
+h3. 1.2.4
 
-NamedTermProxies can now point to terms at the root of a Terminology
+  TerminologyBuilder.root now passes on its options to the root term builder that it creates.
 
-h3.1.2.0
+h3. 1.2.3
+
+  NamedTermProxies can now point to terms at the root of a Terminology
+
+h3. 1.2.0
 
   added OM::XML::TemplateRegistry for built-in templating and creation of new XML nodes
 
-h3.1.1.1
-  
+h3. 1.1.1
+   
   "HYDRA-395":https://jira.duraspace.org/browse/HYDRA-395: Fixed bug that prevented you from appending term values with apostrophes in them
 
-h2.1.1.0
+h2. 1.1.0
 
 HYDRA-371: Provide a way to specify a term that points to nodes where an attribute is not set
 
@@ -24,47 +28,47 @@ HYDRA-371: Provide a way to specify a term that points to nodes where an attribu
 
 namePart[not(@type)]
 
-h3.1.0.1
+h3. 1.0.1
 
 HYDRA-329: Allow for NamedTermProxies at root of Terminology
 
-h2.1.0.0
+h2. 1.0.0
 
 Stable release 
 
-h3.0.1.10
+h3. 0.1.10
 
 Improving generation of constrained xpath queries
 
-h3.0.1.9
+h3. 0.1.9
 
 Improving support for deeply nested nodes (still needs work though)
 
-h3.0.1.5
+h3. 0.1.5
 
 * root_property now inserts an entry into the properties hash
 * added .generate method for building new instances of declared properties
 * refinements to accessor_xpath
 
-h3.0.1.4
+h3. 0.1.4
 
 *  made attribute_xpath idempotent
 
-h3.0.1.3
+h3. 0.1.3
 
 *  added accessor_generic_name and accessor_hierarchical_name methods
 
-h3.0.1.2
+h3. 0.1.2
 
 * changed syntax for looking up accessors with (optional) index values -- no using [{:person=>1}, :first_name]  instead of [:person, 1, :first_name]
 
-h3.0.1.1
+h3. 0.1.1
 
 RENAMED to om (formerly opinionated-xml)
 
 * broke up functionality into Modules
 * added OM::XML::Accessor functionality
 
-h3.0.1
+h3. 0.1
 
 Note: OX v.1 Does not handle treating attribute values as the changing "value" of a node

data/VERSION

@@ -1 +1 @@
-1.2.3
+1.2.4

data/lib/om/xml/term_xpath_generator.rb

@@ -181,7 +181,6 @@ module OM::XML::TermXpathGenerator
           relative_path << proxy_relative_path
           current_location = proxy_term
           rescue Exception => e
-            debugger
             raise "There's a problem with the #{term.name} OM::XML::NamedTermProxy, whose proxy pointer is #{term.proxy_pointer}.  The #{proxy_pointer} pointer is returning #{proxy_term.inspect}"
           end
         end

data/lib/om/xml/terminology.rb

@@ -41,6 +41,9 @@ class OM::XML::Terminology
         end
       end
       root_term_builder = OM::XML::Term::Builder.new(opts.fetch(:path,:root).to_s.sub(/[_!]$/, '')).is_root_term(true)
+      term_opts = opts.dup
+      term_opts.delete(:schema)
+      root_term_builder.settings.merge!(term_opts)
       @term_builders[root_term_builder.name] = root_term_builder
       
       return root_term_builder

data/om.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{om}
-  s.version = "1.2.3"
+  s.version = "1.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt"]
-  s.date = %q{2011-04-19}
+  s.date = %q{2011-05-02}
   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 = [
@@ -123,6 +123,11 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<equivalent-xml>, [">= 0.2.4"])
+      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<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<equivalent-xml>, [">= 0.2.4"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.2"])
       s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
@@ -157,6 +162,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
+      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<jeweler>, [">= 0"])
+      s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
       s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
       s.add_dependency(%q<rspec>, ["< 2.0.0"])
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
@@ -192,6 +202,11 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
+    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<jeweler>, [">= 0"])
+    s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
     s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
     s.add_dependency(%q<rspec>, ["< 2.0.0"])
     s.add_dependency(%q<mocha>, [">= 0.9.8"])

data/spec/integration/rights_metadata_integration_example_spec.rb

@@ -70,7 +70,6 @@ describe "OM::XML::Accessors" do
       pending "nesting is too deep..."
       @sample.retrieve(*[:edit_access, :machine, :person]).length.should == 0
       @sample.update_properties([:edit_access, :machine, :person]=>"user id").should == {"edit_access_machine_person"=>{"-1"=>"user id"}}
-      debugger
       @sample.retrieve(*[:edit_access, :machine, :person]).length.should == 1
       @sample.retrieve(*[:edit_access, :machine, :person]).first.text.should == "user id"
     end

data/spec/unit/terminology_builder_spec.rb

@@ -176,8 +176,15 @@ describe "OM::XML::Terminology::Builder" do
         terminology = @test_builder.build
         terminology.schema.should == "http://www.loc.gov/standards/mods/v3/mods-3-2.xsd"
         terminology.namespaces.should == { "oxns"=>"one:two", 'xmlns' => 'one:two', 'xmlns:foo' => 'bar' }
-        terminology.retrieve_term(:mods).should be_instance_of OM::XML::Term
-        terminology.retrieve_term(:mods).is_root_term?.should == true
+      end
+      it "should create an explicit term correspoinding to the root node and pass any additional settings into that term" do
+        @test_builder.root(:path=>"fwoop", :xmlns => 'one:two', 'xmlns:foo' => 'bar', :index_as=>[:not_searchable], :namespace_prefix=>"foox")
+        terminology = @test_builder.build
+        term = terminology.retrieve_term(:fwoop)
+        term.should be_instance_of OM::XML::Term
+        term.is_root_term?.should == true
+        term.index_as.should == [:not_searchable]        
+        term.namespace_prefix.should == "foox"   
       end
       it "should work within a builder block" do
         @builder_with_block.term_builders[:mods].settings[:is_root_term].should == true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: om
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 -05:00
+date: 2011-05-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -426,11 +426,87 @@ dependencies:
         - 4
         version: 0.2.4
   requirement: *id027
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rspec
+  version_requirements: &id028 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  requirement: *id028
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: mocha
+  version_requirements: &id029 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  requirement: *id029
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: ruby-debug
+  version_requirements: &id030 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id030
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: jeweler
+  version_requirements: &id031 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id031
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: equivalent-xml
+  version_requirements: &id032 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 2
+        - 4
+        version: 0.2.4
+  requirement: *id032
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: nokogiri
-  version_requirements: &id028 !ruby/object:Gem::Requirement 
+  version_requirements: &id033 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -441,12 +517,12 @@ dependencies:
         - 4
         - 2
         version: 1.4.2
-  requirement: *id028
+  requirement: *id033
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rspec
-  version_requirements: &id029 !ruby/object:Gem::Requirement 
+  version_requirements: &id034 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -457,12 +533,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id029
+  requirement: *id034
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: mocha
-  version_requirements: &id030 !ruby/object:Gem::Requirement 
+  version_requirements: &id035 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -473,12 +549,12 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
-  requirement: *id030
+  requirement: *id035
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: ruby-debug
-  version_requirements: &id031 !ruby/object:Gem::Requirement 
+  version_requirements: &id036 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -487,12 +563,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id031
+  requirement: *id036
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: jeweler
-  version_requirements: &id032 !ruby/object:Gem::Requirement 
+  version_requirements: &id037 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -501,12 +577,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id032
+  requirement: *id037
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: equivalent-xml
-  version_requirements: &id033 !ruby/object:Gem::Requirement 
+  version_requirements: &id038 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -517,7 +593,7 @@ dependencies:
         - 2
         - 4
         version: 0.2.4
-  requirement: *id033
+  requirement: *id038
 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: []