elastic_queue 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9056882ae5a6d02c8f6b18be717a34d908d174ab
-  data.tar.gz: 10683bfae76be54a3c63b6e39e340bbf994c0dc1
+  metadata.gz: d769bd3556106cd8ba5b46f4431c240c9224f09b
+  data.tar.gz: abafb1ff884a54e50f1d2fccaf89828f4d344790
 SHA512:
-  metadata.gz: 711303e69e8421e4a065bb13eb2a1e6ad94cd7ae7fe5eec2c844bdb91d5cc72bf17dc222e6e47d679e8c1b810167c82c1effe3b15318a87cc4c8611a2c07d852
-  data.tar.gz: 2ea0cd970a3af6d73241c994beb4dc90bd09c2ad62426272a389392d0e1b52d1e2d25fb5606bb26170c53892473a2ba65058838383748e1d644d5ff4d3e52adb
+  metadata.gz: 6354f5f3e4b483aa664ac99d61c8a1de523835f550869315d0d47aa8741a80209142eb694adfc64960de6c24c468467704294b4bb8a45c430f0597595ae7c68e
+  data.tar.gz: 336a51bb66c21ddef868b4dc0a1483827a13e245bb51846af5852243c328f284c12a442f8169759b1b069804fd62a5f31805dc506ad757c94f89d60caa1d2bfe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elastic_queue (0.0.13)
+    elastic_queue (0.0.14)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
       elasticsearch (~> 0.4)
@@ -56,8 +56,8 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
     sqlite3 (1.3.9)
-    tzinfo (0.3.39)
-    will_paginate (3.0.5)
+    tzinfo (0.3.40)
+    will_paginate (3.0.7)
 
 PLATFORMS
   ruby

data/lib/elastic_queue/filters.rb

@@ -13,7 +13,7 @@ module ElasticQueue
 
     def option_to_filter(key, value)
       # return and_options(value) if key == :and
-      if [:or, :and].include?(key)
+      if [:or, :and, :not].include?(key)
         join_options(key, value)
       elsif value.is_a? Array
         or_filter(key, value)
@@ -30,7 +30,7 @@ module ElasticQueue
 
     def join_options(operator, options)
       conditions = options.map { |o| options_to_filters(o) }.flatten
-      { operator => conditions }
+      operator == :not ? { not: { filter: { and: conditions } } } : { operator => conditions }
     end
 
     def or_filter(term, values)

data/lib/elastic_queue/version.rb

@@ -1,3 +1,4 @@
 module ElasticQueue
-  VERSION = '0.0.13'
-end
+  VERSION = '0.0.14'
+end
+

data/spec/lib/integration/elastic_queue_filters_spec.rb

@@ -41,6 +41,11 @@ describe 'ElasticQueue::Filters integration' do
       expect(TestAnimalsQueue.query.filter(name: 'a').all.map(&:name)).to eq ['a']
     end
 
+    it 'can filter out one value' do
+      @create_animals.call
+      expect(TestAnimalsQueue.query.filter(not: [ { name: 'a'} ]).all.map(&:name).sort).to eq ['b', 'c']
+    end
+
     it 'can filter by a less than or greater than a time' do
       @create_animals.call
       expect(TestAnimalsQueue.query.filter(birthdate: { after: Date.today - 1.year - 1.day }).all.map(&:name)).to eq ['a']
@@ -110,16 +115,41 @@ describe 'ElasticQueue::Filters integration' do
         # (rusty, killer, speedy) && ( rusty || lucky, killer, old bess, cock-a-doodle-doo)
         name: ['rusty', 'killer', 'speedy'], #(rusty, killer, speedy) && (
         or: [
-            and: [ # rusty ||
-              { species: ['dog', 'mountain lion'] },
-              { dangerous: false }
-            ],
-            or: [ #speedy, killer, old bess, cock-a-doodle-doo )
-              { species: ['horse', 'chicken'] },
-              { dangerous: true }
+               and: [ # rusty ||
+                      { species: ['dog', 'mountain lion'] },
+                      { dangerous: false }
+                    ],
+               or: [ #speedy, killer, old bess, cock-a-doodle-doo )
+                     { species: ['horse', 'chicken'] },
+                     { dangerous: true }
+                   ]
             ]
-          ]
       }).all.map(&:name).sort).to eq ['killer', 'rusty', 'speedy']
     end
+
+    it 'can nest multiple ands and ors and nots' do
+      Animal.create({ name: 'rusty', species: 'dog', dangerous: false })
+      Animal.create({ name: 'killer', species: 'mountain lion', dangerous: true })
+      Animal.create({ name: 'cock-a-doodle-doo', species: 'chicken', dangerous: false })
+      Animal.create({ name: 'old bess', species: 'cow', dangerous: true })
+      Animal.create({ name: 'speedy', species: 'horse', dangerous: false })
+      expect(TestAnimalsQueue.query.filter({
+       #(rusty, killer, speedy, cock-a-doodle-doo) && (! rusty && (rusty || speedy, killer, old bess, cock-a-doodle-doo))
+        name: ['rusty', 'killer', 'speedy', 'cock-a-doodle-doo'], #(rusty, killer, speedy, cock-a-doodle-doo) && (
+        not: [ # ! rusty &&
+               { name: 'rusty' }
+             ],
+        or: [
+               and: [ # (rusty ||
+                      { species: ['dog', 'mountain lion'] },
+                      { dangerous: false }
+                    ],
+               or: [ #speedy, killer, old bess, cock-a-doodle-doo ))
+                     { species: ['horse', 'chicken'] },
+                     { not: [ { dangerous: false } ] },
+                   ]
+            ]
+      }).all.map(&:name).sort).to eq ['cock-a-doodle-doo', 'killer', 'speedy']
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_queue
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Ruth Thompson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport