nom-xml 0.0.2 → 0.0.3

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

@@ -40,7 +40,7 @@ module Nom::XML::Decorators::Terminology
   #find this self in the terminology
   def collect_terms_for_node
     self.parent.terms.select do |k,term|
-      self.parent.xpath(term.local_xpath).include? self
+      self.parent.xpath(term.local_xpath, self.document.terminology_namespaces).include? self
     end
   end
 

data/lib/nom/xml/nokogiri_extension.rb

@@ -17,10 +17,15 @@ module Nom::XML
       self
     end
 
-    def set_terminology &block
+    def set_terminology options = {}, &block
+      @terminology_namespaces = options[:namespaces]
       @terminology = Nom::XML::Terminology.new &block
     end
 
+    def terminology_namespaces
+      @terminology_namespaces ||= {}
+    end
+
     def terminology
       @terminology ||= Nom::XML::Terminology.new
     end
@@ -29,8 +34,12 @@ module Nom::XML
     # Add terminology accessors for querying child terms
     # @param [Nokogiri::XML::Node] node
     def add_terminology_methods node
+      terms_to_add = node.terms
+      node.ancestors.each do |a|
+        a.terms.each { |k,t| terms_to_add[k] ||= t if t.options[:global] }
+      end
 
-      node.terms.each do |k, t|
+      terms_to_add.each do |k, t|
         (class << node; self; end).send(:define_method, k.to_sym) do |*args|
           options = args.extract_options!
 
@@ -38,13 +47,14 @@ module Nom::XML
 
           xpath = t.local_xpath
 
+
           xpath += "[#{args.join('][')}]" unless args.empty?
 
           result = case self
                      when Nokogiri::XML::Document
-                       self.root.xpath(xpath)
+                       self.root.xpath(xpath, node.document.terminology_namespaces)
                      else
-                       result = self.xpath(xpath)
+                       self.xpath(xpath, node.document.terminology_namespaces)
                    end
 
           m = t.options[:accessor]

data/lib/nom/xml/terminology.rb

@@ -46,7 +46,11 @@ module Nom::XML
     end
 
     def local_xpath
-      (options[:path] || name).to_s
+      ("#{xmlns}:" unless xmlns.blank? ).to_s + (options[:path] || name).to_s
+    end
+
+    def xmlns
+      (options[:xmlns] if options) || (self.parent.xmlns if self.parent)
     end
     
     def method_missing method, *args, &block 
@@ -77,11 +81,7 @@ module Nom::XML
 
     protected
     def add_term method, options = {}, *args, &block
-      terms[method] = if options[:ref]
-        TermRef.new(self, method, options, *args, &block)
-      else
-        Term.new(self, method, options, *args, &block)
-      end
+      terms[method] = Term.new(self, method, options, *args, &block)
     end
 
     def term method, *args, &block
@@ -89,30 +89,6 @@ module Nom::XML
     end
   end
 
-  class TermRef < Term
-    def ref
-      elements = Array(options[:ref])
-
-      elements.inject(parent) { |memo, mtd| memo.send(mtd) }
-    end
-
-    def key? term
-      ref.key? term
-    end
-
-    def local_xpath
-      (options[:path] || ref.local_xpath).to_s
-    end
-
-    def method_missing *args, &block
-      if in_edit_context?
-        super
-      else
-        ref.method_missing(*args, &block).substitute_parent(self)
-      end
-    end
-  end
-
   class Terminology < Term
     def initialize *args, &block
       @terms = {}

data/lib/nom/xml/version.rb

@@ -1,5 +1,5 @@
 module Nom
   module XML
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/nom.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{ asdfgh }
 
   s.add_dependency 'activesupport'
+  s.add_dependency 'i18n'
   s.add_dependency 'nokogiri'
 
   s.add_development_dependency "rspec"

