elastic_queue 0.0.14 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d769bd3556106cd8ba5b46f4431c240c9224f09b
-  data.tar.gz: abafb1ff884a54e50f1d2fccaf89828f4d344790
+  metadata.gz: 603750b935b0df0fa758f92f3a612ba7f5c4d416
+  data.tar.gz: ca508ffff29ebfb462b44912ebca6b7e959947a8
 SHA512:
-  metadata.gz: 6354f5f3e4b483aa664ac99d61c8a1de523835f550869315d0d47aa8741a80209142eb694adfc64960de6c24c468467704294b4bb8a45c430f0597595ae7c68e
-  data.tar.gz: 336a51bb66c21ddef868b4dc0a1483827a13e245bb51846af5852243c328f284c12a442f8169759b1b069804fd62a5f31805dc506ad757c94f89d60caa1d2bfe
+  metadata.gz: 6f8adc215c6e5aa6b8ac0f20b5d09c2bb86c9681be1dd724de5a50efd57cb16e405dbc0ebc8b6c625c424ba3c32884c5758d0ca57bccb6543a03af2b7c0562e3
+  data.tar.gz: 3411f0922305b6ad239657262745edb1dde18ac194675f7b350385d2cdb6cd9891c6ef48b677a596a2574a209b0bd9bb6047f3f7b2e9553e1d0f0c498c63bb96

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    elastic_queue (0.0.14)
+    elastic_queue (0.0.13)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
-      elasticsearch (~> 0.4)
+      elasticsearch (~> 1.0)
       will_paginate (~> 3.0)
 
 GEM
@@ -31,12 +31,12 @@ GEM
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.3.2)
     diff-lcs (1.2.5)
-    elasticsearch (0.4.11)
-      elasticsearch-api (= 0.4.11)
-      elasticsearch-transport (= 0.4.11)
-    elasticsearch-api (0.4.11)
+    elasticsearch (1.0.4)
+      elasticsearch-api (= 1.0.4)
+      elasticsearch-transport (= 1.0.4)
+    elasticsearch-api (1.0.4)
       multi_json
-    elasticsearch-transport (0.4.11)
+    elasticsearch-transport (1.0.4)
       faraday
       multi_json
     factory_girl (4.4.0)

data/elastic_queue.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'activesupport', '~> 3.0'
   s.add_runtime_dependency 'activerecord', '~>3.0'
-  s.add_runtime_dependency 'elasticsearch', '~> 0.4'
+  s.add_runtime_dependency 'elasticsearch', '~> 1.0.4'
   s.add_runtime_dependency 'will_paginate', '~> 3.0'
   s.add_development_dependency 'bundler', '~> 1.0'
   s.add_development_dependency 'rspec', '~> 2.6'

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, :not].include?(key)
+      if [:or, :and].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 == :not ? { not: { filter: { and: conditions } } } : { operator => conditions }
+      { operator => conditions }
     end
 
     def or_filter(term, values)

data/lib/elastic_queue/version.rb

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

data/spec/lib/integration/elastic_queue_filters_spec.rb

@@ -41,11 +41,6 @@ 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']
@@ -115,41 +110,16 @@ 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

data/spec/lib/integration/elastic_queue_sorts_spec.rb

@@ -47,6 +47,14 @@ describe 'ElasticQueue::Sorts integration' do
       expect(TestAnimalsQueue.query.sort(birthdate: 'asc').sort(name: 'desc').all.map(&:name)).to eq ['c', 'b', 'a']
     end
 
+    it 'sorts ascending and descending on two values using hash syntax' do
+      Animal.create({ name: 'a', birthdate: Date.today.at_midnight - 1.year })
+      Animal.create({ name: 'b', birthdate: Date.today.at_midnight - 1.years })
+      Animal.create({ name: 'c', birthdate: Date.today.at_midnight - 3.years })
+      expect(TestAnimalsQueue.query.sort(birthdate: :asc, name: :asc).all.map(&:name)).to eq ['c', 'a', 'b']
+      expect(TestAnimalsQueue.query.sort(birthdate: :asc, name: :desc).all.map(&:name)).to eq ['c', 'b', 'a']
+    end
+
     it 'doesn\'t fail to sort because of stopwords' do
       Animal.create({ name: 'and' })
       Animal.create({ name: 'or' })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_queue
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.1.0
 platform: ruby
 authors:
 - Ruth Thompson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement