rachinations 0.0.3 → 0.0.4

data/testing/spec/edge_spec.rb

@@ -1,9 +1,10 @@
 require_relative 'spec_helper'
 
+
 describe Edge do
 
   describe '#initialize' do
-
+    using NumberModifiers
     it 'can be created' do
 
       # i only want to test edge methods so I'll use a mock object and stub the method I need
@@ -23,6 +24,7 @@ describe Edge do
       expect(edge.label).to eq 1
       expect(edge.types).to eq []
 
+
     end
 
     it 'can be created with types' do
@@ -60,6 +62,16 @@ describe Edge do
 
     end
 
+
+    it 'can be assigned a percent label' do
+
+      from = double(:name => 'node1')
+      to = double(:name => 'node2')
+
+      edge = Edge.new name: 'edge1', from: from, to: to, types: [Blue, Red], label: 50.percent
+
+    end
+
   end
 
   describe '#test_ping?' do
@@ -75,7 +87,7 @@ describe Edge do
 
         edge = Edge.new :name => 'e', :from => from, :to => @to
         expect(edge).to receive(:strategy).and_return(@strategy)
-        expect(edge.test_ping?(true)).to eq false
+        expect(edge.test_ping?(require_all:true)).to eq false
 
       end
 
@@ -84,7 +96,7 @@ describe Edge do
 
         edge = Edge.new :name => 'e', :from => from, :to => @to, :label => 8
         expect(edge).to receive(:strategy).and_return(@strategy)
-        expect(edge.test_ping?(true)).to eq false
+        expect(edge.test_ping?(require_all:true)).to eq false
       end
 
       it 'is true when the exact number of required resources are available to be moved' do
@@ -92,7 +104,7 @@ describe Edge do
 
         edge = Edge.new :name => 'e', :from => from, :to => @to, :label => 8
         expect(edge).to receive(:strategy).and_return(@strategy)
-        expect(edge.test_ping?(true)).to eq true
+        expect(edge.test_ping?(require_all:true)).to eq true
       end
 
       it 'is true when the more resources than required are available to be moved' do
@@ -100,7 +112,7 @@ describe Edge do
 
         edge = Edge.new :name => 'e', :from => from, :to => @to, :label => 2
         expect(edge).to receive(:strategy).and_return(@strategy)
-        expect(edge.test_ping?(true)).to eq true
+        expect(edge.test_ping?(require_all:true)).to eq true
       end
 
     end
@@ -112,7 +124,7 @@ describe Edge do
 
         edge = Edge.new :name => 'e', :from => from, :to => @to
         expect(edge).to receive(:strategy).and_return(@strategy)
-        expect(edge.test_ping?(false)).to eq false
+        expect(edge.test_ping?(require_all:false)).to eq false
       end
 
       it 'is true if at least one resource is available' do
@@ -120,7 +132,7 @@ describe Edge do
 
         edge = Edge.new :name => 'e', :from => from, :to => @to, :label => 8
         expect(edge).to receive(:strategy).and_return(@strategy)
-        expect(edge.test_ping?(false)).to eq true
+        expect(edge.test_ping?(require_all:false)).to eq true
       end
 
     end
@@ -222,13 +234,13 @@ describe Edge do
     context 'when edge has label 1' do
 
       before(:each) do
-        @p1 = instance_double(Node,name:'n', types: [], enabled?: true)
-        @p2 = instance_double(Node,name:'n2', types: [], enabled?: true)
+        @p1 = instance_double(Node, name: 'n', types: [], enabled?: true)
+        @p2 = instance_double(Node, name: 'n2', types: [], enabled?: true)
         @e = Edge.new name: 'e', from: @p1, to: @p2
       end
       it 'sends put_resource! to to_node' do
         # passing the same parameter it was given by the caller
-        res = instance_double(Token,type:Token)
+        res = instance_double(Token, type: Token)
         expect(@p2).to receive(:put_resource!)
         @e.push!(res)
 
@@ -241,16 +253,18 @@ describe Edge do
 
     end
 
-    context 'when edge has label greater than 1' do
 
-      it 'raises error if no resources could be sent' do
+  end
 
-      end
+  context 'general tests' do
 
-    end
 
 
   end
 
+  context 'specific features' do
+
+  end
+
 
 end

data/testing/spec/gate_spec.rb

