logic 0.0.9 → 0.1.0

data/lib/logic_operations.rb

@@ -5,7 +5,7 @@ require 'truth_table'
 module LogicStatement
 
   def test_cases
-    @test_cases ||= TestCaseSet.new(condition_count, self)
+    @test_cases ||= TestCaseSet.new(condition_identifiers, self)
   end
 
   def truth_table
@@ -16,10 +16,6 @@ module LogicStatement
     test_cases.mcdc_pairs
   end
 
-  def condition_count
-    condition_identifiers.count
-  end
-
 end
 
 module Condition

data/lib/test_case_set.rb

@@ -2,24 +2,32 @@ require 'test_case'
 
 class TestCaseSet
 
-  def initialize(condition_count, decision)
-    @condition_count = condition_count
+  def initialize(condition_identifiers, decision)
+    @condition_identifiers = condition_identifiers
     @decision = decision
     @test_cases = create_cases
   end
 
   def create_cases
     case_numbers.map do |case_number|
-      TestCase.new(case_number, @condition_count, @decision)
+      TestCase.new(case_number, condition_count, @decision)
     end
   end
 
   def case_numbers
-    1..2**@condition_count
+    1..2**condition_count
   end
 
-  def condition_identifiers
-    identifier_range.take(@condition_count)
+  def condition_count
+    @condition_identifiers.count
+  end
+
+  def input_to_condition_mapping
+    input_identifiers.zip(@condition_identifiers)
+  end
+
+  def input_identifiers
+    identifier_range.take(condition_count)
   end
 
   def identifier_range
@@ -27,7 +35,7 @@ class TestCaseSet
   end
 
   def mcdc_pairs
-    condition_identifiers.map do |condition_identifier|
+    input_identifiers.map do |condition_identifier|
       "#{condition_identifier} => #{mcdc_pairs_for(condition_identifier)}"
     end
   end
@@ -44,12 +52,16 @@ class TestCaseSet
     identifier_range.to_a.index(condition_identifier)
   end
 
-  def count
-    @test_cases.count
+  def formatted_input_to_condition_maping(format)
+    input_to_condition_mapping.inject("") do |output, input_condition_pair|
+      output += format % input_condition_pair
+    end
   end
 
-  def inject(initial, &block)
-    @test_cases.inject(initial, &block)
+  def formatted(format)
+    @test_cases.inject("") do |output, test_case|
+      output += test_case.formatted(format)
+    end
   end
 
 end

data/lib/truth_table.rb

@@ -5,17 +5,21 @@ class TruthTable
   end
 
   def to_s
-    header + formatted_cases + "\n"
+    formatted_input_to_condition_maping + "\n" +
+      table_header + "\n" +
+      formatted_cases + "\n"
   end
 
-  def header
-    "    %s | output\n" % @test_cases.condition_identifiers.join(" ")
+  def formatted_input_to_condition_maping
+    @test_cases.formatted_input_to_condition_maping("%s <= %s\n")
+  end
+
+  def table_header
+    "    %s | output" % @test_cases.input_identifiers.join(" ")
   end
 
   def formatted_cases
-    @test_cases.inject("") do |output, test_case|
-      output += test_case.formatted("%2d) %s | %3d\n")
-    end
+    @test_cases.formatted("%2d) %s | %3d\n")
   end
 
 end

data/spec/logic_parser_spec.rb

@@ -3,76 +3,51 @@ require 'treetop'
 require 'logic_parser'
 require 'logic_operations'
 
-describe LogicParser do
+describe LogicParser, :parsing do
 
   let(:parser) { LogicParser.new }
 
-  describe "parsing a single condition" do
-    
-    let(:decision) { parser.parse('Hello') }
-    
+  describe "a single condition" do
+        
     it "identifies the condition" do
+      decision = parser.parse('Hello')
       decision.condition_identifiers.should == ['Hello']
     end
 
-    it "has 1 condition" do
-      decision.condition_count.should == 1
-    end
-
   end
 
-  describe "parsing 'A or B'" do
-
-    let(:decision) { parser.parse('A or B') }
+  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
 
-    it "has 2 conditions" do
-      decision.condition_count.should == 2
-    end
-
   end
 
-  describe "parsing 'A or B or C'" do
-
-    let(:decision) { parser.parse('A or B or C') }
+  describe "'A or B or C'" do
     
     it "condition identifiers are ['A','B','C']" do
-      decision.condition_identifiers.should == ['A','B', 'C']
-    end
-
-    it "has 3 conditions" do
-      decision.condition_count.should == 3
+      decision = parser.parse('A or B or C')
+      decision.condition_identifiers.should == ['A','B','C']
     end
 
   end
 
-  describe "parsing 'A and B'" do
-
-    let(:decision) { parser.parse('A and B') }
+  describe "'A and B'" do
     
     it "conditions are ['A','B']" do
+      decision = parser.parse('A and B')
       decision.condition_identifiers.should == ['A','B']
     end
 
-    it "has 2 conditions" do
-      decision.condition_count.should == 2
-    end
-
   end
 
-  describe "parsing 'A and B and C'" do
-
-    let(:decision) { parser.parse('A and B and C') }
+  describe "'A and B and C'" do
     
     it "condition identifiers are ['A','B','C']" do
-      decision.condition_identifiers.should == ['A','B', 'C']
-    end
-
-    it "has 3 conditions" do
-      decision.condition_count.should == 3
+      decision = parser.parse('A and B and C')
+      decision.condition_identifiers.should == ['A','B','C']
     end
 
   end
@@ -116,12 +91,11 @@ describe LogicParser do
       [0, 1, 1] => 0
     }
   }.each do |logic, cases|
-    describe "parsing '#{logic}'" do
-
-      let(:decision) { parser.parse(logic) }
+    describe "'#{logic}'" do
 
       cases.each do |conditions, result|
         it "'#{conditions}' evaluates to '#{result}'" do
+          decision = parser.parse(logic)
           decision.evaluate(conditions).should == result
         end
       end

data/spec/test_case_set_spec.rb

@@ -3,21 +3,12 @@ require 'test_case_set'
 describe TestCaseSet do
 
   describe "with 1 condition" do
-
-    let(:test_case_set) { TestCaseSet.new(1, nil) }
     
-    describe :condition_dentifiers do
-      
-      it "includes 'a'" do
-        test_case_set.condition_identifiers.should include('a')
-      end
-
+    it "input_dentifiers includes 'a'" do
+      test_case_set = TestCaseSet.new(['hello'], nil)
+      test_case_set.input_identifiers.should include('a')
     end
     
-    it "has 2 test cases" do
-      test_case_set.count.should == 2
-    end
-
   end
   
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Bryan Ash