spree_solr_search 0.40.0 → 0.40.3

data/Rakefile

@@ -22,7 +22,7 @@ Jeweler::Tasks.new do |s|
   s.homepage = "http://github.com/romul/spree-solr-search"
   s.authors = ["Roman Smirnov"]
   s.add_dependency 'spree_core', ['>= 0.30.1']
-  s.add_dependency 'acts_as_solr_reloaded', ['>= 1.5.0']
+  s.add_dependency 'acts_as_solr_reloaded', ['>= 1.6.0']
   s.has_rdoc = false
   #s.extra_rdoc_files = [ "README.rdoc"]
   #s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers"]

data/VERSION

@@ -1 +1 @@
-0.40.0
+0.40.3

data/app/helpers/{solr_helper.rb → spree/base_helper_decorator.rb}

@@ -1,4 +1,4 @@
-module SolrHelper
+Spree::BaseHelper.module_eval do
   def link_to_facet(name, value, count) 
       facets_hash = params[:facets]
       facets_hash = {} unless facets_hash.is_a?(Hash)

data/app/models/product_decorator.rb

@@ -1,9 +1,5 @@
 Product.class_eval do
-  acts_as_solr  :fields => [:name, :description, :is_active, {:price => :float}, 
-                            :taxon_ids, :price_range, :taxon_names,
-                            :brand_property, :color_option, :size_option],
-                :facets=>[:price_range, :taxon_names,
-                          :brand_property, :color_option, :size_option]
+  acts_as_solr  :fields => PRODUCT_SOLR_FIELDS, :facets => PRODUCT_SOLR_FACETS
 
   def taxon_ids
     taxons.map(&:id)
@@ -17,24 +13,25 @@ Product.class_eval do
   
   private
   
+  def store_ids
+    if self.respond_to? :stores
+      stores.map(&:id)
+    else
+      []
+    end
+  end
+  
   def taxon_names
     taxons.map(&:name)
   end
   
   def price_range
-    price_ranges = YAML.load(Spree::Config[:product_price_ranges])
-    case price
-      when 0..25
-        price_ranges[0]
-      when 25..50
-        price_ranges[1]
-      when 50..100
-        price_ranges[2]
-      when 100..200
-        price_ranges[3]
-      else
-        price_ranges[4]
+    max = 0
+    PRODUCT_PRICE_RANGES.each do |range, name|
+      return name if range.include?(price)
+      max = range.max if range.max > max
     end
+    I18n.t(:price_and_above, :price => max)
   end
   
   def brand_property

data/app/views/products/_facets.html.erb

@@ -1,9 +1,13 @@
-<% 
+<%
 facets = @searcher.facets || []
   taxon_names = @taxon ? @taxon.self_and_descendants.map(&:name) : []
   for facet in facets 
     options = facet.options
-    options = options.sort{|x,y| y.count <=> x.count} unless facet.name == "price_range"
+    if facet.name == "price_range"
+      options = options.sort{|x, y| x.name <=> y.name}
+    else
+      options = options.sort{|x, y| y.count <=> x.count}
+    end
     unless options.empty? %>
       <h4><%= t "#{facet.name}_facet" %></h4>
       <ul><%

data/config/initializers/solr_config.rb

@@ -0,0 +1,13 @@
+unless defined?(PRODUCT_PRICE_RANGES)
+  PRODUCT_PRICE_RANGES = {0..25 => "  Under $25", 25..50 => " $25 to $50", 
+                          50..100 => " $50 to $100", 100..200 => "$100 to $200"}
+end
+unless defined?(PRODUCT_SOLR_FIELDS)
+  PRODUCT_SOLR_FIELDS = [:name, :description, :is_active, {:price => :float}, 
+                        :taxon_ids, :price_range, :taxon_names, :store_ids,
+                        :brand_property, :color_option, :size_option]
+end
+unless defined?(PRODUCT_SOLR_FACETS)
+  PRODUCT_SOLR_FACETS = [:price_range, :taxon_names,
+                        :brand_property, :color_option, :size_option]
+end

data/config/locales/en.yml

@@ -4,3 +4,4 @@ en:
   brand_property_facet: "Brand"
   color_option_facet: "Color"
   size_option_facet: "Size"
+  price_and_above: "$%{price} and above"

data/config/locales/ru.yml

@@ -4,3 +4,4 @@ ru:
   brand_property_facet: "Бренд"
   color_option_facet: "Цвет"
   size_option_facet: "Размер"
+  price_and_above: "%{price} руб. и выше"

data/lib/spree/search/solr.rb

@@ -1,10 +1,10 @@
 module Spree::Search
-  class Solr < Spree::Search::Base
+  class Solr < defined?(Spree::Search::MultiDomain) ? Spree::Search::MultiDomain :  Spree::Search::Base
     protected
 
     def get_products_conditions_for(base_scope, query)
       facets = {
-          :fields => [:price_range, :taxon_names, :brand_property, :color_option, :size_option],
+          :fields => PRODUCT_SOLR_FACETS,
           :browse => @properties[:facets_hash].map{|k,v| "#{k}:#{v}"},
           :zeros => false 
       }