@@ -0,0 +1,34 @@
+require_relative 'spec_helper'
+
+describe 'Diagrams with gates' do
+
+  context 'general tests' do
+
+    it 'works' do
+
+      d = Diagram.new
+
+      d.add_node! Source, name: 's'
+      d.add_node! Gate, name: 'g'
+      d.add_node! Pool, name: 'p'
+      d.add_edge! Edge, from: 's', to: 'g'
+      d.add_edge! Edge, from: 'g', to: 'p'
+
+      d.run!(5)
+
+      expect(d.get_node('p').resource_count).to eq 5
+
+    end
+
+  end
+
+  context 'specific features' do
+
+    it 'does not keep resources over turns' do
+      skip
+    end
+
+  end
+
+
+end

data/testing/spec/pool_spec.rb

@@ -91,31 +91,31 @@ describe Pool do
     end
 
     it 'raises an error when it is asked about an unsupported type and it is typed' do
-      expect { @typed.resource_count(Mango) }.to raise_error UnsupportedTypeError
+      expect { @typed.resource_count(type:Mango) }.to raise_error UnsupportedTypeError
     end
 
     it 'just returns zero if it is untyped and it is asked about a type' do
-      expect(@untyped.resource_count(Mango)).to eq 0
+      expect(@untyped.resource_count(type:Mango)).to eq 0
     end
 
     it 'otherwise works with one type param' do
-      expect(@typed.resource_count(Peach)).to eq 10
+      expect(@typed.resource_count(type:Peach)).to eq 10
     end
 
     it 'accepts a single block' do
-      expect(@typed.resource_count { |r| r.is_type? Peach }).to eq 10
-      expect(@untyped.resource_count { true }).to eq 10
+      expect(@typed.resource_count(expr: proc{|r| r.is_type? Peach } ) ).to eq 10
+      expect(@untyped.resource_count( expr: proc{true})).to eq 10
 
       # if user sent a block. he prolly knows what he's doing so no errors.
-      expect(@typed.resource_count { |r| r.is_type? Football }).to eq 0
+      expect(@typed.resource_count(expr: proc{|r| r.is_type? Football })).to eq 0
     end
 
     it 'errors if given both a type and a block' do
-      expect { @typed.resource_count(Peach) { |r| r.is_type? Mango } }.to raise_error ArgumentError
+      expect { @typed.resource_count(type:Peach,expr: proc{ |r| r.is_type? Mango } )}.to raise_error ArgumentError
     end
 
     it 'also errors if some other nonsense is passed' do
-      expect { @typed.resource_count(Hash.new) }.to raise_error ArgumentError
+      expect { @typed.resource_count(Object.new) }.to raise_error ArgumentError
       expect { @untyped.resource_count('Foo') }.to raise_error ArgumentError
     end
 
@@ -204,8 +204,6 @@ describe Pool do
       it 'does not call push! on edge if it cannot provide the needed resource' do
         expect(@e).to receive(:push_expression).and_return( proc{ true })
 
-        expect(@p).to receive(:remove_resource!).and_raise(RuntimeError)
-
         expect(@e).not_to receive(:push!)
 
         @p.trigger!

data/testing/spec/release1/dsl_spec.rb

