waistband 0.3.2 → 0.4.0

data/lib/waistband/free_query.rb

@@ -0,0 +1,34 @@
+require 'active_support/core_ext/hash/indifferent_access'
+
+module Waistband
+  class FreeQuery
+
+    include ::Waistband::QueryHelpers
+
+    attr_accessor :page, :page_size
+
+    def initialize(index, options = {})
+      @index      = index
+      @page       = (options[:page] || 1).to_i
+      @page_size  = (options[:page_size] || 20).to_i
+    end
+
+    def prepare(hash)
+      @hash = hash.with_indifferent_access
+    end
+
+    private
+
+      def to_hash
+        raise "No query has been prepared yet!" unless @hash
+
+        @hash[:from] = from       unless @hash[:from]
+        @hash[:size] = @page_size unless @hash[:size]
+
+        @hash
+      end
+
+    # /private
+
+  end
+end

data/lib/waistband/query.rb

@@ -6,6 +6,8 @@ require 'kaminari/models/array_extension' if defined?(Kaminari)
 module Waistband
   class Query
 
+    include ::Waistband::QueryHelpers
+
     attr_accessor :page, :page_size
 
     def initialize(index, search_term, options = {})
@@ -22,25 +24,6 @@ module Waistband
       @page_size      = (options[:page_size] || 20).to_i
     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
-
     def add_match(field)
       @match = field
     end
@@ -110,18 +93,6 @@ module Waistband
 
     private
 
