om 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/om/xml/properties.rb

@@ -133,11 +133,20 @@ module OM::XML::Properties
       prefix = "oxns"
       property_info[:path] ||= "" 
       path = property_info[:path]
-      path_array = Array( path )
+      unless path.kind_of?(Hash)
+        path = Array( path )
+      end
       template = ""
       template << "//" unless opts[:relative]
       template << "#{prefix}:"
-      template << delimited_list(path_array, "/#{prefix}:")
+      
+      if path.kind_of?(Hash)
+        if path.has_key?(:attribute)
+          template = "@"+path[:attribute]
+        end
+      else
+        template << delimited_list(path, "/#{prefix}:")
+      end
 
       predicates = []   
       default_content_path = property_info.has_key?(:default_content_path) ? property_info[:default_content_path] : ""
@@ -175,13 +184,18 @@ module OM::XML::Properties
             end
           elsif opts[:constraints].has_key?(:path)
             constraint_predicates = []
-            if opts.has_key?(:subelement_of)
-              constraint_path = "#{prefix}:#{opts[:constraints][:path]}"
-              if opts[:constraints].has_key?(:default_content_path)
-                constraint_path << "/#{prefix}:#{opts[:constraints][:default_content_path]}"
-              end 
+            
+            constraints_path_arg = opts[:constraints][:path]
+            if constraints_path_arg.kind_of?(Hash)
+              if constraints_path_arg.has_key?(:attribute)
+                constraint_path = "@"+constraints_path_arg[:attribute]
+              end
             else
-             constraint_path = "#{prefix}:#{opts[:constraints][:path]}"
+             constraint_path = "#{prefix}:#{constraints_path_arg}"
+            end
+            if opts.has_key?(:subelement_of) && opts[:constraints].has_key?(:default_content_path)
+              # constraint_path = "#{prefix}:#{opts[:constraints][:path]}"
+                constraint_path << "/#{prefix}:#{opts[:constraints][:default_content_path]}" 
             end
             arguments_for_contains_function << constraint_path
             

data/om.gemspec

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

@@ -167,9 +167,8 @@ describe "OM::XML::Accessors" do
     end
     
     it "should generate accessors from the properties hash" do
-      sample_properties_hash = {:mods=>{:path=>"mods", :attributes=>["id", "version"], :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd", :ref=>:mods, :xpath_relative=>"oxns:mods", :xpath_constrained=>"//oxns:mods[contains(\\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:mods", :convenience_methods=>{}}, :person=>{:path=>"name", :attributes=>{:type=>"personal"}, :subelements=>["namePart", "displayForm", "affiliation", :role, "description"], :ref=>:person, :xpath_relative=>"oxns:name[@type=\"personal\"]", :variant_of=>:name_, :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:namePart, \\\"\#{constraint_value}\\\")]", :default_content_path=>"namePart", :xpath=>"//oxns:name[@type=\"personal\"]", :convenience_methods=>{:first_name=>{:path=>"namePart", :attributes=>{:type=>"given"}, :xpath_relative=>"oxns:namePart[@type=\"given\"]", :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:namePart[@type=\\\"given\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:namePart[@type=\"given\"]"}, :affiliation=>{:path=>"affiliation", :xpath_relative=>"oxns:affiliation", :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:affiliation, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:affiliation"}, :terms_of_address=>{:path=>"namePart", :attributes=>{:type=>"termsOfAddress"}, :xpath_relative=>"oxns:namePart[@type=\"termsOfAddress\"]", :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:namePart[@type=\\\"termsOfAddress\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:namePart[@type=\"termsOfAddress\"]"}, :namePart=>{:path=>"namePart", :xpath_relative=>"oxns:namePart", :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:namePart, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:namePart"}, :role=>{:path=>"role", :attributes=>[{"type"=>["text", "code"]}, "authority"], :ref=>:role, :xpath_relative=>"oxns:role", :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:role, \\\"\#{constraint_value}\\\")]", :parents=>[:name_], :convenience_methods=>{:text=>{:path=>"roleTerm", :attributes=>{:type=>"text"}, :xpath_relative=>"oxns:roleTerm[@type=\"text\"]", :xpath_constrained=>"//oxns:role[contains(oxns:roleTerm[@type=\\\"text\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:role/oxns:roleTerm[@type=\"text\"]"}, :code=>{:path=>"roleTerm", :attributes=>{:type=>"code"}, :xpath_relative=>"oxns:roleTerm[@type=\"code\"]", :xpath_constrained=>"//oxns:role[contains(oxns:roleTerm[@type=\\\"code\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:role/oxns:roleTerm[@type=\"code\"]"}}, :xpath=>"//oxns:name[@type=\"personal\"]/oxns:role"}, :displayForm=>{:path=>"displayForm", :xpath_relative=>"oxns:displayForm", :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:displayForm, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:displayForm"}, :date=>{:path=>"namePart", :attributes=>{:type=>"date"}, :xpath_relative=>"oxns:namePart[@type=\"date\"]", :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:namePart[@type=\\\"date\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:namePart[@type=\"date\"]"}, :family_name=>{:path=>"namePart", :attributes=>{:type=>"family"}, :xpath_relative=>"oxns:namePart[@type=\"family\"]", :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:namePart[@type=\\\"family\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:namePart[@type=\"family\"]"}, :description=>{:path=>"description", :xpath_relative=>"oxns:description", :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:description, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:description"}}}, :name_=>{:path=>"name", :attributes=>[:xlink, :lang, "xml:lang", :script, :transliteration, {:type=>["personal", "enumerated", "corporate"]}], :subelements=>["namePart", "displayForm", "affiliation", :role, "description"], :ref=>:name_, :xpath_relative=>"oxns:name", :xpath_constrained=>"//oxns:name[contains(oxns:namePart, \\\"\#{constraint_value}\\\")]", :default_content_path=>"namePart", :xpath=>"//oxns:name", :convenience_methods=>{:first_name=>{:path=>"namePart", :attributes=>{:type=>"given"}, :xpath_relative=>"oxns:namePart[@type=\"given\"]", :xpath_constrained=>"//oxns:name[contains(oxns:namePart[@type=\\\"given\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name/oxns:namePart[@type=\"given\"]"}, :affiliation=>{:path=>"affiliation", :xpath_relative=>"oxns:affiliation", :xpath_constrained=>"//oxns:name[contains(oxns:affiliation, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name/oxns:affiliation"}, :terms_of_address=>{:path=>"namePart", :attributes=>{:type=>"termsOfAddress"}, :xpath_relative=>"oxns:namePart[@type=\"termsOfAddress\"]", :xpath_constrained=>"//oxns:name[contains(oxns:namePart[@type=\\\"termsOfAddress\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name/oxns:namePart[@type=\"termsOfAddress\"]"}, :namePart=>{:path=>"namePart", :xpath_relative=>"oxns:namePart", :xpath_constrained=>"//oxns:name[contains(oxns:namePart, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name/oxns:namePart"}, :role=>{:path=>"role", :attributes=>[{"type"=>["text", "code"]}, "authority"], :ref=>:role, :xpath_relative=>"oxns:role", :xpath_constrained=>"//oxns:name[contains(oxns:role, \\\"\#{constraint_value}\\\")]", :parents=>[:name_], :convenience_methods=>{:text=>{:path=>"roleTerm", :attributes=>{:type=>"text"}, :xpath_relative=>"oxns:roleTerm[@type=\"text\"]", :xpath_constrained=>"//oxns:role[contains(oxns:roleTerm[@type=\\\"text\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:role/oxns:roleTerm[@type=\"text\"]"}, :code=>{:path=>"roleTerm", :attributes=>{:type=>"code"}, :xpath_relative=>"oxns:roleTerm[@type=\"code\"]", :xpath_constrained=>"//oxns:role[contains(oxns:roleTerm[@type=\\\"code\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:role/oxns:roleTerm[@type=\"code\"]"}}, :xpath=>"//oxns:name/oxns:role"}, :displayForm=>{:path=>"displayForm", :xpath_relative=>"oxns:displayForm", :xpath_constrained=>"//oxns:name[contains(oxns:displayForm, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name/oxns:displayForm"}, :description=>{:path=>"description", :xpath_relative=>"oxns:description", :xpath_constrained=>"//oxns:name[contains(oxns:description, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name/oxns:description"}, :family_name=>{:path=>"namePart", :attributes=>{:type=>"family"}, :xpath_relative=>"oxns:namePart[@type=\"family\"]", :xpath_constrained=>"//oxns:name[contains(oxns:namePart[@type=\\\"family\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name/oxns:namePart[@type=\"family\"]"}, :date=>{:path=>"namePart", :attributes=>{:type=>"date"}, :xpath_relative=>"oxns:namePart[@type=\"date\"]", :xpath_constrained=>"//oxns:name[contains(oxns:namePart[@type=\\\"date\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name/oxns:namePart[@type=\"date\"]"}}}, :role=>{:path=>"role", :attributes=>[{"type"=>["text", "code"]}, "authority"], :ref=>:role, :xpath_relative=>"oxns:role", :xpath_constrained=>"//oxns:role[contains(\\\"\#{constraint_value}\\\")]", :parents=>[:name_], :xpath=>"//oxns:role", :convenience_methods=>{:text=>{:path=>"roleTerm", :attributes=>{:type=>"text"}, :xpath_relative=>"oxns:roleTerm[@type=\"text\"]", :xpath_constrained=>"//oxns:role[contains(oxns:roleTerm[@type=\\\"text\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:role/oxns:roleTerm[@type=\"text\"]"}, :code=>{:path=>"roleTerm", :attributes=>{:type=>"code"}, :xpath_relative=>"oxns:roleTerm[@type=\"code\"]", :xpath_constrained=>"//oxns:role[contains(oxns:roleTerm[@type=\\\"code\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:role/oxns:roleTerm[@type=\"code\"]"}}}, :title_info=>{:path=>"titleInfo", :ref=>:title_info, :xpath_relative=>"oxns:titleInfo", :xpath_constrained=>"//oxns:titleInfo[contains(\\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:titleInfo", :convenience_methods=>{:main_title=>{:path=>"title", :xpath_relative=>"oxns:title", :xpath_constrained=>"//oxns:titleInfo[contains(oxns:title, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:titleInfo/oxns:title"}, :language=>{:path=>"@lang", :xpath_relative=>"oxns:@lang", :xpath_constrained=>"//oxns:titleInfo[contains(oxns:@lang, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:titleInfo/oxns:@lang"}}}, :unresolved=>{}}
+      sample_properties_hash = {:abstract=>{:xpath_relative=>"oxns:abstract", :path=>"abstract", :xpath_constrained=>"//oxns:abstract[contains(\\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:abstract", :ref=>:abstract, :convenience_methods=>{}}, :topic_tag=>{:xpath_relative=>"oxns:subject", :path=>"subject", :xpath_constrained=>"//oxns:subject[contains(oxns:topic, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:subject", :ref=>:topic_tag, :default_content_path=>"topic", :convenience_methods=>{}}, :title_info=>{:xpath_relative=>"oxns:titleInfo", :path=>"titleInfo", :xpath_constrained=>"//oxns:titleInfo[contains(\\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:titleInfo", :ref=>:title_info, :convenience_methods=>{:main_title=>{:xpath_relative=>"oxns:title", :path=>"title", :xpath_constrained=>"//oxns:titleInfo[contains(oxns:title, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:titleInfo/oxns:title"}, :language=>{:xpath_relative=>"@lang", :path=>{:attribute=>"lang"}, :xpath_constrained=>"//oxns:titleInfo[contains(@lang, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:titleInfo/@lang"}}}, :person=>{:xpath_relative=>"oxns:name[@type=\"personal\"]", :path=>"name", :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:namePart, \\\"\#{constraint_value}\\\")]", :attributes=>{:type=>"personal"}, :xpath=>"//oxns:name[@type=\"personal\"]", :ref=>:person, :default_content_path=>"namePart", :subelements=>["namePart", "displayForm", "affiliation", :role, "description"], :convenience_methods=>{:first_name=>{:xpath_relative=>"oxns:namePart[@type=\"given\"]", :path=>"namePart", :attributes=>{:type=>"given"}, :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:namePart[@type=\\\"given\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:namePart[@type=\"given\"]"}, :affiliation=>{:xpath_relative=>"oxns:affiliation", :path=>"affiliation", :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:affiliation, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:affiliation"}, :terms_of_address=>{:xpath_relative=>"oxns:namePart[@type=\"termsOfAddress\"]", :path=>"namePart", :attributes=>{:type=>"termsOfAddress"}, :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:namePart[@type=\\\"termsOfAddress\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:namePart[@type=\"termsOfAddress\"]"}, :namePart=>{:xpath_relative=>"oxns:namePart", :path=>"namePart", :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:namePart, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:namePart"}, :displayForm=>{:xpath_relative=>"oxns:displayForm", :path=>"displayForm", :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:displayForm, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:displayForm"}, :role=>{:xpath_relative=>"oxns:role", :path=>"role", :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:role, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:role", :ref=>:role, :convenience_methods=>{:text=>{:xpath_relative=>"oxns:roleTerm[@type=\"text\"]", :path=>"roleTerm", :attributes=>{:type=>"text"}, :xpath_constrained=>"//oxns:role[contains(oxns:roleTerm[@type=\\\"text\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:role/oxns:roleTerm[@type=\"text\"]"}, :code=>{:xpath_relative=>"oxns:roleTerm[@type=\"code\"]", :path=>"roleTerm", :attributes=>{:type=>"code"}, :xpath_constrained=>"//oxns:role[contains(oxns:roleTerm[@type=\\\"code\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:role/oxns:roleTerm[@type=\"code\"]"}}, :parents=>[:name_]}, :date=>{:xpath_relative=>"oxns:namePart[@type=\"date\"]", :path=>"namePart", :attributes=>{:type=>"date"}, :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:namePart[@type=\\\"date\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:namePart[@type=\"date\"]"}, :family_name=>{:xpath_relative=>"oxns:namePart[@type=\"family\"]", :path=>"namePart", :attributes=>{:type=>"family"}, :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:namePart[@type=\\\"family\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:namePart[@type=\"family\"]"}, :description=>{:xpath_relative=>"oxns:description", :path=>"description", :xpath_constrained=>"//oxns:name[@type=\\\"personal\\\" and contains(oxns:description, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name[@type=\"personal\"]/oxns:description"}}, :variant_of=>:name_}, :name_=>{:xpath_relative=>"oxns:name", :path=>"name", :xpath_constrained=>"//oxns:name[contains(oxns:namePart, \\\"\#{constraint_value}\\\")]", :attributes=>[:xlink, :lang, "xml:lang", :script, :transliteration, {:type=>["personal", "enumerated", "corporate"]}], :xpath=>"//oxns:name", :ref=>:name_, :default_content_path=>"namePart", :subelements=>["namePart", "displayForm", "affiliation", :role, "description"], :convenience_methods=>{:affiliation=>{:xpath_relative=>"oxns:affiliation", :path=>"affiliation", :xpath_constrained=>"//oxns:name[contains(oxns:affiliation, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name/oxns:affiliation"}, :first_name=>{:xpath_relative=>"oxns:namePart[@type=\"given\"]", :path=>"namePart", :xpath_constrained=>"//oxns:name[contains(oxns:namePart[@type=\\\"given\\\"], \\\"\#{constraint_value}\\\")]", :attributes=>{:type=>"given"}, :xpath=>"//oxns:name/oxns:namePart[@type=\"given\"]"}, :terms_of_address=>{:xpath_relative=>"oxns:namePart[@type=\"termsOfAddress\"]", :path=>"namePart", :xpath_constrained=>"//oxns:name[contains(oxns:namePart[@type=\\\"termsOfAddress\\\"], \\\"\#{constraint_value}\\\")]", :attributes=>{:type=>"termsOfAddress"}, :xpath=>"//oxns:name/oxns:namePart[@type=\"termsOfAddress\"]"}, :displayForm=>{:xpath_relative=>"oxns:displayForm", :path=>"displayForm", :xpath_constrained=>"//oxns:name[contains(oxns:displayForm, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name/oxns:displayForm"}, :namePart=>{:xpath_relative=>"oxns:namePart", :path=>"namePart", :xpath_constrained=>"//oxns:name[contains(oxns:namePart, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name/oxns:namePart"}, :role=>{:xpath_relative=>"oxns:role", :path=>"role", :xpath_constrained=>"//oxns:name[contains(oxns:role, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name/oxns:role", :ref=>:role, :convenience_methods=>{:text=>{:xpath_relative=>"oxns:roleTerm[@type=\"text\"]", :path=>"roleTerm", :attributes=>{:type=>"text"}, :xpath_constrained=>"//oxns:role[contains(oxns:roleTerm[@type=\\\"text\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:role/oxns:roleTerm[@type=\"text\"]"}, :code=>{:xpath_relative=>"oxns:roleTerm[@type=\"code\"]", :path=>"roleTerm", :attributes=>{:type=>"code"}, :xpath_constrained=>"//oxns:role[contains(oxns:roleTerm[@type=\\\"code\\\"], \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:role/oxns:roleTerm[@type=\"code\"]"}}, :parents=>[:name_]}, :description=>{:xpath_relative=>"oxns:description", :path=>"description", :xpath_constrained=>"//oxns:name[contains(oxns:description, \\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:name/oxns:description"}, :family_name=>{:xpath_relative=>"oxns:namePart[@type=\"family\"]", :path=>"namePart", :xpath_constrained=>"//oxns:name[contains(oxns:namePart[@type=\\\"family\\\"], \\\"\#{constraint_value}\\\")]", :attributes=>{:type=>"family"}, :xpath=>"//oxns:name/oxns:namePart[@type=\"family\"]"}, :date=>{:xpath_relative=>"oxns:namePart[@type=\"date\"]", :path=>"namePart", :xpath_constrained=>"//oxns:name[contains(oxns:namePart[@type=\\\"date\\\"], \\\"\#{constraint_value}\\\")]", :attributes=>{:type=>"date"}, :xpath=>"//oxns:name/oxns:namePart[@type=\"date\"]"}}}, :role=>{:xpath_relative=>"oxns:role", :path=>"role", :xpath_constrained=>"//oxns:role[contains(\\\"\#{constraint_value}\\\")]", :xpath=>"//oxns:role", :ref=>:role, :convenience_methods=>{:text=>{:xpath_relative=>"oxns:roleTerm[@type=\"text\"]", :path=>"roleTerm", :xpath_constrained=>"//oxns:role[contains(oxns:roleTerm[@type=\\\"text\\\"], \\\"\#{constraint_value}\\\")]", :attributes=>{:type=>"text"}, :xpath=>"//oxns:role/oxns:roleTerm[@type=\"text\"]"}, :code=>{:xpath_relative=>"oxns:roleTerm[@type=\"code\"]", :path=>"roleTerm", :xpath_constrained=>"//oxns:role[contains(oxns:roleTerm[@type=\\\"code\\\"], \\\"\#{constraint_value}\\\")]", :attributes=>{:type=>"code"}, :xpath=>"//oxns:role/oxns:roleTerm[@type=\"code\"]"}}, :parents=>[:name_]}, :unresolved=>{}, :mods=>{:xpath_relative=>"oxns:mods", :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd", :path=>"mods", :xpath_constrained=>"//oxns:mods[contains(\\\"\#{constraint_value}\\\")]", :attributes=>["id", "version"], :xpath=>"//oxns:mods", :ref=>:mods, :convenience_methods=>{}}}      
       AccessorTest2.stubs(:properties).returns(sample_properties_hash)
-      
       AccessorTest2.accessors.should be_nil
       AccessorTest2.generate_accessors_from_properties.should_not be_nil
       [:mods, :name_, :person, [:person,:first_name],[:person, :role], [:person, :role, :text] ].each do |pointer|
@@ -178,6 +177,7 @@ describe "OM::XML::Accessors" do
         ai.should_not be_nil
         ai[:relative_xpath].should_not be_nil
       end
+      AccessorTest2.accessor_info(*[:title_info, :language])[:relative_xpath].should == "@lang"
     end
     
   end

data/spec/unit/properties_spec.rb

@@ -15,9 +15,15 @@ describe "OM::XML::Properties" do
       # root :mods_collection, :path=>"modsCollection", 
       #           :attributes=>[],
       #           :subelements => :mods
-                     
-      root_property :mods, "mods", "http://www.loc.gov/mods/v3", :attributes=>["id", "version"], :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd"          
                 
+                  
+      root_property :mods, "mods", "http://www.loc.gov/mods/v3", :attributes=>["id", "version"], :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd"          
+      
+      property :title_info, :path=>"titleInfo", 
+                  :convenience_methods => {
+                    :main_title => {:path=>"title"},
+                    :language => {:path=>{:attribute=>"lang"}},                    
+                  }
                 
       property :name_, :path=>"name", 
                   :attributes=>[:xlink, :lang, "xml:lang", :script, :transliteration, {:type=>["personal", "enumerated", "corporate"]} ],
@@ -37,7 +43,25 @@ describe "OM::XML::Properties" do
                   :attributes=>[ { "type"=>["text", "code"] } , "authority"],
                   :default_content_path => "roleTerm"
                   
-                  
+      property :journal, :path=>'relatedItem', :attributes=>{:type=>"host"},
+                  :subelements=>[:title_info, :origin_info, :issue],
+                  :convenience_methods => {
+                    :issn => {:path=>"identifier", :attributes=>{:type=>"issn"}},
+                  }   
+
+      property :issue, :path=>'part',
+                  :subelements=>[:start_page, :end_page],
+                  :convenience_methods => {
+                    :volume => {:path=>"detail", :attributes=>{:type=>"volume"}},
+                    :level => {:path=>"detail", :attributes=>{:type=>"level"}},
+                    # 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 :start_page, :path=>"extent", :attributes=>{:unit=>"pages"}, :default_content_path => "start"
+      property :end_page, :path=>"extent", :attributes=>{:unit=>"pages"}, :default_content_path => "end"    
     end
     
     class FakeOtherOx < Nokogiri::XML::Document
@@ -127,17 +151,30 @@ describe "OM::XML::Properties" do
       FakeOxMods.properties[:name_][:convenience_methods][:role][:xpath_constrained].should == '//oxns:name[contains(oxns:role/oxns:roleTerm, "#{constraint_value}")]'.gsub('"', '\"')
     end
     
-    it "should create an accessor for the created property" do
-      pending
-      FakeOXMods.accessors.should have_key(:name_)
+    it "supports treating attributes as properties" do
+      FakeOxMods.properties[:title_info][:convenience_methods][:language][:xpath].should == '//oxns:titleInfo/@lang'
+      FakeOxMods.properties[:title_info][:convenience_methods][:language][:xpath_relative].should == '@lang'
+      FakeOxMods.properties[:title_info][:convenience_methods][:language][:xpath_constrained].should == '//oxns:titleInfo[contains(@lang, "#{constraint_value}")]'.gsub('"', '\"')
     end
     
-    it "should create accessors for subelements" do
-      pending
-      FakeOXMods.accessors[:name_][:children][:role][:children].should have_key(:family_name)
+    it "should support deep nesting of properties" do
+      pending "requires property method to be recursive"
+      
+      FakeOxMods.properties[:journal][:convenience_methods][:issue][:convenience_methods][:volume].should == {:xpath_constrained=>"//oxns:part[contains(oxns:detail[@type=\\\"volume\\\"], \\\"\#{constraint_value}\\\")]", :path=>"detail", :attributes=>{:type=>"volume"}, :xpath=>"//oxns:part/oxns:detail[@type=\"volume\"]", :xpath_relative=>"oxns:detail[@type=\"volume\"]"}
+      prop_info = FakeOxMods.property_info_for([:journal, :issue, :volume])
+      prop_info[:xpath_constrained].should == "//oxns:part[contains(oxns:detail[@type=\\\"volume\\\"], \\\"\#{constraint_value}\\\")]"
+      prop_info[:xpath].should == "//oxns:part/oxns:detail[@type=\"volume\"]"
+      prop_info[:xpath_relative].should == "oxns:detail[@type=\"volume\"]"
     end
     
-    it "should not overwrite default property info when adding a variant property" do
+    it "should support even deeper nesting of properties" do
+      pending "requires property method to be recursive"
+      
+      FakeOxMods.properties[:journal][:convenience_methods][:issue][:convenience_methods][:start_page].should == {:xpath_constrained=>"//oxns:part[contains(oxns:detail[@type=\\\"volume\\\"], \\\"\#{constraint_value}\\\")]", :path=>"detail", :attributes=>{:type=>"volume"}, :xpath=>"//oxns:part/oxns:detail[@type=\"volume\"]", :xpath_relative=>"oxns:detail[@type=\"volume\"]"}
+      FakeOxMods.property_info_for([:journal, :issue, :end_page]).should == ""      
+    end
+    
+    it "should not overwrite default property info when adding a variant property" do      
       FakeOxMods.properties[:name_].should_not equal(FakeOxMods.properties[:person])
       FakeOxMods.properties[:name_][:convenience_methods].should_not equal(FakeOxMods.properties[:person][:convenience_methods])
 
@@ -249,6 +286,13 @@ describe "OM::XML::Properties" do
       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"
+    end
+    
   end
   
   describe "#applicable_attributes" do

metadata

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