rachinations 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deaf059839c7d0fda68abfaa14e5c9650fe64001
-  data.tar.gz: 205a6782f1e6475e54feac2a491ac644d7ab76db
+  metadata.gz: 7cdd3c499e1f1791ce742a6a2cc6485fce449c53
+  data.tar.gz: b39dd99ffa4514366b7047be022fb69323a953d8
 SHA512:
-  metadata.gz: 086cd0c6acc17d9300af3078b74aa88336b4a8f607f4e64b0e3cec4f80476d33ba783408023c48016f8831aaa3f6f9127bbe9924bdfe333bab54e0d946d4a4f0
-  data.tar.gz: eb03a7c088526619cdbc2841a06429b45bbf6e246f80b45cb9daed2a6c65e2217eb8ef2a9438de8cf6d43a177a3f5753dc6741de180fdd68a4bec7a0e50bcb18
+  metadata.gz: ac6c02f660108180d6f7d48e048c7ec30ce90a5a1f3f476d19f21e0b0e390073433766bcf868f0a856f3018c2ee33f892e0bdccbed1fff5e1a656f26bfb26be2
+  data.tar.gz: 196440e524df7fa67b43fa13aac1726378a83d578c221769d0ad95ab4f73ecc60ea0c2ee9b74e51b60e3bc2ca50e3ed3c800b85b7e73071f7645ebda8fa8d2f0

data/Gemfile.lock

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

data/README.md

@@ -15,28 +15,4 @@ It provides a Ruby-based DSL to enable game designers to create and also test te
 
 - Classes to model the domain
 - 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.
