om 0.1.3 → 0.1.4

data/History.textile

@@ -1,3 +1,7 @@
+0.1.4
+
+*  made attribute_xpath idempotent
+
 0.1.3
 
 *  added accessor_generic_name and accessor_hierarchical_name methods

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/om/xml/accessors.rb

@@ -92,12 +92,8 @@ module OM::XML::Accessors
           end
         else
         
-          # if indices[key_index]
-          #   add_position_predicate!(relative_path, indices[key_index])
-          # end
-          
           unless index.nil?
-            add_position_predicate!(relative_path, index)
+            relative_path = add_position_predicate(relative_path, index)
           end
         
           if accessor_info.has_key?(:default_content_path)
@@ -106,7 +102,7 @@ module OM::XML::Accessors
         
         end
         if pointer_index > 0
-          relative_path.insert(0, "/")
+          relative_path = "/"+relative_path
         end
         xpath << relative_path 
       end
@@ -114,14 +110,16 @@ module OM::XML::Accessors
       return xpath
     end
     
-    def add_position_predicate!(xpath_query, array_index_value)
+    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?("]")
-        xpath_query.insert(xpath_query.rindex("]"), " and #{position_function}")
+        modified_query.insert(xpath_query.rindex("]"), " and #{position_function}")
       else
-        xpath_query << "[#{position_function}]"
+        modified_query << "[#{position_function}]"
       end
+      return modified_query
     end
     
     def accessor_generic_name(*pointers)

data/om.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{om}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt"]

data/spec/unit/accessors_spec.rb

@@ -116,10 +116,7 @@ describe "OM::XML::Accessors" do
     it "should return the xpath given in the call to #accessor" do
       AccessorTest.accessor_info( :abstract ).should == AccessorTest.accessors[:abstract]
     end
-    it "should dig into the accessors hash as far as you want, ignoring index values" do
-      # Old Syntax ...
-      # AccessorTest.accessor_info( :conference, 0, :role, 1, :text ).should == AccessorTest.accessors[:conference][:children][:role][:children][:text]
-      
+    it "should dig into the accessors hash as far as you want, ignoring index values" do      
       AccessorTest.accessor_info( *[{:conference=>0}, {:role=>1}, :text] ).should == AccessorTest.accessors[:conference][:children][:role][:children][:text]
       AccessorTest.accessor_info( {:conference=>0}, {:role=>1}, :text ).should == AccessorTest.accessors[:conference][:children][:role][:children][:text]
       
@@ -133,22 +130,26 @@ describe "OM::XML::Accessors" do
     end   
     # Note: Ruby array indexes begin from 0.  In xpath queries (which start from 1 instead of 0), this will be translated accordingly.
     it "should prepend the xpath for any parent nodes, inserting calls to xpath:position() function where necessary" do
-      # Old Syntax ...
-      # AccessorTest.accessor_xpath( :conference, 0, :role, 1, :text ).should == '//oxns:name[@type="conference" and position()=1]/oxns:role[position()=2]/oxns:roleTerm[@type="text"]'
-      
       AccessorTest.accessor_xpath( {:conference=>0}, {:role=>1}, :text ).should == '//oxns:name[@type="conference" and position()=1]/oxns:role[position()=2]/oxns:roleTerm[@type="text"]'
     end
+    it "should be idempotent" do
+      AccessorTest.accessor_xpath( *[{:title_info=>2}, :main_title] ).should == "//oxns:titleInfo[position()=3]/oxns:title"
+      AccessorTest.accessor_xpath( *[{:title_info=>2}, :main_title] ).should == "//oxns:titleInfo[position()=3]/oxns:title"
+      AccessorTest.accessor_xpath( *[{:title_info=>2}, :main_title] ).should == "//oxns:titleInfo[position()=3]/oxns: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"
+      AccessorTest.accessor_generic_name( *[{:conference=>0}, {:role=>1}, :text] ).should == "conference_role_text"      
     end
   end
   
   describe "#accessor_hierarchical_name" do
     it "should generate a specific accessor name based on an array of pointers and indexes" do
       AccessorTest.accessor_hierarchical_name( {:conference=>0}, {:role=>1}, :text ).should == "conference_0_role_1_text"
+      AccessorTest.accessor_hierarchical_name( *[{:conference=>0}, {:role=>1}, :text] ).should == "conference_0_role_1_text"
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: om
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Matt Zumwalt