ruote-sequel 2.3.0 → 2.3.0.2

data/CHANGELOG.txt

@@ -2,6 +2,16 @@
 = ruote-sequel - CHANGELOG.txt
 
 
+== ruote-sequel 2.3.1    not yet released
+
+
+== ruote-sequel 2.3.0.2    not yet released
+
+- :asc / :desc fix by Iuri Gagnidze
+- d[:doc].read if possible, as devised with Geoff Herney in
+  https://groups.google.com/d/topic/openwferu-users/ivLPT4jASVc/discussion
+
+
 == ruote-sequel 2.3.0    released 2012/09/01
 
 - switched to "begin_step" model

data/CREDITS.txt

@@ -9,11 +9,14 @@
 
 == contributors
 
+- Iuri Gagnidze - https://github.com/igagnidz
+- Geoff Herney - https://github.com/gherney
 - Wesley Moore - https://github.com/wezm
 
 
 == feedback
 
+- yzhang - reconnect issue
 - Chad Albers - https://github.com/neomantic
 - Eric Smith - issue reporting
 

data/LICENSE.txt

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

@@ -5,7 +5,7 @@ require 'rubygems'
 
 require 'rake'
 require 'rake/clean'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 
 #
@@ -76,17 +76,19 @@ Rake::RDocTask.new do |rd|
 end
 
 
+##
+## upload_rdoc
 #
-# 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/#{GEMSPEC.name}_rdoc #{account}:#{webdir}/"
-end
+#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/#{GEMSPEC.name}_rdoc #{account}:#{webdir}/"
+#end
+  #
+  # leverage rdoc.info instead
 

data/lib/ruote/sequel/storage.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, 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
@@ -197,13 +197,13 @@ module Sequel
       return ds.count if opts[:count]
 
       ds = ds.order(
-        opts[:descending] ? :ide.desc : :ide.asc, :rev.desc
+        opts[:descending] ? ::Sequel.desc(:ide) : ::Sequel.asc(:ide), ::Sequel.desc(:rev)
       ).limit(
         opts[:limit], opts[:skip] || opts[:offset]
       )
 
       docs = select_last_revs(ds)
-      docs = docs.collect { |d| Rufus::Json.decode(d[:doc]) }
+      docs = docs.collect { |d| decode_doc(d) }
 
       if keys && keys.first.is_a?(Regexp)
         docs.select { |doc| keys.find { |key| key.match(doc['_id']) } }
@@ -273,7 +273,7 @@ module Sequel
       return docs.count if opts[:count]
 
       docs = docs.order(
-        :ide.asc, :rev.desc
+        ::Sequel.asc(:ide), ::Sequel.desc(:rev)
       ).limit(
         opts[:limit], opts[:offset] || opts[:skip]
       )
@@ -294,13 +294,13 @@ module Sequel
       docs = @sequel[@table].where(
         :typ => type
       ).filter(
-        :doc.like(lk.join)
+        ::Sequel.like(:doc, lk.join)
       )
 
       return docs.count if opts[:count]
 
       docs = docs.order(
-        :ide.asc, :rev.desc
+        ::Sequel.asc(:ide), ::Sequel.desc(:rev)
       ).limit(
         opts[:limit], opts[:offset] || opts[:skip]
       )
@@ -322,16 +322,16 @@ module Sequel
       pname =
         criteria.delete('participant_name') || criteria.delete('participant')
 
-      ds = ds.filter(:ide.like("%!#{wfid}")) if wfid
+      ds = ds.filter(::Sequel.like(:ide, "%!#{wfid}")) if wfid
       ds = ds.filter(:participant_name => pname) if pname
 
       criteria.collect do |k, v|
-        ds = ds.filter(:doc.like("%\"#{k}\":#{Rufus::Json.encode(v)}%"))
+        ds = ds.filter(::Sequel.like(:doc, "%\"#{k}\":#{Rufus::Json.encode(v)}%"))
       end
 
       return ds.count if count
 
-      ds = ds.order(:ide.asc, :rev.desc).limit(limit, offset)
+      ds = ds.order(::Sequel.asc(:ide), ::Sequel.desc(:rev)).limit(limit, offset)
 
       select_last_revs(ds).collect { |d| Ruote::Workitem.from_json(d[:doc]) }
     end
