solidus_searchkick 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 402dbdfb5175c200fedf8c9926fdc385722cf86c
-  data.tar.gz: a254760c9d46d504dcc4d6d70b6d9419811069a6
+  metadata.gz: ca0b78287e2633baa26f6c7ddeff14b16dc00af3
+  data.tar.gz: 6b2053d60718e3636b27e2b40259cc74a03a084b
 SHA512:
-  metadata.gz: 1c0bb2c7c15e09ddfd9b139c4d7caa2bcd78e3ca85f25262efc27835b25f53bfb6f64a182223c22ba4d48acab9edb65a8cd2e69d9af3fe2a837349347fdcd8d4
-  data.tar.gz: 19a6df8d6d4a786b5df540f67ab9b491b21a0dd3d6ff387bb39c743035249d59115217ad629a4d6c215ebc2cfc29b47e05a869268e5b3d56a46d2e1fcb02a938
+  metadata.gz: a9a69a01475029299acc03e1b6df00f26a812404984b789271b4568c6698c8db787907681725383d3fc26b127530d389996a146d5e187d7a6683aec6d741f799
+  data.tar.gz: c90fb75cbd91aebb1e2b4124c81eb8e0d37ce4e31abc910ad0d4c40cc50ba22987aaecbca1812b9de5728f4183bd3bab78846d3f35b97b12a715cf4cfa87f956

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    solidus_searchkick (0.2.1)
+    solidus_searchkick (0.2.3)
       searchkick (~> 1.2)
       solidus (~> 1.4, >= 1.4.0)
 
@@ -30,7 +30,7 @@ GEM
     activejob (4.2.7.1)
       activesupport (= 4.2.7.1)
       globalid (>= 0.3.0)
-    activemerchant (1.60.0)
+    activemerchant (1.62.0)
       activesupport (>= 3.2.14, < 5.1)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
@@ -50,8 +50,9 @@ GEM
       tzinfo (~> 1.1)
     acts_as_list (0.8.2)
       activerecord (>= 3.0)
-    addressable (2.4.0)
-    arel (6.0.3)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    arel (6.0.4)
     awesome_nested_set (3.1.1)
       activerecord (>= 4.0.0, < 5.1)
     bcrypt (3.1.11)
@@ -94,10 +95,10 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
+    coffee-script-source (1.12.2)
     colorize (0.8.1)
-    concurrent-ruby (1.0.2)
-    css_parser (1.4.5)
+    concurrent-ruby (1.0.4)
+    css_parser (1.4.7)
       addressable
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
@@ -116,25 +117,25 @@ GEM
       devise (>= 2.1.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    elasticsearch (2.0.0)
-      elasticsearch-api (= 2.0.0)
-      elasticsearch-transport (= 2.0.0)
-    elasticsearch-api (2.0.0)
+    elasticsearch (5.0.0)
+      elasticsearch-api (= 5.0.0)
+      elasticsearch-transport (= 5.0.0)
+    elasticsearch-api (5.0.0)
       multi_json
-    elasticsearch-transport (2.0.0)
+    elasticsearch-transport (5.0.0)
       faraday
       multi_json
     erubis (2.7.0)
     execjs (2.7.0)
     factory_girl (4.7.0)
       activesupport (>= 3.0.0)
-    faraday (0.9.2)
+    faraday (0.10.1)
       multipart-post (>= 1.2, < 3)
-    ffaker (2.2.0)
+    ffaker (2.4.0)
     ffi (1.9.14)
-    font-awesome-rails (4.6.3.1)
+    font-awesome-rails (4.7.0.1)
       railties (>= 3.2, < 5.1)
-    friendly_id (5.1.0)
+    friendly_id (5.2.0)
       activerecord (>= 4.0.0)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
@@ -147,7 +148,7 @@ GEM
     highline (1.6.21)
     htmlentities (4.3.4)
     i18n (0.7.0)
-    jquery-rails (4.2.1)
+    jquery-rails (4.2.2)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -167,17 +168,16 @@ GEM
     mime-types-data (3.2016.0521)
     mimemagic (0.3.0)
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
-    monetize (1.4.0)
+    minitest (5.10.1)
+    monetize (1.5.0)
       money (~> 6.7)
-    money (6.7.1)
+    money (6.8.0)
       i18n (>= 0.6.4, <= 0.7.0)
       sixarm_ruby_unaccent (>= 1.1.1, < 2)
     multi_json (1.12.1)
     multipart-post (2.0.0)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     orm_adapter (0.5.0)
     paperclip (4.3.7)
       activemodel (>= 3.2.0)
@@ -185,25 +185,25 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)
-    paranoia (2.1.5)
-      activerecord (~> 4.0)
-    pkg-config (1.1.7)
+    paranoia (2.2.0)
+      activerecord (>= 4.0, < 5.1)
     polyamorous (1.3.1)
       activerecord (>= 3.0)
     polyglot (0.3.5)
     premailer (1.8.7)
       css_parser (>= 1.4.5)
       htmlentities (>= 4.0.0)
-    premailer-rails (1.9.4)
+    premailer-rails (1.9.5)
       actionmailer (>= 3, < 6)
       premailer (~> 1.7, >= 1.7.9)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    public_suffix (2.0.5)
     rabl (0.11.8)
       activesupport (>= 2.3.14)
-    rack (1.6.4)
+    rack (1.6.5)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.7.1)
@@ -219,9 +219,9 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
@@ -230,7 +230,7 @@ GEM
       activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.3.0)
+    rake (12.0.0)
     ransack (1.8.2)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
@@ -257,14 +257,14 @@ GEM
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
     rubyzip (1.2.0)
-    sass (3.4.22)
+    sass (3.4.23)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    searchkick (1.3.5)
+    searchkick (1.5.1)
       activemodel
       elasticsearch (>= 1)
       hashie
@@ -340,7 +340,7 @@ GEM
       solidus_core (= 1.4.0)
     solidus_sample (1.4.0)
       solidus_core (= 1.4.0)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.0)
@@ -356,13 +356,13 @@ GEM
       activerecord (>= 4.1, < 5.1)
       state_machines-activemodel (>= 0.3.0)
     stringex (1.5.1)
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.5)
     tilt (2.0.5)
     truncate_html (0.9.3)
-    twitter_cldr (3.5.0)
+    twitter_cldr (3.6.0)
       camertron-eprun
-      cldr-plurals-runtime-rb (~> 1.0.0)
+      cldr-plurals-runtime-rb (~> 1.0)
       tzinfo
     tzinfo (1.2.2)
       thread_safe (~> 0.1)

data/README.md