@@ -0,0 +1,204 @@
+require_relative '../spec_helper'
+
+describe Diagram do
+
+  using NumberModifiers
+
+  context 'diagram tests using the dsl' do
+
+    it 'runs a simple example diagram' do
+      d = diagram do
+        source 's1'
+        pool 'p1', :push_any, :automatic
+        pool 'p2'
+        edge from: 's1', to: 'p1'
+        edge from: 'p1', to: 'p2'
+      end
+      d.run 5
+
+      expect(d.p1.resource_count).to eq 1
+      expect(d.p2.resource_count).to eq 4
+
+    end
+
+    it 'runs with one pool with no name' do
+      d = diagram do
+        pool
+      end
+
+      d.run! 5
+
+    end
+
+
+    it 'runs with one pool with some params' do
+
+      d = diagram do
+        pool 'p', 9, :pull_all
+        pool 'p', 9, :pull_all
+      end
+
+      d.run! 5
+      expect(d.p.resource_count).to eq 9
+
+    end
+
+    it 'requires valid names for nodes and edges because they might be used as methods' do
+
+      expect {
+
+        d = diagram 'wrong' do
+          pool 'p1'
+          source 's1'
+          pool 'foo bar'
+          source '1ar baz'
+          edge ' foo', from: 'p1', to: 's1'
+          edge 'foo ', from: 'p1', to: 's1'
+        end
+
+      }.to raise_error(BadDSL)
+
+    end
+
+    it 'runs with conditions' do
+
+      d = diagram 'conditions' do
+        source 's1'
+        pool 'p1'
+        source 's2', condition: lambda { p1.resource_count > 3 }
+        pool 'p2'
+        edge from: 's1', to: 'p1'
+        edge from: 's2', to: 'p2'
+      end
+
+      d.run! 10
+
+      expect(d.p2.resource_count).to eq 6
+
+    end
+
+    it 'runs with triggers' do
+
+      d = diagram 'triggers' do
+        source 's1'
+        pool 'p1'
+        source 's2', activation: :passive, triggered_by: 'p1'
+        pool 'p2'
+        edge from: 's1', to: 'p1'
+        edge from: 's2', to: 'p2'
+      end
+
+      d.run! 10
+
+      expect(d.p2.resource_count).to eq 10
+
+    end
+
+    it 'runs with a three-way, default gate using different notations' do
+
+      d = diagram do
+        source 's1'
+        gate 'g1'
+        edge from: 's1', to: 'g1'
+        pool 'p1'
+        pool 'p2'
+        pool 'p3'
+        edge 'e1', 1/3, from: 'g1', to: 'p1'
+        edge 'e1', from: 'g1', to: 'p2', label: 1/3
+        edge 'e1', from: 'g1', to: 'p3', label: 1/3
+      end
+
+
+      d.run! 20
+      #this gate is conservative - each resource necessarily goes to
+      #either p1, p2 or p3 so the sum must be equal to the total amount
+      #created by the source
+      expect(d.p1.resource_count + d.p2.resource_count + d.p3.resource_count).to eq 20
+
+    end
+
+    it 'runs a comprehensive example' do
+
+      d = diagram 'stable_state' do
+        source 's1'
+        gate 'g1'
+        pool 'p1'
+        pool 'p2'
+        pool 'p3'
+        sink 'sink1', activation: :automatic, condition: lambda { p1.resource_count > 30 }
+        edge from: 's1', to: 'g1'
+        edge from: 'g1', to: 'p1', label: 2/4
+        edge from: 'g1', to: 'p2', label: 1/4
+        edge from: 'g1', to: 'p3', label: 1/4
+        edge from: 'p2', to: 'sink1'
+      end
+
+      d.run 300
+
+      expect(d.p3.resource_count).to be_within(40).of(d.p1.resource_count / 2)
+      expect(d.p2.resource_count).to be_within(5).of(1)
+
+    end
+
+    it 'accepts new simpler syntax' do
+
+      d = diagram 'd1' do
+        pool 'p1', 10, :automatic, :push_any
+        pool 'p2'
+        edge from: 'p1', to: 'p2'
+      end
+
+      d.run 5
+
+      expect(d.p1.resource_count).to eq(5)
+      expect(d.p2.resource_count).to eq(5)
+
+    end
+
+
+    it 'example using push_all, activators and triggers' do
+
+      d = diagram do
+        pool 'p1'
+        pool 'p2'
+        pool 'p3'
+        source 's2', :automatic
+        pool 'p5'
+        source 's1', :automatic, condition: expr { p5.resource_count > 5 }
+        pool 'p4', :push_all, initial_value: 11, triggered_by: 's1'
+        edge from: 'p4', to: 'p1'
+        edge from: 'p4', to: 'p2'
+        edge from: 'p4', to: 'p3'
+        edge from: 's2', to: 'p5'
+      end
+
+      d.run 10
+
+      expect(d.p5.resource_count).to eq 10
+
+      expect(d.p1.resource_count).to eq 3
+      expect(d.p2.resource_count).to eq 3
+      expect(d.p3.resource_count).to eq 3
+
+      expect(d.p4.resource_count).to eq 2
+
+
+    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
+
+
+  end
+end

data/testing/spec/spec_helper.rb

@@ -14,6 +14,7 @@ require 'rspec'
 
 require 'rachinations'
 
+
 #resource classes to be used in tests
 Blue=Class.new(Token)
 Black=Class.new(Token)

data/testing/spec/xexeo_spec.rb

@@ -4,16 +4,16 @@ require_relative 'spec_helper'
 
 describe Diagram do
 
+  using DSL::DiagramShorthandMethods
+
   it "runs modelo1" do
 
     n=diagram 'test_diagram' do
