nom-xml 0.0.1 → 0.0.2

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

@@ -4,15 +4,44 @@ module Nom::XML::Decorators::Terminology
     klass.add_terminology_methods!
   end
 
+  def add_terminology_methods!
+    document.add_terminology_methods(self)
+  end
+
   def terms
-    @terms ||= []
+    if self == self.document.root or self.is_a? Nokogiri::XML::Document
+      root_terms
+    elsif not self.parent.terms.empty?
+      child_terms
+    else
+      []
+    end
   end
 
-  def terms= terms
-    @terms = terms
+  private
+
+  def root_terms 
+    self.document.terminology.terms
   end
 
-  def add_terminology_methods!
-    document.add_terminology_methods(self)
+  def child_terms 
+    h = {}
+
+    collect_terms_for_node.each do |k,v|
+      v.terms.each do |k1, v1|
+        h[k1] = v1
+      end
+    end
+
+    h
   end
+
+  ##
+  #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
+    end
+  end
+
 end

data/lib/nom/xml/nokogiri_extension.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/array'
+
 module Nom::XML
   module NokogiriExtension
 
@@ -27,19 +29,24 @@ module Nom::XML
     # Add terminology accessors for querying child terms
     # @param [Nokogiri::XML::Node] node
     def add_terminology_methods node
-      if node == node.document.root or node.is_a? Nokogiri::XML::Document
-        node.terms = root_terms(node)
-      elsif not node.parent.terms.empty?
-        node.terms = child_terms(node)
-      end
 
       node.terms.each do |k, t|
-        (class << node; self; end).send(:define_method, k.to_sym) do
-          if self.is_a? Nokogiri::XML::Document
-            result = self.root.xpath(t.local_xpath)
-          else
-            result = self.xpath(t.local_xpath)
-          end
+        (class << node; self; end).send(:define_method, k.to_sym) do |*args|
+          options = args.extract_options!
+
+          args += options.map { |key, value| %{#{key}="#{value.gsub(/"/, '\\\"') }"} }
+
+          xpath = t.local_xpath
+
+          xpath += "[#{args.join('][')}]" unless args.empty?
+
+          result = case self
+                     when Nokogiri::XML::Document
+                       self.root.xpath(xpath)
+                     else
+                       result = self.xpath(xpath)
+                   end
+
           m = t.options[:accessor]
           case
           when m.nil?
@@ -54,31 +61,5 @@ module Nom::XML
         end
       end
     end
-
-    private
-
-    def root_terms node
-      node.document.terminology.terms
-    end
-
-    def child_terms node
-      h = {}
-
-      terms_for_node(node).each do |k,v|
-        v.terms.each do |k1, v1|
-          h[k1] = v1
-        end
-      end
-
-      h
-    end
-
-    ##
-    #find this node in the terminology
-    def terms_for_node node
-      node.parent.terms.select do |k,term|
-        node.parent.xpath(term.local_xpath).include? node
-      end
-    end
   end
 end

data/lib/nom/xml/version.rb

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

data/nom.gemspec

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

data/spec/examples/nutrition_example_spec.rb

@@ -10,6 +10,7 @@ describe "Nutrition" do
          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
 
@@ -28,10 +29,15 @@ describe "Nutrition" do
      xml
   }
 
+  it "should be able to access things via xpath, and then continue with terminology selectors" do
+    subject.xpath('//food').first._name.text.should == "Avocado Dip"
+  end
+
   it "should have total fat information" 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
@@ -39,4 +45,9 @@ describe "Nutrition" do
   it "should have food names" do
     subject.foods._name.text.should include("Avocado Dip")
   end
+
+  it "should have xpath selectors" do
+    subject.foods(:name => 'Avocado Dip').total_fat.value.first.should == 11
+    subject.foods('total-fat/text() = 11')._name.text.should == "Avocado Dip"
+  end
 end

data/spec/test_spec.rb

@@ -68,13 +68,7 @@ describe Nom do
   #   </level2>
   # </level1>
 
-  it "Should be able to query for all the 'level3' nodes (leafs with different parents)" 
-  it "Should be able to query for all the 'level3' nodes that are children of parent1 (leafs with same parent)" 
-  it "Should be able to query for the nth child of a specific node"
-  it "Should be able to update the inner text of a specific target node"
   it "Should be able to update the inner texts of a bunch of nodes????? (e.g. find('level2 > level3').innerText=['one', 'two', 'three']"
   it "Should be able to add a subtree at a specific point in the graph"
-  it "Should be able to remove a subtree from the graph"
-  it "should be able to set the text content of a node to nil"
  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nom-xml
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,6 +11,22 @@ bindir: bin
 cert_chain: []
 date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  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
@@ -134,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1208570413108466077
+      hash: 880844590018492615
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -143,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1208570413108466077
+      hash: 880844590018492615
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23