spree_products_filters 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b71abdf823ea4bcc6029bd828a6adc2cb7fe241
-  data.tar.gz: c5a587814c4058f971218e56c6a7e7fe3c3dc4c4
+  metadata.gz: 56d9307ca041b44927270fb1cc3f019cd56f2993
+  data.tar.gz: 8cff7c4595f151c61bf1cc3bb418a7c812855221
 SHA512:
-  metadata.gz: edac7773e8018d6e8bd474c39fe4195e6525108e7029ee2a302e11c971a2e37798823c14b3b3352191f495c7121f9d97323c72f50b0229d09886805b7c3897fe
-  data.tar.gz: b428ad8838c441e24dca3868bf5a8a21f4847781e97850c54bf26e33f6bb1f6a574c04a76e15a36e48f817b80dd667cce54dcc2141eb2874949fa844e7c6b98a
+  metadata.gz: 40203fc4e81784c320393a4df9324056b1fe99ac4d10a612f60840119dd461cc53715c04fa6bd816d36da878d50b371b02e2e69a4b19cd1699c18cb992301ff4
+  data.tar.gz: 1c84957302f522c1df6fa56e7c88e3438aee0451a8a341d5139a62aa122953dfd3193df630013582320aa9f78933e52fc1b07a475de05ebba0d96997fb254065

data/.gitignore

@@ -0,0 +1,17 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/.DS_Store
+/app/.DS_Store
+/app/controllers/.DS_Store
+
+.idea
+.ruby-version
+.ruby-gemset
+spec/dummy

data/.gitlab-ci.yml

@@ -0,0 +1,15 @@
+image: ruby:2.4.2
+
+cache:
+  paths:
+    - cache
+
+before_script:
+  - apt-get update -q && apt-get install nodejs -yqq
+  - gem install bundler -v 1.15.4 --no-ri --no-rdoc
+  - bundle install -j $(nproc) --path cache
+
+test:
+  script:
+    - bundle exec rake test_app
+    - rspec spec

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/Gemfile

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in spree-products-filters.gemspec
+gem 'spree', '~> 3.6.0'
+gem 'spree_auth_devise', '~> 3.3'
+gem 'haml'
+gem 'jquery-ui-rails'
+
+group :test do
+  gem 'timecop'
+end
+
+gemspec

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 JetRuby Agency
+
+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:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+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

@@ -0,0 +1,62 @@
+# Spree::Products::Filters
+
+Current gem provides easy installation of advanced product filters for your Spree Commerce application.
+
+Spree Commerce versions:
+- Spree Core - 3.6
+- Spree Auth Devise - 3.3
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'spree-products-filters'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install spree-products-filters
+
+Bundle your dependencies and run the installation generator:
+
+```shell
+bundle
+bundle exec rails g spree_products_filters:install
+```
+
+## Usage
+
+Before use add allowed sorting scopes in config/initializers/spree.rb
+
+```shell
+Spree::FiltersConfiguration::Config.allowed_sortings += [:descend_by_updated_at, :ascend_by_master_price, :descend_by_master_price, :ascend_by_name, :descend_by_name]
+```
+
+Some properties can be removed from filters, for example 'Material', 'Size' (add this line to config/initializers/spree.rb):
+
+```shell
+Spree::FiltersConfiguration::Config.hidden_properties += ['Material', 'Size']
+```
+
+## Testing
+
+Be sure to bundle your dependencies and then create a dummy test app for the specs to run against.
+
+```shell
+bundle
+bundle exec rake test_app
+bundle exec rspec spec
+```
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/Rakefile

@@ -0,0 +1,15 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+require 'spree/testing_support/extension_rake'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+
+desc 'Generates a dummy app for testing'
+task :test_app do
+  ENV['LIB_NAME'] = 'spree_products_filters'
+  Rake::Task['extension:test_app'].invoke
+end

data/app/assets/javascripts/spree/frontend/filters.js

