solidus_searchkick 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f30fff68875027413d67bf0db833bb21a7078577
-  data.tar.gz: a0726e7fda9050afe3a1d1fbb4fff2da71a8a1cf
+  metadata.gz: c10dc0ada7aabb3f96bb28bac7c77b750b7db1aa
+  data.tar.gz: 7be6725add47cacb8398f7c89303b2e392ef75e0
 SHA512:
-  metadata.gz: 5be22ce9869a9bd00b23ac5723c3a3725e463ac6f83159c8f009cd7ec39858a515690a62c4ed853887ff28ab054abdbb46f485f4c48da3291e392b8b95559d9a
-  data.tar.gz: 661f82be3ef9a9d31644c79577eea985a8d45c38afdcde525c78decf726f82b7990a6a67fd4be05361c0b6ffe896f7157f86e2e1ccdbeea8c9ec4534d2b30239
+  metadata.gz: 203e0b2e29d1b09f2eeb08e9282d0f7229b7ad3c8ad7702d29972f1f88c345560b96f7eeaf279591ed81b64fecb824401715345b557b39324266ed7d557b3dd7
+  data.tar.gz: 0b7074a2038c84dcb401283216a3673f536191cfaeef8e79abf26b849e36b16ed0db9a6fb8df86dd1827633e9971aa907e7ce1a0cd028f2479504f080495f6aa

data/LICENSE

@@ -1,26 +1,7 @@
-Copyright (c) 2016 [name of plugin creator]
-All rights reserved.
+Copyright (c) 2016 Jim Smith
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name Spree nor the names of its contributors may be used to
-      endorse or promote products derived from this software without specific
-      prior written permission.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -38,6 +38,11 @@ rake solidus_searchkick:install:migrations
 
 [Install elasticsearch](https://www.elastic.co/downloads/elasticsearch)
 
+Options
+-------------
+Order
+Fields (example of overriding fields)
+
 Documentation
 -------------
 
@@ -51,7 +56,7 @@ By default, only the `Spree::Product` class is indexed. The following items are
 * orders.complete.count (indexed as `conversions`)
 * taxon_ids
 * taxon_names
-* All Properies
+* All Properties
 * All Taxon ids by Taxonomy
 
 In order to control what data is indexed, override `Spree::Product#search_data` method. Call `Spree::Product.reindex` after changing this method.

data/lib/solidus_searchkick/version.rb

@@ -1,3 +1,3 @@
 module SolidusSearchkick
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/spree/search/searchkick.rb

@@ -1,14 +1,26 @@
 module Spree::Search
   class Searchkick < Spree::Core::Search::Base
     def retrieve_products
-      @products = get_base_elasticsearch
+      @products = get_base_search
     end
 
     protected
 
-    def get_base_elasticsearch
-      curr_page = page || 1
-      Spree::Product.search(keyword_query, where: where_query, aggs: aggregations, smart_aggs: true, order: sort, page: curr_page, per_page: per_page)
+    def get_base_search
+      current_page = page || 1
+
+      Spree::Product.search(
+        keyword_query,
+        where: where_query,
+        aggs: aggregations,
+        smart_aggs: true,
+        order: order_query,
+        limit: limit_query,
+        offest: offset_query,
+        page: current_page,
+        per_page: per_page,
+        includes: includes_query
+      )
     end
 
     def where_query
@@ -25,7 +37,7 @@ module Spree::Search
       (keywords.nil? || keywords.empty?) ? "*" : keywords
     end
 
-    def sort
+    def order_query
       order ? order : nil
     end
 
@@ -49,8 +61,19 @@ module Spree::Search
       query
     end
 
+    def includes_query
+      includes =  { master: [:currently_valid_prices] }
+      includes[:master] << :images if include_images
+      includes
+    end
+
+    def limit_query
+      limit ? limit : nil
+    end
+
     def prepare(params)
       @properties[:order] = params[:order].blank? ? nil : params[:order]
+      @properties[:limit] = params[:limit].blank? ? nil : params[:limit]
       params = params.deep_symbolize_keys
       super
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_searchkick
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus