rachinations 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cdd3c499e1f1791ce742a6a2cc6485fce449c53
-  data.tar.gz: b39dd99ffa4514366b7047be022fb69323a953d8
+  metadata.gz: f121ae6b88636bb8f2d61ce349052e5eaaab765a
+  data.tar.gz: 80b8154cb68f75059ed98c866043b052c1271ac0
 SHA512:
-  metadata.gz: ac6c02f660108180d6f7d48e048c7ec30ce90a5a1f3f476d19f21e0b0e390073433766bcf868f0a856f3018c2ee33f892e0bdccbed1fff5e1a656f26bfb26be2
-  data.tar.gz: 196440e524df7fa67b43fa13aac1726378a83d578c221769d0ad95ab4f73ecc60ea0c2ee9b74e51b60e3bc2ca50e3ed3c800b85b7e73071f7645ebda8fa8d2f0
+  metadata.gz: 555791bf758a0458b7cfc3b1c71287c33b54ce296d957878f4c4d236fb0186a8b1aaf036529119b5a85bd40eeeeacf152e7bf2df87590040f75a89330c52e067
+  data.tar.gz: 1443bdad6609c32eb441b22e686c46b04c531808f190301ed0de56d309730ff2b94cd7b47dc4244e252594188fe9b2939caad027c72168a3f9512cd0a9a2fd9b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rachinations (0.0.5)
+    rachinations (0.0.6)
       activesupport (= 3.0.0)
       i18n (= 0.6.11)
       weighted_distribution (= 1.0.0)

data/lib/rachinations.rb

@@ -4,6 +4,8 @@ require 'rachinations/version'
 
 require 'rachinations/domain/modules/common/refiners/proc_convenience_methods'
 require 'rachinations/domain/modules/common/refiners/number_modifiers'
+require 'rachinations/domain/modules/common/schedulable_tasks'
+
 
 require 'rachinations/extras/fifo'
 

data/lib/rachinations/domain/diagrams/diagram.rb

@@ -1,10 +1,12 @@
 require_relative '../../domain/modules/common/invariant'
+require_relative '../../domain/modules/common/schedulable_tasks'
 require_relative '../edge_collection'
 require_relative '../node_collection'
 
 class Diagram
 
   include Invariant
+  include SchedulableTasks
 
   attr_accessor :name, :max_iterations, :nodes, :edges
 
@@ -56,14 +58,15 @@ class Diagram
     node.attach_condition &condition
 
     if !triggered_by.nil?
+
       # ask the current class (diagram) to evaluate what node it is
-      triggerer = self.send(triggered_by.to_sym)
+      triggerer = get_node(triggered_by)
       triggerer.attach_trigger(node)
     end
 
     if !triggers.nil?
-      # ask the current class (diagram) to evaluate what node it is
-      triggeree = self.send(triggers.to_sym)
+      # ask the diagram to evaluate what node it is
+      triggeree = get_node(triggers)
       node.attach_trigger(triggeree)
     end
 
@@ -77,17 +80,16 @@ class Diagram
 
     params.store(:diagram, self)
 
-    #we need to send the actual nodes, not their names
-    from = get_node(params.delete(:from))
-    to = get_node(params.delete(:to))
-
-    params.store(:from, from)
-    params.store(:to, to)
+    # replace node names in params with the actual nodes
+    node_from = get_node(params.delete(:from))
+    params.store(:from, node_from)
+    node_to = get_node(params.delete(:to))
+    params.store(:to, node_to)
 
     edge = edge_klass.new(params)
 
-    from.attach_edge!(edge)
-    to.attach_edge!(edge)
+    node_from.attach_edge!(edge)
+    node_to.attach_edge!(edge)
 
     edges.push(edge)
 

data/lib/rachinations/domain/diagrams/verbose_diagram.rb

@@ -4,6 +4,6 @@ class VerboseDiagram < Diagram
 
   #useful to see round-to-round changes, to help debugging for instance.
 
-  include Verbose
+  include ::Verbose
 
 end

data/lib/rachinations/domain/edges/edge.rb

@@ -5,11 +5,12 @@ require_relative '../../../../lib/rachinations/domain/modules/common/refiners/nu
 
 class Edge
   include HashInit
-  using NumberModifiers
 
+  using NumberModifiers
 
   attr_reader :from, :to, :name, :types
 
+  attr_writer :from, :to
 
   def label
     if @label.is_a?(Proc)
@@ -27,14 +28,14 @@ class Edge
 
     @name = params.fetch(:name, 'anonymous')
 
-    @from = params.fetch(:from)
-
-    @to = params.fetch(:to)
-
     @label = params.fetch(:label)
 
     @types = params.fetch(:types)
 
+    @from = params.fetch(:from) if params.has_key?(:from)
+
+    @to = params.fetch(:to) if params.has_key?(:to)
+
   end
 
   # Simulates a ping!, but no resources get actually
@@ -46,7 +47,7 @@ class Edge
   #
   # @return [Boolean] true in case a ping! on this Edge
   #  would return true. False otherwise.
-  def test_ping?(require_all:false)
+  def test_ping?(require_all: false)
     return false if from.disabled? || to.disabled?
 
     condition = strategy.condition
@@ -123,10 +124,13 @@ class Edge
   # end of this Edge.
   #
   # @raise [RuntimeError] in case the receiving node or this Edge
-  #  won't accept the resource sent.
+  #   won't accept the resource sent.
+  # @raise [RuntimeError] if this edge hasn't defined :from and :to
+  #   instance variables
   # @param res [Token] the resource to send.
   def push!(res)
-    raise RuntimeError, "This Edge does not support type: #{res.type}" unless supports?(res.type)
+    raise RuntimeError, "Edge does not support type: #{res.type}" unless supports?(res.type)
+    raise RuntimeError, "Please define instance variables :from and :to" unless instance_variable_defined?(:@from) && instance_variable_defined?(:@to)
 
     begin
       to.put_resource!(res, self)
@@ -136,16 +140,20 @@ class Edge
   end
 
   # Tries to take a resource matching given block
-  # from the node at the other end.
+  #   from the node at the other end.
   #
   # @param [Proc] blk  block that will define what resource the other node
-  #  should send.
+  #   should send.
   # @raise [RuntimeError] in case the other node could provide no resources
-  #  that satisfy this condition block.
+  #   that satisfy this condition block.
+  # @raise [RuntimeError] if this edge hasn't defined :from and :to
+  #   instance variables
   # @return [Token,nil] a Resource that satisfies the given block or nil,
-  #  if the pull was not performed for some reason (e.g. it's probabilistic)
+  #   if the pull was not performed for some reason (e.g. it's probabilistic)
   def pull!(blk)
 
+    raise RuntimeError, "Please define instance variables :from and :to" unless instance_variable_defined?(:@from) && instance_variable_defined?(:@to)
+
     begin
       res=from.take_resource!(blk)
     rescue => e
@@ -175,7 +183,7 @@ class Edge
   end
 
   def options
-    [:name,:label,:types,:from,:to,:diagram]
+    [:name, :label, :types, :diagram, :from, :to]
   end
 
 end

data/lib/rachinations/domain/modules/common/schedulable_tasks.rb

@@ -0,0 +1,27 @@
+
+module SchedulableTasks
+  def schedule_task(method, *params)
+    task = Hash.new
+    task[:method] = method
+    task[:params] = params
+
+    @scheduled_tasks ||= Array.new
+    @scheduled_tasks << task
+  end
+
+  def scheduled_tasks
+    @scheduled_tasks ||= Array.new
+  end
+  
+  def run_scheduled_tasks
+    scheduled_tasks.each do |task|
+
+      method = task[:method]
+      params = task[:params]
+
+
+      method.call(*params)
+    end
+  end
+
+end

data/lib/rachinations/dsl/bootstrap.rb

@@ -18,24 +18,95 @@ module DSL
         raise BadDSL, "Unknown diagram mode: #{mode.to_s}"
       end
 
-      # methods in the block get run as if they were called on
-      # the diagram (augmented by the DiagramShorthandMethods module) itself
-      dia.instance_eval(&blk)
+      # This is a modified version of Diagram#add_edge!. It defers some method
+      #   calls that involve other nodes until after the end of the block that
+      #   builds the diagram. this is done because, when these options are set,
+      #   the nodes may not have been created yet.
+      # @param [Class] the edge class. probably Edge
+      # @param [Hash] params params to be passed to the constructor of given class
+      def dia.add_edge!(edge_klass, params)
 
-      dia
+        params.store(:diagram, self)
 
-    end
+        from_node_name = params.fetch(:from)
+        to_node_name = params.fetch(:to)
 
-    def non_deterministic_diagram(name, verbose=:silent, &blk)
+        edge = edge_klass.new(params)
 
