spree 0.11.3 → 0.11.4

data/app/models/product.rb

@@ -60,6 +60,15 @@ class Product < ActiveRecord::Base
 
   alias :options :product_option_types
 
+  cattr_accessor :search_scopes do
+    []
+  end
+
+  def self.add_search_scope(name, &block)
+    self.named_scope name.intern, &block
+    search_scopes << name.intern
+  end
+
   include ::Scopes::Product
 
   # default product scope only lists available and non-deleted products

data/app/models/product_group.rb

@@ -90,7 +90,7 @@ class ProductGroup < ActiveRecord::Base
   end
 
   def add_scope(scope_name, arguments=[])
-    if scope_name.to_s !~ /eval|send|system|[^a-z0-9_!?]/
+    if Product.search_scopes.include?(scope_name.intern)
       self.product_scopes << ProductScope.new({
           :name => scope_name.to_s,
           :arguments => [*arguments]

data/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-SPREE_GEM_VERSION = '0.11.3' unless defined? SPREE_GEM_VERSION
+SPREE_GEM_VERSION = '0.11.4' unless defined? SPREE_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

data/lib/scopes/product.rb

@@ -40,23 +40,23 @@ module Scopes::Product
   ]
   
   # default product scope only lists available and non-deleted products
-  ::Product.named_scope :active,      lambda { |*args|
+  ::Product.add_search_scope :active,      lambda { |*args|
     Product.not_deleted.available(args.first).scope(:find)
   }
 
-  ::Product.named_scope :not_deleted, {
+  ::Product.add_search_scope :not_deleted, {
     :conditions => "products.deleted_at is null"
   }
-  ::Product.named_scope :available,   lambda { |*args|
+  ::Product.add_search_scope :available,   lambda { |*args|
     { :conditions => ["products.available_on <= ?", args.first || Time.zone.now] }
   }
 
-  ::Product.named_scope :keywords, lambda{|query|
+  ::Product.add_search_scope :keywords, lambda{|query|
     return {} if query.blank?
     Spree::Config.searcher.get_products_conditions_for(query)
   }
 
-  ::Product.named_scope :price_between, lambda {|low,high|
+  ::Product.add_search_scope :price_between, lambda {|low,high|
     { :joins => :master, :conditions => ["variants.price BETWEEN ? AND ?", low, high] }
   }
 
@@ -65,7 +65,7 @@ module Scopes::Product
   #
   #   Product.taxons_id_eq(x)
   #
-  Product.named_scope :in_taxon, lambda {|taxon|
+  Product.add_search_scope :in_taxon, lambda {|taxon|
     Product.in_taxons(taxon).scope :find
   }
 
@@ -74,13 +74,13 @@ module Scopes::Product
   #
   #   Product.taxons_id_eq([x,y])
   #
-  Product.named_scope :in_taxons, lambda {|*taxons|
+  Product.add_search_scope :in_taxons, lambda {|*taxons|
     taxons = get_taxons(taxons)
     taxons.first ? prepare_taxon_conditions(taxons) : {}
   }
 
   # for quick access to products in a group, WITHOUT using the association mechanism
-  Product.named_scope :in_cached_group, lambda {|product_group| 
+  Product.add_search_scope :in_cached_group, lambda {|product_group| 
     { :joins => "JOIN product_groups_products ON products.id = product_groups_products.product_id", 
       :conditions => ["product_groups_products.product_group_id = ?", product_group] 
     }
@@ -88,7 +88,7 @@ module Scopes::Product
 
 
   # a scope that finds all products having property specified by name, object or id
-  Product.named_scope :with_property, lambda {|property|
+  Product.add_search_scope :with_property, lambda {|property|
     conditions = case property
     when String   then ["properties.name = ?", property]
     when Property then ["properties.id = ?", property.id]
@@ -102,7 +102,7 @@ module Scopes::Product
   }
 
   # a scope that finds all products having an option_type specified by name, object or id
-  Product.named_scope :with_option, lambda {|option|
+  Product.add_search_scope :with_option, lambda {|option|
     conditions = case option
     when String     then ["option_types.name = ?", option]
     when OptionType then ["option_types.id = ?",   option.id]
@@ -117,7 +117,7 @@ module Scopes::Product
 
   # a simple test for product with a certain property-value pairing
   # note that it can test for properties with NULL values, but not for absent values
-  Product.named_scope :with_property_value, lambda { |property, value|
+  Product.add_search_scope :with_property_value, lambda { |property, value|
     conditions = case property
     when String   then ["properties.name = ?", property]
     when Property then ["properties.id = ?", property.id]
@@ -132,7 +132,7 @@ module Scopes::Product
   } 
 
   # a scope that finds all products having an option value specified by name, object or id
-  Product.named_scope :with_option_value, lambda {|option, value|
+  Product.add_search_scope :with_option_value, lambda {|option, value|
     option_type_id = case option
     when String
       option_type = OptionType.find_by_name(option) || option.to_i
@@ -153,7 +153,7 @@ module Scopes::Product
   }
 
   # finds product having option value OR product_property
-  Product.named_scope :with, lambda{|value|
+  Product.add_search_scope :with, lambda{|value|
     {
       :conditions => ["option_values.name = ? OR product_properties.value = ?", value, value],
       :joins => {:variants => :option_values, :product_properties => []}
@@ -178,7 +178,7 @@ module Scopes::Product
   # there is alternative faster and more elegant solution, it has small drawback though,
   # it doesn stack with other scopes :/
   #
-  Product.named_scope :descend_by_popularity, lambda{
+  Product.add_search_scope :descend_by_popularity, lambda{
     # :joins => "LEFT OUTER JOIN (SELECT line_items.variant_id as vid, COUNT(*) as cnt FROM line_items GROUP BY line_items.variant_id) AS popularity_count ON variants.id = vid",
     # :order => 'COALESCE(cnt, 0) DESC'
     {
@@ -201,7 +201,7 @@ SQL
   }
 
   # Produce an array of keywords for use in scopes. Always return array with at least an empty string to avoid SQL errors
-  def self.prepare_words(words)
+  def Product.prepare_words(words)
     a = words.split(/[,\s]/).map(&:strip)
     a.any? ? a : ['']
   end
@@ -212,7 +212,7 @@ SQL
     end
   end
 
-  def self.get_taxons(*ids_or_records_or_names)
+  def Product.get_taxons(*ids_or_records_or_names)
     ids_or_records_or_names.flatten.map { |t|
       case t
       when Integer then Taxon.find_by_id(t)
@@ -227,7 +227,7 @@ SQL
   end
 
   # specifically avoid having an order for taxon search (conflicts with main order)
-  def self.prepare_taxon_conditions(taxons)
+  def Product.prepare_taxon_conditions(taxons)
     conditions = taxons.map{|taxon|
       taxon.self_and_descendants.scope(:find)[:conditions]
     }.inject([[]]){|result, scope|

data/lib/spree.rb

@@ -9,7 +9,7 @@ unless defined? Spree::Version
     module Version
       Major = '0'
       Minor = '11'
-      Tiny  = '3'
+      Tiny  = '4'
       Pre   = nil # 'beta'
 
       class << self

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 11
-  - 3
-  version: 0.11.3
+  - 4
+  version: 0.11.4
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-24 00:00:00 Z
+date: 2012-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake