dataflow 0.1.1 → 0.2.0

data/HISTORY

@@ -0,0 +1,25 @@
+== 0.2.0 / 2009-07-09
+
+* Major enhancements
+ 
+  * Made equality between objects and dataflow variables more transparent
+    (load equality changes with: require 'dataflow/equality')
+ 
+* Minor enhancements
+  
+  * Made #inspect work with unbound variables to not crash deubggers/repls/etc
+ 
+  * Made relationship between lazy and dataflow behavior more strict
+
+== 0.1.1 / 2009-06-13
+ 
+* Minor enhancements
+ 
+  * Got the "require_path" set correctly so rubygems can be used =)
+ 
+
+== 0.1.0 / 2009-06-13
+ 
+* 1 major enhancement
+ 
+  * Birthday!

data/README.textile

@@ -34,6 +34,15 @@ side-effects. Use regular Ruby threading to create threads, use
 "local" or "declare" to create new variables, and use "unify" to bind
 variables.
 
+h1. Install
+
+To install the latest release as a gem:
+<pre>sudo gem install dataflow</pre>
+
+h1. IRC
+
+<pre>#dataflow-gem @ freenode.net</pre>
+
 h1. Examples
 
 <pre>
@@ -160,6 +169,16 @@ Ping.join
 Pong.join
 </pre>
 
+h1. Equality
+
+Most Ruby implmentations will not use method calls for equality
+operations in base types/classes. This means equality between dataflow
+variables and those base types will not behave as expected. Require
+the following to get equality on base types that uses method calls,
+while still passing rubyspec:
+
+<pre>require "dataflow/equality"</pre>
+
 h1. References
 
 The basis of dataflow variables around a language is not common among

data/Rakefile

@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.homepage          = "http://github.com/larrytheliquid/dataflow"
   s.summary           = "Dataflow concurrency for Ruby (inspired by the Oz language)"
   s.description       = s.summary
-  s.files             = %w[LICENSE History.txt Rakefile README.textile dataflow.rb] + Dir["lib/**/*"] + Dir["examples/**/*"]
+  s.files             = %w[LICENSE HISTORY Rakefile README.textile dataflow.rb] + Dir["dataflow/**/*"] + Dir["examples/**/*"]
   s.require_path      = '.'
   s.test_files        = Dir["spec/**/*"]
 end

data/dataflow.rb

@@ -1,7 +1,7 @@
 require 'monitor'
 
 module Dataflow
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
   
   def self.included(cls)
     class << cls
@@ -42,22 +42,23 @@ module Dataflow
   # initialized instance variables in get/set methods for memory and
   # performance reasons
   class Variable
-    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
+    instance_methods.each { |m| undef_method m }
     LOCK = Monitor.new
     def initialize(&block) @__trigger__ = block if block_given? end
     
     # Lazy-load conditions to be nice on memory usage
     def __binding_condition__() @__binding_condition__ ||= LOCK.new_cond end
-
+    
     def __unify__(value)
       LOCK.synchronize do
+        __activate_trigger__ if @__trigger__
         if @__bound__
-          raise UnificationError if @__value__ != value
+          raise UnificationError if self != value
         else
           @__value__ = value
           @__bound__ = true
           __binding_condition__.broadcast # wakeup all method callers
-          remove_instance_variable :@__binding_condition__ # GC
+          @__binding_condition__ = nil # GC
         end
       end
       @__value__
@@ -66,12 +67,13 @@ module Dataflow
     def __activate_trigger__
       @__value__ = @__trigger__.call
       @__bound__ = true
-      remove_instance_variable :@__trigger__ # GC
+      @__trigger__ = nil # GC
     end
 
     def method_missing(name, *args, &block)
       LOCK.synchronize do
         unless @__bound__
+          return '#<Dataflow::Variable unbound>' if name == :inspect
           if @__trigger__
             __activate_trigger__
           else
@@ -86,5 +88,5 @@ module Dataflow
   UnificationError = Class.new StandardError
 end
 
-require "#{File.dirname(__FILE__)}/lib/port"
-require "#{File.dirname(__FILE__)}/lib/actor"
+require "#{File.dirname(__FILE__)}/dataflow/port"
+require "#{File.dirname(__FILE__)}/dataflow/actor"

data/dataflow/equality.rb

@@ -0,0 +1,28 @@
+# The purpose of this file is to make equality use method calls in as
+# many Ruby implementations as possible. If method calls are used,
+# then equality operations using dataflow variaables becomes seemless
+# I realize overriding core classes is a pretty nasty hack, but if you
+# have a better idea that also passes the equality_specs then I'm all
+# ears. Please run the rubyspec before committing changes to this file.
+
+class Object
+  def ==(other)
+    __id__ == other.__id__
+  end
+end
+
+class Symbol
+  def ==(other)
+    __id__ == other.__id__
+  end
+end
+
+class Regexp
+  def ==(other)
+    other.is_a?(Regexp) && 
+    casefold? == other.casefold? &&
+    kcode == other.kcode &&
+    options == other.options &&
+    source == other.source
+  end
+end

data/spec/actor_spec.rb

@@ -1,5 +1,4 @@
 require "#{File.dirname(__FILE__)}/spec_helper"
-Thread.abort_on_exception = true
 
 describe 'Syncronously sending to an Actor' do  
   it 'passes in each message received and preserves order' do

data/spec/by_need_spec.rb

@@ -1,12 +1,55 @@
 require "#{File.dirname(__FILE__)}/spec_helper"
 
-describe 'A by_need trigger' do
-  it 'creates a need when a method is called on it' do
-    local do |x, y, z|
-      Thread.new { unify y, by_need { 4 } }
-      Thread.new { unify z, x + y }
-      Thread.new { unify x, by_need { 3 } }      
-      z.should == 7
+describe 'A by_need expression' do
+  describe 'when a method is called on it' do
+    it 'binds its variable' do
+      local do |x, y, z|
+        Thread.new { unify y, by_need { 4 } }
+        Thread.new { unify z, x + y }
+        Thread.new { unify x, by_need { 3 } }
+        z.should == 7
+      end
+    end
+  end
+
+  describe 'when a bound variable is unified to it' do
+    it 'passes unififcation for equal values' do
+      local do |x|
+        unify x, by_need { 1 }
+        unify x, 1
+        x.should == 1
+
+        y = by_need { 1 }
+        unify y, 1
+        y.should == 1
+      end
+    end
+
+    it 'fails unififcation for unequal values' do
+      local do |x|
+        unify x, by_need { 1 }
+        lambda { unify x, 2 }.should raise_error(Dataflow::UnificationError)
+
+        y = by_need { 1 }
+        lambda { unify y, 2 }.should raise_error(Dataflow::UnificationError)
+      end
+    end
+
+    describe 'when it is unified to a bound variable' do
+      it 'passes unififcation for equal values' do
+        local do |x|
+          unify x, 1
+          unify x, by_need { 1 }
+          x.should == 1
+        end
+      end
+      
+      it 'fails unification for unequal values' do
+        local do |x|
+          unify x, 1
+          lambda { unify x, by_need { 2 } }.should raise_error(Dataflow::UnificationError)
+        end
+      end
     end
   end
 end

data/spec/equality_spec.rb

@@ -0,0 +1,40 @@
+require "#{File.dirname(__FILE__)}/spec_helper"
+
+describe 'Unifying a bound value' do
+  [nil, true, false,
+   :sym, "str", /regex/,
+   3, 2.0,
+   Object.new, Class.new.new,
+   [], {}].each do |type|
+    describe "for #{type.class} instances" do
+      it 'passes unification for an object of equal value' do
+        local do |var, var2|
+          unify var, type
+          var.should == type
+          type.should == var
+          lambda {unify var, type}.should_not raise_error
+
+          unify var2, type
+          var.should == var2
+          var2.should == var
+          lambda {unify var, var2}.should_not raise_error        
+        end
+      end
+
+      it 'fails unification for an object of inequal value' do
+        different = Object.new
+        local do |var, var2|
+          unify var, type
+          var.should_not == different
+          different.should_not == var
+          lambda {unify var, different}.should raise_error(Dataflow::UnificationError)
+
+          unify var2, different
+          var.should_not == var2
+          var2.should_not == var
+          lambda {unify var, different}.should raise_error(Dataflow::UnificationError)
+        end
+      end
+    end
+  end
+end

data/spec/inspect_spec.rb

@@ -0,0 +1,19 @@
+require "#{File.dirname(__FILE__)}/spec_helper"
+
+describe "An unbound variable" do
+  it "should be inspectable for debugging purposes" do
+    local do |unbound|
+      unbound.inspect.should == "#<Dataflow::Variable unbound>"
+    end
+  end
+end
+
+describe "An bound variable" do
+  it "should proxy inspect" do
+    local do |bound|
+      bound.inspect
+      unify bound, "str"
+      bound.should == "str"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 require 'rubygems'
 require 'spec'
-require 'dataflow'
+require "#{File.dirname(__FILE__)}/../dataflow"
+require "#{File.dirname(__FILE__)}/../dataflow/equality"
+
+Thread.abort_on_exception = true
 
 Spec::Runner.configure do |config|
   config.include Dataflow

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dataflow
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Larry Diehl
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-13 00:00:00 -07:00
+date: 2009-07-09 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -23,22 +23,23 @@ extra_rdoc_files: []
 
 files: 
 - LICENSE
-- History.txt
+- HISTORY
 - Rakefile
 - README.textile
 - dataflow.rb
-- lib/actor.rb
-- lib/port.rb
-- examples/local_variables.rb
+- dataflow/actor.rb
+- dataflow/equality.rb
+- dataflow/port.rb
+- examples/data_driven.rb
 - examples/dataflow_http_gets.rb
+- examples/future_http_gets.rb
 - examples/instance_variables.rb
-- examples/data_driven.rb
-- examples/ring.rb
-- examples/port_send.rb
 - examples/laziness.rb
-- examples/port_http_gets.rb
-- examples/future_http_gets.rb
+- examples/local_variables.rb
 - examples/messages.rb
+- examples/port_http_gets.rb
+- examples/port_send.rb
+- examples/ring.rb
 has_rdoc: false
 homepage: http://github.com/larrytheliquid/dataflow
 post_install_message: 
@@ -66,10 +67,12 @@ signing_key:
 specification_version: 2
 summary: Dataflow concurrency for Ruby (inspired by the Oz language)
 test_files: 
-- spec/need_later_spec.rb
+- spec/actor_spec.rb
 - spec/by_need_spec.rb
-- spec/spec_helper.rb
+- spec/dataflow_spec.rb
+- spec/equality_spec.rb
+- spec/inspect_spec.rb
+- spec/need_later_spec.rb
 - spec/port_spec.rb
 - spec/spec.opts
-- spec/dataflow_spec.rb
-- spec/actor_spec.rb
+- spec/spec_helper.rb

data/History.txt

@@ -1,12 +0,0 @@
-== 0.1.1 / 2009-06-13
- 
-* Minor enhancements
- 
-  * Got the "require_path" set correctly so rubygems can be used =)
- 
-
-== 0.1.0 / 2009-06-13
- 
-* 1 major enhancement
- 
-  * Birthday!