om 0.1.2 → 0.1.3

data/History.textile

@@ -1,3 +1,7 @@
+0.1.3
+
+*  added accessor_generic_name and accessor_hierarchical_name methods
+
 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]

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/om/xml/accessors.rb

@@ -40,25 +40,22 @@ module OM::XML::Accessors
     
     # Returns the configuration info for the selected accessor.
     # Ingores any integers in the array (ie. nodeset indices intended for use in other accessor convenience methods)
-    def accessor_info(*args)
+    def accessor_info(*pointers)
       info = @accessors
-      args.each do |pointer|
-        
-        # Ignore any nodeset indexes in the args array
-        if pointer.kind_of?(Hash)
-          k = pointer.keys.first
-        else
-          k = pointer
-        end
+      
+      # flatten the pointers array, excluding node indices
+      pointers = pointers_to_flat_array(pointers, false)
+      
+      pointers.each do |pointer|
         
-        unless args.index(pointer) == 0
+        unless pointers.index(pointer) == 0
           info = info.fetch(:children, nil)
           if info.nil?
             return nil
           end
         end
         
-        info = info.fetch(k, nil)
+        info = info.fetch(pointer, nil)
         if info.nil?
           return nil
         end
@@ -67,13 +64,11 @@ module OM::XML::Accessors
     end
     
     
-    def accessor_xpath(*args)
+    def accessor_xpath(*pointers)
       
       keys = []
-      # keys = even_values(args)
-      # indices = odd_values(args)
       xpath = "//"
-      args.each do |pointer|
+      pointers.each do |pointer|
         
         if pointer.kind_of?(Hash)
           k = pointer.keys.first
@@ -86,7 +81,7 @@ module OM::XML::Accessors
         keys << k
         
         # key_index = keys.index(k)
-        pointer_index = args.index(pointer)
+        pointer_index = pointers.index(pointer)
         # accessor_info = accessor_info(*keys[0..key_index])
         accessor_info = accessor_info(*keys)        
         relative_path = accessor_info[:relative_xpath]
@@ -129,12 +124,35 @@ module OM::XML::Accessors
       end
     end
     
-    def odd_values(array)
-      array.values_at(* array.each_index.select {|i| i.odd?})
+    def accessor_generic_name(*pointers)
+      pointers_to_flat_array(pointers, false).join("_")
     end
-    def even_values(array)
-      array.values_at(* array.each_index.select {|i| i.even?})
+    
+    def accessor_hierarchical_name(*pointers)
+      pointers_to_flat_array(pointers, true).join("_")
     end
+    
+    # @pointers pointers array that you would pass into other Accessor methods
+    # @include_indices (default: true) if set to false, parent indices will be excluded from the array
+    # Converts an array of accessor pointers into a flat array.
+    # ie. [{:conference=>0}, {:role=>1}, :text] becomes [:conference, 0, :role, 1, :text]
+    #   if include_indices is set to false,
+    #     [{:conference=>0}, {:role=>1}, :text] becomes [:conference, :role, :text]
+    def pointers_to_flat_array(pointers, include_indices=true)
+      flat_array = []
+      pointers.each do |pointer|
+        if pointer.kind_of?(Hash)
+          flat_array << pointer.keys.first
+          if include_indices 
+            flat_array << pointer.values.first
+          end
+        else
+          flat_array << pointer
+        end
+      end
+      return flat_array
+    end
+    
   end
   
   # Instance Methods -- These methods will be available on instances of OM classes (ie. the actual xml documents)
@@ -143,11 +161,11 @@ module OM::XML::Accessors
     klass.extend(ClassMethods)
   end
   
-  # *args Variable length array of values in format [:accessor_name, index, :accessor_name ...]
+  # *pointers Variable length array of values in format [:accessor_name, :accessor_name ...] or [{:accessor_name=>index}, :accessor_name ...]
   # example: [:person, 1, :first_name]
   # Currently, indexes must be integers.
-  def retrieve(*args)
-    xpath = self.class.accessor_xpath(*args)    
+  def retrieve(*pointers)
+    xpath = self.class.accessor_xpath(*pointers)    
     ng_xml.xpath(xpath, "oxns"=>"http://www.loc.gov/mods/v3")    
   end
   

data/om.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{om}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   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

@@ -139,6 +139,19 @@ describe "OM::XML::Accessors" do
       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
   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"
+    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"
+    end
+  end
+  
   # describe ".accessor_xpath (instance method)" do
   #   it "should delegate to the class method" do
   #     AccessorTest.expects(:accessor_xpath).with( [:conference, conference_index, :text_role] )

metadata

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