rachinations 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 760155c227543c780d0ce31b94b0f3f7ac2f287d
-  data.tar.gz: ef961b92ed034f84795ab44a32eebbbaadd3ccda
+  metadata.gz: 49ee8fa5ba3a2fd67f645d651f16675e2a93d723
+  data.tar.gz: be88690c64ece75e4d1af590dec1a06837bd914c
 SHA512:
-  metadata.gz: 870ef895b064df8bb9c42304f076f8385405cc63bab61bd7c4c634cfb2baecf0c11e55541c2cb8c3f9a463b876fd210000e0957e206a125eee35870c9708eb35
-  data.tar.gz: 362d1cb7f3a10c540c6188d425f289bb74db600f6da9f2af5c145c6c486311bbbfb51217d544cc312e14ddac5106225c2d80461d15016729ec00a4b7ddbaf23f
+  metadata.gz: 0159177f5cd1b84731efa5057767eb6317aabd9dd6f082d61d2dfc1d0a62989e3c8900e0595adf84d2d5c7e7371ee6e7e3c5e53d73e1aaa369776c542245b342
+  data.tar.gz: 243693a7ceff066b8649510c3cc7655ab49a1ac633a82633472726a7e050c7ec5bdba5a0eab08610052ef05ade0516d1a07987f7224ef465e8ea108f5ec82611

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rachinations (0.0.1)
+    rachinations (0.0.3)
       activesupport (= 3.0.0)
       i18n (= 0.6.11)
 
@@ -17,20 +17,10 @@ GEM
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    cucumber (1.3.16)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
     ffi (1.9.3-x64-mingw32)
     ffi (1.9.3-x86-mingw32)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    gherkin (2.12.2-x86-mingw32)
-      multi_json (~> 1.3)
     i18n (0.6.11)
     mime-types (2.3)
     minitest (5.4.0)
@@ -40,7 +30,6 @@ GEM
       minitest (>= 5.0)
       ruby-progressbar
     multi_json (1.10.1)
-    multi_test (0.1.1)
     netrc (0.7.7)
     rake (10.3.2)
     rest-client (1.7.2)
@@ -84,10 +73,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.5)
-  coveralls
-  cucumber
-  minitest
-  minitest-reporters
+  coveralls (= 0.7.0)
+  minitest (~> 5.4)
+  minitest-reporters (~> 1.0)
   rachinations!
-  rake
+  rake (~> 10.3)
   rspec (~> 3.0)

data/README.md

@@ -7,7 +7,9 @@ rachinations
 
 ### Introduction
 
-This is a port of Dr. J. Dormans' Machinations framework into Ruby.
+This is a port of Dr. J. Dormans' [Machinations framework](http://www.jorisdormans.nl/machinations/) into Ruby.
+
+It provides a Ruby-based DSL to enable game designers to create and also test tentative game designs and/or prototypes.
 
 ### Contents
 
@@ -15,5 +17,26 @@ This is a port of Dr. J. Dormans' Machinations framework into Ruby.
 - Tests
 - A simple DSL (Domain-specific language) whose objective is to enable anyone to write Machinations diagrams, run them, obtain metrics, compose subdiagrams and so on.
 
