ruote-redis 2.1.11 → 2.2.0

data/CHANGELOG.txt

@@ -2,6 +2,12 @@
 = ruote-redis - CHANGELOG.txt
 
 
+== ruote-redis 2.2.0    released 2011/03/01
+
+- Ruote::Redis::Storage (instead of RedisStorage)
+- fixed get_many result order (was broken for 1.8.7)
+
+
 == ruote-redis 2.1.11    released 2010/10/01
 
 - storage format change (thanks @wwkeyboard)

data/CREDITS.txt

@@ -9,6 +9,7 @@
 
 == contributors
 
+- John Le - http://github.com/sandbox
 - Aaron Lee - http://github.com/wwkeyboard
 
 

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2001-2010, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2001-2011, John Mettraux, jmettraux@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.rdoc

@@ -1,7 +1,7 @@
 
 = ruote-redis
 
-Redis persistence for ruote 2.1 (a ruby workflow engine)
+Redis persistence for ruote (a Ruby workflow engine)
 
 
 == usage
@@ -14,14 +14,14 @@ The storage is instantiate by passing a redis-rb instance to the storage.
 
   engine = Ruote::Engine.new(
     Ruote::Worker.new(
-      Ruote::Redis::RedisStorage.new(
+      Ruote::Redis::Storage.new(
         ::Redis.new(:db => 14, :thread_safe => true), {})))
 
   # ...
 
 Passing an em-redis instance might work, but I haven't tried.
 
-Tested with Redis 1.3.8 (redis-rb 2.0.1).
+Tested with Redis 1.2.6 and 2.0.4 (redis-rb 2.1.1).
 
 
 == running tests

data/Rakefile

@@ -1,75 +1,92 @@
 
+$:.unshift('.') # 1.9.2
+
 require 'rubygems'
+
 require 'rake'
+require 'rake/clean'
+require 'rake/rdoctask'
 
-require 'lib/ruote/redis/version.rb'
 
 #
-# CLEAN
+# clean
 
-require 'rake/clean'
-CLEAN.include('pkg', 'tmp', 'html')
-task :default => [ :clean ]
+CLEAN.include('pkg', 'rdoc')
 
 
 #
-# GEM
+# test / spec
+
+task :test do
+
+  puts
+  puts "to test ruote-redis, head to your ruote/ dir and run"
+  puts
+  puts "  ruby test/test.rb -- --redis"
+  puts
+  puts "but first, make sure your ruote-dm/test/functional_connection.rb"
+  puts "is set correctly."
+  puts
+end
 
-require 'jeweler'
+task :default => [ :test ]
 
-Jeweler::Tasks.new do |gem|
 
-  gem.version = Ruote::Redis::VERSION
-  gem.name = 'ruote-redis'
-  gem.summary = 'Redis storage for ruote (a ruby workflow engine)'
-  gem.description = %{
-Redis storage for ruote (a ruby workflow engine)
-  }.strip
-  gem.email = 'jmettraux@gmail.com'
-  gem.homepage = 'http://github.com/jmettraux/ruote-redis'
-  gem.authors = [ 'John Mettraux' ]
-  gem.rubyforge_project = 'ruote'
+#
+# gem
+
+GEMSPEC_FILE = Dir['*.gemspec'].first
+GEMSPEC = eval(File.read(GEMSPEC_FILE))
+GEMSPEC.validate
 
-  #gem.test_file = 'test/test.rb'
 
-  gem.add_dependency 'ruote', ">= #{Ruote::Redis::VERSION}"
-  gem.add_dependency 'redis', '>= 2.0.5'
-  gem.add_development_dependency 'yard'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'jeweler'
+desc %{
+  builds the gem and places it in pkg/
+}
+task :build do
 
-  # gemspec spec : http://www.rubygems.org/read/chapter/20
+  sh "gem build #{GEMSPEC_FILE}"
+  sh "mkdir pkg" rescue nil
+  sh "mv #{GEMSPEC.name}-#{GEMSPEC.version}.gem pkg/"
 end
-Jeweler::GemcutterTasks.new
 
+desc %{
+  builds the gem and pushes it to rubygems.org
+}
+task :push => :build do
+
+  sh "gem push pkg/#{GEMSPEC.name}-#{GEMSPEC.version}.gem"
+end
 
-#
-# DOC
 
 #
-# make sure to have rdoc 2.5.x to run that
+# rdoc
 #
-require 'rake/rdoctask'
+# make sure to have rdoc 2.5.x to run that
+
 Rake::RDocTask.new do |rd|
 
   rd.main = 'README.rdoc'
-  rd.rdoc_dir = 'rdoc/ruote-redis_rdoc'
+  rd.rdoc_dir = 'rdoc'
 
   rd.rdoc_files.include(
     'README.rdoc', 'CHANGELOG.txt', 'CREDITS.txt', 'lib/**/*.rb')
 
-  rd.title = "ruote-redis #{Ruote::Redis::VERSION}"
+  rd.title = "#{GEMSPEC.name} #{GEMSPEC.version}"
 end
 
 
 #
-# TO THE WEB
+# upload_rdoc
 
+desc %{
+  upload the rdoc to rubyforge
+}
 task :upload_rdoc => [ :clean, :rdoc ] do
 
   account = 'jmettraux@rubyforge.org'
   webdir = '/var/www/gforge-projects/ruote'
 
-  sh "rsync -azv -e ssh rdoc/ruote-redis_rdoc #{account}:#{webdir}/"
+  sh "rsync -azv -e ssh rdoc/#{GEMSPEC.name}_rdoc #{account}:#{webdir}/"
 end
 

data/TODO.txt

@@ -1,10 +1,9 @@
 
 [x] methods specific to StorageParticipant
 [o] redis -> @redis
-
-[ ] 1 ::Redis instance per thread ? (instead of :thread_safe => true)
-[ ] update to redis-rb 2.0 (which has sthing about threads)
+[o] update to redis-rb 2.0 (which has sthing about threads)
     http://blog.citrusbyte.com/2010/05/14/redis-rb-200/
+[x] 1 ::Redis instance per thread ? (instead of :thread_safe => true)
 
-[ ] double-check for deletion of old keys
+[ ] resque participant ?
 

data/lib/ruote/redis/storage.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright(c) 2005-2010, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2011, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files(the "Software"), to deal
@@ -60,7 +60,7 @@ module Redis
   # If you try and it works, feedback is welcome
   # http://groups.google.com/group/openwferu-users
   #
-  class RedisStorage
+  class Storage
 
     include Ruote::StorageBase
 
@@ -74,24 +74,23 @@ module Redis
       @options = options
 
       def @redis.keys_to_a(opt)
-        r = keys(opt)
-        r.is_a?(Array) ? r : r.split(' ')
+        keys(opt) rescue []
       end
 
       put_configuration
     end
 
+    # Returns true if the doc is successfully deleted.
+    #
     def reserve(doc)
 
-      @redis.del(key_for(doc))
+      (@redis.del(key_for(doc)) == 1)
     end
 
     def put_msg(action, options)
 
       doc = prepare_msg_doc(action, options)
 
-      puts "XXX" if @redis.nil?
-
       @redis.set(key_for(doc), to_json(doc))
 
       nil
@@ -110,6 +109,8 @@ module Redis
 
     def delete_schedule(schedule_id)
 
+      return unless schedule_id
+
       @redis.del(key_for('schedules', schedule_id))
     end
 
@@ -233,7 +234,11 @@ module Redis
         h
       end
 
-      opts[:count] ? docs.size : docs.values
+      return docs.size if opts[:count]
+
+      docs = docs.values.sort_by { |d| d['_id'] }
+
+      opts[:descending] ? docs.reverse : docs
     end
 
     def ids(type)
@@ -258,21 +263,36 @@ module Redis
       @redis.keys_to_a("#{type}/*").sort.join("\n")
     end
 
+    # Shuts this worker down.
+    #
+    # (This close / shutdown dichotomy has to be resolved at some point...)
+    #
     def close
 
       @redis.quit
     end
 
+    # Shuts this worker down.
+    #
+    # (This close / shutdown dichotomy has to be resolved at some point...)
+    #
+    def shutdown
+
+      @redis.quit
+    end
+
     # Mainly used by ruote's test/unit/ut_17_storage.rb
     #
     def add_type(type)
+
+      # nothing to be done
     end
 
     # Nukes a db type and reputs it(losing all the documents that were in it).
     #
     def purge_type!(type)
 
-      @redis.keys_to_a("#{type}/*").each { |k| @redis.del(k) }
+      @redis.keys_to_a("#{type}/*").each { |k| (@redis.del(k) rescue nil) }
     end
 
     protected
@@ -352,6 +372,12 @@ module Redis
       put({ '_id' => 'engine', 'type' => 'configurations' }.merge(@options))
     end
   end
+
+  #
+  # Keeping Ruote::Redis::RedisStorage for backward compatibility.
+  #
+  class RedisStorage < Storage
+  end
 end
 end
 

data/lib/ruote/redis/version.rb

@@ -1,7 +1,8 @@
 
 module Ruote
 module Redis
-  VERSION = '2.1.11'
+
+  VERSION = '2.2.0'
 end
 end
 

data/ruote-redis.gemspec

@@ -1,68 +1,31 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
 Gem::Specification.new do |s|
-  s.name = %q{ruote-redis}
-  s.version = "2.1.11"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["John Mettraux"]
-  s.date = %q{2010-10-01}
-  s.description = %q{Redis storage for ruote (a ruby workflow engine)}
-  s.email = %q{jmettraux@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-     "README.rdoc"
-  ]
-  s.files = [
-    "CHANGELOG.txt",
-     "CREDITS.txt",
-     "LICENSE.txt",
-     "README.rdoc",
-     "Rakefile",
-     "TODO.txt",
-     "lib/ruote-redis.rb",
-     "lib/ruote/redis.rb",
-     "lib/ruote/redis/storage.rb",
-     "lib/ruote/redis/version.rb",
-     "ruote-redis.gemspec",
-     "test/functional_connection.rb"
-  ]
-  s.homepage = %q{http://github.com/jmettraux/ruote-redis}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{ruote}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Redis storage for ruote (a ruby workflow engine)}
-  s.test_files = [
-    "test/functional_connection.rb"
+  s.name = 'ruote-redis'
+  s.version = File.read('lib/ruote/redis/version.rb').match(/VERSION = '([^']+)'/)[1]
+  s.platform = Gem::Platform::RUBY
+  s.authors = [ 'John Mettraux' ]
+  s.email = [ 'jmettraux@gmail.com' ]
+  s.homepage = 'http://ruote.rubyforge.org'
+  s.rubyforge_project = 'ruote'
+  s.summary = 'Redis storage for ruote (a Ruby workflow engine)'
+  s.description = %q{
+Redis storage for ruote (a Ruby workflow engine)
+}
+
+  #s.files = `git ls-files`.split("\n")
+  s.files = Dir[
+    'Rakefile',
+    'lib/**/*.rb', 'spec/**/*.rb', 'test/**/*.rb',
+    '*.gemspec', '*.txt', '*.rdoc', '*.md'
   ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_runtime_dependency 'redis', '2.1.1'
+  s.add_runtime_dependency 'ruote', ">= #{s.version}"
+
+  s.add_development_dependency 'rake'
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ruote>, [">= 2.1.11"])
-      s.add_runtime_dependency(%q<redis>, [">= 2.0.5"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<ruote>, [">= 2.1.11"])
-      s.add_dependency(%q<redis>, [">= 2.0.5"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<ruote>, [">= 2.1.11"])
-    s.add_dependency(%q<redis>, [">= 2.0.5"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
+  s.require_path = 'lib'
 end
 

data/test/functional_connection.rb

@@ -23,7 +23,7 @@ end
 
 def new_storage (opts)
 
-  Ruote::Redis::RedisStorage.new(
+  Ruote::Redis::Storage.new(
     ::Redis.new(:db => 14, :thread_safe => true),
     #::Redis.new(:db => 14, :thread_safe => true, :logger => RrLogger.new),
     opts)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 1
-  - 11
-  version: 2.1.11
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - John Mettraux
@@ -14,41 +14,44 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 +09:00
+date: 2011-03-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ruote
+  name: redis
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 1
-        - 11
-        version: 2.1.11
+        - 1
+        version: 2.1.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: redis
+  name: ruote
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
+        - 2
         - 0
-        - 5
-        version: 2.0.5
+        version: 2.2.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rake
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -57,62 +60,40 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
-description: Redis storage for ruote (a ruby workflow engine)
-email: jmettraux@gmail.com
+description: "\n\
+  Redis storage for ruote (a Ruby workflow engine)\n"
+email: 
+- jmettraux@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- CHANGELOG.txt
-- CREDITS.txt
-- LICENSE.txt
-- README.rdoc
 - Rakefile
-- TODO.txt
-- lib/ruote-redis.rb
-- lib/ruote/redis.rb
 - lib/ruote/redis/storage.rb
 - lib/ruote/redis/version.rb
-- ruote-redis.gemspec
+- lib/ruote/redis.rb
+- lib/ruote-redis.rb
 - test/functional_connection.rb
+- ruote-redis.gemspec
+- CHANGELOG.txt
+- CREDITS.txt
+- LICENSE.txt
+- TODO.txt
+- README.rdoc
 has_rdoc: true
-homepage: http://github.com/jmettraux/ruote-redis
+homepage: http://ruote.rubyforge.org
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -120,6 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -129,9 +111,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruote
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Redis storage for ruote (a ruby workflow engine)
-test_files: 
-- test/functional_connection.rb
+summary: Redis storage for ruote (a Ruby workflow engine)
+test_files: []
+