logic 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 397f970e699d515bdde7d8e1de8c721fcd653ae4
-  data.tar.gz: 9b13c676f0606347dea178edee118b0367df33db
+  metadata.gz: 11e5edf39c29218f130ec320ef00c7b883eb6800
+  data.tar.gz: 86a38a736d41e8801598678e4be7ac2639725b29
 SHA512:
-  metadata.gz: 83fb66a1bcada7c6e4fcc26567ae367c8e429b0d4f39775fd5296ab2736c64c77cca0927fb2140e61f58e2aa5e431e9d63706c06c43e96498be40f10f54d2aae
-  data.tar.gz: 3f1d5980bff682648e9fb2b6dc28fb7e395ef92b31544d57add4c8098de5a477e662d097b2994011b60a03547677cdb9c2a44b7a457d96e0f5e3c504b44a74a5
+  metadata.gz: cd9a8d5026c1011747cb33bd5f0bec1981c3054bc0cbcd4d02de8937c586bdf7cda367ae0b44da181f28cea3c44121f2b82dbc0e2ec3d5a233d07f58ea15d3fb
+  data.tar.gz: 067073560f67447e7bb195232ed9b149b3a93eb1e35d9bad6f0ca76e423e49d329d4ba9d7bf1c110236b4e63b70686d49c1915116dd17af3a2d0469e57bb2cba

data/LICENSE

@@ -1,5 +1,5 @@
-Copyright (c) 2010 Bryan Ash
- 
+Copyright (c) 2017 Bryan Ash
+
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@ without limitation the rights to use, copy, modify, merge, publish,
 distribute, sublicense, and/or sell copies of the Software, and to
 permit persons to whom the Software is furnished to do so, subject to
 the following conditions:
- 
+
 The above copyright notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
- 
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

data/README.rdoc

@@ -8,10 +8,15 @@
 
 By default, you get a truth table and a list of MC/DC pairs:
 
-  logic '(a or b) and (c or d)'
+  logic '(apple or bongo) and (cat or dog)'
 
 Gives you:
 
+a <= apple
+b <= bongo
+c <= cat
+d <= dog
+
       a b c d | output
    1) 0 0 0 0 |   0
    2) 0 0 0 1 |   0
@@ -35,6 +40,10 @@ Gives you:
   c => [[5, 7], [9, 11], [13, 15]]
   d => [[5, 6], [9, 10], [13, 14]]
 
+== Operators
+
+The syntax understands: 'and', '&&', 'or', '||', 'xor', '^', 'not', '!', and parenthesis.
+
 == Copyright
 
-Copyright (c) 2010 Bryan Ash. See LICENSE for details.
+Copyright (c) 2017 Bryan Ash. See LICENSE for details.

data/lib/logic_parser.treetop

@@ -1,12 +1,11 @@
 grammar Logic
-
   rule decision
     binary_decision / unary_decision
   end
 
   rule binary_decision
-    operand_1:unary_decision space
-    operator space
+    operand_1:unary_decision
+    operator
     operand_2:decision <BinaryDecision>
   end
 
@@ -15,12 +14,11 @@ grammar Logic
   end
 
   rule negation
-    space?
-    'not' space operand:unary_decision <Negation>
+    ('not' space / '!' space?) operand:unary_decision <Negation>
   end
 
   rule condition
-    [A-Za-z]+ <Condition>
+    [A-Za-z_]+ <Condition>
   end
 
   rule parenthesized
@@ -28,15 +26,14 @@ grammar Logic
   end
 
   rule operator
-    'and' <And>
+    (space 'and' space / space? '&&' space?) <And>
     /
-    'or' <Or>
+    (space 'or' space / space? '||' space?) <Or>
     /
-    'xor' <Xor>
+    (space 'xor' space / space? '^' space?) <Xor>
   end
 
   rule space
     [ \t\n\r]+
   end
-
 end

data/lib/test_case.rb

@@ -1,6 +1,5 @@
 require 'integer'
 require 'range'
-require 'symbol'
 
 class TestCase
 

data/spec/logic_parser_spec.rb