-### Usage
-- TODO
+### DSL Usage
+- Simplest possible usage:
+  - Install the `rachinations` [gem](http://rubygems.org/gems/rachinations)
+  
+    ```
+    $ gem install rachinations
+    ```
+  - Require it into your code and start designing diagrams:
+  
+    ```ruby
+    require 'rachinations'
+
+    n=diagram 'my diagram' do
+      node 's1',Source
+      node 'p1', Pool
+      edge 'e1', Edge, 's1','p1'
+    end
+  
+    n.run!(5)
+    
+    p n.get_node("p1").resource_count
+    #prints 5
+    ```

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

@@ -102,6 +102,17 @@ class Diagram
 
   end
 
+
+  def resource_count(klass=nil)
+    total=0
+    @nodes.each do |n|
+      total+=n.resource_count(klass)
+    end
+    total
+  end
+
+  private
+
   def to_s
     nodes.reduce('') { |carry, n| carry+n.to_s }
   end
@@ -136,15 +147,6 @@ class Diagram
     nodes.shuffle.each { |n| n.commit! }
   end
 
-
-  def resource_count(klass=nil)
-    total=0
-    @nodes.each do |n|
-      total+=n.resource_count(klass)
-    end
-    total
-  end
-
   def enabled_nodes
     nodes.select{|n| n.enabled? }
   end

data/lib/rachinations/domain/modules/common/refiners/proc_convenience_methods.rb

@@ -0,0 +1,18 @@
+module ProcConvenienceMethods
+
+  # A few extra methods
+  # to make code read more intuitively.
+  refine Proc do
+
+    alias_method :accepts?, :call
+    alias_method :accept?, :call
+
+    alias_method :match?, :call
+    alias_method :matches?, :call
+
+    alias_method :match_resource?, :call
+    alias_method :matches_resource?, :call
+
+  end
+
+end

data/lib/rachinations/domain/nodes/converter.rb

@@ -1,5 +1,8 @@
 require_relative '../../domain/nodes/node'
 require_relative '../../domain/nodes/resourceless_node'
+require_relative '../../domain/modules/common/refiners/proc_convenience_methods'
+
+using ProcConvenienceMethods
 
 class Converter < ResourcefulNode
 
@@ -52,7 +55,7 @@ class Converter < ResourcefulNode
       if in_conditions_met?
         if outgoing_edges.all? { |edge| edge.test_push?(true) }
           push_all!
-          pop_stored_resources!
+          clear_stored_resources!
         end # converters are always push_all
       end # conditions weren't met this turn
 
@@ -127,8 +130,11 @@ class Converter < ResourcefulNode
 
   # This removes from the internal store just enough
   # resources to accomplish one push_all (only applicable when in pull_any mode)
-  def pop_stored_resources!
-    #TODO
+  def clear_stored_resources!
+    incoming_edges
+    .each do |edge|
+      edge.label.times{remove_from_contributed_resources!(edge)}
+    end
   end
 
 
@@ -257,6 +263,13 @@ class Converter < ResourcefulNode
     resources_contributed.fetch(edge).put!(resource)
   end
 
+  # Once a Converter has 'converted', we must alter its state so that
+  # contributions across turns don't cause more conversions than they
+  # should.
+  def remove_from_contributed_resources!(edge)
+    resources_contributed.fetch(edge).take!
+  end
+
   def init_resources
     edges.reduce(Hash.new) { |hash, edge| hash.store(edge.object_id, Fifo.new) }
   end

data/lib/rachinations/domain/nodes/pool.rb

@@ -3,8 +3,11 @@ require_relative '../../domain/nodes/node'
 require_relative '../../domain/resources/token'
 require_relative '../resource_bag'
 require_relative '../../domain/exceptions/no_elements_matching_condition_error'
+require_relative '../../domain/modules/common/refiners/proc_convenience_methods'
 
 
+using ProcConvenienceMethods
+
 class Pool < ResourcefulNode
 
   def initialize(hsh={})
@@ -132,7 +135,7 @@ class Pool < ResourcefulNode
   end
 
   def to_s
-    "Pool '#{@name}':  #{@resources.to_s}"
+    "Pool '#{@name}':  #{resources} "
   end
 
   # TODO this smells. where is this used? can i do without it?

data/lib/rachinations/domain/nodes/resourceful_node.rb

@@ -1,6 +1,10 @@
 require 'set'
 require_relative '../../domain/resources/token'
 require_relative '../../domain/nodes/node'
+require_relative '../../domain/modules/common/refiners/proc_convenience_methods'
+
+
+using ProcConvenienceMethods
 
 class ResourcefulNode < Node
 

data/lib/rachinations/domain/nodes/source.rb

@@ -28,7 +28,7 @@ class Source < ResourcefulNode
   end
 
   def to_s
-    "Source '#{@name}':  #{@resources.to_s}"
+    "Source '#{@name}':  \n"
   end
 
   def put_resource!;

data/lib/rachinations/domain/resource_bag.rb

@@ -19,27 +19,18 @@ class ResourceBag
     @store.push(obj)
   end
 
-  #retrieve
-  def get(klass)
-
-    if count(klass) === 0
-      raise NoElementsOfGivenTypeError, "No elements of class #{klass} found."
-    end
-
-    obj = store.select { |el| el.is_a?(klass) }.sample
-
-    remove_element!(obj)
-    obj
-
-  end
-
-  def count(klass)
-
-    inv { klass.is_a?(Class) }
-
-    store.select { |el| el.is_a?(klass) }.length
-
-  end
+  # Returns how many resources of given type there are
+  #  Note that this method includes locked resources in the count.
+  #
+  # @param [Class] resource type
+  # @return []Int] quantity of resources (including locked)
+  # def count(klass)
+  #
+  #   inv { klass.is_a?(Class) }
+  #
+  #   store.select { |el| el.is_a?(klass) }.length
+  #
+  # end
 
   def count_where(&blk)
 
@@ -73,20 +64,7 @@ class ResourceBag
 
   end
 
-  # created so that I don't have to call count everytime just to see whether there's at least one element matching said condition
-  def theres_at_least_one_where
-
-    raise ArgumentError, 'Please supply a block containing the condition.' unless block_given?
-
-    store.each do |e|
-      if e.unlocked? && (yield e)
-        return true
-      end
-    end
-
-    false
-
-  end
+  private
 
   def to_s
     out = ''
@@ -96,12 +74,15 @@ class ResourceBag
     classes.each do |klass|
 
       name = if klass.name.nil?
-               'Anonymous Klass'
+               'Anonymous Token'
              else
                klass.name
              end
 
-      out += "\n"+'    '+ name + ' -> '+ count(klass).to_s+"\n\n"
+      unlocked = count_where{|r| (r.is_type? klass) && (r.unlocked?) }
+      locked = count_where{|r| (r.is_type? klass) && (r.locked?) }
+
+      out += "\n #{name} -> #{unlocked} (#{locked}) \n\n"
     end
 
     if classes.empty?
@@ -113,8 +94,20 @@ class ResourceBag
 
   end
 
-  private
+  # created so that I don't have to call count everytime just to see whether there's at least one element matching said condition
+  def theres_at_least_one_where
 
+    raise ArgumentError, 'Please supply a block containing the condition.' unless block_given?
+
+    store.each do |e|
+      if e.unlocked? && (yield e)
+        return true
+      end
+    end
+
+    false
+
+  end
 
   def store
     @store

data/lib/rachinations/version.rb

@@ -1,3 +1,3 @@
 module Rachinations
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/rachinations.rb

@@ -3,21 +3,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rachinations/version'
 
 
-# A few extra methods
-# to make code read more intuitively.
-class Proc
-
-  alias_method :accepts?, :call
-  alias_method :accept?, :call
-
-  alias_method :match?, :call
-  alias_method :matches?, :call
-
-  alias_method :match_resource?, :call
-  alias_method :matches_resource?, :call
-
-end
 
+require 'rachinations/domain/modules/common/refiners/proc_convenience_methods'
 require 'rachinations/extras/fifo'
 
 require 'rachinations/domain/diagrams/diagram'

data/rachinations.gemspec

@@ -22,12 +22,11 @@ design and also test tentative game designs and/or prototypes}
   spec.required_ruby_version = '~> 2.1'
 
   spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "~> 10.3"
   spec.add_development_dependency "rspec","~> 3.0"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "minitest-reporters"
-  spec.add_development_dependency "cucumber"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "minitest", "~> 5.4"
+  spec.add_development_dependency "minitest-reporters", "~> 1.0"
+  spec.add_development_dependency "coveralls", "0.7.0"
 
   spec.add_dependency "activesupport","3.0.0"
   spec.add_dependency "i18n","0.6.11"

data/testing/spec/canon/conditions_spec.rb

@@ -0,0 +1,95 @@
+require_relative '../spec_helper'
+
+describe 'Nodes that can be given conditions' do
+
+  it 'does not run disabled nodes from the beginning' do
+
+    d=Diagram.new 'simple'
+
+    d.add_node! Source, {
+        :name => 'source'
+    }
+
+    d.add_node! Pool, {
+        :name => 'deposit',
+        :initial_value => 0
+    }
+
+
+    d.add_edge! Edge, {
+        :name => 'connector',
+        :from => 'source',
+        :to => 'deposit'
+    }
+
+    d.get_node('source').attach_condition(lambda { false })
+
+    d.run!(10)
+
+    expect(d.resource_count).to eq 0
+    expect(d.get_node('deposit').resource_count).to eq 0
+
+  end
+
+  it 'must not run disabled nodes at some point' do
+
+    #não entendi pra que serve esse teste
+
+    d=Diagram.new 'simple'
+
+    d.add_node! Source, {
+        :name => 'source'
+    }
+
+    d.add_node! Pool, {
+        :name => 'deposit',
+        :initial_value => 0
+    }
+
+
+    d.add_edge! Edge, {
+        :name => 'connector',
+        :from => 'source',
+        :to => 'deposit'
+    }
+
+    d.get_node('source').attach_condition(lambda { d.get_node('deposit').resource_count < 3 })
+
+    d.run!(10)
+
+    expect(d.resource_count).to eq 3
+    expect(d.get_node('deposit').resource_count).to eq 3
+
+  end
+
+  it 'runs when both ends (of an edge) are enabled' do
+
+    d= Diagram.new 'simple'
+
+    d.add_node! Source, {
+        :name => 'source'
+    }
+
+    d.add_node! Pool, {
+        :name => 'deposit',
+        :initial_value => 0
+    }
+
+
+    d.add_edge! Edge, {
+        :name => 'connector',
+        :from => 'source',
+        :to => 'deposit'
+    }
+
+    d.get_node('deposit').attach_condition(lambda { d.get_node('deposit').resource_count < 3 })
+
+    d.run!(10)
+
+    # expect(d.resource_count).to eq 3
+    expect(d.get_node('deposit').resource_count).to eq 3
+
+  end
+
+
+end

data/testing/spec/canon/converter_spec.rb

@@ -2,32 +2,167 @@ require_relative '../spec_helper'
 
 describe 'Converter canonical behavior' do
 
-  context "there's just one pool on each side" do
+  it 'pulls_any' do
 
-    before(:each) {
-      @d = Diagram.new 'foo'
-      @d.add_node! Pool, name: 'p9', initial_value: 9
-      @d.add_node! Pool, name: 'p0'
-      @d.add_node! Converter, name: 'c', mode: :pull_any
-      @d.add_edge! Edge, name:'e1', from: 'p9', to: 'c'
-      @d.add_edge! Edge, name:'e2',from: 'c', to: 'p0'
-    }
-    it 'is triggered by itself' do
-      c = @d.get_node 'c'
-      p0 = @d.get_node('p0')
-      p9 = @d.get_node('p9')
+    d = Diagram.new 'foo'
+    d.add_node! Pool, name: 'p9', initial_value: 9
+    d.add_node! Pool, name: 'p0'
+    d.add_node! Converter, name: 'c', mode: :pull_any, activation: :automatic
+    d.add_edge! Edge, name: 'e1', from: 'p9', to: 'c'
+    d.add_edge! Edge, name: 'e2', from: 'c', to: 'p0'
 
-      5.times{ c.trigger! }
+    c = d.get_node 'c'
+    p0 = d.get_node('p0')
+    p9 = d.get_node('p9')
 
-      # to unlock the resources
-      @d.get_node('p0').commit!
-      @d.get_node('p9').commit!
+    d.run!(5)
 
-      expect(@d.get_node('p0').resource_count).to eq 5
-      expect(@d.get_node('p9').resource_count).to eq 4
+    expect(p0.resource_count).to eq 5
+    expect(p9.resource_count).to eq 4
 