-      def url
-        index.search_url
-      end
-
-      def index
-        Waistband::Index.new(@index)
-      end
-
-      def execute!
-        @executed ||= JSON.parse(RestClient.post(url, to_hash.to_json))
-      end
-
       def to_hash
         {
           query: {
@@ -211,10 +182,6 @@ module Waistband
         end
       end
 
-      def from
-        @page_size * (@page - 1)
-      end
-
       def prep_words_uniquely(val)
         val.to_s.gsub(/ +/, ' ').strip.split(' ').uniq
       end

data/lib/waistband/query_helpers.rb

@@ -0,0 +1,44 @@
+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.post(url, to_hash.to_json))
+      end
+
+      def from
+        @page_size * (@page - 1)
+      end
+
+    # /private
+
+  end
+end

data/lib/waistband/version.rb

@@ -1,3 +1,3 @@
 module Waistband
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/lib/waistband.rb

@@ -7,7 +7,9 @@ module Waistband
   autoload :StringifiedArray, "waistband/stringified_array"
   autoload :StringifiedHash,  "waistband/stringified_hash"
   autoload :QueryResult,      "waistband/query_result"
+  autoload :QueryHelpers,     "waistband/query_helpers"
   autoload :Query,            "waistband/query"
+  autoload :FreeQuery,        "waistband/free_query"
   autoload :Index,            "waistband/index"
   autoload :QuickError,       "waistband/quick_error"
   autoload :Model,            "waistband/model"

data/spec/config/waistband/waistband_geo.yml

@@ -0,0 +1,19 @@
+development: &DEV
+  name: waistband_geo
+  stringify: false
+  settings:
+    index:
+      number_of_shards: 4
+  mappings:
+    geo:
+      _source:
+        includes: ["*"]
+      properties:
+        work_area:
+          type: geo_shape
+          tree: geohash
+          precision: 5m
+
+test:
+  <<: *DEV
+  name: waistband_geo_test

data/spec/lib/free_query_spec.rb

@@ -0,0 +1,161 @@
+require 'spec_helper'
+
+describe Waistband::FreeQuery do
+
+  let(:index)     { Waistband::Index.new('search') }
+  let(:geo_index) { Waistband::Index.new('geo') }
+
+  let(:query)     { Waistband::FreeQuery.new('search') }
+  let(:geo_query) { Waistband::FreeQuery.new('geo') }
+
+  let(:attrs) do
+    {
+      'query' => {
+        'bool' => {
+          'must' => [
+            {
+              'multi_match' => {
+                'query' => "shopping ikea",
+                'fields' => ['name']
+              },
+            }
+          ]
+        }
+      }
+    }
+  end
+
+  it "correclty forms a query hash" do
+    add_result!
+    query.prepare(attrs)
+
+    expect(query.instance_variable_get('@hash')).to eql(attrs)
+  end
+
+  it "finds results for a free query" do
+    add_result!
+    query.prepare(attrs)
+    json = query.send(:execute!)
+
+    json['hits'].should be_a Hash
+    json['hits']['total'].should > 0
+    json['hits']['hits'].size.should eql 2
+
+    hit = json['hits']['hits'].first
+
+    hit['_id'].should match(/^task_.*/)
+    hit['_source'].should be_a Hash
+    hit['_source']['id'].should eql 123123
+    hit['_source']['name'].should eql 'some shopping in ikea'
+    hit['_source']['user_id'].should eql 999
+    hit['_source']['description'].should eql 'i need you to pick up some stuff in ikea'
+  end
+
+  it "permits storing and fetching geo results" do
+    add_geo_results!
+    geo_query.prepare({
+      "query" => {
+        "filtered" => {
+          "query" => { "match_all" => {} },
+          "filter" => {
+             "geo_shape" => {
+               "work_area" => {
+                 "relation" => "intersects",
+                 "shape" => {
+                   "type" => "Point",
+                   "coordinates" => [-122.39455,37.7841]
+                 }
+               }
+             }
+          }
+        }
+      }
+    })
+
+    json = geo_query.send(:execute!)
+
+    json['hits'].should be_a Hash
+    json['hits']['total'].should eql 3
+    json['hits']['hits'].size.should eql 3
+
+    geo_query.prepare({
+      "query" => {
+        "filtered" => {
+          "query" => { "match_all" => {} },
+          "filter" => {
+             "geo_shape" => {
+               "work_area" => {
+                 "relation" => "intersects",
+                 "shape" => {
+                   "type" => "Point",
+                   "coordinates" => [-122.3859222222222,37.78292222222222]
+                 }
+               }
+             }
+          }
+        }
+      }
+    })
+
+    json = geo_query.send(:execute!)
+
+    json['hits'].should be_a Hash
+    json['hits']['total'].should eql 1
+    json['hits']['hits'].size.should eql 1
+  end
+
+  def add_result!
+    index.store!("task_123123", {id: 123123, name: 'some shopping in ikea',                   user_id: 999, description: 'i need you to pick up some stuff in ikea',  internal: false})
+    index.store!("task_234234", {id: 234234, name: "some shopping in ikea and trader joe's",  user_id: 987, description: 'pick me up some eggs',                      internal: true})
+    index.refresh
+  end
+
+  def add_geo_results!
+    geo_index.store!("rabbit_1", {
+      id: "rabbit_1",
+      work_area: {
+        type: 'polygon',
+        coordinates: [[
+          [-122.4119,37.78211],
+          [-122.39285,37.79649],
+          [-122.37997,37.78415],
+          [-122.39817,37.77248],
+          [-122.40932,37.77302],
+          [-122.4119,37.78211]
+        ]]
+      }
+    })
+
+    geo_index.store!("rabbit_2", {
+      id: "rabbit_2",
+      work_area: {
+        type: 'polygon',
+        coordinates: [[
+          [-122.41087,37.78822],
+          [-122.43174,37.78578],
+          [-122.42816,37.75938],
+          [-122.38787,37.76882],
+          [-122.39199,37.78584],
+          [-122.41087,37.78822]
+        ]]
+      }
+    })
+
+    geo_index.store!("rabbit_3", {
+      id: "rabbit_3",
+      work_area: {
+        type: 'polygon',
+        coordinates: [[
+          [-122.41997,37.79744],
+          [-122.39576,37.79975],
+          [-122.38461,37.78469],
+          [-122.40294,37.77738],
+          [-122.41997,37.79744]
+        ]]
+      }
+    })
+
+    geo_index.refresh
+  end
+
+end

data/spec/support/index_helper.rb

@@ -1,6 +1,6 @@
 class IndexHelper
 
-  INDEXES = %w(events search)
+  INDEXES = %w(events search geo)
 
   class << self
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waistband
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,9 +109,11 @@ files:
 - lib/waistband.rb
 - lib/waistband/configuration.rb
 - lib/waistband/connection.rb
+- lib/waistband/free_query.rb
 - lib/waistband/index.rb
 - lib/waistband/model.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
@@ -119,9 +121,11 @@ files:
 - lib/waistband/version.rb
 - spec/config/waistband/waistband.yml
 - spec/config/waistband/waistband_events.yml
+- spec/config/waistband/waistband_geo.yml
 - spec/config/waistband/waistband_search.yml
 - spec/lib/configuration_spec.rb
 - spec/lib/connection_spec.rb
+- spec/lib/free_query_spec.rb
 - spec/lib/index_spec.rb
 - spec/lib/model_spec.rb
 - spec/lib/query_result_spec.rb
@@ -159,9 +163,11 @@ summary: Elastic Search all the things!
 test_files:
 - spec/config/waistband/waistband.yml
 - spec/config/waistband/waistband_events.yml
+- spec/config/waistband/waistband_geo.yml
 - spec/config/waistband/waistband_search.yml
 - spec/lib/configuration_spec.rb
 - spec/lib/connection_spec.rb
+- spec/lib/free_query_spec.rb
 - spec/lib/index_spec.rb
 - spec/lib/model_spec.rb
 - spec/lib/query_result_spec.rb