spree_core 1.0.7 → 1.1.0.rc1

data/lib/spree/core/search/base.rb

@@ -10,25 +10,41 @@ module Spree
         end
 
         def retrieve_products
-          base_scope = get_base_scope
-          @products_scope = @product_group.apply_on(base_scope)
-          curr_page = manage_pagination && keywords ? 1 : page
+          @products_scope = get_base_scope
+          curr_page = keywords ? 1 : page
 
-          @products = @products_scope.includes([:images, :master]).page(curr_page).per(per_page)
+          @products = @products_scope.includes([:master]).page(curr_page).per(per_page)
         end
 
         def method_missing(name)
-          @properties[name]
+          if @properties.has_key? name
+            @properties[name]
+          else
+            super
+          end
         end
 
         protected
           def get_base_scope
-            base_scope = @cached_product_group ? @cached_product_group.products.active : Spree::Product.active
+            base_scope = 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?
-
             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 = add_search_scopes(base_scope)
+            base_scope
+          end
+
+          def add_search_scopes(base_scope)
+            search.each do |name, scope_attribute|
+              next if name.to_s =~ /eval|send|system/
+
+              scope_name = name.intern
+              if base_scope.respond_to? scope_name
+                base_scope = base_scope.send(scope_name, *scope_attribute)
+              else
+                base_scope = base_scope.merge(Spree::Product.search({scope_name => scope_attribute}).result)
+              end
+            end if search
             base_scope
           end
 
@@ -40,22 +56,23 @@ module Spree
           def prepare(params)
             @properties[:taxon] = params[:taxon].blank? ? nil : Spree::Taxon.find(params[:taxon])
             @properties[:keywords] = params[:keywords]
+            @properties[:search] = params[:search]
 
             per_page = params[:per_page].to_i
             @properties[:per_page] = per_page > 0 ? per_page : Spree::Config[:products_per_page]
             @properties[:page] = (params[:page].to_i <= 0) ? 1 : params[:page].to_i
 
-            if !params[:order_by_price].blank?
-              @product_group = Spree::ProductGroup.new.from_route([params[:order_by_price] + '_by_master_price'])
-            elsif params[:product_group_name]
-              @cached_product_group = Spree::ProductGroup.find_by_permalink(params[:product_group_name])
-              @product_group = Spree::ProductGroup.new
-            elsif params[:product_group_query]
-              @product_group = Spree::ProductGroup.new.from_route(params[:product_group_query].split('/'))
-            else
-              @product_group = Spree::ProductGroup.new
-            end
-            @product_group = @product_group.from_search(params[:search]) if params[:search]
+            # if !params[:order_by_price].blank?
+            #   @product_group = Spree::ProductGroup.new.from_route([params[:order_by_price] + '_by_master_price'])
+            # elsif params[:product_group_name]
+            #   @cached_product_group = Spree::ProductGroup.find_by_permalink(params[:product_group_name])
+            #   @product_group = Spree::ProductGroup.new
+            # elsif params[:product_group_query]
+            #   @product_group = Spree::ProductGroup.new.from_route(params[:product_group_query].split('/'))
+            # else
+            #   @product_group = Spree::ProductGroup.new
+            # end
+            # @product_group = @product_group.from_search(params[:search]) if params[:search]
           end
       end
     end

data/lib/spree/core/ssl_requirement.rb

@@ -61,26 +61,34 @@ module SslRequirement
   module ClassMethods
     # Specifies that the named actions requires an SSL connection to be performed (which is enforced by ensure_proper_protocol).
     def ssl_required(*actions)
-      write_inheritable_array(:ssl_required_actions, actions)
+      class_attribute(:ssl_required_actions)
+      self.ssl_required_actions = actions
     end
 
     def ssl_allowed(*actions)
-      write_inheritable_array(:ssl_allowed_actions, actions)
+      class_attribute(:ssl_allowed_actions)
+      self.ssl_allowed_actions = actions
     end
   end
 
   protected
     # Returns true if the current action is supposed to run as SSL
     def ssl_required?
-      actions = self.class.read_inheritable_attribute(:ssl_required_actions)
-      return false if actions.nil?
-      actions.empty? || actions.include?(action_name.to_sym)
+      if self.class.respond_to?(:ssl_required_actions)
+        actions = self.class.ssl_required_actions
+        actions.empty? || actions.include?(action_name.to_sym)
+      else
+        return false
+      end
     end
 
     def ssl_allowed?
-      actions = self.class.read_inheritable_attribute(:ssl_allowed_actions)
-      return false if actions.nil?
-      actions.empty? || actions.include?(action_name.to_sym)
+      if self.class.respond_to?(:ssl_allowed_actions)
+        actions = self.class.ssl_allowed_actions
+        actions.empty? || actions.include?(action_name.to_sym)
+      else
+        return false
+      end
     end
 
   private