@@ -4,41 +4,45 @@ require 'logic_parser'
 require 'logic_operations'
 
 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']
+      expect(decision.condition_identifiers).to eq ['Hello']
+    end
+
+    it 'allows underscores in the condition' do
+      decision = parser.parse('a_name')
+      expect(decision.condition_identifiers).to eq ['a_name']
     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']
+      expect(decision.condition_identifiers).to eq ['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']
+      expect(decision.condition_identifiers).to eq ['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']
+      expect(decision.condition_identifiers).to eq ['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']
+      expect(decision.condition_identifiers).to eq ['A','B','C']
     end
   end
 
@@ -50,7 +54,11 @@ describe LogicParser, :parsing do
     { [0] => 0,
       [1] => 1
     },
-    ' not negated' =>
+    'not negated' =>
+    { [0] => 1,
+      [1] => 0
+    },
+    '!negated' =>
     { [0] => 1,
       [1] => 0
     },
@@ -59,17 +67,54 @@ describe LogicParser, :parsing do
       [0, 1] => 1,
       [1, 0] => 1
     },
+    'A || B' =>
+    { [0, 0] => 0,
+      [0, 1] => 1,
+      [1, 0] => 1
+    },
+    'A||B' =>
+    { [0, 0] => 0,
+      [0, 1] => 1,
+      [1, 0] => 1
+    },
     'A xor B' =>
     { [0, 0] => 0,
       [0, 1] => 1,
       [1, 0] => 1,
       [1, 1] => 0
     },
+    'A ^ B' =>
+    { [0, 0] => 0,
+      [0, 1] => 1,
+      [1, 0] => 1,
+      [1, 1] => 0
+    },
+    'A^B' =>
+    { [0, 0] => 0,
+      [0, 1] => 1,
+      [1, 0] => 1,
+      [1, 1] => 0
+    },
     'A and B' =>
     { [1, 1] => 1,
       [0, 1] => 0,
       [1, 0] => 0
     },
+    'A && B' =>
+    { [1, 1] => 1,
+      [0, 1] => 0,
+      [1, 0] => 0
+    },
+    'A&&B' =>
+    { [1, 1] => 1,
+      [0, 1] => 0,
+      [1, 0] => 0
+    },
+    'A and not B' =>
+    { [1, 1] => 0,
+      [0, 1] => 0,
+      [1, 0] => 1
+    },
     'A or B or C' =>
     { [0, 0, 0] => 0,
       [1, 0, 0] => 1,
@@ -102,15 +147,12 @@ describe LogicParser, :parsing do
     }
   }.each do |logic, cases|
     describe "'#{logic}'" do
-
       cases.each do |conditions, result|
         it "'#{conditions}' evaluates to '#{result}'" do
           decision = parser.parse(logic)
-          decision.evaluate(conditions).should == result
+          expect(decision.evaluate(conditions)).to eq result
         end
       end
     end
-
   end
-
 end

data/spec/test_case_set_spec.rb

@@ -1,12 +1,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')
+      expect(test_case_set.input_identifiers).to include('a')
     end
   end
-  
 end

metadata

@@ -1,45 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: logic
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Bryan Ash
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
-  name: polyglot
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.9
-  type: :runtime
+        version: 0.14.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.2
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 description: Produces truth table and MC/DC test case pairs from parsed logic statement
-email: ''
+email: bryan.a.ash@gmail.com
 executables:
 - logic
 extensions: []
@@ -55,7 +83,6 @@ files:
 - lib/logic_operations.rb
 - lib/logic_parser.treetop
 - lib/range.rb
-- lib/symbol.rb
 - lib/test_case.rb
 - lib/test_case_set.rb
 - lib/truth_table.rb
@@ -63,7 +90,8 @@ files:
 - spec/spec.opts
 - spec/test_case_set_spec.rb
 homepage: 
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -79,10 +107,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Taking the pain out of MC/DC testing

data/lib/symbol.rb

@@ -1,7 +0,0 @@
-class Symbol
-
-  def to_proc
-    Proc.new { |obj, *args| obj.send(self, *args) }
-  end
-
-end