nom-xml 0.0.7 → 0.0.8

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

@@ -52,11 +52,19 @@ module Nom::XML::Decorators::Terminology
   ##
   # Get the terminology terms associated with this node
   def terms
-    return {} unless self.respond_to? :parent and not self.parent.term_accessors.empty?
+    return @terms if @terms
+    p = self.parent
 
-    self.parent.term_accessors.select do |k,term|
-      self.parent.xpath(term.local_xpath, self.document.terminology_namespaces).include? self
-    end.map { |k, term| term }
+    t = []
+
+    until p.is_a? Nokogiri::XML::Document
+      p.term_accessors.each do |k,term|
+        t << term if term.nodes.include? self
+      end
+      p = p.parent
+    end
+
+    @terms ||= t
   end
 
   protected

data/lib/nom/xml/term.rb

@@ -87,6 +87,10 @@ module Nom::XML
       end
     end
 
+    def to_s
+      "#<Nom::XML::Term name=#{name}>"
+    end
+
     protected
     def in_edit_context &block
       @edit_context = true

data/lib/nom/xml/version.rb

@@ -1,5 +1,5 @@
 module Nom
   module XML
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
   end
 end

data/spec/examples/mods_example_spec.rb

@@ -16,7 +16,9 @@ describe "Namespaces example" do
 
       t.corporate_authors :path => '//mods:name[@type="corporate"]'
       t.personal_authors :path => 'mods:name[@type="personal"]' do |n|
-        n.roleTerm :path => 'mods:role/mods:roleTerm', :index_as => [:type_1]
+        n.roleTerm :path => 'mods:role/mods:roleTerm', :index_as => [:type_1] do |r|
+          r.type :path => '@type'
+        end
 
         n.name_role_pair :path => '.', :accessor => lambda { |node| node.roleTerm.text + ": " + node.namePart.text }
 
@@ -64,6 +66,8 @@ describe "Namespaces example" do
  
     eric.namePart.text.should == "Alterman, Eric"
     eric.roleTerm.text.should == "creator"
+
+    eric.roleTerm.type.text.should == "text"
   end
 
   it "should let you mix and match xpaths and nom accessors" do
@@ -81,7 +85,7 @@ describe "Namespaces example" do
   end
 
   it "should let you go from a terminology to nodes" do
-    subject.terminology.flatten.length.should == 10
+    subject.terminology.flatten.length.should == 11
 
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nom-xml
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -174,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2351930484694908071
+      hash: 4560285643406046416
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2351930484694908071
+      hash: 4560285643406046416
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23