elastic_queue 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27b8c7f2b618f63f8ee1d27fbbddcfe01962203a
-  data.tar.gz: 09eb104fe8598fc18ad91c5fd5e6a60833f9d1a6
+  metadata.gz: 3b98fbf9af561bf1f2bdaf418941c235e9efb6d5
+  data.tar.gz: 2a2b8517d4cdb107ad9fdb55ace575741ee5854f
 SHA512:
-  metadata.gz: 0662d2a579e6a734edc8d5cab8524010210d990ffc8511c5d3740526d41a165d981d75cfa8027fe2a3f6d5d5c0734b986977b90d9d5f201b9f4e4a1112a5f9b9
-  data.tar.gz: 1e5bdd59638781425484331f2463f22604303693b953e5413df09fe23c6612b3619ea0b190830f736a129ad7b9b3301813649e5971995803397abe3ff5e1cd67
+  metadata.gz: 6ebcfd62bf72d135e4fa2532d61237996698a8974b99cf2bdfb9293a6705c0f52dc23af9aa6b2e6e46f861d49a711699c5c9b753b9b96c45c72e2c6c5ddcb035
+  data.tar.gz: e7a20b9650fbd4e411e6449d8373a32416c9a9af9257aeec5caa16827a4faa16985d072d132ba7e5be25893a5d104debace1d5385e2fbf7d684961116b4e59f8

data/Gemfile.lock

@@ -1,56 +1,52 @@
 PATH
   remote: .
   specs:
-    elastic-queue (0.0.2)
-      activesupport
-      elasticsearch
+    elastic_queue (0.0.10)
+      activesupport (~> 3.0)
+      elasticsearch (~> 0.4)
+      will_paginate (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.1)
+    activesupport (3.2.17)
       i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.14)
+      multi_json (~> 1.0)
     diff-lcs (1.2.5)
-    elasticsearch (0.4.1)
-      elasticsearch-api (= 0.4.1)
-      elasticsearch-transport (= 0.4.1)
-    elasticsearch-api (0.4.1)
+    elasticsearch (0.4.11)
+      elasticsearch-api (= 0.4.11)
+      elasticsearch-transport (= 0.4.11)
+    elasticsearch-api (0.4.11)
       multi_json
-    elasticsearch-transport (0.4.1)
+    elasticsearch-transport (0.4.11)
       faraday
       multi_json
-    factory_girl (4.2.0)
+    factory_girl (4.4.0)
       activesupport (>= 3.0.0)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     i18n (0.6.9)
-    minitest (4.7.5)
-    multi_json (1.8.2)
-    multipart-post (1.2.0)
-    rake (10.1.0)
+    multi_json (1.9.2)
+    multipart-post (2.0.0)
+    rake (10.3.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
+    rspec-mocks (2.14.6)
+    sqlite3 (1.3.9)
+    will_paginate (3.0.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.0)
-  elastic-queue!
-  factory_girl
-  rake
+  bundler (~> 1.0)
+  elastic_queue!
+  factory_girl (~> 4.0)
+  rake (~> 10.0)
   rspec (~> 2.6)
+  sqlite3

data/elastic_queue.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.test_files = Dir['spec/**/*.rb']
 
-  s.add_dependency 'activesupport'
-  s.add_dependency 'elasticsearch', '~>0.4.1'
-  s.add_dependency 'will_paginate'
-  s.add_development_dependency 'bundler', '>= 1.0.0'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'factory_girl'
-end
+  s.add_runtime_dependency 'activesupport', '~> 3.0'
+  s.add_runtime_dependency 'elasticsearch', '~> 0.4'
+  s.add_runtime_dependency 'will_paginate', '~> 3.0'
+  s.add_development_dependency 'bundler', '~> 1.0'
+  s.add_development_dependency 'rspec', '~> 2.6'
+  s.add_development_dependency 'factory_girl', '~> 4.0'
+  s.add_development_dependency 'sqlite3', '~> 1.3'
+  s.add_development_dependency 'rake', '~> 10.0'
+end

data/lib/elastic_queue/base.rb

@@ -29,6 +29,10 @@ module ElasticQueue
       @index_name ||= to_s.underscore
     end
 
+    def self.index_name=(name)
+      @index_name = name
+    end
+
     def self.eager_load(includes)
       @eager_loads = includes
     end
@@ -37,8 +41,32 @@ module ElasticQueue
       @eager_loads
     end
 
-    def self.query(options = {})
-      Query.new(self, options)
+    def self.default_scope(proc)
+      @default_scope = proc
+    end
+
+    def self.scope(name, body)
+      @scopes.merge(name => body)
+    end
+
+    def self.scopes
+      @scopes ||= {}
+    end
+
+    # we want to store the scope in our scopes hash
+    # for use in chaining scopes
+    # we also define it on the class to mimic AR scopes
+    def self.scope(name, body)
+      scopes.merge! name => body
+      singleton_class.send(:define_method, name) do |*args|
+        query.instance_exec(*args, &body)
+      end
+    end
+
+    def self.query
+      Query.new(self).tap do |q|
+        q.instance_exec(&@default_scope) if @default_scope
+      end
     end
 
     def self.filter(options)
@@ -48,5 +76,11 @@ module ElasticQueue
     def self.count
       query.count
     end
+
+    # instance methods
+    def query
+      @query ||= self.class.query
+    end
+
   end
 end

data/lib/elastic_queue/query.rb

@@ -79,6 +79,16 @@ module ElasticQueue
 
     private
 
+    # this allows you to chain scopes
+    # the 2+ scopes in the chain will be called
+    # on a query object and not on the base object
+    def method_missing(method, *args, &block)
+      if @queue.respond_to?(method)
+        proc = @queue.scopes[method]
+        instance_exec *args, &proc
+      end
+    end
+
     def execute_query(count: false)
       search_type = count ? 'count' : 'query_then_fetch'
       @queue.search_client.search index: @queue.index_name, body: body, search_type: search_type, from: @options.from, size: @options.per_page

data/lib/elastic_queue/version.rb

@@ -1,3 +1,3 @@
 module ElasticQueue
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_queue
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Ruth Thompson
@@ -9,120 +9,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 description: A library for storing and filtering documents on elastic search with
   a queue paradigm for retrieval.
 email:
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.preview.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A queueing system built on top of elasticsearch.