@@ -0,0 +1,26 @@
+$(document).ready(function() {
+  if ($('#slider-range').length > 0) {
+    var collection_min_price = parseInt($( '#range_limits' ).data('collection-min-price'));
+    var collection_max_price = parseInt($( '#range_limits' ).data('collection-max-price'));
+    var min_range = parseInt($( '#range_limits' ).data('min-range'));
+    var max_range = parseInt($( '#range_limits' ).data('max-range'));
+    var currency  = $('#amount').data('currency');
+
+    var slider = $('#slider-range').slider({
+      range: true,
+      min: collection_min_price,
+      max: collection_max_price,
+      values: [min_range, max_range],
+      slide: function(event, ui) {
+        $('#amount').val(currency + ' ' + ui.values[0] + ' - '+ currency + ' ' + ui.values[1]);
+      },
+      stop: function(_, ui) {
+        $('#min_price_range').val(ui.values[0]);
+        $('#max_price_range').val(ui.values[1]);
+      }
+    });
+
+    $('#amount').val(currency + ' ' + $('#slider-range' ).slider('values', 0) +
+      ' - ' + currency + ' ' + $('#slider-range').slider('values', 1));
+  }
+});

data/app/assets/javascripts/spree/frontend/filters_all.js

@@ -0,0 +1,3 @@
+//= jquery-ui
+//= require_tree .
+

data/app/assets/stylesheets/spree/frontend/filters.css

@@ -0,0 +1,15 @@
+#slider-range {
+    margin-bottom: 7px;
+}
+#amount {
+    border: 0;
+    color: #1e89d1;
+    font-weight: bold;
+}
+#sort-links{
+    padding-bottom: 7px;
+    text-align: right;
+}
+.filters_label {
+    margin-top: 5px;
+}

data/app/assets/stylesheets/spree/frontend/filters_all.css

@@ -0,0 +1,3 @@
+/*
+ *= require_tree .
+*/

data/app/controllers/concerns/filters_initialization.rb

@@ -0,0 +1,38 @@
+module FiltersInitialization
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :param_sorting
+  end
+
+  def param_sorting
+    params[:sorting].try(:to_sym) || default_sorting
+  end
+
+  private
+
+  def default_sorting
+    :descend_by_updated_at
+  end
+
+  def sorting_scope
+    Spree::FiltersConfiguration::Config.allowed_sortings.include?(param_sorting) ? param_sorting : default_sorting
+  end
+
+  def filters_init
+    filters_hash = AdvancedFilters.new(params, @products).filter_results
+    @properties         = filters_hash[:properties]
+    @product_properties = filters_hash[:product_properties]
+    @price_range        = filters_hash[:price_range]
+    products            = filters_hash[:products].page(params[:page]).
+                            per(params[:per_page] || Spree::Config[:products_per_page])
+    @products = if sorting_scope.to_s.include?('price')
+                  products.select('spree_products.*', 'spree_prices.amount').send(sorting_scope)
+                else
+                  products.send(sorting_scope)
+                end
+    if params[:controller] == 'spree/taxons' && params[:action] == 'show'
+      @option_types = filters_hash[:option_types]
+    end
+  end
+end

data/app/controllers/spree/home_controller_decorator.rb

@@ -0,0 +1,11 @@
+Spree::HomeController.class_eval do
+  include FiltersInitialization
+
+  def index
+    @searcher   = build_searcher(params.merge(include_images: true))
+    @products   = @searcher.custom_retrieve_products
+    @taxonomies = Spree::Taxonomy.includes(root: :children)
+
+    filters_init
+  end
+end

data/app/controllers/spree/products_controller_decorator.rb

@@ -0,0 +1,11 @@
+Spree::ProductsController.class_eval do
+  include FiltersInitialization
+
+  def index
+    @searcher   = build_searcher(params.merge(include_images: true))
+    @products   = @searcher.custom_retrieve_products
+    @taxonomies = Spree::Taxonomy.includes(root: :children)
+
+    filters_init
+  end
+end

data/app/controllers/spree/taxons_controller_decorator.rb

