ruote 2.2.0 → 2.3.0

data/test/functional/storage_helper.rb

@@ -6,23 +6,25 @@
 #
 
 require 'ruote/storage/hash_storage'
-require 'ruote/storage/fs_storage'
 
 
-def locate_storage_impl (arg)
+def locate_storage_impl(pers)
 
-  pers = arg[2..-1]
+  glob = File.expand_path("../../../../ruote-#{pers}*", __FILE__)
 
-  path = Dir[File.expand_path(
-    File.join(File.dirname(__FILE__), %w[ .. .. .. ], "ruote-#{pers}*"))].first
+  path = Dir[glob].first
 
-  File.directory?(path) ? [ pers, path ] : nil
+  if path
+    File.directory?(path) ? [ pers, path ] : nil
+  elsif glob.split('/').include?('bundler')
+    glob.match(/^(.+\/ruote-#{pers}\/).+/) ? [ pers, $~[1] ] : nil
+  end
 end
 
+# Returns an instance of the storage to use (the ARGV determines which
+# storage to use).
 #
-# Returns the class of the engine to use, based on the ARGV
-#
-def determine_storage (opts)
+def determine_storage(opts)
 
   if ARGV.include?('--help')
     puts %{
@@ -39,58 +41,69 @@ else uses the in-memory Ruote::Engine (fastest, but no persistence at all)
 
   ps = ARGV.select { |a| a.match(/^--[a-z]/) }
   ps.delete('--split')
+  ps = ps.collect { |s| m = s.match(/^--(.+)$/); m ? m[1] : s }
+
+  ps = [ ENV['RUOTE_STORAGE'] ].compact if ps.empty?
+
+  ps = [] if ps == [ 'hash' ] || ps == [ 'memory' ]
 
   persistent = opts.delete(:persistent)
 
-  if ps.include?('--fs')
+  if ps.include?('fs')
 
-    begin
-      require 'yajl'
-    rescue LoadError
-      require 'json'
-    end
+    require 'ruote/storage/fs_storage'
+
+    require_json
     Rufus::Json.detect_backend
 
     Ruote::FsStorage.new('work', opts)
 
   elsif not ps.empty?
 
-    pers = nil
-    ps.find { |a| pers = locate_storage_impl(a) }
+    pers = ps.inject(nil) { |r, a| r ? r : locate_storage_impl(a) }
 
     raise "no persistence found (#{ps.inspect})" unless pers
 
     lib, path = pers
     $:.unshift(File.join(path, 'lib'))
 
-    begin
-      load 'test/functional_connection.rb'
-    rescue LoadError => le
+    load_errors = []
+
+    [ '.', path ].product(%w[
+      connection functional_connection integration_connection
+    ]).each do |pa, f|
+
+      paf = "#{File.join(pa, 'test', f)}.rb"
       begin
-        load File.join(path, %w[ test functional_connection.rb ])
-      rescue LoadError => lee
-        begin
-          load File.join(path, %w[ test integration_connection.rb ])
-        rescue LoadError => leee
-          p le
-          p lee
-          p leee
-          raise leee
-        end
+        load(paf)
+        load_errors = nil
+        break
+      rescue LoadError => le
+        load_errors << [ paf, le ]
+      end
+    end
+
+    if load_errors
+      puts "=" * 80
+      puts "** failed to load connection"
+      load_errors.each do |paf, le|
+        puts
+        puts paf
+        p le
       end
+      puts "=" * 80
+      exit(1)
     end
 
     new_storage(opts)
 
   elsif persistent
 
-    begin
-      require 'yajl'
-    rescue LoadError
-      require 'json'
-    end
+    require_json
     Rufus::Json.detect_backend
 
+    require 'ruote/storage/fs_storage'
+
     Ruote::FsStorage.new('work', opts)
 
   else

data/test/functional/test.rb

@@ -5,9 +5,9 @@
 # since Mon Oct  9 22:19:44 JST 2006
 #
 
-def l (t)
+def l(t)
 
-  if ARGV.include?('--split')
+  if ENV['RUOTE_TEST_SPLIT'].to_s == 'true'
 
     puts
     puts "=== #{t} :"
@@ -17,7 +17,9 @@ def l (t)
     es = es.nil? ? 66 : es.to_s.to_i
 
     exit(es) if es != 0
+
   else
+
     load(t)
   end
 end
@@ -33,6 +35,8 @@ unless RUBY_PLATFORM.match(/mswin|mingw/)
     # concurrence/collision tests, tests about 2+ instances of ruote colliding
 end
 
+l(File.expand_path('../storage.rb', __FILE__))
+
 Dir.glob(File.join(File.dirname(__FILE__), 'ft_*.rb')).sort.each { |t| l(t) }
   # functional tests targetting features rather than expressions
 

data/test/misc/idle.rb

@@ -0,0 +1,21 @@
+
+#
+# test/idle.rb
+#
+# Thu Jul 26 20:34:53 JST 2012
+#
+# used when observing ruote's idle behaviour (checking it's not polling too
+# much)
+#
+
+require 'rufus-json/automatic'
+require 'ruote'
+require File.expand_path('../../functional/storage_helper', __FILE__)
+
+sto = determine_storage({})
+
+dboard = Ruote::Dashboard.new(Ruote::Worker.new(sto))
+#dboard.noisy = ENV['NOISY'].to_s == 'true'
+
+dboard.join
+

data/test/misc/light.rb

@@ -0,0 +1,29 @@
+
+#
+# test/idle.rb
+#
+# Thu Jul 26 20:34:53 JST 2012
+#
+# light load, for a few hours
+#
+
+require 'rufus-json/automatic'
+require 'ruote'
+require File.expand_path('../../functional/storage_helper', __FILE__)
+
+sto = determine_storage({})
+
+dboard = Ruote::Dashboard.new(Ruote::Worker.new(sto))
+dboard.noisy = ENV['NOISY'].to_s == 'true'
+
+dboard.register 'alpha' do |workitem|
+  sleep(60.0 * rand)
+end
+
+loop do
+  dboard.launch(Ruote.define do
+    21.times { alpha }
+  end)
+  sleep(60.0 * 10 * rand)
+end
+

data/test/path_helper.rb

@@ -10,6 +10,6 @@
 puts `ruby -v`
 puts Time.now.to_s
 
-ruotelib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+ruotelib = File.expand_path('../../lib', __FILE__)
 $:.unshift(ruotelib) unless $:.include?(ruotelib)
 

data/test/test.rb

@@ -5,9 +5,6 @@
 # since Mon Oct  9 22:19:44 JST 2006
 #
 
-load File.dirname(__FILE__) + '/unit/test.rb'
-load File.dirname(__FILE__) + '/functional/test.rb'
-
-#load File.dirname(__FILE__) + '/extras/test.rb'
-  # special tests that require external stuff
+load File.expand_path('../unit/test.rb', __FILE__)
+load File.expand_path('../functional/test.rb', __FILE__)
 

data/test/test_helper.rb

@@ -7,15 +7,28 @@
 
 require File.join(File.dirname(__FILE__), 'path_helper')
 
+require 'pp'
 require 'test/unit'
 require 'rubygems'
 
+# Fail fast, especially when testing
+#
+Thread.abort_on_exception = true
 
+# A helper method
+#
 def require_json
+
+  return if $json_lib_loaded
+
   begin
     require 'yajl'
+    require 'yajl/version'
+    puts "using yajl #{Yajl::VERSION}"
   rescue LoadError
     require 'json'
+    puts "using json #{JSON::VERSION}"
   end
+  $json_lib_loaded = true
 end
 

data/test/unit/test.rb

@@ -5,7 +5,7 @@
 # since Mon Oct  9 22:19:44 JST 2006
 #
 
-def l (t)
+def l(t)
 
   if ARGV.include?('--split')
 
@@ -21,8 +21,5 @@ def l (t)
   end
 end
 
-load File.join(File.dirname(__FILE__), 'storage.rb')
-
 Dir.glob(File.join(File.dirname(__FILE__), 'ut_*.rb')).sort.each { |t| l(t) }
-Dir.glob(File.join(File.dirname(__FILE__), 'hut_*.rb')).sort.each { |t| l(t) }
 

data/test/unit/ut_0_ruby_reader.rb

@@ -5,7 +5,7 @@
 # Tue May 12 15:31:26 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
+require File.expand_path('../../test_helper', __FILE__)
 
 require 'ruote/reader'
 
@@ -130,33 +130,33 @@ class UtRubyReaderTest < Test::Unit::TestCase
       Ruote::Reader.read %{ Ruote.define { alpha } }
     #end
 
-    assert_raise ArgumentError do
+    assert_raise Ruote::Reader::Error do
       Ruote::Reader.read %{ Ruote.define { abort } }
     end
-    assert_raise ArgumentError do
+    assert_raise Ruote::Reader::Error do
       Ruote::Reader.read %{ Ruote.define { exit } }
     end
-    assert_raise ArgumentError do
+    assert_raise Ruote::Reader::Error do
       Ruote::Reader.read %{ Ruote.define { exit! } }
     end
 
-    assert_raise ArgumentError do
+    assert_raise Ruote::Reader::Error do
       Ruote::Reader.read %{ Ruote.define { x = Kernel } }
     end
 
-    assert_raise ArgumentError do
+    assert_raise Ruote::Reader::Error do
       Ruote::Reader.read %{ Ruote.define { module Nada; end } }
     end
 
-    assert_raise ArgumentError do
+    assert_raise Ruote::Reader::Error do
       Ruote::Reader.read %{ Ruote.define { File.read('stuff') } }
     end
 
-    assert_raise ArgumentError do
+    assert_raise Ruote::Reader::Error do
       Ruote::Reader.read %{ Ruote.define { at_exit { } } }
     end
 
-    assert_raise ArgumentError do
+    assert_raise Ruote::Reader::Error do
       Ruote::Reader.read %{ Ruote.define { def nada; end } }
     end
   end
@@ -203,5 +203,21 @@ class UtRubyReaderTest < Test::Unit::TestCase
       ] ],
       tree)
   end
