maroon 0.6.1 → 0.6.5

data/Examples/greeter.rb

@@ -1,14 +1,14 @@
 #Thanks to Ted Milken for updating the original example
-
-require '../lib/maroon.rb'
-require '../lib/maroon/kernel.rb'
+require_relative '../base/maroon_base.rb'
+#require_relative '../base/maroon/kernel.rb'
+#require_relative '../base/maroon/contracts.rb'
 
 class Person
   attr_accessor :name
   attr_accessor :greeting
 end
 
-context :Greet_Someone, :greet do
+ctx, source = Context::define :Greet_Someone, :greet do
   role :greeter do
     welcome do
       self.greeting
@@ -19,7 +19,7 @@ context :Greet_Someone, :greet do
   end
 
   greet do
-    puts "#{greeter.name}: \"#{greeter.welcome}, #{greeted.name}!\""
+    puts %{#{greeter.name}: "#{greeter.welcome}, #{greeted.name}!"}
   end
 end
 
@@ -30,6 +30,7 @@ class Greet_Someone
   end
 end
 
+p source
 p1 = Person.new
 p1.name = 'Bob'
 p1.greeting = 'Hello'
@@ -39,7 +40,7 @@ p2.name = 'World!'
 p2.greeting = 'Greetings'
 
 #Execute is automagically created for the default interaction (specified by the second argument in context :Greet_Someone, :greet do)
-#Executes construc a context object and calls the default interaction on this object
-Greet_Someone.execute p1, p2
+#Executes construct a context object and calls the default interaction on this object
+#Greet_Someone.assert_that(p1).can_play(:greeter)
 #constructs a Greet_Someone context object and executes greet.
 Greet_Someone.new(p2, p1).greet

data/Examples/meter.rb

@@ -1,14 +1,14 @@
-require './lib/maroon'
+
 require './lib/maroon/kernel'
 
 context :Meter, :current_total do
-   role :price_per_sec
+  role :price_per_sec
 
-   role :route do
-        price do
-          route.calculate_price clock.start
-        end
-   end
+  role :route do
+    price do
+      route.calculate_price clock.start
+    end
+  end
 
   role :clock do
     price do
@@ -20,17 +20,17 @@ context :Meter, :current_total do
     route.update_position current_position
     clock.price + route.price
   end
-   print_route do
-     route.each_point {|x,y|
-       p "#{x},#{y}"
-     }
-   end
+  print_route do
+    route.each_point { |x, y|
+      p "#{x},#{y}"
+    }
+  end
 end
 
 class Meter
-  def initialize(start,start_pos)
+  def initialize(start, start_pos)
     @clock = Clock.new start
-    @route = Route.new({0=>{1=>1.25}},Road_types.new)
+    @route = Route.new({0 => {1 => 1.25}}, Road_types.new)
     route.update_position start_pos
     @price_per_sec = 0.05
   end
@@ -38,16 +38,19 @@ end
 
 class Clock
   attr_reader :start
+
   def initialize(start)
     @start = start
   end
+
   def duration
     (Time::now - @start)
   end
 end
 
 context :Route do
-  role :prices do end
+  role :prices do
+  end
   role :payable_position do
     price_from do |prev|
       return 0 unless prev
@@ -59,23 +62,23 @@ context :Route do
   end
 
   role :positions do
-     price_for_route do |price_table|
-       prev = nil
-       sum = 0
-       positions.each do |pos|
-         bind pos=>:payable_position, price_table => :prices
-         sum += pos.price_from prev
-         prev = pos
-       end
-       sum
-     end
+    price_for_route do |price_table|
+      prev = nil
+      sum = 0
+      positions.each do |pos|
+        bind pos => :payable_position, price_table => :prices
+        sum += pos.price_from prev
+        prev = pos
+      end
+      sum
+    end
   end
   update_position do |new_position|
     positions << new_position
   end
   calculate_price do |start_time|
-     price_table = prices[start_time.hour / (24/prices.length)]
-     positions.price_for_route price_table
+    price_table = prices[start_time.hour / (24/prices.length)]
+    positions.price_for_route price_table
   end
 end
 
@@ -91,11 +94,13 @@ class Road_types
   def initialize
     @road_types = {}
   end
-  def []=(pos,road_type)
+
+  def []=(pos, road_type)
     t = @road_types[pos.x] ||= {}
     t = t[pos.y] ||= {}
     t[pos.z] = road_type
   end
+
   def [](pos)
     t = @road_types[pos.x]
     return 1 unless t
@@ -111,7 +116,8 @@ class Position
   attr_reader :x
   attr_reader :y
   attr_reader :z
-  def initialize(x,y,z)
+
+  def initialize(x, y, z)
     @x = x
     @y = y
     @z = z

data/Gemfile

@@ -1,4 +1,9 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in maroon.gemspec
-gemspec
+source 'http://rubygems.org'
+
+# Specify your gem's dependencies in maroon.gemspec
+gemspec
+
+group :development, :test do
+  gem 'rake'
+  gem 'debugger'
+end

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2013 TODO: Write your name
-
-MIT License
-
-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
-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
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+Copyright (c) 2013 TODO: Write your name
+
+MIT License
+
+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
+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
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -30,6 +30,12 @@ Context::define :context_name do
    end
 end
 
+## Running Tests
+
+If you're using Bundler, run `bundle install` to setup your environment.
+
+Run `rake test` or just `rake` to make the tests run.
+
 
 ## Contributing
 
@@ -39,3 +45,10 @@ end
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+
+Known bugs
+There are a few known bugs. The two major once are that #{...} syntax in strings can't beused. This is due to
+limitaion/bug in the current version of sourcify.
+If declaring several role methods for the same role sourcify might get confused and return the same sexp for
+multiple of them. The work around is to use do...end for the role ans {|| } for the role methods
+

data/Rakefile

@@ -1 +1,41 @@
-require "bundler/gem_tasks"
+require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
+end
+
+task :generate do |t|
+  require_relative './lib/Context'
+  require_relative './lib/maroon/kernel'
+  require_relative './lib/build' #use the one in lib. That should be the stable one
+  Context::generate_files_in(:generated) #generate files not just in memory classes
+  `git ls-files ./base/`.split($/).grep(%r{(.)*.rb}).select {|f|p f; require_relative("#{f}")}
+end
+
+#execute as with command line to make memory spaces independent
+task :build_lib_setup do |t|
+  generate_out = `rake generate`
+  raise generate_out if generate_out and generate_out != ''
+  test_res = {}
+  test_out = `rake test`
+  test_out.split(/[\n,]/)[-5..-1].each do |e|
+    pair = e.strip.split(/\s/)
+    test_res[pair[-1].to_sym] = pair[0].to_i
+  end
+  raise test_out if (test_res[:failures] + test_res[:errors] != 0)
+  generate_out = `rake build_generate`
+  raise generate_out if generate_out and generate_out != ''
+end
+
+task :build_generate do |t|
+  require_relative './generated/build' #use the one previously generated
+  Context::generate_files_in('generated') #generate files
+  `git ls-files ./base/`.split($/).grep(%r{(.)*.rb}).select {|f| require_relative("#{f}")}
+end
+
+task :default => [:generate,:test]
+
+task :build_lib => [:build_lib_setup,:test]

data/Test/Generate/method_info_test.rb

@@ -0,0 +1,12 @@
+require 'test/unit'
+require_relative '../../lib/build'
+require_relative '../../lib/maroon/kernel'
+
+
+class Generate_method_info < Test::Unit::TestCase
+
+ def test_convert
+   require_relative '../../base/method_info'
+   assert(true)
+ end
+end

data/Test/{Greeter_test.rb → Greeter_test_disabled.rb}

@@ -1,13 +1,14 @@
-require 'test/unit'
-require './lib/maroon.rb'
-require './lib/maroon/kernel.rb'
-require 'ripper'
-require './Test/source_assertions.rb'
-require './Examples/meter.rb'
+require_relative './test_helper.rb'
 
+require_relative '../lib/maroon/kernel.rb'
+require_relative '../lib/build'
 
-class BasicTests < Test::Unit::TestCase
-  include Source_assertions
+require_relative 'assertions.rb'
+#require './Examples/meter.rb'
+
+
+class BasicTests < MiniTest::Unit::TestCase
+  include SourceAssertions
 
   def test_define_context
     name = :MyContext
@@ -19,12 +20,12 @@ class BasicTests < Test::Unit::TestCase
 
   def test_base_class
     name = :MyDerivedContext
-    ctx,source = context name, Person do
+    ctx, source = context name, Person do
     end
     obj = MyDerivedContext.new
     obj.name = name
     assert_equal(ctx.name, "Kernel::#{name}")
-    assert_not_nil(obj.name)
+    refute_nil(obj.name)
     assert((obj.class < Person), 'Object is not a Person')
     assert_equal(name, obj.name)
   end
@@ -38,7 +39,7 @@ class BasicTests < Test::Unit::TestCase
         end
       end
     end
-    assert_not_nil(ctx)
+    refute_nil(ctx)
     assert_equal(ctx.name, "Kernel::#{name}")
     assert_source_equal("class #{name}\r\n\n@#{role_name}\n\n  private\ndef #{role_name};@#{role_name} end\n\n  \ndef self_#{role_name}_role_go_do \n end\n\n\r\nend", source)
   end
@@ -47,7 +48,7 @@ class BasicTests < Test::Unit::TestCase
     name, role_name = :MyContextWithRoleAndArgs, :my_role
     ctx, source = Context::define name do
       role role_name do
-        role_go_do do |x,y|
+        role_go_do do |x, y|
 
         end
         role_go do |x|
@@ -55,7 +56,7 @@ class BasicTests < Test::Unit::TestCase
         end
       end
     end
-    assert_not_nil(ctx)
+    refute_nil(ctx)
     assert_equal(ctx.name, "Kernel::#{name}")
     assert_source_equal("class #{name}\r\n\n@#{role_name}\n\n  private\ndef #{role_name};@#{role_name} end\n\n  \ndef self_#{role_name}_role_go_do(x,y) \n end\n\ndef self_#{role_name}_role_go(x) \n end\n\n\r\nend", source)
   end
@@ -78,7 +79,7 @@ class BasicTests < Test::Unit::TestCase
       end
     end
     arr = MyContextUsingBind.new.go_do
-    assert_not_nil(ctx)
+    refute_nil(ctx)
     assert_equal(ctx.name, "Kernel::#{name}")
     expected = "class MyContextUsingBind\r\n  \ndef go_do \na = Array.new\n  [1, 2].each do |e|\n    temp____other_role = @other_role\n    @other_role = e\n    (a << self_other_role_plus_one)\n    @other_role = temp____other_role\n  end\n  a\n end\n\n@other_role\n\n  private\ndef other_role;@other_role end\n\n  \ndef self_other_role_plus_one \n(other_role + 1)  end\n\n\r\nend"
     assert_source_equal(expected, source)
@@ -140,7 +141,7 @@ class Greet_Someone2
   end
 end
 
-class TestExamples < Test::Unit::TestCase
+class TestExamples < MiniTest::Unit::TestCase
   def test_greeter
     p1 = Person.new
     p1.name = 'Bob'
@@ -164,7 +165,7 @@ class TestExamples < Test::Unit::TestCase
 end
 
 
-class TestExamples < Test::Unit::TestCase
+class TestExamples < MiniTest::Unit::TestCase
   def test_greeter
     p1 = Person.new
     p1.name = 'Bob'
@@ -174,6 +175,9 @@ class TestExamples < Test::Unit::TestCase
     p2.name = 'World!'
     p2.greeting = 'Greetings'
 
+    puts "with_contracts: #{Context::with_contracts}"
+    Greet_Someone.assert_that(p1).can_play(:greeter)
+    Greet_Someone.refute_that(self).can_play(:greeter)
     message = ' Nice weather, don\'t you think?'
     res1 = Greet_Someone2.call p1, p2, message
     res2 = Greet_Someone2.new(p2, p1).greet message
@@ -186,11 +190,11 @@ class TestExamples < Test::Unit::TestCase
   end
 end
 
-class TestExamples < Test::Unit::TestCase
+class TestExamples < MiniTest::Unit::TestCase
   def test_meter_example
-    meter = Meter.new Time::now, Position.new(1,2,0)
-    result = meter.call Position.new(2,4,1)
-    assert_equal(3,result.to_i)
+    meter = Meter.new Time::now, Position.new(1, 2, 0)
+    result = meter.call Position.new(2, 4, 1)
+    assert_equal(3, result.to_i)
   end
 end
 

data/Test/ImmutableQueue_test.rb

@@ -0,0 +1,18 @@
+require 'test/unit'
+require_relative '../generated/ImmutableQueue'
+
+
+
+class ImmutableQueueTest < Test::Unit::TestCase
+
+  def test_sunny
+    queue = ImmutableQueue::empty.push 1
+    queue = queue.push(2)
+    f,queue = queue.pop()
+    refute_nil(queue)
+    s,queue = queue.pop()
+    assert_equal(1,f)
+    assert_equal(2,s)
+    assert_equal(ImmutableQueue::empty, queue)
+  end
+end

data/Test/MethodInfo_test.rb

@@ -0,0 +1,65 @@
+require 'test/unit'
+require_relative '../generated/MethodInfo'
+require 'ripper'
+require_relative 'test_helper'
+
+class MethodInfoTest < Test::Unit::TestCase
+  include SourceAssertions
+  def test_simple
+    block = get_sexp do |a,b|
+      p 'this is a test'
+    end
+    source = MethodInfo.new(false,block,true).build_as_context_method("name",InterpretationContext.new({},{},{},nil))
+    expected = %{def name(a,b)
+       p("this is a test")
+    end
+}
+    assert_source_equal(expected,source)
+  end
+  def test_class_method
+    block = get_sexp do |a,b|
+      p 'this is a test'
+    end
+    source = MethodInfo.new(self,block,true).build_as_context_method("name",InterpretationContext.new({},{},{},nil))
+    expected = %{def self.name(a,b)
+       p("this is a test")
+    end
+}
+    assert_source_equal(expected,source)
+  end
+
+  def test_splat_argument
+    block = get_sexp do |a,*b|
+      p 'this is a test'
+    end
+    source = MethodInfo.new(nil,block,true).build_as_context_method("name",InterpretationContext.new({},{},{},nil))
+    expected = %{def name(a,*b)
+       p("this is a test")
+    end
+}
+    assert_source_equal(expected,source)
+  end
+
+  def test_block_argument
+    block = get_sexp do |a,b|
+      p 'this is a test'
+    end
+    source = MethodInfo.new({:block=>:block},block,true)
+    source = source.build_as_context_method("name",InterpretationContext.new({},{},{},nil))
+    expected = %{def name(a,b,&block)
+       p("this is a test")
+    end
+}
+    assert_source_equal(expected,source)
+  end
+  def test_block_argument_class_method
+    block = (get_sexp { |a,*b|
+      p 'is a test'    })
+    source = MethodInfo.new({:block=>:block,:self=>self},block,true).build_as_context_method("name",InterpretationContext.new({},{},{},nil))
+    expected = %{def self.name(a,*b,&block)
+       p("this is a test")
+    end
+}
+    assert_source_equal(expected,source)
+  end
+end