+  end
+
+
+  it 'pulls_any to two targets' do
+
+    d = Diagram.new 'foo'
+    d.add_node! Pool, name: 'p9', initial_value: 9
+    d.add_node! Pool, name: 'p1'
+    d.add_node! Pool, name: 'p2'
+    d.add_node! Converter, name: 'c', mode: :pull_any
+    d.add_edge! Edge, name: 'e1', from: 'p9', to: 'c'
+    d.add_edge! Edge, name: 'e2', from: 'c', to: 'p1'
+    d.add_edge! Edge, name: 'e3', from: 'c', to: 'p2'
+
+    c = d.get_node 'c'
+    p1 = d.get_node('p1')
+    p2 = d.get_node('p2')
+    p9 = d.get_node('p9')
+
+    5.times { c.trigger! }
+
+    # to unlock the resources
+    p1.commit!
+    p2.commit!
+    p9.commit!
+
+    expect(p1.resource_count).to eq 5
+    expect(p2.resource_count).to eq 5
+    expect(p9.resource_count).to eq 4
+
+  end
+
+  it 'pulls_any from two sources' do
+
+    d = Diagram.new 'foo'
+    d.add_node! Pool, name: 'p1', initial_value: 9
+    d.add_node! Pool, name: 'p2', initial_value: 3
+    d.add_node! Pool, name: 'p3'
+    d.add_node! Pool, name: 'p4'
+    d.add_node! Converter, name: 'c', mode: :pull_any
+    d.add_edge! Edge, name: 'e1', from: 'p1', to: 'c'
+    d.add_edge! Edge, name: 'e2', from: 'p2', to: 'c'
+    d.add_edge! Edge, name: 'e3', from: 'c', to: 'p3'
+    d.add_edge! Edge, name: 'e4', from: 'c', to: 'p4'
+
+    c = d.get_node 'c'
+    p1 = d.get_node('p1')
+    p2 = d.get_node('p2')
+    p3 = d.get_node('p3')
+    p4 = d.get_node('p4')
+
+    5.times { c.trigger! }
+
+    # to unlock the resources
+    p1.commit!
+    p2.commit!
+    p3.commit!
+    p4.commit!
+
+    expect(p1.resource_count).to eq 4
+    expect(p2.resource_count).to eq 0
+    expect(p3.resource_count).to eq 3
+    expect(p4.resource_count).to eq 3
+
+  end
+
+  it "pulls_all from a single source" do
+    d = Diagram.new 'foo'
+    d.add_node! Pool, name: 'p1', initial_value: 9
+    d.add_node! Pool, name: 'p2'
+    d.add_node! Converter, name: 'c', mode: :pull_all
+    d.add_edge! Edge, name: 'e1', from: 'p1', to: 'c'
+    d.add_edge! Edge, name: 'e2', from: 'c', to: 'p2'
+
+    c = d.get_node 'c'
+    p1 = d.get_node('p1')
+    p2 = d.get_node('p2')
+
+    5.times { c.trigger! }
 
-    end
+    # to unlock the resources
+    p1.commit!
+    p2.commit!
 
+    expect(p1.resource_count).to eq 4
+    expect(p2.resource_count).to eq 5
   end
+
+  it 'pulls_all from multiple sources' do
+
+    d = Diagram.new 'foo'
+    d.add_node! Pool, name: 'p1', initial_value: 9
+    d.add_node! Pool, name: 'p2', initial_value: 3
+    d.add_node! Pool, name: 'p3', initial_value: 5
+    d.add_node! Pool, name: 'p4'
+    d.add_node! Pool, name: 'p5'
+
+    d.add_node! Converter, name: 'c', mode: :pull_all, activation: :automatic
+    d.add_edge! Edge, name: 'e1', from: 'p1', to: 'c', label: 2
+    d.add_edge! Edge, name: 'e2', from: 'p2', to: 'c'
+    d.add_edge! Edge, name: 'e3', from: 'p3', to: 'c'
+    d.add_edge! Edge, name: 'e4', from: 'c', to: 'p4'
+    d.add_edge! Edge, name: 'e5', from: 'c', to: 'p5'
+
+    d.run! 5
+
+    expect(d.get_node('p1').resource_count).to eq 3
+    expect(d.get_node('p2').resource_count).to eq 0
+    expect(d.get_node('p3').resource_count).to eq 2
+    expect(d.get_node('p4').resource_count).to eq 3
+    expect(d.get_node('p5').resource_count).to eq 3
+  end
+
+  it 'pulls_any across turns (converter has memory)' do
+
+    # converter should keep pulling_any as long as it can
+    #  but only when the conditions are satisfied for _both_
+    #  incoming edges.
+
+    d = Diagram.new 'foo'
+
+    d.add_node! Pool, name: 'p1', initial_value:8
+    d.add_node! Source, name: 's' # default automatic
+    d.add_node! Pool, name: 'p2' # default zero resources
+
+    d.add_node! Converter, name: 'c', mode: :pull_any,activation: :automatic
+
+    d.add_node! Pool, name: 'p3'
+
+    d.add_edge! Edge, name: 'e1', from: 'p1', to:'c', label: 3
+    d.add_edge! Edge, name: 'e2', from: 'p2', to:'c', label: 2
+    d.add_edge! Edge, name: 'e3', from: 's', to:'p2'
+    d.add_edge! Edge, name: 'e4', from: 'c', to:'p3'
+
+    d.run! 10
+
+    expect(d.get_node('p3').resource_count).to eq 2
+
+    # they get consumed as it is pull any
+    expect(d.get_node('p1').resource_count).to eq 0
+
+
+
+  end
+
 end

data/testing/spec/canon/trigger_spec.rb

@@ -0,0 +1,128 @@
+require_relative '../spec_helper'
+
+describe 'triggers' do
+
+  it 'makes triggers trig!' do
+    d=Diagram.new 'simple'
+
+    d.add_node! Source, {
+        :name => 'source'
+    }
+
+    d.add_node! Pool, {
+        :name => 'deposit',
+        :initial_value => 0
+    }
+
+
+    d.add_edge! Edge, {
+        :name => 'connector',
+        :from => 'source',
+        :to => 'deposit'
+    }
+
+    d.get_node('deposit').attach_trigger([lambda { d.get_node('deposit').resource_count === 3 }, d.get_node('source')])
+
+    d.run!(10)
+
+    expect(d.resource_count).to eq 11
+    expect(d.get_node('deposit').resource_count).to eq 11
+
+  end
+
+  it 'makes triggers trig! more than once' do
+    d=Diagram.new 'simple'
+
+    d.add_node! Source, {
+        :name => 's1'
+    }
+
+    d.add_node! Pool, {
+        :name => 'd1',
+        :initial_value => 0
+    }
+
+
+    d.add_node! Source, {
+        :name => 's2',
+        :activation => :passive
+    }
+
+    d.add_edge! Edge, {
+        :name => 'c1',
+        :from => 's1',
+        :to => 'd1'
+    }
+
+    d.add_node! Pool, {
+        :name => 'd2',
+        :initial_value => 0
+    }
+
+
+    d.add_edge! Edge, {
+        :name => 'c2',
+        :from => 's2',
+        :to => 'd2'
+    }
+
+
+    d.get_node('d1').attach_trigger([lambda { d.get_node('d1').resource_count > 3 }, d.get_node('s1')])
+    d.get_node('d1').attach_trigger([lambda { d.get_node('d1').resource_count > 3 }, d.get_node('s2')])
+    #d.extend(Verbose)
+    d.run!(6)
+
+    expect(d.resource_count).to eq 10
+    expect(d.get_node('d1').resource_count).to eq 8
+    expect(d.get_node('d2').resource_count).to eq 2
+
+  end
+
+  it 'makes triggers trig! more than once with instant_resource_count' do
+    d=Diagram.new 'simple'
+
+    d.add_node! Source, {
+        :name => 's1'
+    }
+
+    d.add_node! Pool, {
+        :name => 'd1',
+        :initial_value => 0
+    }
+
+
+    d.add_node! Source, {
+        :name => 's2',
+        :activation => :passive
+    }
+
+    d.add_edge! Edge, {
+        :name => 'c1',
+        :from => 's1',
+        :to => 'd1'
+    }
+
+    d.add_node! Pool, {
+        :name => 'd2',
+        :initial_value => 0
+    }
+
+
+    d.add_edge! Edge, {
+        :name => 'c2',
+        :from => 's2',
+        :to => 'd2'
+    }
+
+
+    d.get_node('d1').attach_trigger([lambda { d.get_node('d1').instant_resource_count > 3 }, d.get_node('s1')])
+    d.get_node('d1').attach_trigger([lambda { d.get_node('d1').instant_resource_count > 3 }, d.get_node('s2')])
+    #d.extend(Verbose)
+    d.run!(6)
+
+    expect(d.resource_count).to eq 12
+    expect(d.get_node('d1').resource_count).to eq 9
+    expect(d.get_node('d2').resource_count).to eq 3
+
+  end
+end

