nom-xml 0.0.5 → 0.0.6

data/lib/nom/xml/nokogiri_extension.rb

@@ -22,7 +22,7 @@ module Nom::XML
 
     def set_terminology options = {}, &block
       @terminology_namespaces = options[:namespaces]
-      @terminology = Nom::XML::Terminology.new(options, &block)
+      @terminology = Nom::XML::Terminology.new(self, options, &block)
     end
 
     def terminology_namespaces
@@ -30,7 +30,7 @@ module Nom::XML
     end
 
     def terminology
-      @terminology ||= Nom::XML::Terminology.new
+      @terminology ||= Nom::XML::Terminology.new self
     end
 
     def template_registry

data/lib/nom/xml/term.rb

@@ -47,6 +47,10 @@ module Nom::XML
       (options[:xmlns] if options) || (self.parent.xmlns if self.parent)
     end
 
+    def nodes
+      terminology.document.root.xpath(xpath, terminology.namespaces)
+    end
+
     def method_missing method, *args, &block 
       if in_edit_context?
         add_term(method, *args, &block)
@@ -65,6 +69,10 @@ module Nom::XML
       [self, terms.map { |k,v| v.flatten }].flatten
     end
 
+    def terminology
+      @terminology ||= parent.terminology
+    end
+
     protected
     def add_term method, options = {}, *args, &block
       terms[method] = Term.new(self, method, options, *args, &block)
@@ -73,6 +81,7 @@ module Nom::XML
     def term method, *args, &block
       terms[method]
     end
+
   end
 
 end

data/lib/nom/xml/terminology.rb

@@ -1,9 +1,11 @@
 module Nom::XML
   class Terminology < Term
+    attr_reader :document
 
-    def initialize options = {}, *args, &block
+    def initialize document = nil, options = {}, *args, &block
       @terms = {}
       @options = options || {}
+      @document = document
       in_edit_context do
         yield(self) if block_given?
       end
@@ -13,6 +15,10 @@ module Nom::XML
       options[:namespaces] || {}
     end
 
+    def terminology
+      self
+    end
+
     def xpath
       nil
     end

data/lib/nom/xml/version.rb

@@ -1,5 +1,5 @@
 module Nom
   module XML
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

data/spec/examples/mods_example_spec.rb

@@ -83,11 +83,12 @@ describe "Namespaces example" do
   it "should let you go from a terminology to nodes" do
     subject.terminology.flatten.length.should == 10
 
-    subject.terminology.flatten.select { |x| x.options[:index_as] }.length.should == 2
+    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
+  end
 
-    subject.terminology.flatten.select { |x| x.options[:index_as] }.each do |term|
-      subject.xpath(term.xpath, subject.terminology.namespaces)
-    end
+  it "should let you go from a term to a terminology" do
+    subject.personal_authors.terms.first.terminology.should == subject.terminology
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nom-xml
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -174,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4581122629078918118
+      hash: -3784330826546141673
 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: 4581122629078918118
+      hash: -3784330826546141673
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23