om 0.1.8 → 0.1.9

data/History.textile

@@ -1,3 +1,7 @@
+0.1.9
+
+Improving support for deeply nested nodes (still needs work though)
+
 0.1.5
 
 * root_property now inserts an entry into the properties hash

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/lib/om/xml/properties.rb

@@ -263,14 +263,14 @@ module OM::XML::Properties
     end
 
     def property_info_for(property_ref)
-      if property_ref.instance_of?(Array) && property_ref.length == 1
+      if property_ref.instance_of?(Array) && property_ref.length < 2
         property_ref = property_ref[0]      
       end
       if property_ref.instance_of?(Symbol)
         property_info = properties[property_ref]
       elsif property_ref.kind_of?(Array)
-        prop_ref = property_ref[0]
-        cm_name = property_ref[1]
+        prop_ref = property_ref[property_ref.length-2]
+        cm_name = property_ref[property_ref.length-1]
         if properties.has_key?(prop_ref)
           property_info = properties[prop_ref][:convenience_methods][cm_name]
         end

data/om.gemspec

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

@@ -50,16 +50,19 @@ describe "OM::XML::Properties" do
                   }   
 
       property :issue, :path=>'part',
-                  :subelements=>[:start_page, :end_page],
+                  :subelements=>[:start_page, :end_page, :volume],
                   :convenience_methods => {
-                    :volume => {:path=>"detail", :attributes=>{:type=>"volume"}},
-                    :level => {:path=>"detail", :attributes=>{:type=>"level"}},
+                    # :volume => {:path=>"detail", :attributes=>{:type=>"volume"}},
+                    :level => {:path=>"detail", :attributes=>{:type=>"number"}, :default_content_path=>"number"},
                     # Hack to support provisional spot for start & end page (nesting was too deep for this version of OM)
                     :citation_start_page => {:path=>"pages", :attributes=>{:type=>"start"}},
                     :citation_end_page => {:path=>"pages", :attributes=>{:type=>"end"}},
                     :foo => {:path=>"foo", :attributes=>{:type=>"ness"}},
                     :publication_date => {:path=>"date"}
                   }
+                  
+      property :volume, :path=>"detail", :attributes=>{:type=>"volume"}, :subelements=>"number"
+      
       property :start_page, :path=>"extent", :attributes=>{:unit=>"pages"}, :default_content_path => "start"
       property :end_page, :path=>"extent", :attributes=>{:unit=>"pages"}, :default_content_path => "end"    
     end
@@ -283,14 +286,16 @@ describe "OM::XML::Properties" do
       
       marcrelator_role_builder_template = 'xml.role( :type=>\'code\', :authority=>\'marcrelator\' ) { xml.roleTerm( \'#{builder_new_value}\' ) }'  
       FakeOxMods.builder_template([:role], {:attributes=>{"type"=>"code", "authority"=>"marcrelator"}} ).should == marcrelator_role_builder_template
-      FakeOxMods.builder_template([:person,:role], {:attributes=>{"type"=>"code", "authority"=>"marcrelator"}} ).should == marcrelator_role_builder_template
+      FakeOxMods.builder_template([:person,:role], {:attributes=>{"type"=>"code", "authority"=>"marcrelator"}} ).should == marcrelator_role_builder_template      
     end
     
-    it "should work with deeply nested properties" do
-      pending "requires property method to be recursive"
-      
-      FakeOxMods.builder_template([:journal, :issue, :volume]).should == "fixme"
-      FakeOxMods.builder_template([:journal, :issue, :start_page]).should == "fixme"
+    it "should work with deeply nested properties" do      
+      FakeOxMods.builder_template([:issue, :volume]).should == "xml.detail( '\#{builder_new_value}', :type=>'volume' )"
+      FakeOxMods.builder_template([:volume, :number]).should == "xml.number( '\#{builder_new_value}' )"
+      FakeOxMods.builder_template([:journal, :issue, :level]).should == "xml.detail( :type=>'number' ) { xml.number( '\#{builder_new_value}' ) }"
+      FakeOxMods.builder_template([:journal, :issue, :volume]).should == "xml.detail( '\#{builder_new_value}', :type=>'volume' )"
+      FakeOxMods.builder_template([:journal, :issue, :volume, :number]).should == "xml.number( '\#{builder_new_value}' )"
+      FakeOxMods.builder_template([:journal, :issue, :start_page]).should == "xml.extent( :unit=>'pages' ) { xml.start( '\#{builder_new_value}' ) }"
     end
     
   end

metadata

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