@@ -0,0 +1,14 @@
+Spree::TaxonsController.class_eval do
+  include FiltersInitialization
+
+  def show
+    @taxon = Spree::Taxon.friendly.find(params[:id])
+    return unless @taxon
+
+    @searcher   = build_searcher(params.merge(taxon: @taxon.id, include_images: true))
+    @products   = @searcher.custom_retrieve_products
+    @taxonomies = Spree::Taxonomy.includes(root: :children)
+
+    filters_init
+  end
+end

data/app/helpers/spree/filters_helper.rb

@@ -0,0 +1,3 @@
+module Spree::FiltersHelper
+  
+end

data/app/helpers/spree/products_helper_decorator.rb

@@ -0,0 +1,26 @@
+Spree::ProductsHelper.class_eval do
+  def cache_key_for_products
+    count    = @products.count
+    first_id = @products.any? ? @products.first.id : nil
+    sorting  = params[:sorting]
+    "#{I18n.locale}/#{current_currency}/spree/products/all-#{params[:page]}-#{first_id}-#{sorting}-#{count}"
+  end
+
+  def link_to_sort(key)
+    if current_sorting?(key)
+      klass = 'btn btn-primary btn-sm'
+    else
+      klass = 'btn btn-default btn-sm'
+    end
+
+    link_to Spree.t(key).html_safe, params.merge(sorting: key), class: klass
+  end
+
+  def current_sorting?(key)
+    param_sorting == key.to_sym
+  end
+
+  def filter_checked?(keys, value)
+    (params[:filters][keys[0]].present? && params[:filters][keys[0]][keys[1]].include?(value)) ? true : false
+  end
+end

data/app/models/spree/filters_configuration.rb

@@ -0,0 +1,10 @@
+module Spree
+  class FiltersConfiguration < Preferences::Configuration
+    attr_accessor :allowed_sortings, :hidden_properties
+    # FiltersConfiguration
+    def initialize
+      @allowed_sortings  = []
+      @hidden_properties = []
+    end
+  end
+end

data/app/models/spree/product_decorator.rb

@@ -0,0 +1,6 @@
+Spree::Product.class_eval do
+  scope :with_property_values, -> (values_array) { joins(:properties).
+    where("#{Spree::ProductProperty.table_name}.value IN (?)", values_array)}
+  scope :with_option_values,   -> (values_array) { joins(variants_including_master: :option_values).
+    where("#{Spree::OptionValue.table_name}.name IN (?)", values_array).distinct }
+end

data/app/overrides/spree/add_group_of_advanced_filters_to_home_index.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(
+  virtual_path: 'spree/home/index',
+  name: 'advanced_filters',
+  insert_before: "[data-hook='homepage_sidebar_navigation']",
+  text: "<%= render 'spree/shared/advanced_filters'%>"
+)

data/app/overrides/spree/add_group_of_advanced_filters_to_products_index.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(
+  virtual_path: 'spree/products/index',
+  name: 'advanced_filters',
+  insert_before: "[data-hook='homepage_sidebar_navigation']",
+  text: "<%= render 'spree/shared/advanced_filters'%>"
+)

data/app/overrides/spree/add_group_of_advanced_filters_to_taxon_show.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(
+  virtual_path: 'spree/taxons/show',
+  name: 'advanced_filters',
+  insert_before: "[data-hook='taxon_sidebar_navigation']",
+  text: "<%= render 'spree/shared/advanced_filters'%>"
+)

data/app/overrides/spree/shared/add_sorting_links_in_products.rb

@@ -0,0 +1,4 @@
+Deface::Override.new(virtual_path:  'spree/shared/_products',
+                     insert_before: '#products[data-hook]',
+                     partial:       'spree/shared/sorting_bar',
+                     name:          'sorting_in_products')

data/app/services/advanced_filters.rb

