om 1.2.2 → 1.2.3

data/History.textile

@@ -1,12 +1,16 @@
-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
 
-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
 
-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
 
@@ -20,47 +24,47 @@ HYDRA-371: Provide a way to specify a term that points to nodes where an attribu
 
 namePart[not(@type)]
 
-1.0.1
+h3.1.0.1
 
 HYDRA-329: Allow for NamedTermProxies at root of Terminology
 
-1.0.0
+h2.1.0.0
 
 Stable release 
 
-0.1.10
+h3.0.1.10
 
 Improving generation of constrained xpath queries
 
-0.1.9
+h3.0.1.9
 
 Improving support for deeply nested nodes (still needs work though)
 
-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
 
-0.1.4
+h3.0.1.4
 
 *  made attribute_xpath idempotent
 
-0.1.3
+h3.0.1.3
 
 *  added accessor_generic_name and accessor_hierarchical_name methods
 
-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]
 
-0.1.1
+h3.0.1.1
 
 RENAMED to om (formerly opinionated-xml)
 
 * broke up functionality into Modules
 * added OM::XML::Accessor functionality
 
-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.2
+1.2.3

data/lib/om/xml/term_xpath_generator.rb

@@ -169,13 +169,21 @@ module OM::XML::TermXpathGenerator
         current_location = term.parent.nil? ? term.terminology : term.parent
         relative_path = ""
         term.proxy_pointer.each_with_index do |proxy_pointer, proxy_pointer_index|
+          begin
           proxy_term = current_location.retrieve_term(proxy_pointer)
+          if proxy_term.nil?
+            proxy_term = terminology.retrieve_term(proxy_pointer)
+          end
           proxy_relative_path = proxy_term.xpath_relative
           if proxy_pointer_index > 0
             proxy_relative_path = "/"+proxy_relative_path
           end
           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
       else  
         relative_path = term.xpath_relative

data/om.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{om}
-  s.version = "1.2.2"
+  s.version = "1.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt"]
-  s.date = %q{2011-03-26}
+  s.date = %q{2011-04-19}
   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 = [
@@ -113,6 +113,16 @@ 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_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"])
@@ -137,6 +147,16 @@ 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<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"])
@@ -162,6 +182,16 @@ 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<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/unit/named_term_proxy_spec.rb

@@ -13,6 +13,7 @@ describe "OM::XML::NamedTermProxy" do
         t.my_proxy(:proxy=>[:foo, :bar])
       }
       t.adoptive_parent(:ref=>[:parent], :attributes=>{:type=>"adoptive"})
+      t.parentfoobarproxy(:proxy=>[:parent, :foo, :bar])
     end
     
     @test_terminology = @test_terminology_builder.build
@@ -36,4 +37,7 @@ describe "OM::XML::NamedTermProxy" do
     proxy2.proxied_term.should == @test_terminology.retrieve_term(:adoptive_parent, :foo, :bar)
     proxy2.xpath.should == '//oxns:parent[@type="adoptive"]/oxns:foo/oxns:bar'
   end
+  it "should support NamedTermProxies that point to root terms" do
+    @test_terminology.xpath_for(:parentfoobarproxy).should == "//oxns:parent/oxns:foo/oxns:bar"
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: om
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 -05:00
+date: 2011-04-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -274,11 +274,163 @@ dependencies:
         - 4
         version: 0.2.4
   requirement: *id017
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rspec
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  requirement: *id018
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: mocha
+  version_requirements: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  requirement: *id019
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: ruby-debug
+  version_requirements: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id020
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: jeweler
+  version_requirements: &id021 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id021
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: equivalent-xml
+  version_requirements: &id022 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 2
+        - 4
+        version: 0.2.4
+  requirement: *id022
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rspec
+  version_requirements: &id023 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  requirement: *id023
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: mocha
+  version_requirements: &id024 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  requirement: *id024
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: ruby-debug
+  version_requirements: &id025 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id025
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: jeweler
+  version_requirements: &id026 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id026
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: equivalent-xml
+  version_requirements: &id027 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 2
+        - 4
+        version: 0.2.4
+  requirement: *id027
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: nokogiri
-  version_requirements: &id018 !ruby/object:Gem::Requirement 
+  version_requirements: &id028 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -289,12 +441,12 @@ dependencies:
         - 4
         - 2
         version: 1.4.2
-  requirement: *id018
+  requirement: *id028
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rspec
-  version_requirements: &id019 !ruby/object:Gem::Requirement 
+  version_requirements: &id029 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -305,12 +457,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id019
+  requirement: *id029
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: mocha
-  version_requirements: &id020 !ruby/object:Gem::Requirement 
+  version_requirements: &id030 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -321,12 +473,12 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
-  requirement: *id020
+  requirement: *id030
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: ruby-debug
-  version_requirements: &id021 !ruby/object:Gem::Requirement 
+  version_requirements: &id031 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -335,12 +487,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id021
+  requirement: *id031
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: jeweler
-  version_requirements: &id022 !ruby/object:Gem::Requirement 
+  version_requirements: &id032 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -349,12 +501,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id022
+  requirement: *id032
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: equivalent-xml
-  version_requirements: &id023 !ruby/object:Gem::Requirement 
+  version_requirements: &id033 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -365,7 +517,7 @@ dependencies:
         - 2
         - 4
         version: 0.2.4
-  requirement: *id023
+  requirement: *id033
 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: []