+
+  def test_proc
+
+    tree = Ruote.define do
+      set 'v:v' => "lambda { |wi| p wi }\n"
+      set 'v:v' => lambda { |wi| p wi }
+      set 'v:v' => { 'on_workitem' => lambda { |wi| p wi } }
+    end
+
+    assert_equal(
+      [ 'define', {}, [
+        [ 'set', { 'v:v' => "lambda { |wi| p wi }\n" }, [] ],
+        [ 'set', { 'v:v' => "proc { |wi| p wi }\n" }, [] ],
+        [ 'set', { 'v:v' => { 'on_workitem' => "proc { |wi| p wi }\n" } }, [] ] ] ],
+      tree)
+  end
 end
 

data/test/unit/ut_10_participants.rb

@@ -0,0 +1,47 @@
+
+#
+# testing ruote
+#
+# Wed Jun 29 12:05:41 JST 2011
+#
+
+require File.expand_path('../../test_helper', __FILE__)
+
+require 'ruote/workitem'
+require 'ruote/part/local_participant'
+
+
+class UtParticipantsTest < Test::Unit::TestCase
+
+  class OldParticipant
+    include Ruote::LocalParticipant
+    def consume(workitem)
+      $result = workitem.fields['test']
+    end
+  end
+
+  class NewParticipant
+    include Ruote::LocalParticipant
+    def on_workitem
+      $result = workitem.fields['test']
+    end
+  end
+
+  def new_workitem(fields)
+    Ruote::Workitem.new('fields' => fields)
+  end
+
+  def test_consume
+
+    OldParticipant.new._consume(new_workitem('test' => 'zero'))
+    assert_equal 'zero', $result
+    OldParticipant.new._on_workitem(new_workitem('test' => 'zero'))
+    assert_equal 'zero', $result
+
+    NewParticipant.new._consume(new_workitem('test' => 'one'))
+    assert_equal 'one', $result
+    NewParticipant.new._on_workitem(new_workitem('test' => 'one'))
+    assert_equal 'one', $result
+  end
+end
+

data/test/unit/ut_11_lookup.rb

@@ -5,7 +5,7 @@
 # Mon Aug  3 19:19:58 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
+require File.expand_path('../../test_helper', __FILE__)
 
 require 'ruote/util/lookup'
 
@@ -18,6 +18,12 @@ class LookupTest < Test::Unit::TestCase
     assert_equal('B', Ruote.lookup({ 'h' => %w[ A B C ] }, 'h.1'))
   end
 
+  def test_hash_lookup_and_number_keys
+
+    assert_equal('B', Ruote.lookup({ '1' => %w[ A B C ] }, '1.1'))
+    assert_equal('B', Ruote.lookup({ 1 => %w[ A B C ] }, '1.1'))
+  end
+
   def test_lookup_dot
 
     h = { 'a' => 'b' }
@@ -27,11 +33,26 @@ class LookupTest < Test::Unit::TestCase
 
   def test_container_lookup
 
+    assert_equal(
+      %w[ A B C ],
+      Ruote.lookup({ 'h' => { 'hh' => %w[ A B C ]} }, 'h.hh', false))
     assert_equal(
       [ 'hh', { 'hh' => %w[ A B C ] } ],
       Ruote.lookup({ 'h' => { 'hh' => %w[ A B C ]} }, 'h.hh', true))
   end
 
+  def test_deep_container_lookup
+
+    h = { 'foo' => { 'bar' => { 'baz' => { 'fruit' => 'pineapple' } } } }
+
+    assert_equal(
+      "pineapple",
+      Ruote.lookup(h, 'foo.bar.baz.fruit', false))
+    assert_equal(
+      [ 'fruit', { 'fruit' => 'pineapple' } ],
+      Ruote.lookup(h, 'foo.bar.baz.fruit', true))
+  end
+
   def test_missing_container_lookup
 
     assert_equal(
@@ -39,6 +60,21 @@ class LookupTest < Test::Unit::TestCase
       Ruote.lookup({ 'h' => { 'hh' => %w[ A B C ]} }, 'nada.nada', true))
   end
 
+  def test_has_key
+
+    h = { 'h' => %w[ a b c ] }
+
+    assert_equal(true, Ruote.has_key?(h, 'h'))
+    assert_equal(true, Ruote.has_key?(h, 'h.1'))
+
+    h = { 'foo' => { 'bar' => { 'baz' => { 'fruit' => 'pineapple' } } } }
+
+    assert_equal(true, Ruote.has_key?(h, 'foo.bar.baz.fruit'))
+    assert_equal(true, Ruote.has_key?(h, 'foo.bar'))
+
+    assert_equal(false, Ruote.has_key?(h, 'bar'))
+  end
+
   def test_set
 
     h = { 'customer' => { 'name' => 'alpha' } }
@@ -47,12 +83,33 @@ class LookupTest < Test::Unit::TestCase
     assert_equal({"customer"=>{"name"=>"bravo"}}, h)
   end
 
+  # courtesy of Nando Sola
+  #
+  def test_deep_set
+
+    h = { 'foo' => { 'bar' => { 'baz' => { 'fruit' => 'pineapple' } } } }
+
+    Ruote.set(h, 'foo.bar.baz.fruit', 'orange')
+
+    assert_equal(
+      { "foo" => { "bar" => { "baz" => { "fruit" => "orange" } } } },
+      h)
+  end
+
   def test_set_missing
 
     h = {}
     Ruote.set(h, 'customer.name', 'bravo')
 
-    assert_equal({"customer.name"=>"bravo"}, h)
+    assert_equal({ 'customer.name' => 'bravo' }, h)
+  end
+
+  def test_set_integer_corner_case
+
+    h = {}
+    Ruote.set(h, '0_0_1', 'charly')
+
+    assert_equal({ '0_0_1' => 'charly' }, h)
   end
 
   def test_hash_unset