cauldron 0.1.1 → 0.1.2

data/lib/util/MethodEvaluation.rb

@@ -5,10 +5,8 @@ class MethodEvaluation
   
   def evaluate_method(runtime_method,params,additional_methods=[])
 
-    # Create file to include the runtime method
-    filepath = $LOC+File.join(['tmp','runtime_method_evaluation.rb'])    
-    #filepath = $LOC+File.join(['tmp','runtime_method_evaluation_'+@@COUNTER.to_s+'.rb'])        
-    file = File.open(filepath,'w+')    
+    # Create file to include the runtime method    
+    file = Tempfile.new("runtime_method_evaluation.rb")      
     
     # A new class name is created otherwise previously declared method names are peristent.
     # e.g. if a "RuntimeMethodEvaluation" was created with the method_a it would still 
@@ -39,11 +37,13 @@ class MethodEvaluation
     end
   
     # Load the generated class
-    load filepath
+    load file.path
 
     # Use the evaluated paramaters with the evaluated runtime method
     return eval("#{class_name}.new."+runtime_method.method_name+"(*evaluated_parameters)")
-    
+  ensure 
+      file.close
+      file.unlink          
   end
   
 end

data/lib/util/StatementCheck.rb

@@ -11,8 +11,7 @@ class StatementCheck
   def valid_syntax?(statement)
     
     # Create file to include the test method
-    filepath = $LOC+File.join(['tmp','runtime_statement_check.rb'])    
-    file = File.open(filepath,'w+')
+    file = Tempfile.new("runtime_statement_check.rb")   
     
     # Include the sytax for the statement in the file
     file << 'class RuntimeStatementCheck'+"\n"
@@ -24,7 +23,7 @@ class StatementCheck
     
     # Load the newly created class and check the statement
     begin    
-      load filepath
+      load file.path
       RuntimeStatementCheck.new.check
     rescue NameError => e
       return false
@@ -37,6 +36,9 @@ class StatementCheck
     end
     return true    
     
+  ensure 
+      file.close
+      file.unlink          
   end
 
 end

data/lib/util/StringToTheory.rb

@@ -61,7 +61,6 @@ class StringToTheory < Parser
   def self.parse_const(token)
     constants = {
       'Statement'=>'StatementClass',
-      'IfStatement'=>'IfStatementClass',
       'Return'=>'ReturnClass',
       'InstanceCallContainer'=>'InstanceCallContainerClass',
       'StringLength'=>'StringLengthClass',

data/spec/cauldron/pot_spec.rb

@@ -65,6 +65,46 @@ module Cauldron
         pot.brew(cases).reset_ids!.basic_write.should == sexp2cauldron.process(sexp).basic_write                     
       end
       
+      context 'it has both demo one and two loaded' do
+        before(:each) {
+          @pot = Cauldron::Pot.new
+          @pot.clear
+          @pot.simmer(demo_one)
+          @pot.simmer(demo_two)
+        }
+        it 'can generate a solution like demo 1' do
+          cases = []
+          cases << convert_to_example(separate_values("'pip','pip'"))
+          cases << convert_to_example(separate_values("'rowiage','rowiage'"))
+          ruby      =  "
+            def method_0(var_0)
+              \treturn var_0
+            end
+          "
+          parser    = RubyParser.new          
+          sexp      = parser.process(ruby)
+          sexp2cauldron = Sexp2Cauldron.new      
+          @pot.brew(cases).reset_ids!.basic_write.should == sexp2cauldron.process(sexp).basic_write                              
+        end
+        it 'can generate a solution like demo 2(it needs to discount the demo 1 solution)' do
+          cases = []
+          cases << convert_to_example(separate_values("'sparky','bro'"))
+          cases << convert_to_example(separate_values("'kel','sis'"))
+          ruby      =  "
+                          def method_0(var_0)
+                            \tif(var_0 == 'sparky')
+                            \t\treturn 'bro'
+                            \tend
+                            \treturn 'sis'
+                          end        
+                       "                    
+          parser    = RubyParser.new          
+          sexp      = parser.process(ruby)
+          sexp2cauldron = Sexp2Cauldron.new
+          @pot.brew(cases).reset_ids!.basic_write.should == sexp2cauldron.process(sexp).basic_write
+        end
+      end
+      
     end
     
   end

data/test/fixtures/theories/9/declaration.txt

@@ -6,7 +6,7 @@
     )
     action = TheoryAction.new(
       TheoryStatement.new(StringToTheory.run(
-        'IfStatement.new(var2[var3][:params][var6],Equivalent.new,var2[var3][:output])'
+        'Statement.new(If.new,Container.new(var2[var3][:params][var6],Equivalent.new,var2[var3][:output]))'
     	)),
     	StringToTheory.run('var1.statement_id')
 		)

data/test/fixtures/theories/9/desc

@@ -10,7 +10,7 @@ if:
 	end
 
 action: 
-	<runtime_method>.add_statement_at(IfStatement.new(var2[var3][:params][var6], Equivalent.new, var2[var3][:output]),var1.statement_id)
+	<runtime_method>.add_statement_at(Statement.new(If.new, Container.new(var2[var3][:params][var6], Equivalent.new, var2[var3][:output])),var1.statement_id)
 result: 
 	if(var1.history(var2[var3][:params]).any?{ |x| x.statement_id == var1.last.statement_id} )
 		return true

data/test/ts_complete.rb

@@ -74,7 +74,6 @@ require 'test/unit/core/statement/tc_statement_dependencies'
 require 'test/unit/tc_statement_structure_2'
 require 'test/unit/tc_variable_declaration'
 
-require 'test/tc_contextual_variables'
 require 'test/tc_describe'
 require 'test/tc_method'
 require 'test/tc_requirement'

data/test/unit/core/runtime_method/tc_runtime_method.rb

@@ -163,31 +163,6 @@ class TestRuntimeMethod < Test::Unit::TestCase
     
   end
   
-  # Tests that the literal value of each variable in the method can
-  # be evaluated.
-  # 
-  def test_literal_value_of_var
-   
-    # Check that each of the variables has the correct evaluated value
-    local_var_a = 'test'.to_var
-    local_var_b = 'LividKel'.to_var
-    assert_equal(
-      local_var_a.value,
-      @simple_method.literal_value_of_var(
-        @method_var_a.variable_id,
-        ParametersContainer.new(local_var_a,local_var_b)
-      )
-    )        
-    assert_equal(9,@simple_method.literal_value_of_var(@var_b.variable_id,ParametersContainer.new(local_var_a,local_var_b)))        
-    assert_equal(local_var_a.value.clone.chop,@simple_method.literal_value_of_var(@var_c.variable_id,ParametersContainer.new(local_var_a,local_var_b)))            
-    assert_equal(local_var_a.value.clone.chop.length,@simple_method.literal_value_of_var(@var_d.variable_id,ParametersContainer.new(local_var_a,local_var_b)))            
-    assert_equal(12,@simple_method.literal_value_of_var(@var_e.variable_id,ParametersContainer.new(local_var_a,local_var_b)))            
-
-    # Check that an exception is raised for not existant variables
-    assert_raises(FailedToFindVariableError){@simple_method.literal_value_of_var(Variable.variable_id+1,ParametersContainer.new(local_var_a,local_var_b))} 
-        
-  end
-  
   # Tests the RuntimeMethods abilitity to identify what comninations
   # of variables can be used to call this method.
   #

data/test/unit/core/statement/tc_statement.rb

@@ -229,25 +229,6 @@ class TestStatement < Test::Unit::TestCase
     assert_raises(UnknownStatementType){Statement.new(RequirementsVariable.new,RequirementsVariable.new).statement_type}
   end
   
-  # Presumes the statement is a declaration statement and returns the
-  # specified variable in context.
-  #
-  def test_find_variable_in_declaration_statement
-    
-    # Attempt to retrieve both variables used in the statement (var_c = var_b.chop)
-    assert(@statement_b.send(:find_variable_in_declaration_statement,@var_c).kind_of?(Variable))
-    assert(@statement_b.send(:find_variable_in_declaration_statement,@var_b).kind_of?(Variable))    
-    
-    # Attempt to retrieve variable not used in statement
-    assert(@statement_b.send(:find_variable_in_declaration_statement,@var_b).kind_of?(Variable))        
-    
-    # Attempt to retrieve variable for statement with three variables
-    assert(@statement_c.send(:find_variable_in_declaration_statement,@var_e).kind_of?(Variable))                
-    assert(@statement_c.send(:find_variable_in_declaration_statement,@var_f).kind_of?(Variable))                
-    assert(@statement_c.send(:find_variable_in_declaration_statement,@var_g).kind_of?(Variable))            
-    
-  end
-  
   def test_required_variable_ids
     
     # Confirm that the simple statement var = 'daggerfall' has no dependencies
@@ -516,39 +497,6 @@ class TestStatement < Test::Unit::TestCase
       
   end
   
