agent 0.9.0 → 0.9.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    agent (1.0.0)
+    agent (0.9.0)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -36,7 +36,7 @@ A "select" statement chooses which of a set of possible communications will proc
 cw = channel!(Integer, 1)
 cr = channel!(Integer, 1)
 
-select do |s|
+select! do |s|
   s.case(cr, :receive) { |value| do_something(value) }
   s.case(cw, :send, 3)
 end
@@ -47,7 +47,7 @@ In example above, cr is currently unavailable to read from (since its empty), bu
 ```ruby
 cr = channel!(Integer, 1)
 
-select do |s|
+select! do |s|
   s.case(cr, :receive) { |value| do_something(value) }
   s.default            { puts :default }
 end
@@ -58,7 +58,7 @@ In this example, cr is unavailable for read (since its empty), but we also provi
 ```ruby
 cr = channel!(Integer, 1)
 
-select do |s|
+select! do |s|
   s.case(cr, :receive) { |value| do_something(value) }
   s.timeout(1.0)       { puts :timeout }
 end

data/lib/agent/errors.rb

@@ -10,5 +10,6 @@ module Agent
     class NotImplementedError < Exception; end
     class DefaultCaseAlreadyDefinedError < Exception; end
     class NegativeWaitGroupCount < Exception; end
+    class AlreadySelectedError < Exception; end
   end
 end

data/lib/agent/pop.rb

@@ -37,7 +37,7 @@ module Agent
         raise Errors::ChannelClosed if @closed
 
         if @blocking_once
-          value, error = @blocking_once.perform do
+          _, error = @blocking_once.perform do
             @object = Marshal.load(yield)
             @received = true
             @cvar.signal

data/lib/agent/push.rb

@@ -37,7 +37,7 @@ module Agent
         raise Errors::ChannelClosed if @closed
 
         if @blocking_once
-          value, error = @blocking_once.perform do
+          _, error = @blocking_once.perform do
             yield @object
             @sent = true
             @cvar.signal

data/lib/agent/queue/buffered.rb

@@ -1,4 +1,3 @@
-require "agent/queue"
 require "agent/errors"
 
 module Agent

data/lib/agent/queue/unbuffered.rb

@@ -1,4 +1,3 @@
-require "agent/queue"
 require "agent/errors"
 
 module Agent

data/lib/agent/selector.rb

@@ -11,11 +11,6 @@ module Agent
     selector = Selector.new
     yield selector
     selector.select
-  ensure
-    if selector
-      selector.close_default_channel
-      selector.dequeue_operations
-    end
   end
 
   class Selector
@@ -29,6 +24,8 @@ module Agent
       @operations    = {}
       @blocking_once = BlockingOnce.new
       @notifier      = Notifier.new
+      @default_case  = nil
+      @selected      = false
     end
 
     def default(&blk)
@@ -47,12 +44,13 @@ module Agent
 
     def case(chan, direction, value=nil, &blk)
       raise "invalid case, must be a channel" unless chan.is_a?(Channel)
-      raise Errors::BlockMissing if blk.nil? && direction == :receive
       raise Errors::InvalidDirection if direction != :send && direction != :receive
       add_case(chan, direction, value, &blk)
     end
 
     def select
+      raise Errors::AlreadySelectedError if @selected
+
       if !@ordered_cases.empty?
         @ordered_cases.each do |cse|
           if cse.direction == :send
@@ -76,8 +74,15 @@ module Agent
 
         execute_case(@notifier.payload)
       end
+    ensure
+      @selected = true
+      close_default_channel
+      dequeue_operations
     end
 
+
+  protected
+
     def dequeue_operations
       @operations.each do |channel, operations|
         channel.remove_operations(operations)
@@ -88,9 +93,6 @@ module Agent
       @default_case.channel.close if @default_case
     end
 
-
-  protected
-
     def add_case(chan, direction, value=nil, &blk)
       uuid = UUID.generate
       cse = Case.new(uuid, chan, direction, value, blk)

data/lib/agent/version.rb

@@ -1,3 +1,3 @@
 module Agent
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/spec/channel_spec.rb

@@ -48,7 +48,7 @@ describe Agent::Channel do
       # timeout blocking receive calls
       timed_out = false
       select! do |s|