@@ -347,20 +347,45 @@ module Sequel
 
     protected
 
+    def decode_doc(doc)
+
+      return nil if doc.nil?
+
+      doc = doc[:doc]
+      doc = doc.read if doc.respond_to?(:read)
+
+      Rufus::Json.decode(doc)
+    end
+
     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),
-        :wfid => extract_wfid(doc),
-        :participant_name => doc['participant_name']
-      )
+      # Use bound variables
+      # http://sequel.rubyforge.org/rdoc/files/doc/prepared_statements_rdoc.html
+      #
+      # That makes Oracle happy (the doc field might > 4000 characters)
+      #
+      # Thanks Geoff Herney
+      #
+      @sequel[@table].call(
+        :insert, {
+          :ide => (doc['_id'] || ''),
+          :rev => (rev || ''),
+          :typ => (doc['type'] || ''),
+          :doc => (Rufus::Json.encode(doc) || ''),
+          :wfid => (extract_wfid(doc) || ''),
+          :participant_name => (doc['participant_name'] || '')
+        }, {
+          :ide => :$ide,
+          :rev => :$rev,
+          :typ => :$typ,
+          :doc => :$doc,
+          :wfid => :$wfid,
+          :participant_name => :$participant_name
+        })
     end
 
     def extract_wfid(doc)
@@ -374,7 +399,7 @@ module Sequel
         :typ => type, :ide => key
       ).reverse_order(:rev).first
 
-      d ? Rufus::Json.decode(d[:doc]) : nil
+      decode_doc(d)
     end
 
     # Weed out older docs (same ide, smaller rev).
@@ -410,9 +435,9 @@ module Sequel
       ).where(
         :typ => CACHED_TYPES
       ).order(
-        :ide.asc, :rev.desc
+        ::Sequel.asc(:ide), ::Sequel.desc(:rev)
       ).each do |d|
-        (cache[d[:typ]] ||= {})[d[:ide]] ||= Rufus::Json.decode(d[:doc])
+        (cache[d[:typ]] ||= {})[d[:ide]] ||= decode_doc(d)
       end
 
       cache['variables']['trackers'] ||=
@@ -459,4 +484,3 @@ module Sequel
   end
 end
 end
-

data/lib/ruote/sequel/version.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, 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
@@ -26,7 +26,7 @@
 module Ruote
 module Sequel
 
-  VERSION = '2.3.0'
+  VERSION = '2.3.0.2'
 end
 end
 

data/ruote-sequel.gemspec

@@ -26,7 +26,7 @@ Sequel storage for ruote (a workflow engine)
   ]
 
   s.add_runtime_dependency 'sequel'#, '>= 3.31.0'
-  s.add_runtime_dependency 'ruote', ">= #{s.version}"
+  s.add_runtime_dependency 'ruote', ">= #{s.version.to_s.split('.')[0, 3].join('.')}"
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'pg', '0.10.1'

data/test/connection.rb

@@ -11,31 +11,37 @@ 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
+  $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',
+          :after_connect => proc { |c| c.send(:reconnect=, true) })
+      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
+  logger =
+    case dbg = ENV['RUOTE_STORAGE_DEBUG']
+      when 'log'
+        FileUtils.rm("debug_#{$$}.log") rescue nil
+        Logger.new("debug_#{$$}.log")
+      when 'stdout'
+        Logger.new($stdout)
+      when /\.(log|txt)$/
+        Logger.new(dbg)
+      else
+        nil
+    end
 
   if logger
     logger.level = Logger::DEBUG

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruote-sequel
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-01 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -103,13 +103,13 @@ files:
 - lib/ruote/sequel/version.rb
 - lib/ruote/sequel.rb
 - lib/ruote-sequel.rb
-- test/connection.rb
 - test/test.rb
+- test/connection.rb
 - ruote-sequel.gemspec
 - CHANGELOG.txt
-- CREDITS.txt
-- LICENSE.txt
 - TODO.txt
+- LICENSE.txt
+- CREDITS.txt
 homepage: http://ruote.rubyforge.org
 licenses: []
 post_install_message: 
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruote
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Sequel storage for ruote (a workflow engine)