maroon 0.5.2 → 0.5.3

data/Examples/Dijkstra/calculate_shortest_path.rb

@@ -1,4 +1,6 @@
 # -*- encoding: utf-8 -*-
+require 'live_ast'
+require 'live_ast/to_ruby'
 #
 # Consider street corners on a Manhattan grid. We want to find the
 # minimal path from the most northeast city to the most
@@ -39,7 +41,7 @@
 #
 # Map is a DCI role. The role in this example is played by an
 # object representing a particular Manhattan geometry
-Context::define :CalculateShortestPath do
+ ctx,source = Context::define :CalculateShortestPath do
   role :distance_labeled_graph_node do
     # Access to roles and other Context data
     tentative_distance_values do
@@ -350,3 +352,5 @@ class CalculateShortestPath
   end
 end
 
+ File.open('CalculateShortestPath_generated.rb', 'w') {|f| f.write(source) }
+

data/Examples/greeter.rb

@@ -1,7 +1,7 @@
 #Thanks to Ted Milken for updating the original example
 
 require '../lib/maroon.rb'
-require '../lib/Moby/kernel.rb'
+require '../lib/maroon/kernel.rb'
 
 class Person
   attr_accessor :name

data/Test/Greeter_test.rb

@@ -0,0 +1,108 @@
+require "test/unit"
+require '../lib/maroon.rb'
+require '../lib/maroon/kernel.rb'
+
+##
+# General comment
+# it's hopeless to test for the actual source. It should be the syntax tree rather than the source
+# it's the semantics that are important not the formatted source!!
+##
+
+context :Greet_Someone, :greet do
+  role :greeter do
+    welcome do
+      self.greeting
+    end
+  end
+
+  role :greeted do
+  end
+
+  greet do
+    "#{greeter.name}: \"#{greeter.welcome}, #{greeted.name}!\""
+  end
+end
+
+class Person
+  attr_accessor :name
+  attr_accessor :greeting
+end
+
+
+class Greet_Someone
+  def initialize(greeter, greeted)
+    @greeter = greeter
+    @greeted = greeted
+  end
+end
+
+class BasicTests < Test::Unit::TestCase
+
+  def test_define_context
+    name = :MyContext
+    ctx,source = Context::define name do end
+    assert_equal(ctx.name, "Kernel::#{name}")
+    assert_equal(source,"class #{name}\r\n\n\n  private\n\n\n\r\nend")
+  end
+
+  def test_define_role
+    name,role_name = :MyContextWithRole,:my_role
+    ctx,source = Context::define name do
+      role role_name do
+        role_go_do do
+
+        end
+      end
+    end
+    assert_not_nil(ctx)
+    assert_equal(ctx.name, "Kernel::#{name}")
+    assert_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
+
+  def test_bind
+    name,role_name,other_name = :MyContextUsingBind,:my_role, :other_role
+    ctx,source = Context::define name do
+      role other_name do
+          plus_one do
+             (self + 1)
+          end
+      end
+      go_do do
+             a = Array.new
+             [1,2].each do |e|
+                  bind e => :other_role
+                  a << e.plus_one
+             end
+          a
+       end
+    end
+    arr = MyContextUsingBind.new.go_do
+    assert_not_nil(ctx)
+    assert_equal(ctx.name, "Kernel::#{name}")
+    assert_equal("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",source)
+    assert_equal(2,arr[0])
+    assert_equal(3,arr[1])
+  end
+end
+
+class TestExamples < Test::Unit::TestCase
+   def test_greeter
+     p1 = Person.new
+     p1.name = 'Bob'
+     p1.greeting = 'Hello'
+
+     p2 = Person.new
+     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
+     res1 = Greet_Someone.execute p1, p2
+     res2 = Greet_Someone.new(p2, p1).greet
+     assert_equal(res1,"#{p1.name}: \"#{p1.greeting}, #{p2.name}!\"")
+     assert_equal(res1,Greet_Someone.new(p1, p2).greet) #verifies default action
+     #constructs a Greet_Someone context object and executes greet.
+     assert_equal(res2,"#{p2.name}: \"#{p2.greeting}, #{p1.name}!\"")
+   end
+end
+

data/lib/maroon.rb

@@ -151,7 +151,8 @@ class Context
     code << "#{interactions}\n#{fields}\n  private\n#{getters}\n#{impl}\n"
 
     complete = "class #{name}\r\n#{code}\r\nend"
-    return c.class_eval(code),complete
+    temp = c.class_eval(code)
+    return (temp ||c),complete
   end
 
   def role_or_interaction_method(method_name,*args, &b)
@@ -243,9 +244,10 @@ class Context
   def rewrite_bind(aliased_role, local, block)
     raise 'aliased_role must be a Symbol' unless aliased_role.instance_of? Symbol
     raise 'local must be a Symbol' unless local.instance_of? Symbol
+    aliased_field = "@#{aliased_role}".to_sym
     assignment = Sexp.new
     assignment[0] = :iasgn
-    assignment[1] = aliased_role
+    assignment[1] = aliased_field
     load_arg = Sexp.new
     load_arg[0] = :lvar
     load_arg[1] = local
@@ -259,14 +261,14 @@ class Context
     assignment[1] = temp_symbol
     load_field = Sexp.new
     load_field[0] = :ivar
-    load_field[1] = aliased_role
+    load_field[1] = aliased_field
     assignment[2] = load_field
     block.insert 1, assignment
 
     # reassign original player
     assignment = Sexp.new
     assignment[0] = :iasgn
-    assignment[1] = aliased_role
+    assignment[1] = aliased_field
     load_temp = Sexp.new
     load_temp[0] = :lvar
     load_temp[1] = temp_symbol

data/lib/maroon/version.rb

@@ -1,3 +1,3 @@
 module Maroon
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/maroon.gemspec

@@ -13,7 +13,7 @@ the first language to support injectionless DCI.
 
 The performance of code written using maroon is on par with code using regular method invocation.
 
-For examples on how to use maroon look at the examples}
+For examples on how to use maroon look at the examples found at the home page}
   gem.summary       = %q{maroon}
   gem.homepage      = 'https://github.com/runefs/maroon'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maroon
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -109,7 +109,7 @@ description: ! 'maroon makes DCI a DSL for Ruby it''s mainly based on the work g
   invocation.
 
 
-  For examples on how to use maroon look at the examples'
+  For examples on how to use maroon look at the examples found at the home page'
 email:
 - funchsoltoft@gmail.com
 executables: []
@@ -127,6 +127,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Test/Greeter_test.rb
 - lib/maroon.rb
 - lib/maroon/kernel.rb
 - lib/maroon/version.rb