-  def test_to_var
-    
-    # Create a simple statement and check that it can be changed to a statement variable
-    assert_equal(StatementVariable,@simple_statement.to_var.class)
-    
-    # Check that the content of the statement is pre-served
-    assert_equal(@simple_statement.write,@simple_statement.to_var.value.write)
-    assert_equal(@chop_wally.write,@chop_wally.to_var.value.write)    
-    
-    # Check that variable ids are maintained and classes are maintained
-    chop_wally_var = @chop_wally.to_var
-    @chop_wally.each_variable do |x|
-      assert_equal(x.variable_id,chop_wally_var.value.find_variable(x.variable_id).variable_id)
-      assert_equal(x.class,chop_wally_var.value.find_variable(x.variable_id).class)
-    end
-    
-    # Check that the id of the generated statement variable can be set.
-    set_variable_id = 0
-    variable_with_set_id = @simple_statement.to_var(set_variable_id)
-    assert_equal(0,variable_with_set_id.variable_id)
-    
-    # Change the id's are retained when using blocks
-    assert_equal(89,@simple_statement.to_var(89,101).variable_id)
-    # TODO  I should check that ids are retained inside the value of the statement variable
-    #raise StandardError.new('jsadksadfjksd')
-    runtime_method_a = RuntimeMethod.new(MethodUsage.new)
-    runtime_method_a << @simple_statement
-    realised_runtime_method_a = runtime_method_a.realise2([])
-    assert_equal(@simple_statement.first.variable_id,realised_runtime_method_a.first.first.variable_id)
-    assert_equal(@simple_statement.first.uniq_id,realised_runtime_method_a.first.first.uniq_id)    
-    
-  end
-  
   def test_find_actual_variable
     
     # 1.  Check that the actual variable is returned from a statement

data/test/unit/core/tc_theory_generator.rb

@@ -58,7 +58,7 @@ class TestTheoryGenerator < Test::Unit::TestCase
     # var1 = RuntimeMethod, var2 = test_cases, var3 = 0, var4 = 0
     action_one = TheoryAction.new(
       TheoryStatement.new(StringToTheory.run(
-          'IfStatement.new(var2[var3][:params][var4],Equivalent.new,var2[var3][:output])'
+          'Statement.new(If.new,Container.new(var2[var3][:params][var4],Equivalent.new,var2[var3][:output]))'
         )
       ),
       StringToTheory.run('var1.statement_id')
@@ -81,7 +81,7 @@ class TestTheoryGenerator < Test::Unit::TestCase
     # var1 = RuntimeMethod, var2 = test_cases, var3 = 0, var4 = 0
     action_one = TheoryAction.new(
       TheoryStatement.new(StringToTheory.run(
-          'IfStatement.new(var2[var3][:params][var4],Equivalent.new,var2[var3][:output])'
+          'Statement.new(If.new,Container.new(var2[var3][:params][var4],Equivalent.new,var2[var3][:output]))'
         )
       ),
       StringToTheory.run('var1.statement_id')

data/test/unit/tc_theory.rb

@@ -78,7 +78,7 @@ class TestTheory < Test::Unit::TestCase
     )
     action = TheoryAction.new(
       TheoryStatement.new(StringToTheory.run(
-        'IfStatement.new(var2[var3][:params][var6],Equivalent.new,var2[var3][:output])'
+        'Statement.new(Container.new(var2[var3][:params][var6],Equivalent.new,var2[var3][:output]))'
       )),
       StringToTheory.run('var1.statement_id')
     )
@@ -106,7 +106,7 @@ class TestTheory < Test::Unit::TestCase
     )
     action = TheoryAction.new(
       TheoryStatement.new(StringToTheory.run(
-        'IfStatement.new(var2[var3][:params][var6],Equivalent.new,var2[var3][:output])'
+        'Statement.new(Container.new(var2[var3][:params][var6],Equivalent.new,var2[var3][:output]))'
       )),
       StringToTheory.run('var1.statement_id')
     )
@@ -377,11 +377,6 @@ class TestTheory < Test::Unit::TestCase
   def test_map_to_case1_theory_1
     
     theory =Theory.load_theory(9)
-#    runtime_method = RuntimeMethod.new(MethodUsage.new(MethodParameter.new))
-#    test_cases = [
-#      {:params=>['something'], :output=>'exists'},
-#      {:params=>['my willpower'], :output=>'does not exist'}
-#    ]
     mapping = Mapping.new({
       1=>IntrinsicRuntimeMethod.new,
       2=>IntrinsicTestCases.new,
@@ -389,9 +384,6 @@ class TestTheory < Test::Unit::TestCase
       4=>1.to_literal,
       6=>1.to_literal
     })
-    puts theory.write
-    puts theory.all_theory_variables.length
-    puts theory.map_to(mapping).write
     assert_equal(
       0,
       theory.map_to(mapping).all_theory_variables.length

data/test/unit/theory/tc_theory_action.rb

@@ -2,7 +2,7 @@ $LOAD_PATH << File.expand_path('../../../../lib',__FILE__)
 
 require 'cauldron'
 
-#require 'required'
+
 require 'test/unit'
 
 class TestTheoryAction < Test::Unit::TestCase
@@ -97,16 +97,12 @@ class TestTheoryAction < Test::Unit::TestCase
   def test_map_to_case_1_theory_1_action
     action = TheoryAction.new(
       TheoryStatement.new(StringToTheory.run(
-          'IfStatement.new(var2[var3][:params][var6],Equivalent.new,var2[var3][:output])'
+          'Statement.new(If.new,Container.new(var2[var3][:params][var6],Equivalent.new,var2[var3][:output]))'
         )
       ),
       StringToTheory.run('var1.statement_id')
     )
     mapping = {2=>IntrinsicTestCases.new,3=>Literal.new(0),6=>0.to_literal}
-    # assert_equal(
-      # "<runtime_method>.add_statement_at(IfStatement.new(<test_cases>[0][:params][0], Equivalent.new, <test_cases>[0][:output]),#{TheoryVariable.variable_colour(1)}var1#{TheoryVariable::NORMAL}.statement_id)",
-      # action.map_to(mapping).describe
-    # )
   end    
   
 end

data/test/unit/util/tc_string_to_theory.rb

@@ -246,11 +246,11 @@ class TestStringToTheory < Test::Unit::TestCase
       StringToTheory.run("if(var9 == (var5[:params][var6].length+1))\nend")
     }    
     assert_nothing_raised(){
-      StringToTheory.run("IfStatement.new(var2[var3][:params][var6],Equivalent.new,var2[var3][:output])")
+      StringToTheory.run("Statement.new(If.new,Container.new(var2[var3][:params][var6],Equivalent.new,var2[var3][:output]))")
     }
     assert_equal(
       5,
-      StringToTheory.run("IfStatement.new(var2[var3][:params][var6],Equivalent.new,var2[var3][:output])").select_all {|x| x.kind_of?(ArrayAccess)}.length
+      StringToTheory.run("Statement.new(If.new,Container.new(var2[var3][:params][var6],Equivalent.new,var2[var3][:output]))").select_all {|x| x.kind_of?(ArrayAccess)}.length
     )
     # <var1>.history(<var2>[<var3>][:params]).any? { |x| x.statement_id == <var8>.statement_id }
     assert_nothing_raised(){

data/tmp/runtime_method_evaluation.rb

@@ -1,13 +1,16 @@
-class RuntimeMethodEvaluation3
+class RuntimeMethodEvaluation18
 
 	#
-	#	This is the method that is being evaluated using 'RuntimeMethodEvaluation3.new.method_1
+	#	This is the method that is being evaluated using 'RuntimeMethodEvaluation18.new.method_1
 	#
-	def method_1(var_0)
-		if(var_0 == 'fish')
-			return 'animal'
-		end
-		return 'vegtable'
+	def method_1(var_1, var_2, var_3, var_4)
+		@var_0 = History.new if @var_0.nil?
+		@var_0.push(Step.new(
+      var_1,    
+      var_2,      
+      var_3,         
+      var_4
+     ))
 	end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cauldron
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Warren Sangster
@@ -15,12 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 +01:00
+date: 2011-07-14 00:00:00 +01:00
 default_executable: cauldron
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 2
+        - 5
+        version: 1.2.5
+  requirement: *id001
+  prerelease: false
+  name: ruby2ruby
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +45,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
+  requirement: *id002
   prerelease: false
   name: shoulda
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +61,12 @@ dependencies:
         - 0
         - 15
         version: 1.0.15
-  requirement: *id002
+  requirement: *id003
   prerelease: false
   name: bundler
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +77,12 @@ dependencies:
         - 6
         - 2
         version: 1.6.2
-  requirement: *id003
+  requirement: *id004
   prerelease: false
   name: jeweler
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,25 +91,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-  prerelease: false
-  name: rcov
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 2
-        - 5
-        version: 1.2.5
   requirement: *id005
   prerelease: false
-  name: ruby2ruby
+  name: rcov
 - !ruby/object:Gem::Dependency 
   type: :development
   version_requirements: &id006 !ruby/object:Gem::Requirement 
@@ -213,7 +213,6 @@ files:
 - lib/core/runtime_class/DefCallClass.rb
 - lib/core/runtime_class/EqualClass.rb
 - lib/core/runtime_class/FixnumClass.rb
-- lib/core/runtime_class/IfStatementClass.rb
 - lib/core/runtime_class/InstanceCallClass.rb
 - lib/core/runtime_class/InstanceCallContainerClass.rb
 - lib/core/runtime_class/InstanceClassCallClass.rb
@@ -455,7 +454,6 @@ files:
 - test/output/test_simple_cases/simple_case_06.txt
 - test/output/test_simple_cases/simple_case_07.txt
 - test/output/test_simple_cases/simple_case_08.txt
-- test/tc_contextual_variables.rb
 - test/tc_describe.rb
 - test/tc_method.rb
 - test/tc_requirement.rb