@@ -94,10 +102,10 @@ module SslRequirement
     def ensure_proper_protocol
       return true if ssl_allowed?
       if ssl_required? && !request.ssl? && ssl_supported?
-        redirect_to "https://" + request.host + request.fullpath.sub("//", "/")
+        redirect_to "https://" + request.host + request.fullpath
         flash.keep
       elsif request.ssl? && !ssl_required?
-        redirect_to "http://" + request.host + request.fullpath.sub("//", "/")
+        redirect_to "http://" + request.host + request.fullpath
         flash.keep
       end
 

data/lib/spree/core/testing_support/common_rake.rb

@@ -11,7 +11,7 @@ namespace :common do
     Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--auto-accept", "--migrate=false", "--seed=false", "--sample=false", "--quiet"]
 
     puts "Setting up dummy database..."
-    cmd = "bundle exec rake db:drop db:create db:migrate RAILS_ENV=test AUTO_ACCEPT=true"
+    cmd = "bundle exec rake db:drop db:create db:migrate db:test:prepare"
 
     if RUBY_PLATFORM =~ /mswin/ #windows
       cmd += " >nul"

data/lib/spree/core/testing_support/factories/product_factory.rb

@@ -1,14 +1,9 @@
 FactoryGirl.define do
   sequence(:product_sequence) { |n| "Product ##{n} - #{rand(9999)}" }
 