@@ -17,6 +17,8 @@ module Spree::Search
         taxons_query = taxon.self_and_descendants.map{|t| "taxon_ids:(#{t.id})"}.join(" OR ")
         full_query += " AND (#{taxons_query})"
       end
+      
+      full_query += " AND store_ids:(#{current_store_id})" if current_store_id
 
       result = Product.find_by_solr(full_query, search_options)
 
@@ -48,20 +50,12 @@ module Spree::Search
     
     def parse_facets_hash(facets_hash = {"facet_fields" => {}})
       facets = []
-      price_ranges = YAML::load(Spree::Config[:product_price_ranges])
       facets_hash["facet_fields"].each do |name, options|
         options = Hash[*options.flatten] if options.is_a?(Array)
         next if options.size <= 1
         facet = Facet.new(name.sub('_facet', ''))
-        if name == 'price_range_facet'
-          price_ranges.each do |price_range|           
-            count = options[price_range]
-            facet.options << FacetOption.new(price_range, count) if count
-          end
-        else
-          options.each do |value, count|
-            facet.options << FacetOption.new(value, count)
-          end
+        options.each do |value, count|
+          facet.options << FacetOption.new(value, count)
         end
         facets << facet
       end

data/lib/spree_solr_search.rb

@@ -9,13 +9,12 @@ module SpreeSolrSearch
       
       if Spree::Config.instance
         Spree::Config.searcher_class = Spree::Search::Solr
-        Spree::Config.set(:product_price_ranges => 
-           ["Under $25", "$25 to $50", "$50 to $100", "$100 to $200", "$200 and above"])
       end
 
       Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
         Rails.env == "production" ? require(c) : load(c)
       end
+
     end
     config.to_prepare &method(:activate).to_proc
     config.autoload_paths += %W(#{config.root}/lib)

data/lib/tasks/acts_as_solr.rake

@@ -2,7 +2,7 @@ begin
   ENV['ONLY'] = "Product"
   SOLR_PATH = ENV['SOLR_PATH']
   RAILS_DEFAULT_LOGGER = Logger.new(Rails.root.join("log", Rails.env + ".log"))
-  RAILS_ROOT = Rails.root.to_s
+  RAILS_ROOT = Rails.root.to_s unless defined?(RAILS_ROOT)
   require 'acts_as_solr_reloaded'
   load 'tasks/solr.rake'
 rescue LoadError

data/spree_solr_search.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spree_solr_search}
-  s.version = "0.40.0"
+  s.version = "0.40.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Smirnov"]
-  s.date = %q{2011-02-22}
+  s.date = %q{2011-03-21}
   s.description = %q{Provides search via Apache Solr for a Spree store.}
   s.email = %q{roman@railsdog.com}
   s.extra_rdoc_files = [
@@ -20,11 +20,11 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "VERSION",
-     "app/controllers/spree/base_controller_decorator.rb",
-     "app/helpers/solr_helper.rb",
+     "app/helpers/spree/base_helper_decorator.rb",
      "app/models/product_decorator.rb",
      "app/views/products/_facets.html.erb",
      "app/views/products/_suggestion.html.erb",
+     "config/initializers/solr_config.rb",
      "config/locales/en.yml",
      "config/locales/ru-RU.yml",
      "config/locales/ru.yml",
@@ -49,14 +49,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<spree_core>, [">= 0.30.1"])
-      s.add_runtime_dependency(%q<acts_as_solr_reloaded>, [">= 1.5.0"])
+      s.add_runtime_dependency(%q<acts_as_solr_reloaded>, [">= 1.6.0"])
     else
       s.add_dependency(%q<spree_core>, [">= 0.30.1"])
-      s.add_dependency(%q<acts_as_solr_reloaded>, [">= 1.5.0"])
+      s.add_dependency(%q<acts_as_solr_reloaded>, [">= 1.6.0"])
     end
   else
     s.add_dependency(%q<spree_core>, [">= 0.30.1"])
-    s.add_dependency(%q<acts_as_solr_reloaded>, [">= 1.5.0"])
+    s.add_dependency(%q<acts_as_solr_reloaded>, [">= 1.6.0"])
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 40
-  - 0
-  version: 0.40.0
+  - 3
+  version: 0.40.3
 platform: ruby
 authors: 
 - Roman Smirnov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 +03:00
+date: 2011-03-21 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,9 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 5
+        - 6
         - 0
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   version_requirements: *id002
 description: Provides search via Apache Solr for a Spree store.
@@ -58,11 +58,11 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- app/controllers/spree/base_controller_decorator.rb
-- app/helpers/solr_helper.rb
+- app/helpers/spree/base_helper_decorator.rb
 - app/models/product_decorator.rb
 - app/views/products/_facets.html.erb
 - app/views/products/_suggestion.html.erb
+- config/initializers/solr_config.rb
 - config/locales/en.yml
 - config/locales/ru-RU.yml
 - config/locales/ru.yml

data/app/controllers/spree/base_controller_decorator.rb

@@ -1,4 +0,0 @@
-Spree::BaseController.class_eval do
-  helper :solr
-  RAILS_ROOT = Rails.root.to_s
-end