-        s.case(c, :receive){}
+        s.case(c, :receive)
         s.timeout(0.1){ timed_out = true }
       end
       timed_out.should == true

data/spec/selector_spec.rb

@@ -27,6 +27,23 @@ describe Agent::Selector do
     (Time.now.to_f - now).should be_within(0.05).of(0.1)
   end
 
+  it "should not raise an error when a block is missing on default" do
+    lambda {
+      select! do |s|
+        s.default
+      end
+    }.should_not raise_error(Agent::Errors::BlockMissing)
+  end
+
+  it "should not raise an error when a block is missing on timeout" do
+    lambda {
+      select! do |s|
+        s.timeout(1)
+        s.default
+      end
+    }.should_not raise_error(Agent::Errors::BlockMissing)
+  end
+
   context "with unbuffered channels" do
     before do
       @c = channel!(Integer)
@@ -38,28 +55,27 @@ describe Agent::Selector do
 
     it "should evaluate select statements top to bottom" do
       select! do |s|
-        s.case(@c, :send, 1) {}
-        s.case(@c, :receive) {}
-        s.default {}
+        s.case(@c, :send, 1)
+        s.case(@c, :receive)
+        s.default
         s.cases.size.should == 3
       end
     end
 
-    it "should raise an error when a block is missing on receive" do
+    it "should not raise an error when a block is missing on receive" do
       lambda {
         select! do |s|
           s.case(@c, :receive)
+          s.default
         end
-      }.should raise_error(Agent::Errors::BlockMissing)
+      }.should_not raise_error(Agent::Errors::BlockMissing)
     end
 
     it "should not raise an error when a block is missing on send" do
       lambda {
-        go!{ @c.receive }
-
         select! do |s|
           s.case(@c, :send, 1)
-          s.cases.size.should == 0
+          s.default
         end
       }.should_not raise_error(Agent::Errors::BlockMissing)
     end
@@ -98,7 +114,7 @@ describe Agent::Selector do
       lambda {
         select! do |s|
           s.case(@c, :send, 1)
-          s.case(@c, :receive){}
+          s.case(@c, :receive)
         end
       }.should raise_error(Agent::Errors::ChannelClosed)
     end
@@ -168,7 +184,7 @@ describe Agent::Selector do
         go!{sleep(0.2); c.receive[0].should == 2 }
 
         select! do |s|
-          s.case(c, :send, 2) {}
+          s.case(c, :send, 2)
         end
 
         (Time.now.to_f - now).should be_within(0.1).of(0.2)
@@ -223,26 +239,26 @@ describe Agent::Selector do
 
     it "should evaluate select statements top to bottom" do
       select! do |s|
-        s.case(@c, :send, 1) {}
-        s.case(@c, :receive) {}
+        s.case(@c, :send, 1)
+        s.case(@c, :receive)
         s.cases.size.should == 2
       end
     end
 
-    it "should raise an error when a block is missing on receive" do
+    it "should not raise an error when a block is missing on receive" do
       lambda {
         select! do |s|
           s.case(@c, :receive)
-          s.cases.size.should == 0
+          s.default
         end
-      }.should raise_error(Agent::Errors::BlockMissing)
+      }.should_not raise_error(Agent::Errors::BlockMissing)
     end
 
     it "should not raise an error when a block is missing on send" do
       lambda {
         select! do |s|
           s.case(@c, :send, 1)
-          s.cases.size.should == 0
+          s.default
         end
       }.should_not raise_error(Agent::Errors::BlockMissing)
     end
@@ -283,7 +299,7 @@ describe Agent::Selector do
       lambda {
         select! do |s|
           s.case(@c, :send, 1)
-          s.case(@c, :send, 2){}
+          s.case(@c, :send, 2)
         end
       }.should raise_error(Agent::Errors::ChannelClosed)
     end
@@ -348,7 +364,7 @@ describe Agent::Selector do
         go!{sleep(0.2); c.receive }
 
         select! do |s|
-          s.case(c, :send, 2) {}
+          s.case(c, :send, 2)
         end
 
         c.receive[0].should == 2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: agent
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153154840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153154840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153154240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153154240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Agent is a diverse family of related approaches for modelling concurrent
   systems, in Ruby
 email:
@@ -114,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: agent
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Agent is a diverse family of related approaches for modelling concurrent