nom-xml 0.1.1 → 0.1.2

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

@@ -15,8 +15,8 @@ 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 += "[#{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?
 
@@ -27,6 +27,8 @@ module Nom::XML::Decorators::Terminology
                      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

data/lib/nom/xml/version.rb

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

data/spec/examples/nutrition_example_spec.rb

@@ -12,6 +12,8 @@ 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.units_if :path => '@units', :if => lambda { |node| true }
+           tf.units_if_false :path => '@units', :if => lambda { |node| false }
          end
        end
 
@@ -55,4 +57,9 @@ describe "Nutrition" do
     subject.daily_values.total_fat.unit_value.should include('65g')
     subject.foods.first.at('serving').unit_value.should include('29g')
   end
+
+  it "should accept if in proc-form" do
+    subject.daily_values.total_fat.units_if == subject.daily_values.total_fat.units
+    subject.daily_values.total_fat.units_if_false.should be_empty
+  end
 end

metadata

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