cauldron 0.1.0 → 0.1.1

data/test/unit/tc_chain_with_case_1.rb

@@ -36,7 +36,7 @@ class TestChainWithCase1 < Test::Unit::TestCase
     )
     t1_action = TheoryAction.new(
       TheoryStatement.new(StringToTheory.run(
-        'OpenStatement.new(IfContainer.new(var1.params[var6],Equivalent.new,var2[var3][:params][var6]))'
+        'OpenStatement.new(Statement.new(If.new,Container.new(var1.params[var6],Equivalent.new,var2[var3][:params][var6])))'
       )),
       StringToTheory.run('var1.statement_id')
     )

data/test/unit/tc_method_usage.rb

@@ -9,7 +9,7 @@ class TestMethodUsage < Test::Unit::TestCase
     @empty_method_usage = MethodUsage.new
     
     # Requires a string variable
-    @method_var_a = MethodParameter.new('flipping'.to_requirement)
+    @method_var_a = MethodParameter.new
     @string_paramater_case = MethodUsage.new(@method_var_a)
 
   end

data/test/unit/tc_theory.rb

@@ -1,4 +1,7 @@
-require 'required'
+$LOAD_PATH << File.expand_path('../../../lib',__FILE__)
+
+require 'cauldron'
+
 require 'test/unit'
 
 class TestTheory < Test::Unit::TestCase
@@ -373,7 +376,7 @@ class TestTheory < Test::Unit::TestCase
   
   def test_map_to_case1_theory_1
     
-    theory =Theory.load_theory 9
+    theory =Theory.load_theory(9)
 #    runtime_method = RuntimeMethod.new(MethodUsage.new(MethodParameter.new))
 #    test_cases = [
 #      {:params=>['something'], :output=>'exists'},
@@ -386,6 +389,9 @@ 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

@@ -1,4 +1,8 @@
-require 'required'
+$LOAD_PATH << File.expand_path('../../../../lib',__FILE__)
+
+require 'cauldron'
+
+#require 'required'
 require 'test/unit'
 
 class TestTheoryAction < Test::Unit::TestCase
@@ -62,6 +66,34 @@ class TestTheoryAction < Test::Unit::TestCase
     )
   end
   