-      dia=NonDeterministicDiagram.new(Parser.validate_name!(name))
+        # this method may contain nodes that may not yet exist
+        edge_attach_from = lambda do |edge, node_name, diagram|
+          # ask the diagram to evaluate what node it is
+          node = diagram.get_node(node_name)
+          node.attach_edge!(edge)
+          edge.from = node
+        end
+
+        # this method may contain nodes that may not yet exist
+        edge_attach_to = lambda do |edge, node_name, diagram|
+          # ask the diagram to evaluate what node it is
+          node = diagram.get_node(node_name)
+          node.attach_edge!(edge)
+          edge.to = node
+        end
+
+        # so they need to be scheduled and run later
+        schedule_task(edge_attach_from, edge, from_node_name, self)
+        schedule_task(edge_attach_to, edge, to_node_name, self)
+
+        edges.push(edge)
+
+        self
+
+      end
+
+      def dia.add_node!(node_klass, params)
+
+        params.store(:diagram, self)
+
+        # if there's a condition, return it, otherwise return default condition
+        condition = params.delete(:condition) { lambda { true } }
+
+        # similarly, if nodes are supposed to be triggered by another node
+        triggered_by = params.delete(:triggered_by) { nil }
+
+        # akin to :triggered_by, but it's defined in the triggerER
+        # rather than in the trigerrEE
+        triggers = params.delete(:triggers) { nil }
+
+        node = node_klass.new(params)
+
+        node.attach_condition &condition
+
+        if !triggered_by.nil?
+
+          attach_trigger_task = lambda do |triggeree, triggerer_name, diagram|
+            # ask the diagram to evaluate what node it is
+            triggerer = diagram.get_node(triggerer_name)
+            triggerer.attach_trigger(triggeree)
+          end
+          schedule_task(attach_trigger_task, node, triggered_by, self)
+
+        end
+
+        if !triggers.nil?
+
+          attach_trigger_task = lambda do |triggerer, triggeree_name, diagram|
+            # ask the diagram to evaluate what node it is
+            triggeree = diagram.send(triggeree_name.to_sym)
+            triggerer.attach_trigger(triggeree)
+          end
+          schedule_task(attach_trigger_task, node, triggers, self)
+
+        end
+
+        nodes.push(node)
+
+        self
 
-      # cant verbose be a simple boolean instead?
-      if verbose === :verbose
-        dia.extend(Verbose)
       end
 
-      dia.instance_eval &blk
+      dia.instance_eval(&blk)
+      dia.run_scheduled_tasks
 
       dia
 

data/lib/rachinations/dsl/diagram_shorthand_methods.rb

@@ -76,7 +76,6 @@ module DSL
 
       end
 
-
       # so that I can easily access elements which have been given a name
       # (mostly nodes and maybe edges too)
       def method_missing(method_sym, *args, &block)

data/lib/rachinations/version.rb

@@ -1,3 +1,3 @@
 module Rachinations
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/testing/spec/release1/dsl_spec.rb

@@ -219,20 +219,52 @@ describe Diagram do
     end
 
 
-    # it "forward-referencing of non existing nodes" do
-    #
-    #   expect do
-    #
-    #     d = diagram do
-    #       pool 'p2', initial_value: 7 # this will be triggered 10 times
-    #       edge from: 'p2', to: 'p3'
-    #       pool 'p3'
-    #     end
-    #
-    #   end.not_to raise_error
-    #
-    # end
+    it "accepts declaring forward-referencing of non existing nodes" do
 
+      expect do
+        # triggered_by forward referencing a node
+        diagram do
+          pool 'p2', 7, triggered_by: 'p3'
+          pool 'p3'
+        end
+      end.not_to raise_error
+
+      expect do
+        # edge forward referencing its connected nodes
+        d = diagram do
+          pool 'p2', initial_value: 7 # this will be triggered 10 times
+          edge from: 'p2', to: 'p3'
+          pool 'p3'
+        end
+
+      end.not_to raise_error
+
+    end
+
+    it 'runs diagrams using forward-referencing' do
+
+      d = diagram do
+        pool 'p2',:automatic, :push_any, initial_value: 7 # this will be triggered 10 times
+        edge from: 'p2', to: 'p3'
+        pool 'p3'
+      end
+
+      d.run 10
+
+      expect(d.p3.resource_count).to eq 7
+
+      d2 = diagram do
+        pool :automatic, triggers: 'p2'
+        pool 'p2', :push_any, initial_value: 10
+        pool 'p3'
+        edge from: 'p2', to: 'p3'
+      end
+
+      d2.run 10
+      expect(d2.p3.resource_count).to eq 10
+      expect(d2.p2.resource_count).to eq 0
+
+    end
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rachinations
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Felipe Almeida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,6 +170,7 @@ files:
 - lib/rachinations/domain/modules/common/invariant.rb
 - lib/rachinations/domain/modules/common/refiners/number_modifiers.rb
 - lib/rachinations/domain/modules/common/refiners/proc_convenience_methods.rb
+- lib/rachinations/domain/modules/common/schedulable_tasks.rb
 - lib/rachinations/domain/modules/diagrams/verbose.rb
 - lib/rachinations/domain/node_collection.rb
 - lib/rachinations/domain/nodes/converter.rb