logic 0.1.1 → 0.1.2

data/lib/logic_operations.rb

@@ -1,4 +1,3 @@
-require 'array'
 require 'test_case_set'
 require 'truth_table'
 
@@ -87,3 +86,9 @@ module Or
     a | b
   end
 end
+
+module Xor
+  def apply(a, b)
+    a ^ b
+  end
+end

data/lib/logic_parser.treetop

@@ -30,6 +30,8 @@ grammar Logic
     'and' <And>
     / 
     'or' <Or>
+    / 
+    'xor' <Xor>
   end
 
   rule space

data/lib/test_case_set.rb

@@ -1,3 +1,4 @@
+require 'array'
 require 'test_case'
 
 class TestCaseSet

data/spec/logic_parser_spec.rb

@@ -8,48 +8,38 @@ describe LogicParser, :parsing do
   let(:parser) { LogicParser.new }
 
   describe "a single condition" do
-        
     it "identifies the condition" do
       decision = parser.parse('Hello')
       decision.condition_identifiers.should == ['Hello']
     end
-
   end
 
   describe "'A or B'" do
-    
     it "condition identifiers are ['A','B']" do
       decision = parser.parse('A or B')
       decision.condition_identifiers.should == ['A','B']
     end
-
   end
 
   describe "'A or B or C'" do
-    
     it "condition identifiers are ['A','B','C']" do
       decision = parser.parse('A or B or C')
       decision.condition_identifiers.should == ['A','B','C']
     end
-
   end
 
   describe "'A and B'" do
-    
     it "conditions are ['A','B']" do
       decision = parser.parse('A and B')
       decision.condition_identifiers.should == ['A','B']
     end
-
   end
 
   describe "'A and B and C'" do
-    
     it "condition identifiers are ['A','B','C']" do
       decision = parser.parse('A and B and C')
       decision.condition_identifiers.should == ['A','B','C']
     end
-
   end
 
   { 'Hello' =>
@@ -69,6 +59,12 @@ describe LogicParser, :parsing do
       [0, 1] => 1,
       [1, 0] => 1
     },
+    'A xor B' =>
+    { [0, 0] => 0,
+      [0, 1] => 1,
+      [1, 0] => 1,
+      [1, 1] => 0
+    },
     'A and B' =>
     { [1, 1] => 1,
       [0, 1] => 0,

data/spec/test_case_set_spec.rb

@@ -3,12 +3,10 @@ require 'test_case_set'
 describe TestCaseSet do
 
   describe "with 1 condition" do
-    
     it "input_dentifiers includes 'a'" do
       test_case_set = TestCaseSet.new(['hello'], nil)
       test_case_set.input_identifiers.should include('a')
     end
-    
   end
   
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Bryan Ash