-  factory :product, :class => Spree::Product do
-    name { Factory.next :product_sequence }
-    description { Faker::Lorem.paragraphs(rand(5)+1).join("\n") }
-
-    # associations:
-    tax_category { |r| Spree::TaxCategory.find(:first) || r.association(:tax_category) }
-    shipping_category { |r| Spree::ShippingCategory.find(:first) || r.association(:shipping_category) }
-
+  factory :simple_product, :class => Spree::Product do
+    name { FactoryGirl.generate :product_sequence }
+    description { Faker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
     price 19.99
     cost_price 17.00
     sku 'ABC'
@@ -16,6 +11,11 @@ FactoryGirl.define do
     deleted_at nil
   end
 
+  factory :product, :parent => :simple_product do
+    tax_category { |r| Spree::TaxCategory.find(:first) || r.association(:tax_category) }
+    shipping_category { |r| Spree::ShippingCategory.find(:first) || r.association(:shipping_category) }
+  end
+
   factory :product_with_option_types, :parent => :product do
     after_create { |product| Factory(:product_option_type, :product => product) }
   end
@@ -23,7 +23,7 @@ FactoryGirl.define do
   factory :custom_product, :class => Spree::Product do
     name "Custom Product"
     price "17.99"
-    description { Faker::Lorem.paragraphs(rand(5)+1).join("\n") }
+    description { Faker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
 
     # associations:
     tax_category { |r| Spree::TaxCategory.find(:first) || r.association(:tax_category) }

data/lib/spree/core/testing_support/factories/role_factory.rb

@@ -2,7 +2,7 @@ FactoryGirl.define do
   sequence(:role_sequence) { |n| "Role ##{n}" }
 
   factory :role, :class => Spree::Role do
-    name { Factory.next(:role_sequence) }
+    name { FactoryGirl.generate :role_sequence }
   end
 
   factory :admin_role, :parent => :role do

data/lib/spree/core/testing_support/factories/shipping_category_factory.rb

@@ -2,6 +2,6 @@ FactoryGirl.define do
   sequence(:shipping_category_sequence) { |n| "ShippingCategory ##{n}" }
 
   factory :shipping_category, :class => Spree::ShippingCategory do
-    name { Factory.next(:shipping_category_sequence) }
+    name { FactoryGirl.generate :shipping_category_sequence }
   end
 end

data/lib/spree/core/testing_support/factories/shipping_method_factory.rb

@@ -2,22 +2,22 @@ FactoryGirl.define do
   factory :shipping_method, :class => Spree::ShippingMethod do
     zone { |a| Spree::Zone.find_by_name('GlobalZone') || a.association(:global_zone) }
     name 'UPS Ground'
-    calculator { |sm| Factory(:calculator, :calculable_id => sm.object_id, :calculable_type => 'Spree::ShippingMethod') }
+    calculator { Factory.build(:calculator) }
   end
 
   factory :free_shipping_method, :class => Spree::ShippingMethod do
     zone { |a| Spree::Zone.find_by_name('GlobalZone') || a.association(:global_zone) }
     name 'UPS Ground'
-    calculator { |sm| Factory(:no_amount_calculator, :calculable_id => sm.object_id, :calculable_type => 'Spree::ShippingMethod') }
+    calculator { Factory.build(:no_amount_calculator) }
   end
 
   factory :shipping_method_with_category, :class => Spree::ShippingMethod do
     zone { |a| Spree::Zone.find_by_name('GlobalZone') || a.association(:global_zone) }
     name 'UPS Ground'
-    calculator { |sm| Factory(:calculator, :calculable_id => sm.object_id, :calculable_type => 'Spree::ShippingMethod') }
     match_none nil
     match_one nil
     match_all nil
     association(:shipping_category, :factory => :shipping_category)
+    calculator { Factory.build(:calculator) }
   end
 end

data/lib/spree/core/testing_support/factories/user_factory.rb

@@ -8,7 +8,7 @@ FactoryGirl.define do
     login { email }
     password 'secret'
     password_confirmation 'secret'
-    authentication_token { Factory.next(:user_authentication_token) } if Spree::User.attribute_method? :authentication_token
+    authentication_token { FactoryGirl.generate(:user_authentication_token) } if Spree::User.attribute_method? :authentication_token
   end
 
   factory :admin_user, :parent => :user do

data/lib/spree/core/testing_support/factories/zone_factory.rb

@@ -4,13 +4,15 @@ FactoryGirl.define do
     description { Faker::Lorem.sentence }
     zone_members do |proxy|
       zone = proxy.instance_eval{@instance}
-      Spree::Country.find(:all).map{|c| Spree::ZoneMember.create({:zoneable => c, :zone => zone})}
+      Spree::Country.find(:all).map do |c|
+        zone_member = Spree::ZoneMember.create(:zoneable => c, :zone => zone)
+      end
     end
   end
 
   factory :zone, :class => Spree::Zone do
     name { Faker::Lorem.words }
     description { Faker::Lorem.sentence }
-    zone_members { [Spree::ZoneMember.create(:zoneable => Factory(:country) )] }
+    zone_members { [Spree::ZoneMember.create(:zoneable => Factory(:country))] }
   end
 end

data/lib/spree/core/validators/email.rb

@@ -0,0 +1,23 @@
+# Borrowed from http://my.rails-royce.org/2010/07/21/email-validation-in-ruby-on-rails-without-regexp/
+# Mentioned in tweet here: https://twitter.com/_sohara/status/177120126083141633
+require 'mail'
+class EmailValidator < ActiveModel::EachValidator
+  def validate_each(record,attribute,value)
+    begin
+      m = Mail::Address.new(value)
+      # We must check that value contains a domain and that value is an email address
+      r = m.domain && m.address == value
+      t = m.__send__(:tree)
+      # We need to dig into treetop
+      # A valid domain must have dot_atom_text elements size > 1
+      # user@localhost is excluded
+      # treetop must respond to domain
+      # We exclude valid email values like <user@localhost.com>
+      # Hence we use m.__send__(tree).domain
+      r &&= (t.domain.dot_atom_text.elements.size > 1)
+    rescue Exception => e
+      r = false
+    end
+    record.errors[attribute] << (options[:message] || "is invalid") unless r
+  end
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.0.6"
+    "1.1.0.rc1"
   end
 end

data/lib/spree/core.rb

@@ -34,8 +34,9 @@ require 'kaminari'
 require 'nested_set'
 require 'acts_as_list'
 require 'active_merchant'
-require 'meta_search'
+require 'ransack'
 require 'jquery-rails'
+require 'deface'
 
 module Spree
   module Core
@@ -61,7 +62,6 @@ require 'spree/core/ext/hash'
 
 require 'spree/core/delegate_belongs_to'
 
-require 'spree/core/theme_support'
 require 'spree/core/responder'
 require 'spree/core/respond_with'
 require 'spree/core/ssl_requirement'

data/lib/spree/product_filters.rb

@@ -4,9 +4,9 @@ module Spree
   #   the current contents are mainly for testing and documentation
 
   # To override this file...
-  #   1) Make a copy of it in your sites local /lib/spree folder
+  #   1) Make a copy of it in your sites local /lib folder
   #   2) Add it to the config load path, or require it in an initializer, e.g...
-  #      
+  #
   #      # config/initializers/spree.rb
   #      require 'product_filters'
   #
@@ -48,7 +48,7 @@ module Spree
   module ProductFilters
     extend ActionView::Helpers::NumberHelper
     extend Spree::BaseHelper
-    
+
     # Example: filtering by price
     #   The named scope just maps incoming labels onto their conditions, and builds the conjunction
     #   'price' is in the base scope's context (ie, "select foo from products where ...") so
@@ -61,20 +61,15 @@ module Spree
     Spree::Product.scope :price_range_any,
       lambda {|*opts|
         conds = opts.map {|o| Spree::ProductFilters.price_filter[:conds][o]}.reject {|c| c.nil?}
-        scope = conds.shift
-        conds.each do |new_scope|
-          scope = scope.or(new_scope)
-        end
-        Spree::Product.scoped(:joins => :master).where(scope)
+        Spree::Product.scoped(:joins => :master).conditions_any(conds)
       }
 
     def ProductFilters.price_filter
-      v = Spree::Variant.arel_table
-      conds = [ [ I18n.t(:under_price, :price => format_price(10))   , v[:price].lteq(10)],
-                [ "#{format_price(10)} - #{format_price(15)}"        , v[:price].in(10..15)],
-                [ "#{format_price(15)} - #{format_price(18)}"        , v[:price].in(15..18)],
-                [ "#{format_price(18)} - #{format_price(20)}"        , v[:price].in(18..20)],
-                [ I18n.t(:or_over_price, :price => format_price(20)) , v[:price].gteq(20)]]
+      conds = [ [ I18n.t(:under_price, :price => format_price(10))   , "price             <= 10" ],
+                [ "#{format_price(10)} - #{format_price(15)}"        , "price between 10 and 15" ],
+                [ "#{format_price(15)} - #{format_price(18)}"        , "price between 15 and 18" ],
+                [ "#{format_price(18)} - #{format_price(20)}"        , "price between 18 and 20" ],
+                [ I18n.t(:or_over_price, :price => format_price(20)) , "price             >= 20" ] ]
       { :name   => I18n.t(:price_range),
         :scope  => :price_range_any,
         :conds  => Hash[*conds.flatten],
@@ -100,11 +95,7 @@ module Spree
       Spree::Product.scope :brand_any,
         lambda {|*opts|
           conds = opts.map {|o| ProductFilters.brand_filter[:conds][o]}.reject {|c| c.nil?}
-          scope = conds.shift
-          conds.each do |new_scope|
-            scope = scope.or(new_scope)
-          end
-          Spree::Product.with_property("brand").where(scope)
+          Spree::Product.with_property("brand").conditions_any(conds)
         }
 
       def ProductFilters.brand_filter

data/lib/tasks/core.rake

@@ -21,7 +21,7 @@ For .rb       use rake db:load_file[/absolute/path/to/sample/filename.rb]}
   desc "Loads fixtures from the the dir you specify using rake db:load_dir[loadfrom]"
   task :load_dir , [:dir] => :environment do |t , args|
     dir = args.dir
-    dir = File.join(Rails.root, "db", dir) unless dir =~ /^(\/|[a-zA-Z]:[\/\\])/
+    dir = File.join(Rails.root, "db", dir) if Pathname.new(dir).relative?
 
     fixtures = ActiveSupport::OrderedHash.new
     ruby_files = ActiveSupport::OrderedHash.new

data/vendor/assets/javascripts/jquery.alerts/jquery.alerts.css.erb

@@ -17,7 +17,7 @@
   text-align: center;
   line-height: 1.75em;
   color: #666;
-  background: #CCC url(<%= asset_path 'icons/title.gif' %>) top repeat-x;
+  background: #CCC url(<%= asset_path('jquery.alerts/images/title.gif') %>) top repeat-x;
   border: solid 1px #FFF;
   border-bottom: solid 1px #999;
   cursor: default;
@@ -26,21 +26,21 @@
 }
 
 #popup_content {
-  background: 16px 16px no-repeat url(<%= asset_path 'icons/info.gif' %>);
+  background: 16px 16px no-repeat url(<%= asset_path('jquery.alerts/images/info.gif') %>);
   padding: 1em 1.75em;
   margin: 0em;
 }
 
 #popup_content.alert {
-  background-image: url(<%= asset_path 'icons/info.gif' %>);
+  background-image: url(<%= asset_path('jquery.alerts/images/info.gif') %>);
 }
 
 #popup_content.confirm {
-  background-image: url(<%= asset_path 'icons/important.gif' %>);
+  background-image: url(<%= asset_path('jquery.alerts/images/important.gif') %>);
 }
 
 #popup_content.prompt {
-  background-image: url(<%= asset_path 'icons/help.gif' %>);
+  background-image: url(<%= asset_path('jquery.alerts/images/help.gif') %>);
 }
 
 #popup_message {

data/vendor/assets/stylesheets/jquery-ui.datepicker.css.erb

@@ -89,7 +89,7 @@
 ----------------------------------*/
 
 /* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(jquery-ui/ui-icons_ff0084_256x240.png); }
+.ui-icon { width: 16px; height: 16px; background-image: url(<%= asset_path("jquery-ui/ui-icons_ff0084_256x240.png") %>); }
 .ui-widget-content .ui-icon {background-image: url(<%= asset_path("jquery-ui/ui-icons_ff0084_256x240.png") %>); }
 .ui-widget-header .ui-icon {background-image: url(<%= asset_path("jquery-ui/ui-icons_0073ea_256x240.png") %>); }
 .ui-state-default .ui-icon { background-image: url(<%= asset_path("jquery-ui/ui-icons_666666_256x240.png") %>); }