@@ -0,0 +1,62 @@
+class AdvancedFilters
+  def initialize(params = {}, products)
+    @params   = params
+    @products = products
+  end
+
+  def filter_results
+    @params[:filters] ||= {}
+    params_clone = @params[:filters].deep_dup.delete_if { |_query, value| value.blank? }
+
+    products    = filters_merger(params_clone, @products).distinct
+    min_price   = products.map(&:price).min.to_i
+    max_price   = products.map(&:price).max.round.to_i
+    price_range = {min_range: params_clone[:min_price_range].present? ? params_clone[:min_price_range].to_i : min_price,
+                   max_range: params_clone[:max_price_range].present? ? params_clone[:max_price_range].to_i : max_price,
+                   collection_min_price: min_price,
+                   collection_max_price: max_price}
+    properties = products.map(&:properties).flatten.uniq
+    properties = properties.blank? ? nil : allowed_properties(properties)
+
+    product_properties = products.map(&:product_properties).flatten.uniq.map(&:value).uniq
+    product_properties = product_properties.blank? ? nil : product_properties
+
+    result_hash = { properties: properties, product_properties: product_properties,
+                    products:   products,   price_range:        price_range }
+
+    if @params[:controller] == 'spree/taxons' && @params[:action] == 'show'
+      option_types = products.map(&:option_types).flatten.uniq
+      option_types = option_types.blank? ? nil : option_types
+
+      result_hash[:option_types] = option_types
+    end
+
+    result_hash
+  end
+
+  private
+
+  def filters_merger(params, products)
+    if params[:min_price_range].present? && params[:max_price_range].present?
+      products = products.send('price_between', params[:min_price_range].to_i, params[:max_price_range].to_i)
+    end
+
+    if params[:option_types].present? && !params[:option_types][:names].blank?
+      products = products.with_option_values(params[:option_types][:names])
+    end
+
+    if params[:properties].present? && !params[:properties][:types].blank?
+      products = products.with_property_values(params[:properties][:types])
+    end
+
+    products
+  end
+
+  def allowed_properties(properties)
+    if Spree::FiltersConfiguration::Config.hidden_properties.any?
+      properties - Spree::Property.where(name: Spree::FiltersConfiguration::Config.hidden_properties)
+    else
+      properties
+    end
+  end
+end

data/app/views/spree/shared/_advanced_filters.html.haml

@@ -0,0 +1,22 @@
+= form_tag '', method: :get, id: 'advanced_filters' do
+  -# Search request repeater
+  - if params[:keywords].present?
+    = hidden_field_tag :keywords, params[:keywords]
+
+  -# Price Range filter
+  %h4= Spree.t(:price_range_filter)
+  %p
+    = label_tag 'amount', Spree.t(:price_range)
+    %input#amount{readonly: '', type: '1', data: {currency: current_currency}}
+  #slider-range
+    %span.hidden#range_limits{data: @price_range }
+  = hidden_field_tag 'filters[min_price_range]', @price_range[:min_range], {id: :min_price_range}
+  = hidden_field_tag 'filters[max_price_range]', @price_range[:max_range], {id: :max_price_range}
+  - if @option_types.present?
+    = render 'spree/shared/options_filters', option_types: @option_types
+  - if @properties.present?
+    = render 'spree/shared/property_filters', properties: @properties, product_properties: @product_properties
+
+  = submit_tag 'Filter', class: 'btn btn-primary'
+  = link_to 'Clear filters', products_path, class: 'btn btn-primary'
+%br

data/app/views/spree/shared/_options_filters.html.haml

@@ -0,0 +1,10 @@
+%h4= Spree.t(:options_filter)
+- option_types.each do |option_type|
+  = label_tag option_type.presentation, "#{option_type.presentation}:", class: 'filters_label'
+  %br
+  - option_type.option_values.each do |option_value|
+    - is_checked = filter_checked?([:option_types, :names], option_value.name)
+    = check_box('filters[option_types]', 'names', { multiple: true, checked: is_checked }, option_value.name, nil)
+    = option_value.presentation
+  %br
+%br

data/app/views/spree/shared/_property_filters.html.haml

