ruote-couch 2.1.8 → 2.1.9

data/CHANGELOG.txt

@@ -2,9 +2,16 @@
 = ruote-couch - CHANGELOG.txt
 
 
+== ruote-couch 2.1.9    not yet released
+
+- trusting rufus-jig : not closing couches anymore
+- CouchStorage#clear and purge cleanup
+
+
 == ruote-couch 2.1.8    released 2010/03/15
 
-- 'prefix' and :prefix as configuration parameter
+- 'couch_timeout' configuration parameter
+- 'couch_prefix' and :prefix as configuration parameter
 
 
 == ruote-couch 2.1.7    released 2010/02/15

data/Rakefile

@@ -33,14 +33,30 @@ CouchDB storage for ruote 2.1 (ruby workflow engine)
   gem.test_file = 'test/test.rb'
 
   gem.add_dependency 'ruote', ">= #{Ruote::Couch::VERSION}"
-  gem.add_dependency 'rufus-jig', '>= 0.1.15'
+  gem.add_dependency 'rufus-jig', '>= 0.1.17'
   gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'jeweler'
 
   # gemspec spec : http://www.rubygems.org/read/chapter/20
 end
 Jeweler::GemcutterTasks.new
 
+#
+# MISC
+
+task :delete_all_test_databases do
+
+  require 'json'
+  require 'rufus/jig'
+  couch = Rufus::Jig::Couch.new('127.0.0.1', 5984)
+  %w[
+    configurations errors expressions msgs schedules variables workitems
+  ].each do |type|
+    couch.delete("/test_ruote_#{type}")
+  end
+end
+
 
 #
 # DOC

data/TODO.txt

@@ -7,7 +7,5 @@
 
 [ ] jig / r-couch should not rely on exceptions
 
-[ ] re-run suite with --patron
-[ ] run suite with --net
-[ ] run suite with --em
+[ ] issue with cron '* * * * *' and long-polling
 

data/lib/ruote/couch/database.rb

@@ -105,25 +105,25 @@ module Ruote::Couch
       end
     end
 
-    def shutdown
+    #def shutdown
+    #  @couch.close
+    #end
+      # jig > 0.1.17 is OK without that
 
-      @couch.close
-    end
-
-    # Deletes database and closes it.
+    # Deletes all the documents in this database.
     #
     def purge!
 
-      @couch.delete('.')
-      @couch.close
-    end
-
-    # Removes all the documents in this database.
-    #
-    def purge_docs!
-
-      @couch.delete('.')
-      @couch.put('.')
+      @couch.get('_all_docs')['rows'].each do |row|
+        doc = { '_id' => row['id'], '_rev' => row['value']['rev'] }
+        @couch.delete(doc) unless doc['_id'].match(/^\_design\//)
+      end
+        #
+        # which is faster than
+        #
+      #@couch.delete('.')
+      #@couch.put('.')
+      #@couch.http.cache.clear
     end
 
     protected
@@ -189,6 +189,13 @@ module Ruote::Couch
       get_many(/!#{wfid}$/, {})
     end
 
+    # Returns the design document that goes with this class of database
+    #
+    def self.design_doc
+
+      self.allocate.send(:design_doc)
+    end
+
     protected
 
     def design_doc
@@ -207,7 +214,12 @@ module Ruote::Couch
     def prepare
 
       d = @couch.get('_design/ruote')
-      @couch.delete(d) if d
+
+      return if d && d['views'] == design_doc['views']
+
+      d ||= design_doc
+      d['views'] = design_doc['views']
+
       @couch.put(design_doc)
     end
   end
@@ -274,6 +286,13 @@ module Ruote::Couch
       hwis.collect { |hwi| Ruote::Workitem.new(hwi) }
     end
 
+    # Returns the design document that goes with this class of database
+    #
+    def self.design_doc
+
+      self.allocate.send(:design_doc)
+    end
+
     protected
 
     def design_doc

data/lib/ruote/couch/storage.rb

@@ -120,6 +120,19 @@ module Couch
     def purge!
 
       @dbs.values.each { |db| db.purge! }
+      #@dbs.values.each { |db| db.shutdown }
+    end
+
+    # Used when doing integration tests, removes all
+    # msgs, schedules, errors, expressions and workitems.
+    #
+    # NOTE that it doesn't remove engine variables (danger)
+    #
+    def clear
+
+      %w[ msgs schedules errors expressions workitems ].each do |type|
+        @dbs[type].purge!
+      end
     end
 
     def dump (type)
@@ -131,7 +144,7 @@ module Couch
 
       @poller.kill if @poller
 
-      @dbs.values.each { |db| db.shutdown }
+      #@dbs.values.each { |db| db.shutdown }
     end
 
     # Mainly used by ruote's test/unit/ut_17_storage.rb
@@ -147,7 +160,7 @@ module Couch
     def purge_type! (type)
 
       if db = @dbs[type]
-        db.purge_docs!
+        db.purge!
       end
     end
 

data/lib/ruote/couch/version.rb

@@ -1,7 +1,7 @@
 
 module Ruote
 module Couch
-  VERSION = '2.1.8'
+  VERSION = '2.1.9'
 end
 end
 

data/ruote-couch.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruote-couch}
-  s.version = "2.1.8"
+  s.version = "2.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux"]
-  s.date = %q{2010-03-15}
+  s.date = %q{2010-03-23}
   s.description = %q{CouchDB storage for ruote 2.1 (ruby workflow engine)}
   s.email = %q{jmettraux@gmail.com}
   s.extra_rdoc_files = [
@@ -32,7 +32,9 @@ Gem::Specification.new do |s|
      "test/functional/ft_0_long_polling.rb",
      "test/functional/test.rb",
      "test/integration_connection.rb",
-     "test/test.rb"
+     "test/test.rb",
+     "test/unit/test.rb",
+     "test/unit/ut_0_design_doc.rb"
   ]
   s.homepage = %q{http://github.com/jmettraux/ruote-couch}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -49,20 +51,23 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ruote>, [">= 2.1.8"])
-      s.add_runtime_dependency(%q<rufus-jig>, [">= 0.1.15"])
+      s.add_runtime_dependency(%q<ruote>, [">= 2.1.9"])
+      s.add_runtime_dependency(%q<rufus-jig>, [">= 0.1.17"])
       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.8"])
-      s.add_dependency(%q<rufus-jig>, [">= 0.1.15"])
+      s.add_dependency(%q<ruote>, [">= 2.1.9"])
+      s.add_dependency(%q<rufus-jig>, [">= 0.1.17"])
       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.8"])
-    s.add_dependency(%q<rufus-jig>, [">= 0.1.15"])
+    s.add_dependency(%q<ruote>, [">= 2.1.9"])
+    s.add_dependency(%q<rufus-jig>, [">= 0.1.17"])
     s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end

data/test/integration_connection.rb

@@ -17,6 +17,8 @@ end
 
 require 'ruote/couch/storage'
 
+# TODO : maybe place delete_all_test_databases here
+
 
 def new_storage (opts)
 

data/test/test.rb

@@ -1,3 +1,4 @@
 
+require File.join(File.dirname(__FILE__), 'unit', 'test.rb')
 require File.join(File.dirname(__FILE__), 'functional', 'test.rb')
 

data/test/unit/test.rb

@@ -0,0 +1,9 @@
+
+#
+# testing ruote-couch
+#
+# Thu Mar 18 09:38:21 JST 2010
+#
+
+Dir.glob(File.join(File.dirname(__FILE__), 'ut_*.rb')).sort.each { |t| load(t) }
+

data/test/unit/ut_0_design_doc.rb

@@ -0,0 +1,28 @@
+
+#
+# testing ruote-couch
+#
+# Thu Mar 18 09:15:11 JST 2010
+#
+
+#require File.join(File.dirname(__FILE__), 'base')
+$:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'ruote', 'lib'))
+$:.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+require 'test/unit'
+require 'ruote/couch'
+
+
+class UtDesignDocTest < Test::Unit::TestCase
+
+  #def setup
+  #end
+  #def teardown
+  #end
+
+  def test_design_docs
+
+    assert_equal Hash, Ruote::Couch::WfidIndexedDatabase.design_doc.class
+    assert_equal Hash, Ruote::Couch::WorkitemDatabase.design_doc.class
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 1
-  - 8
-  version: 2.1.8
+  - 9
+  version: 2.1.9
 platform: ruby
 authors: 
 - John Mettraux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 +09:00
+date: 2010-03-23 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 2
         - 1
-        - 8
-        version: 2.1.8
+        - 9
+        version: 2.1.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 15
-        version: 0.1.15
+        - 17
+        version: 0.1.17
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,7 +58,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -69,6 +69,18 @@ dependencies:
         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: CouchDB storage for ruote 2.1 (ruby workflow engine)
 email: jmettraux@gmail.com
 executables: []
@@ -95,6 +107,8 @@ files:
 - test/functional/test.rb
 - test/integration_connection.rb
 - test/test.rb
+- test/unit/test.rb
+- test/unit/ut_0_design_doc.rb
 has_rdoc: true
 homepage: http://github.com/jmettraux/ruote-couch
 licenses: []