rudelo 0.2.4 → 0.2.5

data/lib/rudelo/matchers/set_logic.rb

@@ -47,7 +47,7 @@ module Rudelo
       end
 
       def matches?(cell, value)
-        puts "\n matches? `#{cell}` => `#{value}`"
+        # puts "\n matches? `#{cell}` => `#{value}`"
         return false unless force || can_match?(cell)
         evaluator = ast(cell)
         return return_on_cant_match if evaluator.nil?

data/lib/rudelo/parsers/set_logic_parser.rb

@@ -9,7 +9,7 @@ module Rudelo
       rule(:digit)   { match("[0-9]") }
 
       rule(:integer) do
-        str("-").maybe >> match("[1-9]") >> digit.repeat
+        str("-").maybe >> digit.repeat(1)
       end
     end
 

data/lib/rudelo/version.rb

@@ -1,3 +1,3 @@
 module Rudelo
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/matchers/set_logic_spec.rb

@@ -23,6 +23,11 @@ describe "Rudelo::Matchers::SetLogic" do
     expect(subject.matches?(cell2, 'a,b,c')).to eq(:break)
   end
 
+  it "matches explicit set syntax" do
+    expect(subject.matches?('$(a, b, c)', 'a,b,c')).to be_true
+    expect(subject.matches?('$(a, b, c)', 'a,b,d')).to eq(:break)
+  end
+
   context "rufus-decision" do
     let(:table){
       table = Rufus::Decision::Table.new(%{

data/spec/parsers/set_logic_parser_spec.rb

@@ -141,6 +141,8 @@ describe "Rudelo::Parsers::SetLogicParser" do
     it "parses a set logic expression with optional cardinality" do
       expect(expr_parser).to    parse('$(bob, jeff) <= $in', trace: true)
       expect(expr_parser).to    parse('$(bob, jeff) <= $in #> 3', trace: true)
+      expect(expr_parser).to    parse('$in intersection $(Differentiation Kit, Human Embryonic Progenitor Package, Growth Media, Basal Media) #> 0', trace: true)
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rudelo
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufus-decision
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -283585303558073235
+      hash: -1336408223698741406
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -283585303558073235
+      hash: -1336408223698741406
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25