-      node 'source', Source
-      node 'pool1', Pool
-      edge 'edge1', Edge, 'source', 'pool1'
+      source 'source'
+      pool 'pool1'
+      edge from: 'source', to: 'pool1'
     end
 
-    d = Diagram.new('one source one pool')
-
     n.run!(5)
 
   end
@@ -113,13 +113,13 @@ describe Diagram do
 
   it "runs sequencial" do
     n=diagram 'test_diagram' do
-      node 'p1', Pool, mode: :push, activation: :automatic, initial_value: 8
-      node 'p2', Pool, mode: :push, activation: :automatic
-      node 'p3', Pool, mode: :push, activation: :automatic
-      node 'p4', Pool, mode: :push, activation: :automatic
-      edge 'e1', Edge, 'p1', 'p2'
-      edge 'e2', Edge, 'p2', 'p3'
-      edge 'e3', Edge, 'p3', 'p4'
+      pool 'p1', mode: :push_any, activation: :automatic, initial_value: 8
+      pool 'p2', mode: :push_any, activation: :automatic
+      pool 'p3', mode: :push_any, activation: :automatic
+      pool 'p4', mode: :push_any, activation: :automatic
+      edge from: 'p1', to: 'p2'
+      edge from: 'p2', to: 'p3'
+      edge from: 'p3', to: 'p4'
     end
 
     n.run!(5)
@@ -128,40 +128,39 @@ describe Diagram do
   end
 
   it "runs sobonito" do
+
     n=diagram 'test_diagram' do
-      node 'p1', Pool, mode: :push, activation: :automatic, initial_value: 8
-      node 'p2', Pool, mode: :push, activation: :automatic
-      node 'p3', Pool, mode: :push, activation: :automatic
-      node 'p4', Pool, mode: :push, activation: :automatic
-      edge 'e1', Edge, 'p1', 'p2'
-      edge 'e2', Edge, 'p2', 'p1'
-      edge 'e3', Edge, 'p1', 'p3'
-      edge 'e4', Edge, 'p3', 'p1'
-      edge 'e5', Edge, 'p4', 'p2'
-      edge 'e6', Edge, 'p2', 'p4'
-      edge 'e7', Edge, 'p4', 'p3'
-      edge 'e8', Edge, 'p3', 'p4'
+      pool 'p1', mode: :push_any, activation: :automatic, initial_value: 8
+      pool 'p2', mode: :push_any, activation: :automatic
+      pool 'p3', mode: :push_any, activation: :automatic
+      pool 'p4', mode: :push_any, activation: :automatic
+      edge from: 'p1',to: 'p2'
+      edge from: 'p2',to: 'p1'
+      edge from: 'p1',to: 'p3'
+      edge from: 'p3',to: 'p1'
+      edge from: 'p4',to: 'p2'
+      edge from: 'p2',to: 'p4'
+      edge from: 'p4',to: 'p3'
+      edge from: 'p3',to: 'p4'
     end
 
-    d = Diagram.new('bonitinho')
-
     n.run!(20)
   end
 
   it "runs sobonitowhile" do
     n=diagram 'test_diagram' do
-      node 'p1', Pool, mode: :push, activation: :automatic, initial_value: 8
-      node 'p2', Pool, mode: :push, activation: :automatic
-      node 'p3', Pool, mode: :push, activation: :automatic
-      node 'p4', Pool, mode: :push, activation: :automatic
-      edge 'e1', Edge, 'p1', 'p2'
-      edge 'e2', Edge, 'p2', 'p1'
-      edge 'e3', Edge, 'p1', 'p3'
-      edge 'e4', Edge, 'p3', 'p1'
-      edge 'e5', Edge, 'p4', 'p2'
-      edge 'e6', Edge, 'p2', 'p4'
-      edge 'e7', Edge, 'p4', 'p3'
-      edge 'e8', Edge, 'p3', 'p4'
+      pool 'p1',  mode: :push_any, activation: :automatic, initial_value: 8
+      pool 'p2',  mode: :push_any, activation: :automatic
+      pool 'p3',  mode: :push_any, activation: :automatic
+      pool 'p4',  mode: :push_any, activation: :automatic
+      edge from: 'p1',to: 'p2'
+      edge from: 'p2',to: 'p1'
+      edge from: 'p1',to: 'p3'
+      edge from: 'p3',to: 'p1'
+      edge from: 'p4',to: 'p2'
+      edge from: 'p2',to: 'p4'
+      edge from: 'p4',to: 'p3'
+      edge from: 'p3',to: 'p4'
     end
 
     d = Diagram.new('bonitinho')
