ruote-sequel 2.2.0 → 2.3.0

data/CHANGELOG.txt

@@ -2,6 +2,16 @@
 = ruote-sequel - CHANGELOG.txt
 
 
+== ruote-sequel 2.3.0    released 2012/09/01
+
+- switched to "begin_step" model
+- StorageParticipant#by_participant :skip :limit fix (Thanks Jan Topiński)
+- #delete : doc count > 1 is OK
+- StorageParticipant :count => true made consistent (Thanks Jan Topiński)
+- query_workitems didn't recognize :skip option (Thanks Eric Smith)
+- 'table_name' option for specifying something other than 'documents'
+
+
 == ruote-sequel 2.2.0    released 2011/03/01
 
 - initial release

data/CREDITS.txt

@@ -1,15 +1,24 @@
 
 = ruote-sequel CREDITS.txt
 
+
 == authors
 
-- John Mettraux - http://github.com/jmettraux
+- John Mettraux - https://github.com/jmettraux
 
 
 == contributors
 
+- Wesley Moore - https://github.com/wezm
+
+
+== feedback
+
+- Chad Albers - https://github.com/neomantic
+- Eric Smith - issue reporting
+
 
 == many thanks to
 
-- Jeremy Evans and all the Sequel community
+- Jeremy Evans and the Sequel community
 

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2005-2011, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2005-2012, 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/TODO.txt

@@ -1,3 +1,5 @@
 
-[ ] nothing for now
+[o] implement #reserve (simpler delete?)
+    that will prevent the SELECT in case of delete count < 1
+[ ] lots of select('configurations', 'engine') when starting, investigate
 

data/lib/ruote/sequel/storage.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2011, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2012, 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
@@ -33,20 +33,29 @@ module Sequel
   # Creates the 'documents' table necessary for this storage.
   #
   # If re_create is set to true, it will destroy any previous 'documents'
-  # table and create it.
+  # table and create it. If false (default) then the table will be created
+  # if it doesn't already exist.
   #
-  def self.create_table(sequel, re_create=false)
+  # It's also possible to change the default table_name from 'documents' to
+  # something else with the optional third parameter
+  #
+  def self.create_table(sequel, re_create=false, table_name='documents')
+
+    m = re_create ? :create_table! : :create_table?
 
-    m = re_create ? :create_table! : :create_table
+    sequel.send(m, table_name.to_sym) do
 
-    sequel.send(m, :documents) do
       String :ide, :size => 255, :null => false
       Integer :rev, :null => false
       String :typ, :size => 55, :null => false
       String :doc, :text => true, :null => false
-      String :wfid, :size => 255, :index => true
+      String :wfid, :size => 255
       String :participant_name, :size => 512
-      primary_key [ :ide, :rev, :typ ]
+
+      primary_key [ :typ, :ide, :rev ]
+
+      index :wfid
+      #index [ :typ, :wfid ]
     end
   end
 
@@ -80,9 +89,10 @@ module Sequel
     def initialize(sequel, options={})
 
       @sequel = sequel
-      @options = options
+      #@options = options
+      @table = (options['sequel_table_name'] || :documents).to_sym
 
-      put_configuration
+      replace_engine_configuration(options)
     end
 
     def put_msg(action, options)
@@ -94,6 +104,17 @@ module Sequel
       nil
     end
 
+    # Used to reserve 'msgs' and 'schedules'. Simply deletes the document,
+    # return true if the delete was successful (ie if the reservation is
+    # valid).
+    #
+    def reserve(doc)
+
+      @sequel[@table].where(
+        :typ => doc['type'], :ide => doc['_id'], :rev => 1
+      ).delete > 0
+    end
+
     def put_schedule(flavour, owner_fei, s, msg)
 
       # put_schedule is a unique action, no need for all the complexity of put
@@ -109,6 +130,8 @@ module Sequel
 
     def put(doc, opts={})
 
+      cache_clear(doc)
+
       if doc['_rev']
 
         d = get(doc['type'], doc['_id'])
@@ -122,7 +145,7 @@ module Sequel
 
       begin
 
-        do_insert(doc, nrev)
+        do_insert(doc, nrev, opts[:update_rev])
 
       rescue ::Sequel::DatabaseError => de
 
@@ -130,30 +153,31 @@ module Sequel
           # failure
       end
 
-      @sequel[:documents].where(
+      @sequel[@table].where(
         :typ => doc['type'], :ide => doc['_id']
       ).filter { rev < nrev }.delete
 
-      doc['_rev'] = nrev if opts[:update_rev]
-
       nil
         # success
     end
 
     def get(type, key)
 
-      d = do_get(type, key)
-
-      d ? Rufus::Json.decode(d[:doc]) : nil
+      cache_get(type, key) || do_get(type, key)
     end
 
     def delete(doc)
 
       raise ArgumentError.new('no _rev for doc') unless doc['_rev']
 
-      count = do_delete(doc)
+      cache_clear(doc)
+        # usually not necessary, adding it not to forget it later on
+
+      count = @sequel[@table].where(
+        :typ => doc['type'], :ide => doc['_id'], :rev => doc['_rev'].to_i
+      ).delete
 
-      return (get(doc['type'], doc['_id']) || true) if count != 1
+      return (get(doc['type'], doc['_id']) || true) if count < 1
         # failure
 
       nil
@@ -162,26 +186,30 @@ module Sequel
 
     def get_many(type, key=nil, opts={})
 
-      ds = @sequel[:documents].where(:typ => type)
+      cached = cache_get_many(type, key, opts)
+      return cached if cached
+
+      ds = @sequel[@table].where(:typ => type)
 
       keys = key ? Array(key) : nil
       ds = ds.filter(:wfid => keys) if keys && keys.first.is_a?(String)
 
-      return ds.all.size if opts[:count]
+      return ds.count if opts[:count]
 
       ds = ds.order(
-        *(opts[:descending] ? [ :ide.desc, :rev.desc ] : [ :ide.asc, :rev.asc ])
+        opts[:descending] ? :ide.desc : :ide.asc, :rev.desc
+      ).limit(
+        opts[:limit], opts[:skip] || opts[:offset]
       )
 
-      ds = ds.limit(opts[:limit], opts[:skip])
-
-      docs = ds.all
-      docs = select_last_revs(docs, opts[:descending])
+      docs = select_last_revs(ds)
       docs = docs.collect { |d| Rufus::Json.decode(d[:doc]) }
 
-      keys && keys.first.is_a?(Regexp) ?
-        docs.select { |doc| keys.find { |key| key.match(doc['_id']) } } :
+      if keys && keys.first.is_a?(Regexp)
+        docs.select { |doc| keys.find { |key| key.match(doc['_id']) } }
+      else
         docs
+      end
 
       # (pass on the dataset.filter(:wfid => /regexp/) for now
       # since we have potentially multiple keys)
@@ -191,23 +219,14 @@ module Sequel
     #
     def ids(type)
 
-      @sequel[:documents].where(:typ => type).collect { |d| d[:ide] }.uniq.sort
+      @sequel[@table].where(:typ => type).collect { |d| d[:ide] }.uniq.sort
     end
 
     # Nukes all the documents in this storage.
     #
     def purge!
 
-      @sequel[:documents].delete
-    end
-
-    # Returns a string representation the current content of the storage for
-    # a given type.
-    #
-    def dump(type)
-
-      "=== #{type} ===\n" +
-      get_many(type).map { |h| "  #{h['_id']} => #{h.inspect}" }.join("\n")
+      @sequel[@table].delete
     end
 
     # Calls #disconnect on the db. According to Sequel's doc, it closes
@@ -237,25 +256,34 @@ module Sequel
     #
     def purge_type!(type)
 
-      @sequel[:documents].where(:typ => type).delete
+      @sequel[@table].where(:typ => type).delete
     end
 
     # A provision made for workitems, allow to query them directly by
     # participant name.
     #
-    def by_participant(type, participant_name, opts)
+    def by_participant(type, participant_name, opts={})
 
       raise NotImplementedError if type != 'workitems'
 
-      docs = @sequel[:documents].where(
-        :typ => type, :participant_name => participant_name)
+      docs = @sequel[@table].where(
+        :typ => type, :participant_name => participant_name
+      )
+
+      return docs.count if opts[:count]
+
+      docs = docs.order(
+        :ide.asc, :rev.desc
+      ).limit(
+        opts[:limit], opts[:offset] || opts[:skip]
+      )
 
-      select_last_revs(docs).collect { |d| Rufus::Json.decode(d[:doc]) }
+      select_last_revs(docs).collect { |d| Ruote::Workitem.from_json(d[:doc]) }
     end
 
     # Querying workitems by field (warning, goes deep into the JSON structure)
     #
-    def by_field(type, field, value=nil)
+    def by_field(type, field, value, opts={})
 
       raise NotImplementedError if type != 'workitems'
 
@@ -263,21 +291,31 @@ module Sequel
       lk.push(Rufus::Json.encode(value)) if value
       lk.push('%')
 
-      docs = @sequel[:documents].where(:typ => type).filter(:doc.like(lk.join))
+      docs = @sequel[@table].where(
+        :typ => type
+      ).filter(
+        :doc.like(lk.join)
+      )
+
+      return docs.count if opts[:count]
+
+      docs = docs.order(
+        :ide.asc, :rev.desc
+      ).limit(
+        opts[:limit], opts[:offset] || opts[:skip]
+      )
 
-      select_last_revs(docs).collect { |d| Rufus::Json.decode(d[:doc]) }
+      select_last_revs(docs).collect { |d| Ruote::Workitem.from_json(d[:doc]) }
     end
 
     def query_workitems(criteria)
 
-      ds = @sequel[:documents].where(:typ => 'workitems')
+      ds = @sequel[@table].where(:typ => 'workitems')
 
-      return select_last_revs(ds.all).size if criteria['count']
+      count = criteria.delete('count')
 
       limit = criteria.delete('limit')
-      offset = criteria.delete('offset')
-
-      ds = ds.limit(limit, offset)
+      offset = criteria.delete('offset') || criteria.delete('skip')
 
       wfid =
         criteria.delete('wfid')
@@ -291,29 +329,35 @@ module Sequel
         ds = ds.filter(:doc.like("%\"#{k}\":#{Rufus::Json.encode(v)}%"))
       end
 
-      select_last_revs(ds.all).collect { |d|
-        Ruote::Workitem.new(Rufus::Json.decode(d[:doc]))
-      }
-    end
+      return ds.count if count
 
-    protected
+      ds = ds.order(:ide.asc, :rev.desc).limit(limit, offset)
 
-    def do_delete(doc)
+      select_last_revs(ds).collect { |d| Ruote::Workitem.from_json(d[:doc]) }
+    end
 
-      @sequel[:documents].where(
-        :ide => doc['_id'], :typ => doc['type'], :rev => doc['_rev'].to_i
-      ).delete
+    # Used by the worker to indicate a new step begins. For ruote-sequel,
+    # it means the cache can be prepared (a unique select yielding
+    # all the info necessary for one worker step (expressions excluded)).
+    #
+    def begin_step
+
+      prepare_cache
     end
 
-    def do_insert(doc, rev)
+    protected
 
-      @sequel[:documents].insert(
+    def do_insert(doc, rev, update_rev=false)
+
+      doc = doc.send(
+        update_rev ? :merge! : :merge,
+        { '_rev' => rev, 'put_at' => Ruote.now_to_utc_s })
+
+      @sequel[@table].insert(
         :ide => doc['_id'],
         :rev => rev,
         :typ => doc['type'],
-        :doc => Rufus::Json.encode(doc.merge(
-          '_rev' => rev,
-          'put_at' => Ruote.now_to_utc_s)),
+        :doc => Rufus::Json.encode(doc),
         :wfid => extract_wfid(doc),
         :participant_name => doc['participant_name']
       )
@@ -326,33 +370,91 @@ module Sequel
 
     def do_get(type, key)
 
-      @sequel[:documents].where(
+      d = @sequel[@table].select(:doc).where(
         :typ => type, :ide => key
       ).reverse_order(:rev).first
+
+      d ? Rufus::Json.decode(d[:doc]) : nil
     end
 
-    # Don't put configuration if it's already in
+    # Weed out older docs (same ide, smaller rev).
     #
-    # (avoid storages from trashing configuration...)
+    # This could all have been done via SQL, but those inconsistencies
+    # are rare, the cost of the pumped SQL is not constant :-(
     #
-    def put_configuration
+    def select_last_revs(docs)
 
-      return if get('configurations', 'engine')
+      docs.each_with_object([]) { |doc, a|
+        a << doc if a.last.nil? || doc[:ide] != a.last[:ide]
+      }
+    end
+
+    #--
+    # worker step cache
+    #
+    # in order to cut down the number of selects, do one select with
+    # all the information the worker needs for one step of work
+    #++
+
+    CACHED_TYPES = %w[ msgs schedules configurations variables ]
+
+    # One select to grab in all the info necessary for a worker step
+    # (expressions excepted).
+    #
+    def prepare_cache
+
+      CACHED_TYPES.each { |t| cache[t] = {} }
+
+      @sequel[@table].select(
+        :ide, :typ, :doc
+      ).where(
+        :typ => CACHED_TYPES
+      ).order(
+        :ide.asc, :rev.desc
+      ).each do |d|
+        (cache[d[:typ]] ||= {})[d[:ide]] ||= Rufus::Json.decode(d[:doc])
+      end
 
-      conf = { '_id' => 'engine', 'type' => 'configurations' }.merge(@options)
-      put(conf)
+      cache['variables']['trackers'] ||=
+        { '_id' => 'trackers', 'type' => 'variables', 'trackers' => {} }
     end
 
-    def select_last_revs(docs, reverse=false)
+    # Ask the cache for a doc. Returns nil if it's not cached.
+    #
+    def cache_get(type, key)
 
-      docs = docs.inject({}) { |h, doc|
-        h[doc[:ide]] = doc
-        h
-      }.values.sort_by { |h|
-        h[:ide]
-      }
+      (cache[type] || {})[key]
+    end
+
+    # Ask the cache for a set of documents. Returns nil if it's not cached
+    # or caching is not OK.
+    #
+    def cache_get_many(type, keys, options)
+
+      if !options[:batch] && CACHED_TYPES.include?(type) && cache[type]
+        cache[type].values
+      else
+        nil
+      end
+    end
+
+    # Removes a document from the cache.
+    #
+    def cache_clear(doc)
+
+      (cache[doc['type']] || {}).delete(doc['_id'])
+    end
+
+    # Returns the cache for the given thread. Returns {} if there is no
+    # cache available.
+    #
+    def cache
+
+      worker = Thread.current['ruote_worker']
+
+      return {} unless worker
 
-      reverse ? docs.reverse : docs
+      (Thread.current["cache_#{worker.name}"] ||= {})
     end
   end
 end

data/lib/ruote/sequel/version.rb

@@ -1,8 +1,32 @@
+#--
+# Copyright (c) 2005-2012, 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
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Made in Japan.
+#++
+
 
 module Ruote
 module Sequel
 
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end
 end
 

data/ruote-sequel.gemspec

@@ -1,9 +1,13 @@
-# encoding: utf-8
+# encoding: UTF-8
 
 Gem::Specification.new do |s|
 
   s.name = 'ruote-sequel'
-  s.version = File.read('lib/ruote/sequel/version.rb').match(/VERSION = '([^']+)'/)[1]
+
+  s.version = File.read(
+    File.expand_path('../lib/ruote/sequel/version.rb', __FILE__)
+  ).match(/ VERSION *= *['"]([^'"]+)/)[1]
+
   s.platform = Gem::Platform::RUBY
   s.authors = [ 'John Mettraux' ]
   s.email = [ 'jmettraux@gmail.com' ]
@@ -12,7 +16,7 @@ Gem::Specification.new do |s|
   s.summary = 'Sequel storage for ruote (a workflow engine)'
   s.description = %q{
 Sequel storage for ruote (a workflow engine)
-}
+  }
 
   #s.files = `git ls-files`.split("\n")
   s.files = Dir[
@@ -21,7 +25,7 @@ Sequel storage for ruote (a workflow engine)
     '*.gemspec', '*.txt', '*.rdoc', '*.md'
   ]
 
-  s.add_runtime_dependency 'sequel', '3.20.0'
+  s.add_runtime_dependency 'sequel'#, '>= 3.31.0'
   s.add_runtime_dependency 'ruote', ">= #{s.version}"
 
   s.add_development_dependency 'rake'

data/test/connection.rb

@@ -0,0 +1,54 @@
+
+#
+# testing ruote-sequel
+#
+# Thu Feb 10 11:14:56 JST 2011
+#
+
+require 'rufus-json/automatic'
+require 'ruote-sequel'
+
+
+unless $sequel
+
+  $sequel = case ENV['RUOTE_STORAGE_DB'] || 'postgres'
+    when 'pg', 'postgres'
+      Sequel.connect('postgres://localhost/ruote_test')
+    when 'my', 'mysql'
+      #Sequel.connect('mysql://root:root@localhost/ruote_test')
+      Sequel.connect('mysql://root@localhost/ruote_test')
+    when 'mysql2'
+      Sequel.connect('mysql2://root@localhost/ruote_test')
+    when /:/
+      Sequel.connect(ENV['RUOTE_STORAGE_DB'])
+    else
+      raise ArgumentError.new("unknown DB: #{ENV['RUOTE_STORAGE_DB'].inspect}")
+  end
+
+  require 'logger'
+
+  logger = case ENV['RUOTE_STORAGE_DEBUG']
+    when 'log'
+      FileUtils.rm('debug.log') rescue nil
+      Logger.new('debug.log')
+    when 'stdout'
+      Logger.new($stdout)
+    else
+      nil
+  end
+
+  if logger
+    logger.level = Logger::DEBUG
+    $sequel.loggers << logger
+  end
+
+  Ruote::Sequel.create_table($sequel, true)
+    # true forces re_create of 'documents' table
+end
+
+
+def new_storage(opts)
+
+  Ruote::Sequel::Storage.new($sequel, opts)
+end
+

metadata

@@ -1,150 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruote-sequel
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 2
-  - 0
-  version: 2.2.0
+version: !ruby/object:Gem::Version
+  version: 2.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-01 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sequel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 20
-        - 0
-        version: 3.20.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruote
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruote
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 0
-        version: 2.2.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: pg
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 10
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.10.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mysql
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 8
-        - 1
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+- !ruby/object:Gem::Dependency
+  name: mysql
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 2.8.1
   type: :development
-  version_requirements: *id005
-description: "\n\
-  Sequel storage for ruote (a workflow engine)\n"
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+description: ! "\nSequel storage for ruote (a workflow engine)\n  "
+email:
 - jmettraux@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - lib/ruote/sequel/storage.rb
 - lib/ruote/sequel/version.rb
 - lib/ruote/sequel.rb
 - lib/ruote-sequel.rb
-- test/functional_connection.rb
+- test/connection.rb
 - test/test.rb
 - ruote-sequel.gemspec
 - CHANGELOG.txt
 - CREDITS.txt
 - LICENSE.txt
 - TODO.txt
-- README.rdoc
-has_rdoc: true
 homepage: http://ruote.rubyforge.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ruote
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Sequel storage for ruote (a workflow engine)
 test_files: []
-

data/README.rdoc

@@ -1,75 +0,0 @@
-
-= ruote-sequel
-
-Sequel storage implementation for ruote >= 2.2.0
-
-
-== usage
-
-This is how a ruote engine is setup with a ruote-dm storage (postgres) and a worker :
-
-  require 'rubygems'
-  require 'json' # gem install json
-  require 'ruote'
-  require 'ruote-sequel' # gem install ruote-sequel
-  
-  sequel = Sequel.connect('postgres://localhost/ruote_test')
-  #sequel = Sequel.connect('mysql://root:root@localhost/ruote_test')
-  
-  engine = Ruote::Engine.new(
-    Ruote::Worker.new(
-      Ruote::Sequel::Storage.new(sequel)))
-
-  # ...
-
-To create the tables in the database :
-
-  Ruote::Sequel.create_table($sequel, :re_create => true)
-
-
-Tested with sequel 3.20.0, with the postgresql (pg 0.10.1) adapter.
-
-
-== running tests
-
-assuming you have
-
-  ruote/
-  ruote-sequel/
-
-* unit tests :
-
-get into ruote/ and do
-
-  ruby test/unit/storage.rb -- --sequel
-
-* functional tests :
-
-get into ruote/ and do
-
-  ruby test/functional/test.rb -- --sequel
-
-
-== known issues
-
-none
-
-
-== license
-
-MIT
-
-
-== links
-
-http://sequel.rubyforge.org/
-
-http://ruote.rubyforge.org/
-http://github.com/jmettraux/ruote-sequel
-
-
-== feedback
-
-mailing list : http://groups.google.com/group/openwferu-users
-irc : irc.freenode.net #ruote
-

data/test/functional_connection.rb

@@ -1,44 +0,0 @@
-
-#
-# testing ruote-sequel
-#
-# Thu Feb 10 11:14:56 JST 2011
-#
-
-require 'yajl' rescue require 'json'
-require 'rufus-json'
-Rufus::Json.detect_backend
-
-require 'ruote-sequel'
-
-unless $sequel
-
-  $sequel = Sequel.connect('postgres://localhost/ruote_test')
-  #$sequel = Sequel.connect('mysql://root:root@localhost/ruote_test')
-
-  Ruote::Sequel.create_table($sequel, true)
-    # true forces re_create of 'documents' table
-
-  require 'logger'
-
-  logger = nil
-
-  if ARGV.include?('-l') || ARGV.include?('--l')
-    FileUtils.rm('debug.log') rescue nil
-    logger = Logger.new('debug.log')
-  elsif ARGV.include?('-ls') || ARGV.include?('--ls')
-    logger = Logger.new($stdout)
-  end
-
-  if logger
-    logger.level = Logger::DEBUG
-    $sequel.loggers << logger
-  end
-end
-
-
-def new_storage (opts)
-
-  Ruote::Sequel::Storage.new($sequel, opts)
-end
-