@@ -0,0 +1,15 @@
+- if product_properties.present?
+  %h4= Spree.t(:property_filters)
+  - properties.each do |property|
+    = label_tag property.presentation, "#{property.presentation}:", class: 'filters_label'
+    %br
+    - property.product_properties.pluck(:value).uniq.each do |value|
+      - is_checked = filter_checked?([:properties, :types], value)
+      - if params[:filters].present? || (params[:controller] == 'spree/taxons' && params[:action] == 'show')
+        - if product_properties.include?(value)
+          = check_box('filters[properties]', 'types', { multiple: true, checked: is_checked }, value, nil)
+          = value
+      - else
+        = check_box('filters[properties]', 'types', { multiple: true, checked: is_checked }, value, nil)
+        = value
+    %br

data/app/views/spree/shared/_sorting_bar.html.haml

@@ -0,0 +1,7 @@
+#sort-links
+  .row
+    .col-sm-12
+      = Spree.t(:sort_by)
+      .btn-group{'aria-label' => 'sort-links', role: 'group'}
+        - Spree::FiltersConfiguration::Config.allowed_sortings.each do |sorting|
+          = link_to_sort sorting

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'spree_products_filters'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start

data/bin/setup

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/config/initializers/core_search_custom_retrieve_products.rb

@@ -0,0 +1,11 @@
+Spree::Core::Search::Base.class_eval do
+  def custom_retrieve_products
+    @products = get_base_scope
+
+    unless Spree::Config.show_products_without_price
+      @products = @products.where('spree_prices.amount IS NOT NULL').where('spree_prices.currency' => current_currency)
+    end
+
+    @products
+  end
+end

data/config/locales/en.yml

@@ -0,0 +1,12 @@
+en:
+  spree:
+    price_range_filter:      'Price range filter:'
+    options_filter:          'Option types filters:'
+    property_filters:        'Properties filters:'
+    price_range:             'Price range:'
+    sort_by:                 'Sort by:'
+    descend_by_updated_at:   'Latest'
+    ascend_by_master_price:  "Low Price <i class='glyphicon glyphicon-sort-by-attributes'></i>"
+    descend_by_master_price: "High Price <i class='glyphicon glyphicon-sort-by-attributes-alt'></i>"
+    ascend_by_name:          "A - Z <i class='glyphicon glyphicon-sort-by-alphabet'></i>"
+    descend_by_name:         "Z - A <i class='glyphicon glyphicon-sort-by-alphabet-alt'></i>"

data/config/locales/ru.yml

@@ -0,0 +1,12 @@
+ru:
+  spree:
+    price_range_filter:      'Ценовой фильтр:'
+    options_filter:          'Опциональные фильтры:'
+    property_filters:        'Фильтры свойств товаров:'
+    price_range:             'Диапазон цен:'
+    sort_by:                 'Сортировать:'
+    descend_by_updated_at:   'Новые'
+    ascend_by_master_price:  "Дешевые <i class='glyphicon glyphicon-sort-by-attributes'></i>"
+    descend_by_master_price: "Дорогие <i class='glyphicon glyphicon-sort-by-attributes-alt'></i>"
+    ascend_by_name:          "А - Я <i class='glyphicon glyphicon-sort-by-alphabet'></i>"
+    descend_by_name:         "Я - A <i class='glyphicon glyphicon-sort-by-alphabet-alt'></i>"

data/lib/generators/spree_products_filters/install/install_generator.rb

@@ -0,0 +1,32 @@
+module SpreeProductsFilters
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+
+      class_option :auto_run_migrations, type: :boolean, default: false
+
+      def add_javascripts
+        append_file 'vendor/assets/javascripts/spree/frontend/all.js',
+                    "//= require spree/frontend/filters_all\n//= require jquery-ui\n"
+      end
+
+      def add_stylesheets
+        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css',
+                         " *= require spree/frontend/filters_all\n *= require jquery-ui\n",
+                         before: /\*\//, verbose: true
+      end
+
+      def add_migrations
+        run 'bundle exec rake railties:install:migrations FROM=spree-products-filters'
+      end
+
+      def run_migrations
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask 'Would you like to run the migrations now? [Y/n]')
+        if run_migrations
+          run 'bundle exec rake db:migrate'
+        else
+          puts 'Skipping rake db:migrate, don\'t forget to run it!'
+        end
+      end
+    end
+  end
+end

