spnet 0.1.3 → 0.1.4

data/ChangeLog.rdoc

@@ -19,3 +19,7 @@ Replace messages and message ports with more specific ports, like value ports an
 Each kind of port can only connect to its opposite (e.g. SignaInPort to SignalOutPort).
 Instead of different messages for different actions, each kind of port will just have specific methods (e.g. SignalInPort#enqueue_values or ValueInPort#set_value).
 In Block, contain all InPort objects in @in_ports, and all OutPort objects in @out_ports.
+
+=== 0.1.4 / 2013-02-06
+
+CommandInPort only requires :command_map instead of :list_commands_handler and :exec_command_handler. The command map is just a hash that maps command names to their execution handlers.

data/lib/spnet/block.rb

@@ -10,8 +10,8 @@ class Block
   HASHED_ARG_SPECS = [
     Hashmake::ArgSpec.new(:reqd => false, :key => :name, :type => String, :default => "UNNAMED"),
     Hashmake::ArgSpec.new(:reqd => false, :key => :algorithm, :type => Proc, :default => DO_NOTHING),
-    Hashmake::ArgSpec.new(:reqd => false, :key => :in_ports, :type => InPort, :array => true, :default => ->(){ Array.new } ),
-    Hashmake::ArgSpec.new(:reqd => false, :key => :out_ports, :type => OutPort, :array => true, :default => ->(){ Array.new }),
+    Hashmake::ArgSpec.new(:reqd => false, :key => :in_ports, :type => InPort, :container => Hashmake::ArgSpec::CONTAINER_ARRAY, :default => ->(){ Array.new } ),
+    Hashmake::ArgSpec.new(:reqd => false, :key => :out_ports, :type => OutPort, :container => Hashmake::ArgSpec::CONTAINER_ARRAY, :default => ->(){ Array.new }),
   ]
   
   def initialize args = {}

data/lib/spnet/ports/command_in_port.rb

@@ -6,8 +6,7 @@ class CommandInPort < InPort
   include Hashmake::HashMakeable
 
   ARG_SPECS = [
-    Hashmake::ArgSpec.new(:key => :list_commands_handler, :reqd => true, :type => Proc),
-    Hashmake::ArgSpec.new(:key => :exec_command_handler, :reqd => true, :type => Proc)
+    Hashmake::ArgSpec.new(:key => :command_map, :reqd => true, :type => Proc, :container => Hashmake::ArgSpec::CONTAINER_HASH),
   ]
 
   def initialize hashed_args
@@ -17,11 +16,11 @@ class CommandInPort < InPort
   end
   
   def list_commands
-    @list_commands_handler.call
+    @command_map.keys
   end
   
   def exec_command command, data
-    @exec_command_handler.call command, data
+    @command_map[command].call data
   end  
 end
 end

data/lib/spnet/version.rb

@@ -1,4 +1,4 @@
 module SPNet
   # spnet version
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/ports/command_in_port_spec.rb

@@ -2,41 +2,28 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe SPNet::CommandInPort do
   before :each do
-    @commands = ["add", "sub", "mul", "div"]
-
-    list_commands_handler = lambda { return @commands }
-
-    exec_command_handler = lambda do |command, data|
-      x = data[0]
-      y = data[1]
-      
-      case command
-      when "add"
-        return x + y
-      when "sub"
-        return x - y
-      when "mul"
-        return x * y
-      when "div"
-        return x / y
-      end
-    end
-    
-    @port = SPNet::CommandInPort.new :list_commands_handler => list_commands_handler, :exec_command_handler => exec_command_handler
+    @port = SPNet::CommandInPort.new(
+      :command_map => {
+        :add => lambda {|data| data[0] + data[1] },
+        :sub => lambda {|data| data[0] - data[1] },
+        :mul => lambda {|data| data[0] * data[1] },
+        :div => lambda {|data| data[0] / data[1] },
+      }
+    )
   end
 
   describe '#list_commands' do
     it 'should pass back the return value from the list_commands handler' do
-      @port.list_commands.should eq(@commands)
+      @port.list_commands.should eq([:add, :sub, :mul, :div])
     end
   end
   
   describe '#exec_command' do
     it 'should pass the command and data to the exec_command handler, and pass back the return value' do
-      @port.exec_command("add", [1,2]).should eq(3)
-      @port.exec_command("sub", [5,4]).should eq(1)
-      @port.exec_command("mul", [3,2]).should eq(6)
-      @port.exec_command("div", [9,3]).should eq(3)
+      @port.exec_command(:add, [1,2]).should eq(3)
+      @port.exec_command(:sub, [5,4]).should eq(1)
+      @port.exec_command(:mul, [3,2]).should eq(6)
+      @port.exec_command(:div, [9,3]).should eq(3)
     end
   end
 end

data/spec/ports/command_out_port_spec.rb

@@ -2,27 +2,14 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe SPNet::ValueOutPort do
   before :each do
-    @commands = ["add", "sub", "mul", "div"]
-
-    list_commands_handler = lambda { return @commands }
-
-    exec_command_handler = lambda do |command, data|
-      x = data[0]
-      y = data[1]
-      
-      case command
-      when "add"
-        return x + y
-      when "sub"
-        return x - y
-      when "mul"
-        return x * y
-      when "div"
-        return x / y
-      end
-    end
-    
-    @in_port = SPNet::CommandInPort.new :list_commands_handler => list_commands_handler, :exec_command_handler => exec_command_handler
+    @in_port = SPNet::CommandInPort.new(
+      :command_map => {
+        :add => lambda {|data| data[0] + data[1] },
+        :sub => lambda {|data| data[0] - data[1] },
+        :mul => lambda {|data| data[0] * data[1] },
+        :div => lambda {|data| data[0] / data[1] },
+      }
+    )
     @out_port = SPNet::CommandOutPort.new
   end
 
@@ -36,17 +23,17 @@ describe SPNet::ValueOutPort do
   describe '#list_commands' do
     it 'should pass back the return value from the list_commands handler' do
       @out_port.add_link @in_port
-      @out_port.list_commands.should eq([@commands])
+      @out_port.list_commands.should eq([[:add, :sub, :mul, :div]])
     end
   end
   
   describe '#exec_command' do
     it 'should pass the command and data to the exec_command handler, and pass back the return value' do
       @out_port.add_link @in_port
-      @out_port.exec_command("add", [1,2]).should eq([3])
-      @out_port.exec_command("sub", [5,4]).should eq([1])
-      @out_port.exec_command("mul", [3,2]).should eq([6])
-      @out_port.exec_command("div", [9,3]).should eq([3])
+      @out_port.exec_command(:add, [1,2]).should eq([3])
+      @out_port.exec_command(:sub, [5,4]).should eq([1])
+      @out_port.exec_command(:mul, [3,2]).should eq([6])
+      @out_port.exec_command(:div, [9,3]).should eq([3])
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spnet
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -178,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -270931181
+      hash: -300528529
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -270931181
+      hash: -300528529
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23