om 1.5.2 → 1.5.3

data/History.textile

@@ -1,3 +1,8 @@
+h3. 1.5.3
+
+  HYDRA-657 OM Terms that share a name with methods on Nokogiri Builders have incorrect builder templates
+  HYDRA-674 XML Builder templates incorrect for :none attributes
+
 h3. 1.5.2
 
   HYDRA-742 Can't modify frozen string (parameters in rails 3.2, when using ruby 1.9.3)

data/lib/om/version.rb

@@ -1,3 +1,3 @@
 module Om
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

data/lib/om/xml/term.rb

@@ -253,20 +253,23 @@ class OM::XML::Term
     end
     if !self.attributes.nil?
       self.attributes.merge(extra_attributes).each_pair do |k,v|
-        node_options << "\'#{k}\'=>\'#{v}\'"
+        node_options << "\'#{k}\'=>\'#{v}\'" unless v == :none
       end
     end
-    if self.path.include?(":")
-      ns_prefix = self.path[0..path.index(":")-1]
-      path_name = self.path[path.index(":")+1..-1]
-      template = "xml['#{ns_prefix}'].#{path_name}( #{OM::XML.delimited_list(node_options)} )" + node_child_template
+    builder_ref = "xml"
+    builder_method = self.path
+    if builder_method.include?(":")
+      builder_ref = "xml['#{self.path[0..path.index(":")-1]}']"
+      builder_method = self.path[path.index(":")+1..-1]
     elsif !self.namespace_prefix.nil? and self.namespace_prefix != 'oxns'
-      template = "xml['#{self.namespace_prefix}'].#{self.path}( #{OM::XML.delimited_list(node_options)} )" + node_child_template
+      builder_ref = "xml['#{self.namespace_prefix}']"
     elsif self.path.kind_of?(Hash) && self.path[:attribute]
-      template = "xml.@#{self.path[:attribute]}( #{OM::XML.delimited_list(node_options)} )" + node_child_template
-    else
-      template = "xml.#{self.path}( #{OM::XML.delimited_list(node_options)} )" + node_child_template
+      builder_method = "@#{self.path[:attribute]}"
+    end
+    if Nokogiri::XML::Builder.method_defined? builder_method.to_sym
+      builder_method += "_"
     end
+    template = "#{builder_ref}.#{builder_method}( #{OM::XML.delimited_list(node_options)} )" + node_child_template
     return template.gsub( /:::(.*?):::/ ) { '#{'+$1+'}' }
   end
 

data/spec/unit/term_spec.rb

@@ -7,8 +7,10 @@ describe "OM::XML::Term" do
     @test_name_part = OM::XML::Term.new(:namePart, {}).generate_xpath_queries!
     @test_volume = OM::XML::Term.new(:volume, :path=>"detail", :attributes=>{:type=>"volume"}, :default_content_path=>"number")
     @test_date = OM::XML::Term.new(:namePart, :attributes=>{:type=> "date"})
+    @test_person = OM::XML::Term.new(:namePart, :attributes=>{:type=> :none})
     @test_affiliation = OM::XML::Term.new(:affiliation)
     @test_role_code = OM::XML::Term.new(:roleTerm, :attributes=>{:type=>"code"})
+    @test_type = OM::XML::Term.new(:class)
   end
 
   describe '#new' do
@@ -161,6 +163,7 @@ describe "OM::XML::Term" do
 
     it "should generate a template call for passing into the builder block (assumes 'xml' as the argument for the block)" do
       @test_date.xml_builder_template.should == 'xml.namePart( \'#{builder_new_value}\', \'type\'=>\'date\' )'
+      @test_person.xml_builder_template.should == 'xml.namePart( \'#{builder_new_value}\' )'
       @test_affiliation.xml_builder_template.should == 'xml.affiliation( \'#{builder_new_value}\' )'
     end
     it "should accept extra options" do
@@ -193,7 +196,10 @@ describe "OM::XML::Term" do
       @xml_lang_attribute_term = OM::XML::Term.new(:xml_lang_attribute, :path=>{:attribute=>"xml:lang"})
       @xml_lang_attribute_term.xml_builder_template.should == "xml.@xml:lang( '\#{builder_new_value}' )"
     end
-
+    
+    it "should generate a template call for passing into the builder block (assumes 'xml' as the argument for the block) for terms that share a name with an existing method on the builder" do
+     	@test_type.xml_builder_template.should == 'xml.class_( \'#{builder_new_value}\' )'
+    end
   end
 
 end

data/spec/unit/terminology_spec.rb

@@ -317,6 +317,7 @@ describe "OM::XML::Terminology" do
 
     it "should generate a template call for passing into the builder block (assumes 'xml' as the argument for the block)" do
       @test_full_terminology.xml_builder_template(:person,:date).should == 'xml.namePart( \'#{builder_new_value}\', \'type\'=>\'date\' )'
+      @test_full_terminology.xml_builder_template(:person,:person_id).should == 'xml.namePart( \'#{builder_new_value}\' )'
       @test_full_terminology.xml_builder_template(:name,:affiliation).should == 'xml.affiliation( \'#{builder_new_value}\' )'
     end
     it "should accept extra options" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: om
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000 Z
+date: 2012-02-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70117103404700 !ruby/object:Gem::Requirement
+  requirement: &2169684040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70117103404700
+  version_requirements: *2169684040
 - !ruby/object:Gem::Dependency
   name: mediashelf-loggable
-  requirement: &70117103404020 !ruby/object:Gem::Requirement
+  requirement: &2169683620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70117103404020
+  version_requirements: *2169683620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70117103403040 !ruby/object:Gem::Requirement
+  requirement: &2169683080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70117103403040
+  version_requirements: *2169683080
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70117103402480 !ruby/object:Gem::Requirement
+  requirement: &2169682580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70117103402480
+  version_requirements: *2169682580
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70117103401760 !ruby/object:Gem::Requirement
+  requirement: &2169682120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *70117103401760
+  version_requirements: *2169682120
 description: ! '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
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: ! 'OM (Opinionated Metadata): A library to help you tame sprawling XML schemas