data/lib/spree_products_filters.rb

@@ -0,0 +1,3 @@
+require 'haml'
+require 'spree_core'
+require 'spree_products_filters/engine'

data/lib/spree_products_filters/engine.rb

@@ -0,0 +1,26 @@
+module SpreeProductsFilters
+  class Engine < ::Rails::Engine
+    require 'spree/core'
+
+    isolate_namespace Spree
+
+    engine_name 'spree_products_filters'
+
+    # use rspec for tests
+    config.generators do |g|
+      g.test_framework :rspec
+    end
+
+    initializer "spree.register.filters_configuration", before: :load_config_initializers do |app|
+      Spree::FiltersConfiguration::Config = Spree::FiltersConfiguration.new
+    end
+
+    def self.activate
+      Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
+      end
+    end
+
+    config.to_prepare &method(:activate).to_proc
+  end
+end

data/lib/spree_products_filters/version.rb

@@ -0,0 +1,3 @@
+module SpreeProductsFilters
+  VERSION = '0.2.3'
+end

data/spec/controllers/home_controller_spec.rb

@@ -0,0 +1,91 @@
+require 'timecop'
+require 'spec_helper'
+
+RSpec.describe Spree::HomeController, type: :controller do
+  routes { Spree::Core::Engine.routes }
+
+  describe '#index' do
+    context 'price filter' do
+      let!(:cheap_product)     { create :base_product, price: 10 }
+      let!(:expensive_product) { create :base_product, price: 100 }
+
+      it 'should return cheap product' do
+        get :index, params: { filters: { min_price_range: 5, max_price_range: 20 } }
+
+        expect(response.status).to eq(200)
+        expect(assigns[:products]).to eq [cheap_product]
+      end
+
+      it 'should return expensive product' do
+        get :index, params: { filters: { min_price_range: 50, max_price_range: 101 } }
+
+        expect(response.status).to eq(200)
+        expect(assigns[:products]).to eq [expensive_product]
+      end
+
+      it 'should return both products' do
+        get :index, params: { filters: { min_price_range: 9, max_price_range: 101 } }
+
+        expect(response.status).to eq(200)
+        expect(assigns[:products]).to eq [expensive_product, cheap_product]
+      end
+    end
+
+    context 'property filter' do
+      let! (:property)      { create :property     }
+      let! (:product_red)   { create :base_product }
+      let! (:product_blue)  { create :base_product }
+      let! (:property_blue) { create :product_property, product: product_blue, property: property, value: 'Blue' }
+      let! (:property_red)  { create :product_property, product: product_red,  property: property, value: 'Red'  }
+
+      it 'should return product with property value' do
+        get :index, params: { filters: { properties: { types: ['Red'] } } }
+
+        expect(response.status).to eq(200)
+        expect(assigns[:products]).to eq [product_red]
+      end
+    end
+
+    context 'sorting' do
+      before { Spree::FiltersConfiguration::Config.allowed_sortings += [:descend_by_updated_at, :ascend_by_master_price, :descend_by_master_price, :ascend_by_name, :descend_by_name] }
+      let! (:product_red)   { create :base_product, price: 10, name: 'Zulu' }
+      before { Timecop.travel Time.now + 5.minutes }
+      let! (:product_blue)  { create :base_product, price: 20, name: 'Alpha' }
+
+      it 'should return products in order :descend_by_updated_at' do
+        get :index, params: { sorting: 'descend_by_updated_at' }
+
+        expect(response.status).to eq(200)
+        expect(assigns[:products]).to eq [product_blue, product_red]
+      end
+
+      it 'should return products in order :ascend_by_master_price' do
+        get :index, params: { sorting: 'ascend_by_master_price' }
+
+        expect(response.status).to eq(200)
+        expect(assigns[:products]).to eq [product_red, product_blue]
+      end
+
+      it 'should return products in order :descend_by_master_price' do
+        get :index, params: { sorting: 'descend_by_master_price' }
+
+        expect(response.status).to eq(200)
+        expect(assigns[:products]).to eq [product_blue, product_red]
+      end
+
+      it 'should return products in order :ascend_by_name' do
+        get :index, params: { sorting: 'ascend_by_name' }
+
+        expect(response.status).to eq(200)
+        expect(assigns[:products]).to eq [product_blue, product_red]
+      end
+
+      it 'should return products in order :descend_by_name' do
+        get :index, params: { sorting: 'descend_by_name' }
+
+        expect(response.status).to eq(200)
+        expect(assigns[:products]).to eq [product_red, product_blue]
+      end
+    end
+  end
+end

