maroon 0.6.0 → 0.6.1

data/Examples/meter.rb

@@ -0,0 +1,119 @@
+require './lib/maroon'
+require './lib/maroon/kernel'
+
+context :Meter, :current_total do
+   role :price_per_sec
+
+   role :route do
+        price do
+          route.calculate_price clock.start
+        end
+   end
+
+  role :clock do
+    price do
+      self.duration * price_per_sec
+    end
+  end
+
+  current_total do |current_position|
+    route.update_position current_position
+    clock.price + route.price
+  end
+   print_route do
+     route.each_point {|x,y|
+       p "#{x},#{y}"
+     }
+   end
+end
+
+class Meter
+  def initialize(start,start_pos)
+    @clock = Clock.new start
+    @route = Route.new({0=>{1=>1.25}},Road_types.new)
+    route.update_position start_pos
+    @price_per_sec = 0.05
+  end
+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 :payable_position do
+    price_from do |prev|
+      return 0 unless prev
+      delta = Math.sqrt((prev.x-self.x)**2 + (prev.y-self.y)**2 + (prev.z-self.z)**2)
+      road_type = @road_types[self]
+      price = prices[road_type]
+      delta * price
+    end
+  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
+  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
+  end
+end
+
+class Route
+  def initialize(prices, road_types)
+    @positions = []
+    @prices = prices
+    @road_types = road_types
+  end
+end
+
+class Road_types
+  def initialize
+    @road_types = {}
+  end
+  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
+    t = t[pos.y]
+    return 1 unless t
+    t = t[pos.z]
+    return 1 unless t
+    t
+  end
+end
+
+class Position
+  attr_reader :x
+  attr_reader :y
+  attr_reader :z
+  def initialize(x,y,z)
+    @x = x
+    @y = y
+    @z = z
+  end
+end

data/Test/Greeter_test.rb

@@ -3,6 +3,7 @@ require './lib/maroon.rb'
 require './lib/maroon/kernel.rb'
 require 'ripper'
 require './Test/source_assertions.rb'
+require './Examples/meter.rb'
 
 
 class BasicTests < Test::Unit::TestCase
@@ -185,6 +186,14 @@ class TestExamples < Test::Unit::TestCase
   end
 end
 
+class TestExamples < Test::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)
+  end
+end
+
 
 
 

data/lib/maroon/version.rb

@@ -1,3 +1,3 @@
 module Maroon
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/lib/rewriter.rb

@@ -61,6 +61,7 @@ module Rewriter
 #Calls rewrite_block if needed and will return true if the AST was changed otherwise false
 ##
   def rewrite_bind?(block, expr)
+    changed = false
     #check if the first call is a bind call
     if expr && expr.length && (expr[0] == :call && expr[1] == nil && expr[2] == :bind)
       argument_list = expr[3]
@@ -84,20 +85,20 @@ module Rewriter
             raise "#{aliased_role} used in binding is an unknown role #{roles}" unless aliased_role.instance_of? Symbol and @roles.has_key? aliased_role
             add_alias local, aliased_role
             #replace bind call with assignment of iteration variable to role field
-            rewrite_bind(aliased_role, local, block)
-            return true
+            do_rewrite_bind(aliased_role, local, block)
+            changed = true
           end
         end
       end
     end
-    false
+    changed
   end
 
 ##
 #removes call to bind in a block
 #and replaces it with assignment to the proper role player local variables
 #in the end of the block the local variables have their original values reassigned
-  def rewrite_bind(aliased_role, local, block)
+  def do_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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maroon
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sourcify
@@ -73,6 +73,7 @@ files:
 - Examples/Dijkstra/dijkstra.rb
 - Examples/MoneyTransfer.rb
 - Examples/greeter.rb
+- Examples/meter.rb
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -105,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: maroon