data/spec/examples/namespaced_example_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe "Namespaces example" do
+  let(:file) { File.open(File.join(File.dirname(__FILE__), '..', 'fixtures', 'xml_namespaces.xml'), 'r') }
+  let(:xml) { Nokogiri::XML(file) }
+
+  subject {
+     xml.set_terminology(:namespaces => { 'html4' => 'http://www.w3.org/TR/html4/', 'furniture' => "http://www.w3schools.com/furniture"}) do |t|
+       t.table :xmlns => 'html4' do |t|
+         t.tr do |tr|
+           tr.td
+         end
+       end
+
+       t.furniture_table :path => 'table', :xmlns => 'furniture' do |f|
+         f._name :path => 'name'
+         f.width
+         f.length
+       end
+     end
+
+     xml.nom!
+
+     xml
+  }
+
+  it "should get nodes" do
+    subject.table.tr.td.map { |x| x.text }.should include("Apples", "Bananas")
+  end
+
+  it "should get nodes from the other namespace" do
+    subject.furniture_table._name.text.should include("African Coffee Table")
+  end
+end

data/spec/examples/nutrition_example_spec.rb

@@ -6,11 +6,12 @@ describe "Nutrition" do
 
   subject {
      xml.set_terminology do |t|
+       t.unit_value :path => '.', :accessor => lambda { |node| "#{node.text}#{node['units']}" }, :global => true
+
        t.daily_values :path => 'daily-values' do |dv|
          dv.total_fat :path => 'total-fat' do |tf|
            tf.value :path => '.', :accessor => lambda { |node| node.text.to_i }
            tf.units :path => '@units'
-           tf.display_value :path => '.', :accessor => lambda { |node| "#{node.value.first}#{node.units}" }
          end
        end
 
@@ -37,7 +38,6 @@ describe "Nutrition" do
     subject.daily_values.total_fat.text.should == "65"
     subject.daily_values.total_fat.value.should include(65)
     subject.daily_values.total_fat.units.text.should =='g'
-    subject.daily_values.total_fat.display_value.should include('65g')
 
     subject.foods.total_fat.value.inject(:+).should == 117
   end
@@ -50,4 +50,9 @@ describe "Nutrition" do
     subject.foods(:name => 'Avocado Dip').total_fat.value.first.should == 11
     subject.foods('total-fat/text() = 11')._name.text.should == "Avocado Dip"
   end
+
+  it "should have global terms" do
+    subject.daily_values.total_fat.unit_value.should include('65g')
+    subject.foods.first.at('serving').unit_value.should include('29g')
+  end
 end

data/spec/fixtures/xml_namespaces.xml

@@ -0,0 +1,17 @@
+<root xmlns:h="http://www.w3.org/TR/html4/"
+xmlns:f="http://www.w3schools.com/furniture">
+
+<h:table>
+  <h:tr>
+    <h:td>Apples</h:td>
+    <h:td>Bananas</h:td>
+  </h:tr>
+</h:table>
+
+<f:table>
+  <f:name>African Coffee Table</f:name>
+  <f:width>80</f:width>
+  <f:length>120</f:length>
+</f:table>
+
+</root>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nom-xml
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -128,8 +144,10 @@ files:
 - lib/nom/xml/terminology.rb
 - lib/nom/xml/version.rb
 - nom.gemspec
+- spec/examples/namespaced_example_spec.rb
 - spec/examples/nutrition_example_spec.rb
 - spec/fixtures/nutrition.xml
+- spec/fixtures/xml_namespaces.xml
 - spec/lib/nodeset_decorator_spec.rb
 - spec/lib/nokogiri_extension_spec.rb
 - spec/lib/terminology_decorator_spec.rb
@@ -150,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 880844590018492615
+      hash: 3518149504485723530
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -159,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 880844590018492615
+      hash: 3518149504485723530
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -167,8 +185,10 @@ signing_key:
 specification_version: 3
 summary: asdf
 test_files:
+- spec/examples/namespaced_example_spec.rb
 - spec/examples/nutrition_example_spec.rb
 - spec/fixtures/nutrition.xml
+- spec/fixtures/xml_namespaces.xml
 - spec/lib/nodeset_decorator_spec.rb
 - spec/lib/nokogiri_extension_spec.rb
 - spec/lib/terminology_decorator_spec.rb