data/spec/controllers/taxons_controller_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+RSpec.describe Spree::TaxonsController, type: :controller do
+  routes { Spree::Core::Engine.routes }
+
+  describe '#show' do
+    let!(:taxon)          { create :taxon }
+    let!(:product_m_size) { create :base_product, price: 10 }
+    let!(:product_s_size) { create :base_product, price: 20 }
+    let!(:option_m)       { create :option_value, name: 'size-m', presentation: 'M'}
+    let!(:option_s)       { create :option_value, name: 'size-s', presentation: 'S'}
+    let!(:variant_m_size) { create :base_variant, product: product_m_size }
+    let!(:variant_s_size) { create :base_variant, product: product_s_size }
+
+    before do
+      product_m_size.taxons << taxon
+      product_s_size.taxons << taxon
+      product_m_size.option_types << option_m.option_type
+      product_s_size.option_types << option_s.option_type
+      variant_m_size.option_values << option_m
+      variant_s_size.option_values << option_s
+    end
+
+    it 'should return product with option value' do
+      get :show, params: { id: taxon, filters: { option_types: { names: ['size-m'] } } }
+
+      expect(response.status).to eq(200)
+      expect(assigns[:products]).to eq [product_m_size]
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,74 @@
+# Configure Rails Environment
+ENV['RAILS_ENV'] = 'test'
+
+require File.expand_path('../dummy/config/environment.rb',  __FILE__)
+
+require 'rspec/rails'
+require 'database_cleaner'
+require 'ffaker'
+require 'rails-controller-testing'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
+
+# Requires factories defined in spree_core
+require 'spree/testing_support/factories'
+require 'spree/testing_support/controller_requests'
+require 'spree/testing_support/authorization_helpers'
+require 'spree/testing_support/url_helpers'
+
+
+RSpec.configure do |config|
+  config.include FactoryBot::Syntax::Methods
+
+  config.include Devise::TestHelpers, type: :controller
+  # == URL Helpers
+  #
+  # Allows access to Spree's routes in specs:
+  #
+  # visit spree.admin_path
+  # current_path.should eql(spree.products_path)
+  config.include Spree::TestingSupport::UrlHelpers
+
+  # == Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+  config.mock_with :rspec
+  config.color = true
+
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # Capybara javascript drivers require transactional fixtures set to false, and we use DatabaseCleaner
+  # to cleanup after each test instead.  Without transactional fixtures set to false the records created
+  # to setup a test will be unavailable to the browser, which runs under a seperate server instance.
+  config.use_transactional_fixtures = false
+
+  # Ensure Suite is set to use transactions for speed.
+  config.before(:suite) do
+    DatabaseCleaner.clean_with :truncation
+  end
+
+  config.before(:each) do
+    if Capybara.current_driver == :rack_test
+      DatabaseCleaner.strategy = :transaction
+    else
+      DatabaseCleaner.strategy = :truncation
+    end
+
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+
+  config.fail_fast = ENV['FAIL_FAST'] || false
+
+  Rails::Controller::Testing.install
+end

data/spec/spree/products/filters_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe SpreeProductsFilters do
+  it 'has a version number' do
+    expect(SpreeProductsFilters::VERSION).not_to be nil
+  end
+end

