spree_sunspot 0.70.0 → 1.0.0

data/README.md

@@ -9,7 +9,7 @@ Basic Installation
 
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_sunspot', '~> 0.70.0'
+  gem 'spree_sunspot', '~> 1.0.0'
 </pre>
 2. Run `bundle install`
 3. lunch installation:
@@ -23,4 +23,4 @@ Example
 
 COMING SOON
 
-Copyright (c) 2012 [Damiano Giacomello], released under the New BSD License
+Copyright (c) 2012 [Damiano Giacomello], released under the New BSD License

data/app/models/{app_configuration_decorator.rb → spree/app_configuration_decorator.rb}

@@ -1,3 +1,3 @@
-AppConfiguration.class_eval do
+Spree::AppConfiguration.class_eval do
   preference :total_similar_products, :integer, :default => 10
-end
+end

data/app/models/spree/product_decorator.rb

@@ -0,0 +1,20 @@
+Spree::Product.class_eval do
+  def get_option_values(option_name)
+    sql = <<-eos
+      SELECT DISTINCT ov.id, ov.presentation
+      FROM spree_option_values AS ov
+      LEFT JOIN spree_option_types AS ot ON (ov.option_type_id = ot.id)
+      LEFT JOIN spree_option_values_variants AS ovv ON (ovv.option_value_id = ov.id)
+      LEFT JOIN spree_variants AS v ON (ovv.variant_id = v.id)
+      LEFT JOIN spree_products AS p ON (v.product_id = p.id)
+      WHERE ((ot.name = '#{option_name}' OR ot.presentation = '#{option_name}') 
+            AND p.id = #{self.id});
+    eos
+    Spree::OptionValue.find_by_sql(sql).map(&:presentation)
+  end
+end
+
+unless SpreeSunspot::Setup.configuration.nil?
+  Spree::Product.class_eval &SpreeSunspot::Setup.configuration
+end
+

data/app/views/spree/base/filter.html.erb

@@ -0,0 +1 @@
+<%= render :partial => "spree/shared/search_results", :locals => { :products => @products, :searcher => @searcher } %>

data/app/views/{shared → spree/shared}/_filter.html.erb

@@ -6,8 +6,8 @@
   <%= link_to I18n.t(:clear_all), '#', :class => 'filter_clear_all' %>
   <% filter_params.each do |filter| %>
     <% next unless filter.display? %>
-    <% if lookup_context.find_all("filters/_#{filter.display_param}").any? %>
-      <%= render :partial => "filters/#{filter.display_param}", :locals => { :filter => filter }%>
+    <% if lookup_context.find_all("spree/filters/_#{filter.display_param}").any? %>
+      <%= render :partial => "spree/filters/#{filter.display_param}", :locals => { :filter => filter }%>
     <% else %>
     <fieldset class="filter" data-field="<%= filter.display_param %>">
       <legend class="sub-header"><%= filter.display_name %></legend>

data/app/views/spree/shared/_search_results.html.erb

@@ -0,0 +1,11 @@
+<% content_for :sidebar do %>
+  <div data-hook="homepage_sidebar_navigation">
+    <%= render :partial => 'spree/shared/taxonomies' %>
+  </div>
+<% end %>
+
+<% if @products.empty? %>
+<%= t(:empty_search_results) %>
+<% else %>
+<%= render :partial => "spree/shared/products", :locals => { :products => products }%>
+<% end %>

data/config/routes.rb

@@ -1,5 +1,5 @@
-Rails.application.routes.draw do
+Spree::Core::Engine.routes.prepend do
   match "/q" => "home#filter"
   match "/products/q" => "products#filter"
-  match "/:id/q" => "taxons#filter", :constraints => { :id => Regexp.new('(' + Taxon.all.collect { |b| b.linkname rescue b.permalink }.join('|') + ')') }
+  match "/:id/q" => "taxons#filter", :constraints => { :id => Regexp.new('(' + Spree::Taxon.all.collect { |b| b.linkname rescue b.permalink }.join('|') + ')') }
 end

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

@@ -9,11 +9,11 @@ module SpreeSunspot
       def self.source_root
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
-      
+
       def invoke_sunspot_rails_generator
         SunspotRails::Generators::InstallGenerator.start
       end
-      
+
       def copy_initializer_file
         copy_file "spree_sunspot.rb", "config/initializers/spree_sunspot.rb"
       end

data/lib/generators/spree_sunspot/install/templates/spree_sunspot.rb

@@ -3,7 +3,7 @@ SpreeSunspot::Setup.configure do
     text :name, :boost => 2.0
     text :description, :boost => 1.2
     time :available_on
-    integer :taxon_ids, :references => Taxon, :multiple => true do
+    integer :taxon_ids, :references => Spree::Taxon, :multiple => true do
       taxons.collect{|t| t.self_and_ancestors.map(&:id) }.flatten
     end
     string :taxon_names, :multiple => true do
@@ -16,11 +16,11 @@ SpreeSunspot::Setup.configure do
     # Additional Examples
     #
     # string :category_names, :multiple => true do
-    #   category = Taxon.find_by_permalink('categories')
+    #   category = Spree::Taxon.find_by_permalink('categories')
     #   taxons.select{|t| t.ancestors.include?(category)}.collect{|t| t.self_and_ancestors.map(&:name)}.flatten - [category.name]
     # end
     # string :brand_name do
-    #   brand = Taxon.find_by_permalink('brands')
+    #   brand = Spree::Taxon.find_by_permalink('brands')
     #   t = taxons.select{|t| t.ancestors.include?(brand)}.first
     #   t.name unless t.nil?
     # end
@@ -40,12 +40,12 @@ SpreeSunspot::Setup.filters do |filters|
   # filters.add do |f|
   #   f.search_param = 'category_name'
   #   f.display_name = 'Category'
-  #   f.values { Taxon.find_by_permalink('categories').children.map(&:name) }
+  #   f.values { Spree::Taxon.find_by_permalink('categories').children.map(&:name) }
   # end
   #
   # filters.add do |f|
   #   f.search_param = 'brand_name'
   #   f.display_name = 'Brand'
-  #   f.values { Taxon.find_by_permalink('brands').children.map(&:name) }
+  #   f.values { Spree::Taxon.find_by_permalink('brands').children.map(&:name) }
   # end
 end

data/lib/spree_sunspot/engine.rb

@@ -16,25 +16,21 @@ module SpreeSunspot
       Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
-      
+
       ActionView::Base.class_eval do
         include SpreeSunspot::FilterSupport::Helpers
       end
     end
 
     config.to_prepare &method(:activate).to_proc
-    #ActionView::Base.class_eval { include SpreeSunspot::FilterSupport::Helpers }
-    #ActionController::Base.class_eval do
-    #  include(SpreeSunspot::FilterSupport)
-    #  filter_support
-    #end
-        
-    initializer "spree.sunspot.search_config", :after => "spree.environment" do |app|
+
+    initializer "spree.sunspot.search_config", :after => "spree.load_preferences" do |app|
       Spree::BaseController.class_eval do
         include(SpreeSunspot::FilterSupport)
         filter_support
       end
-      Spree::Config.searcher_class = SpreeSunspot::Search
+
+      app.config.spree.preferences.searcher_class = SpreeSunspot::Search
     end
   end
 end

data/lib/spree_sunspot/filter_support.rb

@@ -5,22 +5,22 @@ module SpreeSunspot
     def self.included(base)
       base.extend(ClassMethods)
     end
-    
+
     module ClassMethods
       def filter_support(options = {})
         additional_params = options[:additional_params_method]
         class_eval <<-EOV
-          include SpreeSunspot::FilterSupport::InstanceMethods
-          include SpreeSunspot::FilterSupport::Helpers
-          helper_method :render_filter
+        include SpreeSunspot::FilterSupport::InstanceMethods
+        include SpreeSunspot::FilterSupport::Helpers
+        helper_method :render_filter
         EOV
       end
     end
-    
+
     module InstanceMethods
       def filter
         if params[:id]
-          taxon = Taxon.find_by_linkname(params[:id])
+          taxon = Spree::Taxon.find_by_linkname(params[:id])
           if taxon
             params.merge!(:taxon => taxon)
           end
@@ -29,7 +29,7 @@ module SpreeSunspot
           respond_with(@products)
         end
       end
-      
+
       def search_for_products(scope=nil)
         if (params[:s].nil? or params[:s].empty?) and !params[:source_url].nil?
           redirect_to params[:source_url]
@@ -43,12 +43,12 @@ module SpreeSunspot
         end
         return true
       end
-      
+
       def search_for_similar_products(product, *field_names)
         @searcher = Spree::Config.searcher_class.new(params)
         @similar_products = @searcher.similar_products(product, *field_names)
       end
-      
+
       def filter_url_options
         object = instance_variable_get('@'+controller_name.singularize)
         if object
@@ -63,11 +63,11 @@ module SpreeSunspot
         end
       end
     end
-    
+
     module Helpers
       def render_filter
         filter_params = SpreeSunspot::Setup.filters.filters
-        render :partial => 'shared/filter', :locals => { :filter_params => filter_params }
+        render :partial => 'spree/shared/filter', :locals => { :filter_params => filter_params }
       end
     end
   end

data/lib/spree_sunspot/filters.rb

@@ -1,22 +1,22 @@
 module SpreeSunspot
   class Filters
     attr_accessor :filters
-    
+
     def initialize
       @filters = []
     end
-    
+
     def add(&blk)
       filter = SpreeSunspot::Filter::Filter.new
       yield filter
       filter.finalize!
       filters << filter
     end
-    
+
     def filter_for(display_name)
       @filters.select{|f| f.display_name == display_name or f.display_param == display_name }.first
     end
-    
+
     def method_missing(method, *args)
       if @filters.respond_to?(method)
         @filters.send(method, *args)

data/lib/spree_sunspot/search.rb

@@ -1,8 +1,8 @@
-require 'spree/search/base'
+require 'spree/core/search/base'
 require 'spree_sunspot/filter/filter'
 
 module SpreeSunspot
-  class Search < Spree::Search::Base
+  class Search < Spree::Core::Search::Base
     def query
       @filter_query
     end
@@ -39,9 +39,9 @@ module SpreeSunspot
       hits = []
       if products_search.total > 0
         hits = products_search.hits.collect{|hit| hit.primary_key.to_i}
-        base_scope = base_scope.where ["#{Product.table_name}.id in (?)", hits]
+        base_scope = base_scope.where ["#{Spree::Product.table_name}.id in (?)", hits]
       else
-        base_scope = base_scope.where ["#{Product.table_name}.id = -1"]
+        base_scope = base_scope.where ["#{Spree::Product.table_name}.id = -1"]
       end
       products_scope = @product_group.apply_on(base_scope)
       products_results = products_scope.includes([:images, :master]).page(1)
@@ -52,32 +52,34 @@ module SpreeSunspot
 
     protected
     def get_base_scope
-      base_scope = get_common_base_scope
+      base_scope = @cached_product_group ? @cached_product_group.products.active : Spree::Product.active
       base_scope = base_scope.in_taxon(taxon) unless taxon.blank?
       base_scope = get_products_conditions_for(base_scope, keywords) unless keywords.blank?
-      
-      # TODO order by master price if is preferred
+
       #base_scope = base_scope.ascend_by_master_price
+      base_scope = base_scope.on_hand unless Spree::Config[:show_zero_stock_products]
+      base_scope = base_scope.group_by_products_id if @product_group.product_scopes.size > 1
       base_scope
     end
 
     def get_products_conditions_for(base_scope, query)
-      @search = Sunspot.new_search(Product) do |q|
+      @search = Sunspot.new_search(Spree::Product) do |q|
         q.keywords(query) unless query.blank?
         # There is no option to say don't paginate.
         #q.paginate(:page => 1, :per_page => 1000000)
       end
-      
+
       if !@properties[:filters].blank?
         @filter_query = SpreeSunspot::Filter::Query.new(@properties[:filters])
         @search = @filter_query.build_search(@search)
       end
+      
       @search.execute
       if @search.total > 0
         hits = @search.hits.collect{|hit| hit.primary_key.to_i}
-        base_scope = base_scope.where ["#{Product.table_name}.id in (?)", hits]
+        base_scope = base_scope.where ["#{Spree::Product.table_name}.id in (?)", hits]
       else
-        base_scope = base_scope.where ["#{Product.table_name}.id = -1"]
+        base_scope = base_scope.where ["#{Spree::Product.table_name}.id = -1"]
       end
       base_scope
     end
@@ -87,14 +89,5 @@ module SpreeSunspot
       @properties[:filters] = params[:s] || params['s'] || []
       @properties[:total_similar_products] = params[:total_similar_products].to_i > 0 ? params[:total_similar_products].to_i : Spree::Config[:total_similar_products]
     end
-
-    private
-    def get_common_base_scope
-      base_scope = @cached_product_group ? @cached_product_group.products.active : Product.active
-      base_scope = base_scope.on_hand unless Spree::Config[:show_zero_stock_products]
-      base_scope = base_scope.group_by_products_id if @product_group.product_scopes.size > 1
-      base_scope
-    end
-
   end
 end

data/lib/spree_sunspot/setup.rb

@@ -7,16 +7,16 @@ module SpreeSunspot
     include Singleton
     IGNORE_MAX = 1000000000
     @@filters = SpreeSunspot::Filters.new
-    
+
     @@configuration = nil
     def self.configure(&blk)
       @@configuration = blk
     end
-    
+
     def self.configuration
       @@configuration
     end
-    
+
     def self.filters(&blk)
       yield @@filters if block_given?
       @@filters

data/lib/tasks/spree_sunspot.rake

@@ -1,8 +1,8 @@
 namespace :spree_sunspot do
   desc "Reindex all products"
   task :reindex => :environment do
-    Product.remove_all_from_index!
-    Product.reindex
+    Spree::Product.remove_all_from_index!
+    Spree::Product.reindex
     Sunspot.commit
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_sunspot
 version: !ruby/object:Gem::Version
-  version: 0.70.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -100,12 +100,11 @@ files:
 - app/assets/stylesheets/admin/spree_sunspot.css
 - app/assets/stylesheets/store/filters.css.erb
 - app/assets/stylesheets/store/spree_sunspot.css
-- app/models/app_configuration_decorator.rb
-- app/models/product_decorator.rb
-- app/views/base/filter.html.erb
-- app/views/home/filter.html.erb
-- app/views/shared/_filter.html.erb
-- app/views/shared/_search_results.html.erb
+- app/models/spree/app_configuration_decorator.rb
+- app/models/spree/product_decorator.rb
+- app/views/spree/base/filter.html.erb
+- app/views/spree/shared/_filter.html.erb
+- app/views/spree/shared/_search_results.html.erb
 - config/locales/en.yml
 - config/locales/it.yml
 - config/routes.rb

data/app/models/product_decorator.rb

@@ -1,20 +0,0 @@
-Product.class_eval do
-  def get_option_values(option_name)
-    sql = <<-eos
-      SELECT DISTINCT ov.id, ov.presentation
-      FROM option_values AS ov
-      LEFT JOIN option_types AS ot ON (ov.option_type_id = ot.id)
-      LEFT JOIN option_values_variants AS ovv ON (ovv.option_value_id = ov.id)
-      LEFT JOIN variants AS v ON (ovv.variant_id = v.id)
-      LEFT JOIN products AS p ON (v.product_id = p.id)
-      WHERE ((ot.name = '#{option_name}' OR ot.presentation = '#{option_name}') 
-            AND p.id = #{self.id});
-    eos
-    OptionValue.find_by_sql(sql).map(&:presentation)
-  end
-end
-
-unless SpreeSunspot::Setup.configuration.nil?
-  Product.class_eval &SpreeSunspot::Setup.configuration
-end
-

data/app/views/base/filter.html.erb

@@ -1 +0,0 @@
-<%= render :partial => "shared/search_results", :locals => { :products => @products, :searcher => @searcher } %>

data/app/views/home/filter.html.erb

@@ -1 +0,0 @@
-<%= render :partial => "shared/search_results", :locals => { :products => @products, :searcher => @searcher } %>

data/app/views/shared/_search_results.html.erb

@@ -1,11 +0,0 @@
-<% content_for :sidebar do %>
-  <div data-hook="homepage_sidebar_navigation">
-    <%= render :partial => 'shared/taxonomies' %>
-  </div>
-<% end %>
-
-<% if @products.blank? %>
-<%= t(:empty_search_results) %>
-<% else %>
-<%= render :partial => "shared/products", :locals => { :products => @products }%>
-<% end %>