postjob 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0be2321073faba782e89878c47c6c6770b97e7ff
-  data.tar.gz: c9d3cf35e02a4105587d5888535e4297d4abb9af
+  metadata.gz: 3db8f37270f64683adc0ef25167f8198cb93e681
+  data.tar.gz: 323f1a09174b3364e8776c2e59e8a9fad9e22708
 SHA512:
-  metadata.gz: 208afca0daf608d1ada39ad4fac5539e2ad10388d73e469bc4164eee2f49c4615a0e845578dd1aad5db6fe33f0decdef62c0329b198fa4f44f2e9941363eb2e7
-  data.tar.gz: 11a854fb585336169a6b218884d8b02503c5e52503efac95609b937dc18dd51703868f93a569f3fb66b557c411215bf9ecf797f5ddd33a4781a750092676855f
+  metadata.gz: d22d0304488080812e9f3b967462867b45d1b51c8eb7733bcace9f4f5bfb2a60db95a70c335f71c393e23077a0a30bc0bbca80731783dac5aeebf93f18536b1f
+  data.tar.gz: a261688942b25f1c1c07870d500138d4a601663e18e081ae4a4d09e756ff0e30f246da60fe2669f7b40adaf9dc271998e6d80a130c0dde5001bbaa87f5300ce1

data/lib/postjob/queue/search.rb

@@ -43,15 +43,12 @@ module Postjob::Queue
 
     column_filters, tags_filters = filter.partition { |key, _| column_names.include?(key) }
 
-    scope = column_filters.inject(scope) do |sc, (key, value)|
-      sc.where(key => value)
-    end
-
-    unless tags_filters.empty?
-      tags_filters = Hash[tags_filters]
-      scope = scope.where "tags @> '#{Postjob::Queue::Encoder.encode(tags_filters)}'"
-    end
-
+    scope = scope.where(Hash[column_filters])
+    scope = scope.where(tags: Hash[tags_filters])
     scope
   end
+
+  def apply_tag_filters(scope, filters)
+    scope.where(tags: Hash[filters])
+  end
 end

data/spec/postjob/queue/search_spec.rb

@@ -26,7 +26,7 @@ describe "Postjob::Queue.search" do
     Simple::SQL.ask("DELETE FROM postjob.postjobs")
   end
 
-  let!(:id) { Postjob.enqueue! "SearchWorkflow", tags: { "initial" => "yay" } }
+  let!(:id) { Postjob.enqueue! "SearchWorkflow", tags: { "initial" => "yay", "multi" => "manyay" } }
 
   Queue = Postjob::Queue
 
@@ -103,5 +103,31 @@ describe "Postjob::Queue.search" do
       result = Simple::SQL.all(scope)
       expect(result.length).to eq(0)
     end
+
+    it "filter tags against empty array" do
+      scope = Postjob::Queue.search("initial" => [])
+      result = Simple::SQL.all(scope)
+      expect(result.length).to eq(0)
+    end
+
+    it "filter tags against multiple matches" do
+      scope = Postjob::Queue.search("initial" => [ "yay", "nay" ])
+      result = Simple::SQL.all(scope)
+      expect(result.length).to eq(1)
+    end
+
+    it "filter tags against a combination of multiple matches" do
+      scope = Postjob::Queue.search("initial" => [ "yay", "nay" ], "multi" => "manyay")
+      result = Simple::SQL.all(scope)
+      expect(result.length).to eq(1)
+
+      scope = Postjob::Queue.search("initial" => [ "yay", "nay" ], "multi" => "nay")
+      result = Simple::SQL.all(scope)
+      expect(result.length).to eq(0)
+
+      scope = Postjob::Queue.search("initial" => [ "yay", "nay" ], "multi" => ["nay", "manyay"])
+      result = Simple::SQL.all(scope)
+      expect(result.length).to eq(1)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postjob
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - radiospiel
@@ -123,7 +123,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.7
 - !ruby/object:Gem::Dependency
   name: simple-cli
   requirement: !ruby/object:Gem::Requirement