@@ -174,14 +173,14 @@ describe Diagram do
 
   it "runs whatIwish1" do
 
-    skip "needed features are missing"
+    skip "Needed features are missing"
 
     # n=diagram 'test_diagram' do
     #   node 'source', Source
     #   node 'pool1', Pool
     #   edge 'edge1', Edge, 'source', 'pool1'
     #   node 'pool2', Pool,
-    #   converter 'c1' , Converter
+    #   converter 'c1'
     #   node 'e3' , Edge , 'pool2' , 'c1'
     #   trigger 't1' , Trigger , 'pool1' , 'pool2' , { |ExtendedNode p| p.resouces>0 }
     # end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rachinations
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Felipe Almeida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2015-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,8 +122,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.6.11
+- !ruby/object:Gem::Dependency
+  name: weighted_distribution
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
-  This project provides a Ruby-based DSL to enable game designers to
+  This project provides a Ruby-based DiagramShorthandMethods to enable game designers to
   design and also test tentative game designs and/or prototypes
 email:
 - falmeida1988@gmail.com
@@ -146,7 +160,6 @@ files:
 - lib/rachinations/domain/diagrams/verbose_diagram.rb
 - lib/rachinations/domain/edge_collection.rb
 - lib/rachinations/domain/edges/edge.rb
-- lib/rachinations/domain/edges/random_edge.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
@@ -154,6 +167,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/number_modifiers.rb
 - lib/rachinations/domain/modules/common/refiners/proc_convenience_methods.rb
 - lib/rachinations/domain/modules/diagrams/verbose.rb
 - lib/rachinations/domain/node_collection.rb
@@ -170,8 +184,14 @@ files:
 - lib/rachinations/domain/resources/token.rb
 - lib/rachinations/domain/strategies/strategy.rb
 - lib/rachinations/domain/strategies/valid_types.rb
-- lib/rachinations/dsl/dsl.rb
+- lib/rachinations/dsl/bad_dsl.rb
+- lib/rachinations/dsl/bootstrap.rb
+- lib/rachinations/dsl/diagram_shorthand_methods.rb
+- lib/rachinations/dsl/helpers/parser.rb
+- lib/rachinations/extras/constant_hash.rb
 - lib/rachinations/extras/fifo.rb
+- lib/rachinations/helpers/edge_helper.rb
+- lib/rachinations/utils/string_helper.rb
 - lib/rachinations/version.rb
 - machinations_diagrams/apenas_bonito.xml
 - machinations_diagrams/behavior_converter.xml
@@ -211,18 +231,19 @@ files:
 - testing/spec/canon/conditions_spec.rb
 - testing/spec/canon/converter_spec.rb
 - testing/spec/canon/pool_spec.rb
-- testing/spec/canon/trigger_spec.rb
 - testing/spec/converter_spec.rb
 - testing/spec/diagram_spec.rb
 - testing/spec/edge_spec.rb
+- testing/spec/gate_spec.rb
 - testing/spec/hash_init_spec.rb
 - testing/spec/node_spec.rb
 - testing/spec/non_deterministic_diagram_spec.rb
 - testing/spec/pool_spec.rb
+- testing/spec/release1/dsl_spec.rb
 - testing/spec/source_spec.rb
 - testing/spec/spec_helper.rb
 - testing/spec/xexeo_spec.rb
-homepage: ''
+homepage: https://github.com/queirozfcom/rachinations
 licenses:
 - MIT
 metadata: {}
@@ -258,14 +279,15 @@ test_files:
 - testing/spec/canon/conditions_spec.rb
 - testing/spec/canon/converter_spec.rb
 - testing/spec/canon/pool_spec.rb
-- testing/spec/canon/trigger_spec.rb
 - testing/spec/converter_spec.rb
 - testing/spec/diagram_spec.rb
 - testing/spec/edge_spec.rb
+- testing/spec/gate_spec.rb
 - testing/spec/hash_init_spec.rb
 - testing/spec/node_spec.rb
 - testing/spec/non_deterministic_diagram_spec.rb
 - testing/spec/pool_spec.rb
+- testing/spec/release1/dsl_spec.rb
 - testing/spec/source_spec.rb
 - testing/spec/spec_helper.rb
 - testing/spec/xexeo_spec.rb

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

@@ -1,4 +0,0 @@
-require_relative '../../domain/edges/edge'
-
-class RandomEdge < Edge
-end