waistband 0.7.3 → 0.7.4

data/README.md

@@ -12,9 +12,7 @@ brew install elasticsearch
 
 Add this line to your application's Gemfile:
 
-    gem 'waistband', git: 'git@github.com:taskrabbit/waistband.git', tag: 'v0.0.9'
-
-Be sure to check out the [releases page](https://github.com/taskrabbit/waistband/releases) to get the latest tag.
+    gem 'waistband'
 
 And then execute:
 
@@ -140,14 +138,16 @@ index.read('my_data')
 
 ### Searching
 
-For searching, Waistband has the Query class available:
+For searching, you construct a query from your index:
 
 ```ruby
 index = Waistband::Index.new('search')
-query = index.query('shopping')
-query.add_fields('name', 'description') # look for the search term `shopping` in the attributes `name` and `description`
-query.add_term('task', 'true')          # only in documents where the attribute task is set to true
-query.add_optiona_term('task', 'true')  # prefers documents where the attribute task is set to true
+query = index.query(page_size: 5).prepare({
+  query: {
+    term: { hidden: false }
+  },
+  sort: { created_at: {order: 'desc' } }
+})
 
 query.results # => returns an array of Waistband::QueryResult
 
@@ -166,21 +166,6 @@ query.results
 
 For paginating the results, you can use the `#paginated_results` method, which requires the [Kaminari](https://github.com/amatsuda/kaminari), gem.  If you use another gem, you can just override the method, etc.
 
-### Model
-
-The gem offers a `Waistband::Model` that you can use to store model type data into the Elastic Search index.  You just inherit from the class and define the following class methods:
-
-```ruby
-class Thing < Waistband::Model
-  with_index :my_index_name
-
-  columns   :user_id, :content, :admin_visible
-  defaults  admin_visible: false
-
-  validates :user_id, :content
-end
-```
-
 For more information and extra methods, take a peek into the class docs.
 
 ## Contributing

data/lib/waistband/query.rb

@@ -3,8 +3,6 @@ require 'active_support/core_ext/hash/indifferent_access'
 module Waistband
   class Query
 
-    include ::Waistband::QueryHelpers
-
     attr_accessor :page, :page_size
 
     def initialize(index, options = {})
@@ -19,6 +17,25 @@ module Waistband
       self
     end
 
+    def paginated_results
+      return Kaminari.paginate_array(results, total_count: total_results).page(@page).per(@page_size) if defined?(Kaminari)
+      raise "Please include the `kaminari` gem to use this method!"
+    end
+
+    def results
+      hits.map do |hit|
+        Waistband::QueryResult.new(hit)
+      end
+    end
+
+    def hits
+      execute!['hits']['hits'] rescue []
+    end
+
+    def total_results
+      execute!['hits']['total'] rescue 0
+    end
+
     private
 
       def to_hash
@@ -28,6 +45,22 @@ module Waistband
         @hash
       end
 
+      def url
+        index.search_url
+      end
+
+      def index
+        Waistband::Index.new(@index)
+      end
+
+      def execute!
+        JSON.parse(RestClient::Request.execute(method: :get, url: url, payload: to_hash.to_json))
+      end
+
+      def from
+        @page_size * (@page - 1)
+      end
+
     # /private
 
   end

data/lib/waistband/version.rb

@@ -1,3 +1,3 @@
 module Waistband
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: waistband
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
+  prerelease: 
 platform: ruby
 authors:
 - David Jairala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -100,7 +111,6 @@ files:
 - lib/waistband/connection.rb
 - lib/waistband/index.rb
 - lib/waistband/query.rb
-- lib/waistband/query_helpers.rb
 - lib/waistband/query_result.rb
 - lib/waistband/quick_error.rb
 - lib/waistband/stringified_array.rb
@@ -123,26 +133,27 @@ files:
 homepage: https://github.com/taskrabbit/waistband
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Elastic Search all the things!
 test_files:
 - spec/config/waistband/waistband.yml
@@ -158,4 +169,3 @@ test_files:
 - spec/lib/stringified_hash_spec.rb
 - spec/spec_helper.rb
 - spec/support/index_helper.rb
-has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjQ5YjAyNjA1NGIyZGE4ZTZjNDg0MjhkNGU3OWY1NmIwZTYxMTIxZQ==
-  data.tar.gz: !binary |-
-    MTU2YjFhN2YyY2QwMzljNWQ4NTJmYTNjNGJlZjE5NDA2YjcxMjU1NA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YWVhNTE5MDM5ZGY3OGM2MTE0ZWU5MzY0Njc2ZjcxZGI2MjE0NWViNDNmZjI4
-    MTgyN2Q2ZGQ5Yzk1Y2I3NjRlYWNhYTc2NmI2NjEzMmQwMTMwZDBmODk2YjI4
-    ZjJiZDJkMDc5OWNhNGQwZDU0MDMwMTEzNDczZGQ3Yjc2Yjg4MGY=
-  data.tar.gz: !binary |-
-    MTRkMDdkYzRlMzFiZGU1OGExY2FjN2QyYmRhNTFkYjBjNzU0ZDg1NWM0MWVl
-    YWE3NWU0NWRkODI5ZjIyNTViZjAxZjAzNjJjMjFjZDlkM2M1OWI2M2YxMWU0
-    NjA4MmMyOGM2ZWUyMTBjZWYzMTg0MTc0Yjg3MDQ1ZTFmOWQyNjU=

data/lib/waistband/query_helpers.rb

@@ -1,46 +0,0 @@
-require 'rest-client'
-
-module Waistband
-  module QueryHelpers
-
-    def paginated_results
-      return Kaminari.paginate_array(results, total_count: total_results).page(@page).per(@page_size) if defined?(Kaminari)
-      raise "Please include the `kaminari` gem to use this method!"
-    end
-
-    def results
-      hits.map do |hit|
-        Waistband::QueryResult.new(hit)
-      end
-    end
-
-    def hits
-      execute!['hits']['hits'] rescue []
-    end
-
-    def total_results
-      execute!['hits']['total'] rescue 0
-    end
-
-    private
-
-      def url
-        index.search_url
-      end
-
-      def index
-        Waistband::Index.new(@index)
-      end
-
-      def execute!
-        JSON.parse(RestClient::Request.execute(method: :get, url: url, payload: to_hash.to_json))
-      end
-
-      def from
-        @page_size * (@page - 1)
-      end
-
-    # /private
-
-  end
-end