om 0.1.9 → 0.1.10

data/History.textile

@@ -1,3 +1,7 @@
+0.1.10
+
+Improving generation of constrained xpath queries
+
 0.1.9
 
 Improving support for deeply nested nodes (still needs work though)

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/lib/om/xml/accessors.rb

@@ -140,6 +140,12 @@ module OM::XML::Accessors
       return xpath
     end
     
+    def accessor_constrained_xpath(pointers, constraint)
+      constraint_function = "contains(., \"#{constraint}\")"
+      xpath = self.accessor_xpath(*pointers)
+      xpath = self.add_predicate(xpath, constraint_function)
+    end
+    
     # Adds xpath xpath node index predicate to the end of your xpath query
     # Example: 
     # add_node_index_predicate("//oxns:titleInfo",0)
@@ -161,13 +167,17 @@ module OM::XML::Accessors
     # add_position_predicate("//oxns:titleInfo[@lang=\"finnish\"]",0)
     # => "//oxns:titleInfo[@lang=\"finnish\" and position()=1]"
     def add_position_predicate(xpath_query, array_index_value)
-      modified_query = xpath_query.dup
       position_function = "position()=#{array_index_value + 1}"
-      
-      if xpath_query.include?("]")
-        modified_query.insert(xpath_query.rindex("]"), " and #{position_function}")
+      self.add_predicate(xpath_query, position_function)
+    end
+    
+    def add_predicate(xpath_query, predicate)
+      modified_query = xpath_query.dup
+      # if xpath_query.include?("]")
+      if xpath_query[xpath_query.length-1..xpath_query.length] == "]"
+        modified_query.insert(xpath_query.rindex("]"), " and #{predicate}")
       else
-        modified_query << "[#{position_function}]"
+        modified_query << "[#{predicate}]"
       end
       return modified_query
     end

data/om.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{om}
-  s.version = "0.1.9"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt"]
-  s.date = %q{2010-07-03}
+  s.date = %q{2010-07-06}
   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 = [

data/spec/unit/accessors_spec.rb

@@ -146,6 +146,14 @@ describe "OM::XML::Accessors" do
     end
   end
   
+  describe "#accessor_constrained_xpath" do
+    it 'should append contains("#{constraint_value}") to query' do
+      # @sample.class.accessor_constrained_xpath_template([:journal, :issn]).should == '//oxns:relatedItem[@type="host"]/oxns:identifier[@type="issn" and contains("#{constraint_value}")]'
+      @sample.class.accessor_constrained_xpath([:journal, :issn], "123-456-ABC").should == '//oxns:relatedItem[@type="host"]/oxns:identifier[@type="issn" and contains(., "123-456-ABC")]'
+      @sample.class.accessor_constrained_xpath([:journal, :title], "My Journal Title").should == '//oxns:relatedItem[@type="host"]/oxns:titleInfo/oxns:title[contains(., "My Journal Title")]'
+    end
+  end
+  
   describe "#accessor_generic_name" do
     it "should generate a generic accessor name based on an array of pointers" do
       AccessorTest.accessor_generic_name( {:conference=>0}, {:role=>1}, :text ).should == "conference_role_text"

data/spec/unit/properties_spec.rb

@@ -202,11 +202,11 @@ describe "OM::XML::Properties" do
       @fixturemods.ng_xml.expects(:xpath).with('//oxns:name[@type="personal" and contains(oxns:role/oxns:roleTerm, "donor")]', @fixturemods.ox_namespaces)
       @fixturemods.lookup(:person, :role=>"donor")
       
-      # @fixturemods.expects(:xpath).with('//oxns:name[@type="personal"]/oxns:namePart[@type="date"]', @fixturemods.ox_namespaces)
-      # @fixturemods.lookup([:person,:date])
+      # 
+      # This is the way we want to move towards... (currently implementing part of this in accessor_constrained_xpath)
+      # @fixturemods.ng_xml.expects(:xpath).with('//oxns:relatedItem/oxns:identifier[@type=\'issn\'] and contains("123-ABC-44567")]', @fixturemods.ox_namespaces)
+      # @fixturemods.lookup([:journal, :issn], "123-ABC-44567")
       
-      # @fixturemods.expects(:xpath).with('//oxns:name[contains(oxns:namePart[@type="date"], "2010")]', @fixturemods.ox_namespaces)
-      # @fixturemods.lookup([:person,:date], "2010")
     end
   
   end
@@ -254,8 +254,13 @@ describe "OM::XML::Properties" do
       FakeOxMods.generate_xpath(opts1,  :variations=>{:attributes=>{:type=>"personal"}, :subelement_path=>["role", "roleTerm"] } ).should == '//oxns:name[@type="personal"]/oxns:role/oxns:roleTerm'
       
       FakeOxMods.generate_xpath( opts3, :variations=>{:attributes=>{:type=>"date"}} ).should == '//oxns:name/oxns:namePart[@type="date"]'
+      FakeOxMods.generate_xpath( opts3, :variations=>{:attributes=>{:type=>"date"}}, :constraints=>:default ).should == '//oxns:name/oxns:namePart[@type="date" and contains("#{constraint_value}")]'
+
+      FakeOxMods.generate_xpath( {:path=>["relatedItem", "identifier"]}, :variations=>{:attributes=>{:type=>"issn"}}, :constraints=>:default ).should == '//oxns:relatedItem/oxns:identifier[@type="issn" and contains("#{constraint_value}")]'
+
     end
     
+    
     it "should support relative paths" do
       relative_opts = {:path=>"namePart"}
       FakeOxMods.generate_xpath( relative_opts, :variations=>{:attributes=>{:type=>"date"}}, :relative=>true).should == 'oxns:namePart[@type="date"]'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: om
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-03 00:00:00 -05:00
+date: 2010-07-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency