ruote-dm 2.1.7 → 2.1.9

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = ruote-dm - CHANGELOG.txt
 
 
+== ruote-dm 2.1.9    released 2010/03/24
+
+- storage participant queries with more than 1 field are now possible
+
+
 == ruote-dm 2.1.7    released 2010/02/15
 
 - adapted to latest Ruote::StorageHistory

data/Rakefile

@@ -37,6 +37,7 @@ datamapper storage for ruote (a ruby workflow engine)
   #gem.add_dependency 'dm-aggregates'
   #gem.add_dependency 'dm-types'
   gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'jeweler'
 
   # gemspec spec : http://www.rubygems.org/read/chapter/20

data/TODO.txt

@@ -1,4 +1,7 @@
 
+[o] [test/functional/ft_20_storage_participant.rb:176]: <1> expected but was <4>
+    not on ruby 1.9.1, but on ruby 1.8.7p72
+
 [ ] storage : control #save result
 [ ] examine indices (index) (participant_name ?) perf perf perf
 

data/lib/ruote/dm/storage.rb

@@ -228,9 +228,12 @@ module Dm
       cr[:limit] = limit if limit
       cr[:participant_name] = pname if pname
 
-      criteria.each do |k, v|
-        cr[:doc.like] = "%\"#{k}\":#{Rufus::Json.encode(v)}%"
+      likes = criteria.collect do |k, v|
+        "%\"#{k}\":#{Rufus::Json.encode(v)}%"
       end
+      cr[:conditions] = [
+        ([ 'doc LIKE ?' ] * likes.size).join(' AND '), *likes
+      ] unless likes.empty?
 
       Document.all(cr).collect { |d|
         Ruote::Workitem.new(Rufus::Json.decode(d.doc))

data/lib/ruote/dm/version.rb

@@ -1,7 +1,7 @@
 
 module Ruote
 module Dm
-  VERSION = '2.1.7'
+  VERSION = '2.1.9'
 end
 end
 

data/ruote-dm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruote-dm}
-  s.version = "2.1.7"
+  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-02-15}
+  s.date = %q{2010-03-24}
   s.description = %q{datamapper storage for ruote (a ruby workflow engine)}
   s.email = %q{jmettraux@gmail.com}
   s.extra_rdoc_files = [
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{ruote}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{datamapper storage for ruote (a ruby workflow engine)}
   s.test_files = [
     "test/test.rb"
@@ -45,20 +45,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.7"])
+      s.add_runtime_dependency(%q<ruote>, [">= 2.1.9"])
       s.add_runtime_dependency(%q<dm-core>, [">= 0"])
       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.7"])
+      s.add_dependency(%q<ruote>, [">= 2.1.9"])
       s.add_dependency(%q<dm-core>, [">= 0"])
       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.7"])
+    s.add_dependency(%q<ruote>, [">= 2.1.9"])
     s.add_dependency(%q<dm-core>, [">= 0"])
     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

@@ -11,10 +11,10 @@ Rufus::Json.detect_backend
 
 require 'ruote-dm'
 
-if ARGV.include?('-l')
+if ARGV.include?('-l') || ARGV.include?('--l')
   FileUtils.rm('debug.log') rescue nil
   DataMapper::Logger.new('debug.log', :debug)
-elsif ARGV.include?('-ls')
+elsif ARGV.include?('-ls') || ARGV.include?('--ls')
   DataMapper::Logger.new(STDOUT, :debug)
 end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruote-dm
 version: !ruby/object:Gem::Version 
-  version: 2.1.7
+  prerelease: false
+  segments: 
+  - 2
+  - 1
+  - 9
+  version: 2.1.9
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,49 +14,71 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 +09:00
+date: 2010-03-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruote
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.7
-    version: 
+        segments: 
+        - 2
+        - 1
+        - 9
+        version: 2.1.9
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: yard
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  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"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id005
 description: datamapper storage for ruote (a ruby workflow engine)
 email: jmettraux@gmail.com
 executables: []
@@ -87,18 +114,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ruote
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: datamapper storage for ruote (a ruby workflow engine)