@@ -3,17 +3,17 @@
 [![Test Coverage](https://codeclimate.com/github/elevatorup/solidus_searchkick/badges/coverage.svg)](https://codeclimate.com/github/elevatorup/solidus_searchkick/coverage)
 
 Solidus + Searchkick
-===============
+====================
 
-Add [Elasticsearch](http://elastic.co) goodies to Solidus, powered by [searchkick](http://searchkick.org).
+Add [Elasticsearch](http://elastic.co) to Solidus, powered by [searchkick](http://searchkick.org).
 
 Features
 --------
 
-* Full search (keyword, in_taxon)
-* Taxons Aggregations (aggs)
-* Search Autocomplete ([Typeahead](https://twitter.github.io/typeahead.js/))
-
+* Search products by sku, name, description, taxon, and more out of the box.
+* Customize the product search fields to your liking.
+* Search Autocomplete by name out of the box ([Typeahead](https://twitter.github.io/typeahead.js/)).
+* Product filtering based on ElasticSearch queries.
 
 Installation
 ------------
@@ -36,23 +36,83 @@ Installing solidus_searchkick will copy over a new `spree/shared/_filters.html.e
 
 [Install elasticsearch](https://www.elastic.co/downloads/elasticsearch)
 
-Implementation
--------------
-Initially, you are started with a very basic filtering system which includes a price filter in order to show how the filtering works within elasticsearch. In order to add more filtering or change the price filtering, the following steps will need to be taken.
+Searchkick Integration
+----------------------
+
+By default, Searchkick is initialized on the Product model in SolidusSearchkick's `product_decorator` with:
+```
+searchkick word_start: [:name]
+```
+
+If you need to modify this, you can do so in your own `product_decorator`, by adding something like:
+```
+# app/models/spree/product_decorator.rb
+Spree::Product.class_eval do
+  searchkick word_start: [:name], callbacks: :async unless Spree::Product.try(:searchkick_options)
+  ...
+end
+```
+In this example, the `unless Spree::product.try(:searchkick_options)` conditional is needed, since, by default, the development environment does not cache classes and will reload them.
+Adding this condition prevents Rails from throwing an error when reloading the product decorator and trying to add searchkick multiple times.
+
+
+Search Parameters
+-----------------
+
+By default, only the `Spree::Product` class is indexed. The following items are indexed by default:
+* name
+* description
+* available? (indexed as `active`)
+* price (needed in order to return products that have price != nil)
+* currency
+* sku
+* orders.complete.count (indexed as `conversions`)
+* taxon_ids
+* taxon_names
+
+In order to control what data is indexed, override the `Spree::Product#search_data` method. Call `Spree::Product.reindex` after changing this method.
+
+Filtering
+---------
+
+Initially, you start with a very basic filtering system which includes a price filter in order to show how the filtering works with SolidusSearchkick and ElasticSearch. In order to add additional filters or change the price filter, the following steps will need to be taken:
 
 1. Copy the `Spree::Core::SearchkickFilters` file from this gem and place it in `lib/spree/core/`
+
 2. Add it to the config load path, or require it in an initializer, e.g...
    ```
    # config/initializers/spree.rb
    require 'spree/core/searchkick_filters'
    ```
-3. Modify SearchKickFilters as needed.
 
-The `conds` for `SearchkickFilters` are similar to the `ProductFilters` in the default version of spree. Although the first parameters of each is still the label, the second item is the ElasticSerach DSL that will be used for that filter, eg... `{ range: { price: { lt: 1 } } }`
+3. Modify SearchkickFilters as needed.
+
+The `conds` for `SearchkickFilters` are similar to the `ProductFilters` in the default version of spree/solidus. Although the first parameters of each is still the label, the second item is the ElasticSearch DSL that will be used for that filter, eg...
+
+  ```
+  conds = [
+    ...
+    [Spree.t(:under_price, price: format_price(1)),   { range: { price: { lt: 1 } } }],
+    ...
+  ]
+  ```
+
+4. Ensure that `Spree::Taxon#applicable_filters` returns the filters you want:
+
+  ```
+  # app/models/spree/taxon_decorator.rb
+  def applicable_filters
+    filters = []
+    ...
+    filters << Spree::Core::SearchkickFilters.price_filter if Spree::Core::SearchkickFilters.respond_to?(:price_filter)
+    ...
+    filters
+  end
+  ```
 
 Autocomplete
--------------
-SolidusSearchkick provides autocomplete for the `name` field of your products. In order to get this working, all you need to do is add the following lines to the corresponding files:
+------------
+By default, SolidusSearchkick provides autocomplete for the `name` field of your products. In order to get this working, all you need to do is add the following lines to the corresponding files:
 
 application.js
 ```
@@ -67,30 +127,122 @@ application.css
 
 After that, automplete should now be working in the search box.
 
+_**Note:** These requires are not added by the generator in order to give you the option to add Autocomplete instead of forcing it._
+
 Advanced Autocomplete
--------------
-Documentation Coming Soon
+---------------------
+The default autocomplete provided by solidus_searchkick is pretty basic.
 
-Options
--------------
-Order
-Fields (example of overriding fields)
+In order to modify how the autocomplete for your site works, you will first need to create a `product_decorator` if you do not already have one.
+You will then need to override the `self.autocomplete` method in order to suit your needs. Take a look at the `self.autocomplete` method in the solidus_searchkick `product_decorator` to get started.
 
-Documentation
--------------
+```
+# app/models/spree/product_decorator.rb
+Spree::Product.class_eval do
+...
+  def self.autocomplete(keywords)
+  ...
+  end
+...
+end
+```
 
-By default, only the `Spree::Product` class is indexed. The following items are indexed by default:
-* name
-* description
-* available? (indexed as `active`)
-* price (needed in order to return products that have price != nil)
-* currency
-* sku
-* orders.complete.count (indexed as `conversions`)
-* taxon_ids
-* taxon_names
+Searchkick Options
+------------------
+Since SolidusSearchkick uses Searchkick to interact with ElasticSearch, it also accepts all of the Searchkick options.
+
+You can specify a limit or offset when searching, as well as any other options provided by Searchkick.
+In order to use the options, all you need to do is to pass a `searchkick_options` hash along with your search.
+
+```
+searcher = build_searcher(params.deep_merge(searchkick_options: { limit: 6, offset: 100 }))
+@products = searcher.retrieve_products
+```
+
+OR
+
+```
+search_params = {
+  search: {
+    price: {
+      gt: 100
+    }
+  },
+  searchkick_options: {
+    order: {
+      price: :asc
+    },
+    limit: 100
+  }
+}
+
+searcher = build_searcher(params.merge(search_params))
+@products = searcher.retrieve_products
+```
 
-In order to control what data is indexed, override `Spree::Product#search_data` method. Call `Spree::Product.reindex` after changing this method.
+
+ElasticSearch DSL
+-----------------
+There are times where even the power of Searchkick will not be enough to get you the results you need from ElasitcSearch.
+In these cases, you can use the full power of the ElasticSearch DSL by passing in the `query` param.
+
+```
+query = {
+  {
+    'bool': {
+      'must': [
+        { 'match': { 'name':   'Product 1'} }
+      ],
+      'filter': [
+        { 'range': { 'available_on': { 'gte': '2015-01-01' }}}
+      ]
+    }
+  }
+}
+
+searcher = build_searcher(query: query)
+@products = searcher.retrieve_products
+```
+
+
+Overriding and Extending Default Methods
+----------------------------------------
+
+By creating an initializer, you have the ability to override or extend any of the default methods provided by SolidusSearchkick.
+
+### Overriding a Default Method
+
+In order to override a method, simply add that method to the initializer.
+
+_(Take care when overriding methods, as you may loose some functionality if not careful)_
+```
+# config/initializers/solidus_searchkick.rb
+Spree::Search::Searchkick.class_eval do
+  def where_clause
+    # Default items for where_clause
+    where_clause = {
+      active: true
+    }
+    where_clause.merge!({taxon_ids: taxon.id}) if taxon
+
+    # Add search attributes from params[:search]
+    add_search_attributes(where_clause)
+  end
+end
+```
+
+### Extending a Default Method
+
+In order to extend a method, alias the original method, then call the aliased method when defining the new method.
+```
+# config/initializers/solidus_searchkick.rb
+Spree::Search::Searchkick.class_eval do
+  alias_method :original_where_clause, :where_clause
+  def where_clause
+    original_where_clause.merge(param1: param1, param2: param2)
+  end
+end
+```
 
 Testing
 -------
@@ -112,6 +264,7 @@ require 'solidus_searchkick/factories'
 Copyright (c) 2016 Jim Smith, released under the New BSD License
 
 
+Special Thanks
+--------------
 
-TODO:
-Add in information about sorting (maybe even add in default sorting, and sorting template, along with sorting javascript)
+SolidusSearchkick was heavily inspired by [spree_searchkick](https://github.com/ronzalo/spree_searchkick), which was used as a starting point to getting Solidus to work nicely with Searchkick.

data/app/models/spree/product_decorator.rb

@@ -3,7 +3,7 @@ Spree::Product.class_eval do
   Rails.application.config.after_initialize do
     # Check if searchkick_options have been set by the application using this gem
     # If they have, then do not initialize searchkick on the model. If they have not, then set the defaults
-    searchkick autocomplete: [:name] unless Spree::Product.try(:searchkick_options)
+    searchkick word_start: [:name] unless Spree::Product.try(:searchkick_options)
   end
 
   def search_data
@@ -30,14 +30,18 @@ Spree::Product.class_eval do
     if keywords
       Spree::Product.search(
         keywords,
-        autocomplete: true,
-        limit: 10, where: search_where
+        fields: ['name^5'],
+        match: :word_start,
+        limit: 10,
+        load: false,
+        misspellings: { below: 3 },
+        where: search_where,
       ).map(&:name).map(&:strip).uniq
     else
       Spree::Product.search(
         '*',
         where: search_where
-      ).map(&:name).map(&:strip)
+      ).map(&:name).map(&:strip).uniq
     end
   end
 

data/lib/solidus_searchkick/version.rb

@@ -1,3 +1,3 @@
 module SolidusSearchkick
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/routing/spree/products_routes_spec.rb

@@ -4,17 +4,5 @@ RSpec.describe Spree::ProductsController, type: :routing do
   describe 'routing' do
     routes { Spree::Core::Engine.routes }
     let(:taxon) { create(:taxon) }
-
-    context 'best selling products' do
-      it 'routes to #best_selling' do
-        expect(get: best_path).to route_to(controller: 'spree/products', action: 'best_selling')
-      end
-    end
-
-    context 'best selling products by taxon' do
-      it 'routes to #create' do
-        expect(get: best_selling_taxon_path(taxon.permalink)).to route_to(controller: 'spree/products', action: 'best_selling', id: taxon.permalink)
-      end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_searchkick
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Add searchkick to Solidus