data/testing/spec/diagram_spec.rb

@@ -355,218 +355,7 @@ describe Diagram do
 
   end
 
-  it 'does not run disabled nodes from the beginning' do
 
-    d=Diagram.new 'simple'
-
-    d.add_node! Source, {
-        :name => 'source'
-    }
-
-    d.add_node! Pool, {
-        :name => 'deposit',
-        :initial_value => 0
-    }
-
-
-    d.add_edge! Edge, {
-        :name => 'connector',
-        :from => 'source',
-        :to => 'deposit'
-    }
-
-    d.get_node('source').attach_condition(lambda { false })
-
-    d.run!(10)
-
-    expect(d.resource_count).to eq 0
-    expect(d.get_node('deposit').resource_count).to eq 0
-
-  end
-
-  it 'must not run disabled nodes at some point' do
-
-    #não entendi pra que serve esse teste
-
-    d=Diagram.new 'simple'
-
-    d.add_node! Source, {
-        :name => 'source'
-    }
-
-    d.add_node! Pool, {
-        :name => 'deposit',
-        :initial_value => 0
-    }
-
-
-    d.add_edge! Edge, {
-        :name => 'connector',
-        :from => 'source',
-        :to => 'deposit'
-    }
-
-    d.get_node('source').attach_condition(lambda { d.get_node('deposit').resource_count < 3 })
-
-    d.run!(10)
-
-    expect(d.resource_count).to eq 3
-    expect(d.get_node('deposit').resource_count).to eq 3
-
-  end
-
-  it 'runs when both ends (of an edge) are enabled' do
-
-    d=Diagram.new 'simple'
-
-    d.add_node! Source, {
-        :name => 'source'
-    }
-
-    d.add_node! Pool, {
-        :name => 'deposit',
-        :initial_value => 0
-    }
-
-
-    d.add_edge! Edge, {
-        :name => 'connector',
-        :from => 'source',
-        :to => 'deposit'
-    }
-
-    d.get_node('deposit').attach_condition(lambda { d.get_node('deposit').resource_count < 3 })
-
-    d.run!(10)
-
-    # expect(d.resource_count).to eq 3
-    expect(d.get_node('deposit').resource_count).to eq 3
-
-  end
-
-  it 'makes triggers trig!' do
-    d=Diagram.new 'simple'
-
-    d.add_node! Source, {
-        :name => 'source'
-    }
-
-    d.add_node! Pool, {
-        :name => 'deposit',
-        :initial_value => 0
-    }
-
-
-    d.add_edge! Edge, {
-        :name => 'connector',
-        :from => 'source',
-        :to => 'deposit'
-    }
-
-    d.get_node('deposit').attach_trigger([lambda { d.get_node('deposit').resource_count === 3 }, d.get_node('source')])
-
-    d.run!(10)
-
-    expect(d.resource_count).to eq 11
-    expect(d.get_node('deposit').resource_count).to eq 11
-
-  end
-
-  it 'makes triggers trig! more than once' do
-    d=Diagram.new 'simple'
-
-    d.add_node! Source, {
-        :name => 's1'
-    }
-
-    d.add_node! Pool, {
-        :name => 'd1',
-        :initial_value => 0
-    }
-
-
-    d.add_node! Source, {
-        :name => 's2',
-        :activation => :passive
-    }
-
-    d.add_edge! Edge, {
-        :name => 'c1',
-        :from => 's1',
-        :to => 'd1'
-    }
-
-    d.add_node! Pool, {
-        :name => 'd2',
-        :initial_value => 0
-    }
-
-
-    d.add_edge! Edge, {
-        :name => 'c2',
-        :from => 's2',
-        :to => 'd2'
-    }
-
-
-    d.get_node('d1').attach_trigger([lambda { d.get_node('d1').resource_count > 3 }, d.get_node('s1')])
-    d.get_node('d1').attach_trigger([lambda { d.get_node('d1').resource_count > 3 }, d.get_node('s2')])
-    #d.extend(Verbose)
-    d.run!(6)
-
-    expect(d.resource_count).to eq 10
-    expect(d.get_node('d1').resource_count).to eq 8
-    expect(d.get_node('d2').resource_count).to eq 2
-
-  end
-
-  it 'makes triggers trig! more than once with instant_resource_count' do
-    d=Diagram.new 'simple'
-
-    d.add_node! Source, {
-        :name => 's1'
-    }
-
-    d.add_node! Pool, {
-        :name => 'd1',
-        :initial_value => 0
-    }
-
-
-    d.add_node! Source, {
-        :name => 's2',
-        :activation => :passive
-    }
-
-    d.add_edge! Edge, {
-        :name => 'c1',
-        :from => 's1',
-        :to => 'd1'
-    }
-
-    d.add_node! Pool, {
-        :name => 'd2',
-        :initial_value => 0
-    }
-
-
-    d.add_edge! Edge, {
-        :name => 'c2',
-        :from => 's2',
-        :to => 'd2'
-    }
-
-
-    d.get_node('d1').attach_trigger([lambda { d.get_node('d1').instant_resource_count > 3 }, d.get_node('s1')])
-    d.get_node('d1').attach_trigger([lambda { d.get_node('d1').instant_resource_count > 3 }, d.get_node('s2')])
-    #d.extend(Verbose)
-    d.run!(6)
-
-    expect(d.resource_count).to eq 12
-    expect(d.get_node('d1').resource_count).to eq 9
-    expect(d.get_node('d2').resource_count).to eq 3
-
-  end
 
   context 'integration' do
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rachinations
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Felipe Almeida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -56,58 +56,44 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +154,7 @@ files:
 - lib/rachinations/domain/exceptions/unsupported_type_error.rb
 - lib/rachinations/domain/modules/common/hash_init.rb
 - lib/rachinations/domain/modules/common/invariant.rb
