nom-xml 0.1.2 → 0.2.0

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - "1.9.3"
+  - jruby-19mode
+  - rbx-19mode
+  - jruby-18mode
+  - "1.8.7"

data/Gemfile

@@ -4,3 +4,7 @@ gemspec
 
 gem 'simplecov', :platform => :ruby_19
 gem 'rcov', :platform => :ruby_18
+gem 'debugger', :platform => :mri_19
+gem "redcarpet", :platform => :ruby_19
+
+gem 'nokogiri', '1.5.6.rc2'

data/Rakefile

@@ -30,5 +30,5 @@ end
 desc "Continuous Integration build"
 task :ci do
   Rake::Task['spec'].invoke
-  Rake::Task['yard'].invoke
+ # Rake::Task['yard'].invoke
 end

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

@@ -1,4 +1,9 @@
 module Nom::XML::Decorators::NodeSet
+	
+	##
+	# Add a #method_missing handler to NodeSets. If all of the elements in the Nodeset
+	# respond to a method (e.g. if it is a term accessor), call that method on all the
+	# elements in the node
 	def method_missing sym, *args, &block
 		if self.all? { |node| node.respond_to? sym }
 			result = self.collect { |node| node.send(sym, *args, &block) }.flatten
@@ -7,4 +12,12 @@ module Nom::XML::Decorators::NodeSet
 			super
 		end
 	end
+
+	def respond_to? sym
+      if self.all? { |node| node.respond_to? sym }
+      	true
+      else
+      	super
+      end
+	end
 end

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

@@ -1,91 +1,60 @@
 module Nom::XML::Decorators::Terminology