data/spree_products_filters.gemspec

@@ -0,0 +1,41 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'spree_products_filters/version'
+
+Gem::Specification.new do |spec|
+  spec.name    = 'spree_products_filters'
+  spec.version = SpreeProductsFilters::VERSION
+  spec.author  = 'Jet Ruby Agency'
+
+  spec.summary               = 'Advanced product filters for your Spree Commerce app'
+  spec.description           = 'Advanced product filters for your Spree Commerce app'
+  spec.email                 = 'info@jetruby.com'
+  spec.homepage              = 'http://jetruby.com/'
+  spec.license               = 'MIT'
+  spec.required_ruby_version = '>= 1.9.3'
+
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+
+  spec.require_path = 'lib'
+  spec.requirements << 'none'
+
+  spec.add_runtime_dependency 'spree_core', '~> 3.6.0'
+  spec.add_runtime_dependency 'haml'
+  spec.add_runtime_dependency 'jquery-ui-rails'
+
+  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'rake', '~> 10.0'
+
+  spec.add_development_dependency 'factory_bot_rails', '~> 4.10.0'
+  spec.add_development_dependency 'database_cleaner'
+  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'capybara', '~> 2.1'
+  spec.add_development_dependency 'coffee-rails'
+  spec.add_development_dependency 'ffaker'
+  spec.add_development_dependency 'rspec-rails',  '~> 3.7.1'
+  spec.add_development_dependency 'rails-controller-testing'
+  spec.add_development_dependency 'selenium-webdriver'
+  spec.add_development_dependency 'sass-rails'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_products_filters
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Jet Ruby Agency
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-30 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -222,10 +222,54 @@ dependencies:
         version: '0'
 description: Advanced product filters for your Spree Commerce app
 email: info@jetruby.com
-executables: []
+executables:
+- console
+- setup
 extensions: []
 extra_rdoc_files: []
-files: []
+files:
+- ".gitignore"
+- ".gitlab-ci.yml"
+- ".rspec"
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- app/assets/javascripts/spree/frontend/filters.js
+- app/assets/javascripts/spree/frontend/filters_all.js
+- app/assets/stylesheets/spree/frontend/filters.css
+- app/assets/stylesheets/spree/frontend/filters_all.css
+- app/controllers/concerns/filters_initialization.rb
+- app/controllers/spree/home_controller_decorator.rb
+- app/controllers/spree/products_controller_decorator.rb
+- app/controllers/spree/taxons_controller_decorator.rb
+- app/helpers/spree/filters_helper.rb
+- app/helpers/spree/products_helper_decorator.rb
+- app/models/spree/filters_configuration.rb
+- app/models/spree/product_decorator.rb
+- app/overrides/spree/add_group_of_advanced_filters_to_home_index.rb
+- app/overrides/spree/add_group_of_advanced_filters_to_products_index.rb
+- app/overrides/spree/add_group_of_advanced_filters_to_taxon_show.rb
+- app/overrides/spree/shared/add_sorting_links_in_products.rb
+- app/services/advanced_filters.rb
+- app/views/spree/shared/_advanced_filters.html.haml
+- app/views/spree/shared/_options_filters.html.haml
+- app/views/spree/shared/_property_filters.html.haml
+- app/views/spree/shared/_sorting_bar.html.haml
+- bin/console
+- bin/setup
+- config/initializers/core_search_custom_retrieve_products.rb
+- config/locales/en.yml
+- config/locales/ru.yml
+- lib/generators/spree_products_filters/install/install_generator.rb
+- lib/spree_products_filters.rb
+- lib/spree_products_filters/engine.rb
+- lib/spree_products_filters/version.rb
+- spec/controllers/home_controller_spec.rb
+- spec/controllers/taxons_controller_spec.rb
+- spec/spec_helper.rb
+- spec/spree/products/filters_spec.rb
+- spree_products_filters.gemspec
 homepage: http://jetruby.com/
 licenses:
 - MIT