+- lib/rachinations/domain/modules/common/refiners/proc_convenience_methods.rb
 - lib/rachinations/domain/modules/diagrams/verbose.rb
 - lib/rachinations/domain/node_collection.rb
 - lib/rachinations/domain/nodes/converter.rb
@@ -221,9 +208,10 @@ files:
 - testing/simulations/sobonito.rb
 - testing/simulations/sobonitowhile.rb
 - testing/simulations/whatIwish1.rb
+- testing/spec/canon/conditions_spec.rb
 - testing/spec/canon/converter_spec.rb
 - testing/spec/canon/pool_spec.rb
-- testing/spec/conditions_spec.rb
+- testing/spec/canon/trigger_spec.rb
 - testing/spec/converter_spec.rb
 - testing/spec/diagram_spec.rb
 - testing/spec/edge_spec.rb
@@ -267,9 +255,10 @@ test_files:
 - testing/simulations/sobonito.rb
 - testing/simulations/sobonitowhile.rb
 - testing/simulations/whatIwish1.rb
+- testing/spec/canon/conditions_spec.rb
 - testing/spec/canon/converter_spec.rb
 - testing/spec/canon/pool_spec.rb
-- testing/spec/conditions_spec.rb
+- testing/spec/canon/trigger_spec.rb
 - testing/spec/converter_spec.rb
 - testing/spec/diagram_spec.rb
 - testing/spec/edge_spec.rb

data/testing/spec/conditions_spec.rb

@@ -1,10 +0,0 @@
-require_relative 'spec_helper'
-
-describe 'Nodes that can be given conditions' do
-
-  it 'does something' do
-
-    skip "will test conditions later"
-
-  end
-end