+  def test_map_to_with_complex_action
+    action = TheoryAction.new(
+      TheoryStatement.new(StringToTheory.run(
+        'OpenStatement.new(If.new,Container.new(var1.params[var3],Equivalent.new,var2[var4][:params][var5]))')
+      ),
+      StringToTheory.run('var1.statement_id')
+    )    
+    # #<Mapping:0xb7027288
+     # @hash=
+      # {5=>#<TheoryVariable:0xb7027148 @theory_variable_id=2>,
+       # 1=>#<TheoryVariable:0xb7027198 @theory_variable_id=1>,
+       # 2=>#<TheoryVariable:0xb70270f8 @theory_variable_id=3>,
+       # 3=>#<TheoryVariable:0xb70271fc @theory_variable_id=0>,
+       # 4=>#<TheoryVariable:0xb70270a8 @theory_variable_id=4>}>
+    m = Mapping.new({
+      1=>TheoryVariable.new(1),
+      2=>TheoryVariable.new(3),
+      3=>TheoryVariable.new(0),
+      4=>TheoryVariable.new(4),
+      5=>TheoryVariable.new(2)
+    })
+    assert_equal(
+      action.map_to(m).write,
+      "runtime_method.add_statement_at(OpenStatement.new(If.new, Container.new(var1.params[var0], Equivalent.new, var3[var4][:params][var2])),var1.statement_id)" 
+    )
+    
+  end
+  
   def test_map_to_case_1_theory_1_action
     action = TheoryAction.new(
       TheoryStatement.new(StringToTheory.run(
@@ -71,10 +103,10 @@ class TestTheoryAction < Test::Unit::TestCase
       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
-    )
+    # 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/theory/tc_theory_chain_validator.rb

@@ -229,7 +229,7 @@ class TestTheoryChainValidator < Test::Unit::TestCase
     last_real_method = Parser.run('last_runtime_method')    
     
     finish = OpenStatement.new(
-      IfContainer.new(InstanceCallContainer.new(real_method,AllPass.new,tc))
+      Statement.new(If.new,Container.new(InstanceCallContainer.new(real_method,AllPass.new,tc)))
     )
     finish << Statement.new(Return.new,True.new)
     potential_values = MappingValues.new([tc,tc_index_0,tc_index_1,param_0,real_method,last_real_method])  
@@ -265,7 +265,7 @@ class TestTheoryChainValidator < Test::Unit::TestCase
     real_method = Parser.run('runtime_method')
     
     finish = OpenStatement.new(
-      IfContainer.new(InstanceCallContainer.new(real_method,Pass.new,ArrayAccess.new(tc,tc_index_0)))
+      Statement.new(If.new,Container.new(InstanceCallContainer.new(real_method,Pass.new,ArrayAccess.new(tc,tc_index_0))))
     )
     finish << Statement.new(Return.new,True.new)
     potential_values = MappingValues.new([
@@ -310,7 +310,7 @@ class TestTheoryChainValidator < Test::Unit::TestCase
 #    real_method = Parser.run('runtime_method')
 #    
 #    finish = OpenStatement.new(
-#      IfContainer.new(InstanceCallContainer.new(real_method,Pass.new,ArrayAccess.new(tc,tc_index_0)))
+#      Statement.new(If.new,Container.new(InstanceCallContainer.new(real_method,Pass.new,ArrayAccess.new(tc,tc_index_0))))
 #    )
 #    finish << Statement.new(Return.new,True.new)
 #    potential_values = MappingValues.new([

data/test/unit/theory/tc_theory_connector.rb

@@ -273,42 +273,7 @@ class TestTheoryConnector < Test::Unit::TestCase
         initial_chain
       ).any? {|x| x.length > 1 }
      )    
-    
-    
-#    runtime_method = RuntimeMethod.new(MethodUsage.new(MethodParameter.new))
-#    test_case_1 = CTestCase.new 
-#    test_case_1[:params] = ['something']
-#    test_case_1[:output] = 'exists'
-#    test_case_2 = CTestCase.new
-#    test_case_2[:params] = ['my willpower']
-#    test_case_2[:output] = 'does not exist'
-#    test_cases = [
-#      test_case_1,test_case_2
-#    ]
-#    
-#    tc = Parser.run('test_cases')
-#    tc_index_0 = IntrinsicLiteral.new(0)
-#    tc_index_1 = IntrinsicLiteral.new(1)
-#    param_0 = IntrinsicLiteral.new(0)
-#    real_method = Parser.run('runtime_method') 
-#    last_real_method = Parser.run('last_runtime_method')
-#    
-#    finish = OpenStatement.new(
-#      IfContainer.new(InstanceCallContainer.new(real_method,AllPass.new,tc))
-#    )
-#    finish << Statement.new(Return.new,True.new)
-#    potential_values = MappingValues.new([tc,tc_index_0,tc_index_1,param_0,real_method,last_real_method])     
-#    connector = TheoryConnector.new(potential_values)
-#    assert_equal(
-#      36,
-#      connector.chain(runtime_method,test_cases,finish,[theory_1,theory_2,theory_3,theory_4]).length
-#    )
-      
-#    # DEVELOPMENT - Output each chain to a file
-#    res = connector.chain(runtime_method,test_cases,finish,[theory_1,theory_2,theory_3,theory_4])
-#    res.each_with_index do |x,i|
-#    end
-      
+     
   end
   
   def test_unify_chain_with_a_very_simple_problem
@@ -373,7 +338,7 @@ class TestTheoryConnector < Test::Unit::TestCase
     real_method = Parser.run('runtime_method')
     
     finish = OpenStatement.new(
-      IfContainer.new(InstanceCallContainer.new(real_method,Pass.new,ArrayAccess.new(tc,tc_index_0)))
+      Statement.new(If.new,Container.new(InstanceCallContainer.new(real_method,Pass.new,ArrayAccess.new(tc,tc_index_0))))
     )
     finish << Statement.new(Return.new,True.new)
     potential_values = MappingValues.new([

data/test/unit/theory/tc_theory_dependent.rb

@@ -1,3 +1,5 @@
+$LOAD_PATH << File.expand_path('../../../../lib',__FILE__)
+
 require 'required'
 require 'test/unit'
 

data/test/unit/theory/tc_theory_implementation.rb

@@ -1,4 +1,8 @@
-require 'required'
+$LOAD_PATH << File.expand_path('../../../../lib',__FILE__)
+
+require 'cauldron'
+
+
 require 'test/unit'
  
 class TestTheoryImplementation < Test::Unit::TestCase

data/test/unit/theory/tc_theory_result.rb

@@ -1,3 +1,5 @@
+$LOAD_PATH << File.expand_path('../../../../lib',__FILE__)
+
 require 'required'
 require 'test/unit'
 
@@ -46,7 +48,7 @@ class TestTheoryResult < Test::Unit::TestCase
     evaluation_code += 'runtime_method.add_statement_at(Statement.new(Return.new, runtime_method.params[0]),runtime_method.statement_id)'+"\n"
     
     evaluation_code += 'return runtime_method'+"\n"        
-    result = CodeEvaluation.new.evaluate_code(evaluation_code)  
+    result = CodeEvaluation.new.evaluate_code(evaluation_code)
     assert(true,implementation.results.all? {|x| x.validates?(result,test_cases)})
     
   end
@@ -68,7 +70,6 @@ class TestTheoryResult < Test::Unit::TestCase
   def test_same_structure_4
     # TODO  Fixtures should include implemented TheoryResult and TheoryResults - I don't like using first
     theory = Theory.load_theory(4)
-    
     implemented_result = load_implementation_result(0)
     theory_result = theory.results.first
     assert_equal(

data/test/unit/util/tc_method_validation.rb

@@ -1,3 +1,5 @@
+$LOAD_PATH << File.expand_path('../../../../lib',__FILE__)
+
 require 'required'
 require 'test/unit'
 
@@ -19,7 +21,8 @@ class TestMethodValidation < Test::Unit::TestCase
     assert_equal(
       true,
       MethodValidation.new.use_runtime_method(
-        validation_test_1,ParametersContainer.new(RuntimeMethod.new(MethodUsage.new).to_declaration)
+        validation_test_1,
+        ParametersContainer.new(RuntimeMethod.new(MethodUsage.new).to_declaration)
       )
     )
     

data/test/unit/util/tc_parser.rb

@@ -1,3 +1,5 @@
+$LOAD_PATH << File.expand_path('../../../../lib',__FILE__)
+
 require 'required'
 require 'test/unit'
 

data/test/unit/util/tc_string_to_theory.rb

@@ -1,7 +1,8 @@
+$LOAD_PATH << File.expand_path('../../../../lib',__FILE__)
+
 require 'required'
 require 'test/unit'
 
-
 class TestStringToTheory < Test::Unit::TestCase
   
   def setup
@@ -92,7 +93,7 @@ class TestStringToTheory < Test::Unit::TestCase
   end
   
   def test_variable_assignment
-    # var1.length = var2.length
+    a = StringToTheory.run("var1.length = var2.length")
     assert_equal(
       "#{TheoryVariable.variable_colour(1)}var1#{TheoryVariable::NORMAL}.length = #{TheoryVariable.variable_colour(2)}var2#{TheoryVariable::NORMAL}.length",    
       StringToTheory.run("var1.length = var2.length").describe

data/tmp/runtime_method_evaluation.rb

@@ -1,10 +1,13 @@
-class RuntimeMethodEvaluation24
+class RuntimeMethodEvaluation3
 
 	#
-	#	This is the method that is being evaluated using 'RuntimeMethodEvaluation24.new.method_1
+	#	This is the method that is being evaluated using 'RuntimeMethodEvaluation3.new.method_1
 	#
-	def method_1(var_2)
-		return nil
+	def method_1(var_0)
+		if(var_0 == 'fish')
+			return 'animal'
+		end
+		return 'vegtable'
 	end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cauldron
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Warren Sangster
@@ -15,9 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 Z
+date: 2011-07-04 00:00:00 +01:00
+default_executable: cauldron
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :development
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -27,11 +29,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id001
   prerelease: false
   name: shoulda
 - !ruby/object:Gem::Dependency 
+  type: :development
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,11 +45,11 @@ dependencies:
         - 0
         - 15
         version: 1.0.15
-  type: :development
   requirement: *id002
   prerelease: false
   name: bundler
 - !ruby/object:Gem::Dependency 
+  type: :development
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -59,11 +61,11 @@ dependencies:
         - 6
         - 2
         version: 1.6.2
-  type: :development
   requirement: *id003
   prerelease: false
   name: jeweler
 - !ruby/object:Gem::Dependency 
+  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -73,10 +75,41 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   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
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        - 6
+        version: 2.0.6
+  requirement: *id006
+  prerelease: false
+  name: ruby_parser
 description: Cauldron generates a methd from a number of examples that describe the input and the expected output.  It is still at a very early stage of development right now so you're unlikely to get much practical use out of it.
 email: warrensangster@yahoo.com
 executables: 
@@ -110,6 +143,8 @@ files:
 - features/step_definitions/cauldron_steps.rb
 - features/step_definitions/terminal_steps.rb
 - features/support/env.rb
+- features/support/method_1.example
+- features/support/method_2.example
 - lib/Chain.rb
 - lib/ChainMapping.rb
 - lib/CodeHandler.rb
@@ -120,6 +155,7 @@ files:
 - lib/UnifiedChain.rb
 - lib/cauldron.rb
 - lib/cauldron/conversion.rb
+- lib/cauldron/demos.rb
 - lib/cauldron/pot.rb
 - lib/cauldron/sexp2cauldron.rb
 - lib/cauldron/terminal.rb
@@ -234,7 +270,6 @@ files:
 - lib/core/syntax/Do.rb
 - lib/core/syntax/False.rb
 - lib/core/syntax/If.rb
-- lib/core/syntax/IfContainer.rb
 - lib/core/syntax/Nil.rb
 - lib/core/syntax/Return.rb
 - lib/core/syntax/Subtract.rb
@@ -315,12 +350,18 @@ files:
 - lib/util/StatementCheck.rb
 - lib/util/StringToTheory.rb
 - lib/util/System.rb
+- spec/cauldron/chain_spec.rb
+- spec/cauldron/demos_spec.rb
 - spec/cauldron/pot_spec.rb
 - spec/cauldron/runtime_method_spec.rb
 - spec/cauldron/sexp_2_cauldron_spec.rb
 - spec/cauldron/terminal_spec.rb
 - spec/cauldron/theory_action_spec.rb
+- spec/cauldron/theory_connector_spec.rb
+- spec/cauldron/theory_spec.rb
+- spec/cauldron/unified_chain_spec.rb
 - spec/spec_helper.rb
+- tasks/theory_tasks.rake
 - test/fixtures/chains/1/declaration.txt
 - test/fixtures/chains/1/dump
 - test/fixtures/chains/2/declaration.txt
@@ -396,9 +437,11 @@ files:
 - test/fixtures/theory_implementations/0/desc.txt
 - test/fixtures/theory_implementations/0/dump
 - test/fixtures/theory_implementations/0/theory_id
+- test/fixtures/theory_implementations/1/declaration.txt
 - test/fixtures/theory_implementations/1/desc.txt
 - test/fixtures/theory_implementations/1/dump
 - test/fixtures/theory_implementations/1/theory_id
+- test/fixtures/theory_implementations/2/declaration.txt
 - test/fixtures/theory_implementations/2/desc.txt
 - test/fixtures/theory_implementations/2/dump
 - test/fixtures/theory_implementations/2/theory_id
@@ -485,6 +528,7 @@ files:
 - test/unit/util/tc_string_to_theory.rb
 - test/unit/variable/tc_method_usage_variable.rb
 - tmp/runtime_method_evaluation.rb
+has_rdoc: true
 homepage: http://github.com/theinbetweens/cauldron
 licenses: 
 - MIT
@@ -498,10 +542,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 31
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 6
+      - 8
+      version: 1.6.8
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -514,7 +560,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Generate simple ruby methods from the input(s) and expected output