nom-xml 0.1.0 → 0.1.1

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

@@ -15,6 +15,9 @@ module Nom::XML::Decorators::Terminology
 
         xpath = t.local_xpath
 
+        xpath += "[#{t.options[:if]}]" if t.options[:if]
+        xpath += "[not(#{t.options[:unless]})]" if t.options[:unless]
+
         xpath += "[#{args.join('][')}]" unless args.empty?
 
         result = case self
@@ -30,9 +33,9 @@ module Nom::XML::Decorators::Terminology
           when m.nil?
             result
           when m.is_a?(Symbol)
-            result.collect { |r| r.send(m) }
+            result.collect { |r| r.send(m) }.compact
           when m.is_a?(Proc)
-            result.collect { |r| m.call(r) }
+            result.collect { |r| m.call(r) }.compact
           else
             raise "Unknown accessor class: #{m.class}"
         end

data/lib/nom/xml/version.rb

@@ -1,5 +1,5 @@
 module Nom
   module XML
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/spec/lib/terminology_decorator_spec.rb

@@ -25,6 +25,8 @@ describe "Nutrition" do
        t.c do |c|
          c.nested
        end
+
+       t.d :if => 'my-custom-function()'
      end
 
      xml.nom!
@@ -111,6 +113,24 @@ describe "Nutrition" do
 
       subject.asdf.should == 1
     end
+
+    it "should evaluate if" do
+       mock_term = mock(:local_xpath => '//asdf', :options => {:if => 'my-custom-function()' })
+       @term_accessors = { :asdf => mock_term }
+
+       subject.should_receive(:xpath).with('//asdf[my-custom-function()]', anything).and_return([1])
+
+       subject.asdf.should == [1]
+    end
+
+    it "should evaluate unless" do
+       mock_term = mock(:local_xpath => '//asdf', :options => {:unless => 'my-custom-function()' })
+       @term_accessors = { :asdf => mock_term }
+
+       subject.should_receive(:xpath).with('//asdf[not(my-custom-function())]', anything).and_return([1])
+
+       subject.asdf.should == [1]
+    end
   end
 
   describe "#terms" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nom-xml
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -174,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2818954073322895052
+      hash: -2240857808020887200
 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: 2818954073322895052
+      hash: -2240857808020887200
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23