-
-### 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
-    ```
+- 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.

data/Rakefile

@@ -5,12 +5,12 @@ require 'bundler/gem_tasks'
 
 task :default => [:spec]
 
-Rake::TestTask.new do |t|
-  t.pattern = 'testing/**/*_test.rb'
-end
+#Rake::TestTask.new do |t|
+#  t.pattern = 'testing/**/*_test.rb'
+#end
 
 RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts= ['--default-path testing/spec','--color']
+  t.rspec_opts= ['--default-path testing/spec','--color','--pattern **/*_spec.rb']
 end
 
 

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

@@ -41,12 +41,16 @@ class Diagram
 
     params.store(:diagram, self)
 
-    #if there's a condition, return it, otherwise return default condition
+    # 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
+    # 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
@@ -57,6 +61,12 @@ class Diagram
       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)
+      node.attach_trigger(triggeree)
+    end
+
     nodes.push(node)
 
     self

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

@@ -8,9 +8,17 @@ class Edge
   using NumberModifiers
 
 
-  attr_reader :from, :to, :name, :label, :types
+  attr_reader :from, :to, :name, :types
 
 
+  def label
+    if @label.is_a?(Proc)
+      @label.call
+    else
+      @label
+    end
+  end
+
   def initialize(hsh)
 
     check_options!(hsh)

data/lib/rachinations/domain/exceptions/bad_config.rb

@@ -0,0 +1,4 @@
+# this exception should be used to signal that an inconsistent state
+# was found, but due to bad initialization, not bad changes in state
+class BadConfig < RuntimeError
+end

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

@@ -38,8 +38,7 @@ module HashInit
 
     end
 
-    #make sure all required ones are there
-
+    # make sure all required ones are there
     options.each do |el|
       if el.is_a? Hash
 

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

@@ -4,7 +4,7 @@ module NumberModifiers
   # allow user to modify Numbers in order to express
   # percentages ( 12.percent ) and also fractions, for
   # example.
-  refine Fixnum do
+  class ::Fixnum
 
     def /(other)
       fdiv(other)

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

@@ -3,6 +3,7 @@ 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/exceptions/bad_config'
 require_relative '../../domain/modules/common/refiners/proc_convenience_methods'
 require_relative '../../../../lib/rachinations/helpers/edge_helper'
 
@@ -59,8 +60,9 @@ class Pool < ResourcefulNode
         pull_all!
 
       else
-
+        raise BadConfig, "Invalid config for this node's mode"
       end
+      fire_triggers!
     end
   end
 

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

@@ -2,7 +2,6 @@ require_relative '../../domain/nodes/pool'
 
 class Source < ResourcefulNode
 
-
   def initialize(hsh={})
 
     check_options!(hsh)
@@ -65,12 +64,17 @@ class Source < ResourcefulNode
 
         push_any!
 
-      elsif pull?
+      elsif push? && all?
+
+        push_all!
 
-        raise NotImplementedError('A pulling Source?')
+      else
+        raise BadConfig, 'Invalid mode for Source'
 
       end
 
+      fire_triggers!
+
     end
   end
 

data/lib/rachinations/dsl/bootstrap.rb

@@ -26,7 +26,6 @@ module DSL
 
     end
 
-
     def non_deterministic_diagram(name, verbose=:silent, &blk)
 
       dia=NonDeterministicDiagram.new(Parser.validate_name!(name))
@@ -53,7 +52,5 @@ module DSL
         Proc.new(&blk)
       end
     end
-
   end
-
 end

data/lib/rachinations/dsl/helpers/parser.rb

@@ -9,20 +9,19 @@ module DSL
 
     ConstantHash = ::Extras::ConstantHash
 
-    # these patterns (*_EXPR) define what each argument should look like
+    # these patterns define what each argument should look like
 
-    IDENTIFIER_EXPR = proc { |arg| arg.is_a?(String) && valid_name?(arg) }
+    IDENTIFIER = proc { |arg| arg.is_a?(String) && valid_name?(arg) }
 
-    INITIAL_VALUE_EXPR = proc { |arg| arg.is_a? Fixnum }
+    INITIAL_VALUE = proc { |arg| arg.is_a? Fixnum }
 
-    MODE_EXPR = proc { |arg| [:pull_any, :pull_all, :push_any, :push_all].include? arg }
+    MODE = proc { |arg| [:pull_any, :pull_all, :push_any, :push_all].include? arg }
 
-    ACTIVATION_EXPR = proc { |arg| [:automatic, :passive, :start].include? arg }
+    ACTIVATION= proc { |arg| [:automatic, :passive, :start].include? arg }
 
-    PROC_EXPR = proc { |arg| arg.is_a? Proc }
+    PROC = proc { |arg| arg.is_a? Proc }
 
-    # returns true for integers or floats
-    LABEL_EXPR = proc { |arg| arg.is_a? Numeric }
+    LABEL = proc { |arg| arg.is_a?(Numeric) || arg.is_a?(Proc) }
 
     # Parse an arbitrary list of arguments and returns a well-formed
     #  Hash which can then be used as argument to method add_node!
@@ -31,57 +30,66 @@ module DSL
     def self.parse_arguments(arguments)
       arguments.inject(ConstantHash.new) do |accumulator, arg|
 
-        # named parameters are expressed are hashes
+        # named parameters are expressed as hashes
         # and all arguments can (also) be passed as named parameters
         if arg.is_a? Hash
+
+          if arg.has_key? :activation
+            if ACTIVATION.match? arg[:activation]
+              accumulator[:activation] = arg[:activation]
+            else
+              raise BadDSL.new
+            end
+          end
+
           if arg.has_key? :condition
-            if PROC_EXPR.match? arg[:condition]
+            if PROC.match? arg[:condition]
               accumulator[:condition] = arg[:condition]
             else
               raise BadDSL.new
             end
           end
 
-          if arg.has_key? :triggered_by
-            if IDENTIFIER_EXPR.match? arg[:triggered_by]
-              accumulator[:triggered_by] = arg[:triggered_by]
+          if arg.has_key? :initial_value
+            if INITIAL_VALUE.match? arg[:initial_value]
+              accumulator[:initial_value] = arg[:initial_value]
             else
               raise BadDSL.new
             end
           end
 
-          if arg.has_key? :activation
-            if ACTIVATION_EXPR.match? arg[:activation]
-              accumulator[:activation] = arg[:activation]
+          if arg.has_key? :mode
+            if MODE.match? arg[:mode]
+              accumulator[:mode] = arg[:mode]
             else
               raise BadDSL.new
             end
           end
 
-          if arg.has_key? :initial_value
-            if INITIAL_VALUE_EXPR.match? arg[:initial_value]
-              accumulator[:initial_value] = arg[:initial_value]
+          if arg.has_key? :triggered_by
+            if IDENTIFIER.match? arg[:triggered_by]
+              accumulator[:triggered_by] = arg[:triggered_by]
             else
               raise BadDSL.new
             end
           end
 
-          if arg.has_key? :mode
-            if MODE_EXPR.match? arg[:mode]
-              accumulator[:mode] = arg[:mode]
+          if arg.has_key? :triggers
+            if IDENTIFIER.match? arg[:triggers]
+              accumulator[:triggers] = arg[:triggers]
             else
               raise BadDSL.new
             end
           end
 
         else
-          if IDENTIFIER_EXPR.match?(arg) # a node's name, if present, is always the first argument
+          if IDENTIFIER.match?(arg) # a node's name, if present, is always the first argument
             accumulator[:name] = arg
-          elsif INITIAL_VALUE_EXPR.match?(arg)
+          elsif INITIAL_VALUE.match?(arg)
             accumulator[:initial_value] = arg
-          elsif MODE_EXPR.match?(arg)
+          elsif MODE.match?(arg)
             accumulator[:mode] = arg
-          elsif ACTIVATION_EXPR.match?(arg)
+          elsif ACTIVATION.match?(arg)
             accumulator[:activation] = arg
           else
             raise BadDSL, "Argument #{arg} doesn't fit any known signature"
@@ -99,16 +107,16 @@ module DSL
       arguments.inject(ConstantHash.new) do |accumulator, arg|
         if arg.is_a? Hash
           if arg.has_key? :condition
-            accumulator[:condition] = arg[:condition] if PROC_EXPR.match?(arg[:condition])
+            accumulator[:condition] = arg[:condition] if PROC.match?(arg[:condition])
           elsif arg.has_key? :triggered_by
-            accumulator[:triggered_by] = arg[:triggered_by] if IDENTIFIER_EXPR.match?(arg[:triggered_by])
+            accumulator[:triggered_by] = arg[:triggered_by] if IDENTIFIER.match?(arg[:triggered_by])
           else
-            ra
+            raise BadDSL, "Named argument doesn't fit any known signature"
           end
         else
-          if IDENTIFIER_EXPR.match?(arg)
+          if IDENTIFIER.match?(arg)
             accumulator[:name] = arg
-          elsif ACTIVATION_EXPR.match?(arg)
+          elsif ACTIVATION.match?(arg)
             accumulator[:activation] = arg
           else
             raise BadDSL, "Argument #{arg} doesn't fit any known signature"
@@ -122,23 +130,24 @@ module DSL
     def self.parse_edge_arguments(arguments)
 
       arguments.inject(ConstantHash.new) do |accumulator, arg|
-        if IDENTIFIER_EXPR.match?(arg)
-          accumulator[:name] = arg
-        elsif LABEL_EXPR.match?(arg)
-          accumulator[:label]=arg
-        elsif arg.is_a? Hash
-
+        if arg.is_a? Hash
           if arg.has_key? :from
-            accumulator[:from] = arg[:from]
+            accumulator[:from] = arg[:from] if IDENTIFIER.match? arg[:from]
           end
           if arg.has_key? :to
-            accumulator[:to] = arg[:to]
+            accumulator[:to] = arg[:to] if IDENTIFIER.match? arg[:to]
           end
           if arg.has_key? :label
-            accumulator[:label] = arg[:label]
+            accumulator[:label] = arg[:label] if LABEL.match? arg[:label]
           end
         else
-          raise BadDSL, "Argument #{arg} doesn't fit any known signature."
+          if IDENTIFIER.match?(arg)
+            accumulator[:name] = arg
+          elsif LABEL.match?(arg)
+            accumulator[:label]=arg
+          else
+            raise BadDSL, "Argument #{arg} doesn't fit any known signature."
+          end
         end
         accumulator
       end

data/lib/rachinations/version.rb

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

data/lib/rachinations.rb

@@ -18,6 +18,7 @@ require 'rachinations/domain/edges/edge'
 require 'rachinations/domain/exceptions/no_elements_of_given_type'
 require 'rachinations/domain/exceptions/unsupported_type_error'
 require 'rachinations/domain/exceptions/bad_options'
+require 'rachinations/domain/exceptions/bad_config'
 require 'rachinations/domain/exceptions/no_elements_matching_condition_error'
 require 'rachinations/domain/exceptions/no_elements_found'
 require 'rachinations/dsl/bad_dsl'
@@ -36,9 +37,10 @@ require 'rachinations/domain/node_collection'
 require 'rachinations/domain/resource_bag'
 
 
-# users can call .percent on integers
-using NumberModifiers
-
 # users can use the dsl to create diagrams
 include DSL::Bootstrap
-using DSL::DiagramShorthandMethods
+
+# users can call .percent on numbers
+include NumberModifiers
+
+

data/testing/spec/non_deterministic_diagram_spec.rb

@@ -11,13 +11,13 @@ describe NonDeterministicDiagram do
         name: 'g1',
         activation: :automatic,
         initial_value: 5,
-        mode: :push
+        mode: :push_any
     }
 
     generator.add_node! Pool, {
         name: 'g2',
         activation: :automatic,
-        mode: :push
+        mode: :push_any
     }
 
     generator.add_node! Pool, {

data/testing/spec/release1/dsl_spec.rb

@@ -2,8 +2,6 @@ require_relative '../spec_helper'
 
 describe Diagram do
 
-  using NumberModifiers
-
   context 'diagram tests using the dsl' do
 
     it 'runs a simple example diagram' do
@@ -185,6 +183,42 @@ describe Diagram do
 
     end
 
+    it "accepts procs for edge labels" do
+
+      d = diagram do
+        source 's'
+        pool 'p'
+        edge from: 's', to: 'p', label: expr { rand(10) }
+      end
+
+      d.run 2
+
+      # this is clearly not an exhaustive test but itll do for now
+
+      expect(d.p.resource_count).to be <= 20
+      expect(d.p.resource_count).to be >= 0
+
+    end
+
+    it 'accepts :triggers' do
+
+      # see how it gets confusing when you to turn your logic
+      # around in your head and define stuff in the wrong order
+
+      d = diagram do
+        pool 'p2'
+        pool 'p1', :push_any, initial_value: 7
+        source 's', triggers: 'p1'
+        edge from: 'p1', to: 'p2'
+      end
+
+      d.run 10
+
+      expect(d.p2.resource_count).to eq 7
+
+    end
+
+
     # it "forward-referencing of non existing nodes" do
     #
     #   expect do

data/testing/spec/xexeo_spec.rb

@@ -26,13 +26,13 @@ describe Diagram do
         :name => 'g1',
         :activation => :automatic,
         :initial_value => 5,
-        mode: :push
+        mode: :push_any
     }
 
     generator.add_node! Pool, {
         :name => 'g2',
         :activation => :automatic,
-        mode: :push
+        mode: :push_any
     }
 
     generator.add_node! Pool, {
@@ -68,13 +68,13 @@ describe Diagram do
         name: 'g1',
         activation: :automatic,
         initial_value: 5,
-        mode: :push
+        mode: :push_any
     }
 
     generator.add_node! Pool, {
         name: 'g2',
         activation: :automatic,
-        mode: :push
+        mode: :push_any
     }
 
     generator.add_node! Pool, {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rachinations
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Felipe Almeida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,6 +160,7 @@ files:
 - lib/rachinations/domain/diagrams/verbose_diagram.rb
 - lib/rachinations/domain/edge_collection.rb
 - lib/rachinations/domain/edges/edge.rb
+- lib/rachinations/domain/exceptions/bad_config.rb
 - lib/rachinations/domain/exceptions/bad_options.rb
 - lib/rachinations/domain/exceptions/no_elements_found.rb
 - lib/rachinations/domain/exceptions/no_elements_matching_condition_error.rb