-  def self.extended klass
-
-    klass.add_terminology_methods!
-  end
-
-  ##
-  # Add terminology accessors for querying child terms
-  def add_terminology_methods!
-    self.term_accessors.each do |k, t|
-      (class << self; 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 += "[#{t.options[:if]}]" if t.options[:if] and t.options[:if].is_a? String
-        xpath += "[not(#{t.options[:unless]})]" if t.options[:unless] and t.options[:unless].is_a? String
-
-        xpath += "[#{args.join('][')}]" unless args.empty?
-
-        result = case self
-                   when Nokogiri::XML::Document
-                     self.root.xpath(xpath, self.document.terminology_namespaces)
-                   else
-                     self.xpath(xpath, self.document.terminology_namespaces)
-                 end
-
-        result = result.select &t.options[:if] if t.options[:if].is_a? Proc
-        result = result.reject &t.options[:unless] if t.options[:unless].is_a? Proc
-
-        m = t.options[:accessor]
-        return_value = case
-          when m.nil?
-            result
-          when m.is_a?(Symbol)
-            result.collect { |r| r.send(m) }.compact
-          when m.is_a?(Proc)
-            result.collect { |r| m.call(r) }.compact
-          else
-            raise "Unknown accessor class: #{m.class}"
-        end
-
-
-        if return_value and (t.options[:single] or (return_value.length == 1 and return_value.first.is_a? Nokogiri::XML::Attr))
-          return return_value.first
+  
+  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
+      end
+    eos
+  end
 
-        return return_value
+  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
+
+      self.send(method, *args, &block)
+    else
+      super
     end
+  end
 
-    self
+  def respond_to? method
+    super || self.term_accessors[method.to_sym]
   end
 
   ##
-  # Get the terminology terms associated with this node
+  # Get the terms associated with this node
   def terms
-    return @terms if @terms
-    p = self.parent
-
-    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
+    @terms ||= self.ancestors.map { |p| p.term_accessors(self).map { |keys, values| values } }.flatten.compact.uniq
   end
 
   protected
   ##
   # Collection of salient terminology accessors for this node
-  def term_accessors
-    case
+  #
+  # The root note or document node should have all the root terms
+  def term_accessors matching_node =  nil
+    terms = case
       when (self == self.document.root or self.is_a? Nokogiri::XML::Document)
         root_terms
       else
         child_terms
     end
+
+    terms &&= terms.select { |key, term| term.nodes.include? matching_node } if matching_node
+
+    terms
   end
 
   private
-
   ##
   # Root terms for the document
   def root_terms
@@ -97,17 +66,60 @@ module Nom::XML::Decorators::Terminology
   def child_terms
     h = {}
 
+    # collect the sub-terms of the terms applicable to this node
     terms.each do |term|
-
       term.terms.each do |k1, v1|
         h[k1] = v1
       end
     end
 
+    # and mix in any global terms of this node's ancestors
     self.ancestors.each do |a|
       a.term_accessors.each { |k,t| h[k] ||= t if t.options[:global] }
     end
 
     h
   end
+
+  def lookup_term term, *args
+    options = args.extract_options!
+
+    args += options.map { |key, value| %{#{key}="#{value.gsub(/"/, '\\\"') }"} }
+
+    xpath = term.local_xpath
+
+    xpath += "[#{term.options[:if]}]" if term.options[:if] and term.options[:if].is_a? String
+    xpath += "[not(#{term.options[:unless]})]" if term.options[:unless] and term.options[:unless].is_a? String
+
+    xpath += "[#{args.join('][')}]" unless args.empty?
+
+    result = case self
+               when Nokogiri::XML::Document
+                 self.document.root.xpath(xpath, self.document.terminology_namespaces)
+               else
+                 self.xpath(xpath, self.document.terminology_namespaces)
+               end
+
+    result = result.select &(term.options[:if]) if term.options[:if].is_a? Proc
+    result = result.reject &(term.options[:unless]) if term.options[:unless].is_a? Proc
+
+    m = term.options[:accessor]
+   
+    return_value = case
+      when m.nil?
+        result
+      when m.is_a?(Symbol)
+        result.collect { |r| r.send(m) }.compact
+      when m.is_a?(Proc)
+        result.collect { |r| m.call(r) }.compact
+      else
+        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))
+      return return_value.first
+    end
+
+    return return_value
+  end
 end

data/lib/nom/xml/nokogiri_extension.rb

@@ -3,6 +3,8 @@ require 'active_support/core_ext/array'
 module Nom::XML
   module NokogiriExtension
 
+    ##
+    # Apply NOM decorators to Nokogiri classes
     def nom!
       unless decorators(Nokogiri::XML::Node).include? Nom::XML::Decorators::Terminology
         decorators(Nokogiri::XML::Node) << Nom::XML::Decorators::Terminology
@@ -20,19 +22,26 @@ module Nom::XML
       self
     end
 
+    ##
+    # Set the terminology accessors for this document
     def set_terminology options = {}, &block
-      @terminology_namespaces = options[:namespaces]
       @terminology = Nom::XML::Terminology.new(self, options, &block)
+      
+      self
     end
 
     def terminology_namespaces
-      @terminology_namespaces ||= {}
+      @terminology.namespaces
     end
 
     def terminology
       @terminology ||= Nom::XML::Terminology.new self
     end
 
+    def terminology= terminology
+      @terminology = terminology
+    end
+
     def template_registry
       @template_registry ||= Nom::XML::TemplateRegistry.new
     end

data/lib/nom/xml/version.rb

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

data/nom.gemspec

@@ -19,8 +19,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
   s.add_development_dependency "yard"
-  s.add_development_dependency "redcarpet"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/spec/examples/mods_example_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Namespaces example" do
 
-  let(:file) { File.open(File.join(File.dirname(__FILE__), '..', 'fixtures', 'mods_document.xml'), 'r') }
+  let(:file) { File.read(File.join(File.dirname(__FILE__), '..', 'fixtures', 'mods_document.xml')) }
   let(:xml) { Nokogiri::XML(file) }
 
   subject {
@@ -17,7 +17,7 @@ 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] do |r|
-          r.type :path => '@type'
+          r._type :path => '@type'
         end
 
         n.name_role_pair :path => '.', :accessor => lambda { |node| node.roleTerm.text + ": " + node.namePart.text }
@@ -32,7 +32,6 @@ describe "Namespaces example" do
      end
 
      xml.nom!
-
      xml
   }
 
@@ -67,7 +66,7 @@ describe "Namespaces example" do
     eric.namePart.text.should == "Alterman, Eric"
     eric.roleTerm.text.should == "creator"
 
-    eric.roleTerm.type.text.should == "text"
+    eric.roleTerm._type.text.should == "text"
   end
 
   it "should let you mix and match xpaths and nom accessors" do

data/spec/examples/namespaced_example_spec.rb

@@ -6,8 +6,8 @@ describe "Namespaces example" do
 
   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|
+       t.table :xmlns => 'html4' do |tb|
+         tb.tr do |tr|
            tr.td
          end
        end

data/spec/examples/template_registry_example_spec.rb

@@ -37,6 +37,7 @@ describe "Template Registry example" do
   }
 
   it "should work" do
+    pending if defined? JRUBY_VERSION
     subject.root.add_child(subject.template(:a, 'asdf'))
     subject.a.should have(2).items
   end

data/spec/fixtures/mods_document.xml

@@ -1,4 +1,3 @@
-
 <?xml version='1.0' encoding='UTF-8' ?>
 <mods xmlns:xlink="http://www.w3.org/1999/xlink" version="3.4"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.loc.gov/mods/v3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nom-xml
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -107,22 +107,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: ! ' asdfgh '
 email: cabeer@stanford.edu
 executables: []
@@ -131,6 +115,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -174,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3641921164440724288
+      hash: -597609388430309558
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -183,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3641921164440724288
+      hash: -597609388430309558
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23