nom-xml 0.2.0 → 0.3.0

data/lib/nom/xml/decorators/terminology.rb

@@ -1,24 +1,22 @@
 module Nom::XML::Decorators::Terminology
-  
-  METHODS_WE_NEED_TO_BE_CAREFUL_OF = [:id, :type]
-
-  METHODS_WE_NEED_TO_BE_CAREFUL_OF.each do |t|
-    class_eval <<-eos
-      def #{t.to_s} *args, &block
-        if self.term_accessors[:#{t}]
-          lookup_term(self.term_accessors[:#{t}], *args, &block)
-        else
-          super
-        end
+
+  def self.extended node
+    node.add_terminology_method_overrides!
+  end
+
+  def add_terminology_method_overrides!
+    self.term_accessors.each do |k, term|
+      if self.respond_to_without_terms? k and not term.options[:override]
+        raise "Trying to redefine method #{k} on #{self.to_s}"
       end
-    eos
+    end.select { |k, term| term.options[:override] }.each do |method, term|
+       define_term_method(method, self.term_accessors[method.to_sym])
+    end
   end
 
   def method_missing method, *args, &block
     if self.term_accessors[method.to_sym]
-      (class << self; self; end).send(:define_method, method.to_sym) do |*local_args|
-        lookup_term(self.term_accessors[method.to_sym], *local_args)
-      end
+      define_term_method(method, self.term_accessors[method.to_sym])
 
       self.send(method, *args, &block)
     else
@@ -26,6 +24,8 @@ module Nom::XML::Decorators::Terminology
     end
   end
 
+  alias_method :respond_to_without_terms?, :respond_to?
+
   def respond_to? method
     super || self.term_accessors[method.to_sym]
   end
@@ -81,6 +81,12 @@ module Nom::XML::Decorators::Terminology
     h
   end
 
+  def define_term_method method, term
+    (class << self; self; end).send(:define_method, method.to_sym) do |*local_args|
+      lookup_term(self.term_accessors[method.to_sym], *local_args)
+    end
+  end
+
   def lookup_term term, *args
     options = args.extract_options!
 
@@ -116,7 +122,7 @@ module Nom::XML::Decorators::Terminology
         raise "Unknown accessor class: #{m.class}"
       end
 
-    if return_value and (term.options[:single] or (return_value.length == 1 and return_value.first.is_a? Nokogiri::XML::Attr))
+    if return_value and (term.options[:single] or (result.length == 1 and result.first.is_a? Nokogiri::XML::Attr))
       return return_value.first
     end
 

data/lib/nom/xml/version.rb

@@ -1,5 +1,5 @@
 module Nom
   module XML
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/spec/examples/mods_example_spec.rb

@@ -9,7 +9,11 @@ describe "Namespaces example" do
 
      xml.set_terminology(:namespaces => { 'mods' => 'http://www.loc.gov/mods/v3'}) do |t|
 
+      t.genre :path => "mods:genre", :accessor => lambda { |e| e.text }
+
       t.author :path => '//mods:name' do |n|
+        n.authorityURI :path => '@authorityURI', :accessor => lambda { |e| e.text }
+        n.description :path => 'mods:description', :override => true
         n.valueURI :path => '@valueURI'
         n.namePart :path => 'mods:namePart', :single => true, :index_as => [:type_1]
       end
@@ -35,6 +39,10 @@ describe "Namespaces example" do
      xml
   }
 
+  it "should work with existing reserved method names when override is present" do
+    subject.author.first.description.text.should include('asdf')
+  end
+
   it "should return nodesets by default" do
     subject.personal_authors.should be_a_kind_of(Nokogiri::XML::NodeSet)
   end
@@ -47,6 +55,11 @@ describe "Namespaces example" do
     subject.personal_authors.first.valueURI.should be_a_kind_of(Nokogiri::XML::Attr)
   end
 
+
+  it "should treat attributes with an accessor as a single-able element" do
+    subject.author.first.authorityURI.should == 'http://id.loc.gov/authorities/names'
+  end
+
   it "should share terms over matched nodes" do
     subject.personal_authors.first.namePart.text.should == "Alterman, Eric"
   end
@@ -89,7 +102,7 @@ describe "Namespaces example" do
   end
 
   it "should let you go from a terminology to nodes" do
-    subject.terminology.flatten.length.should == 11
+    subject.terminology.flatten.length.should == 14
 
     subject.terminology.flatten.select { |x| x.options[:index_as] }.should have(2).terms 
     subject.terminology.flatten.select { |x| x.options[:index_as] }.map { |x| x.nodes }.flatten.should have(2).nodes

data/spec/fixtures/mods_document.xml

@@ -11,6 +11,7 @@
   <name type="personal" authorityURI="http://id.loc.gov/authorities/names"
     valueURI="http://id.loc.gov/authorities/names/n92101908">
     <namePart>Alterman, Eric</namePart>
+    <description>asdf</description>
     <role>
       <roleTerm type="text">creator</roleTerm>
     </role>

data/spec/lib/terminology_decorator_spec.rb

@@ -44,7 +44,7 @@ describe "Nutrition" do
     end
 
     it "should define terminology accessors" do
-      mock_term = mock
+      mock_term = mock(:options => {})
       @term_accessors = { :asdf => mock_term }
 
       subject.should respond_to(:asdf)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nom-xml
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -159,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -597609388430309558
+      hash: -2552568584722504681
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -597609388430309558
+      hash: -2552568584722504681
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23