spree_core 1.1.1 → 1.1.2.rc1

data/db/migrate/20120523061241_convert_sales_tax_to_default_tax.rb

@@ -0,0 +1,9 @@
+class ConvertSalesTaxToDefaultTax < ActiveRecord::Migration
+  def up
+    execute "UPDATE spree_calculators SET type='Spree::Calculator::DefaultTax' WHERE type='Spree::Calculator::SalesTax'"
+  end
+
+  def down
+    execute "UPDATE spree_calculators SET type='Spree::Calculator::SalesTax' WHERE type='Spree::Calculator::DefaultTax'"
+ end
+end

data/db/migrate/20120604030249_add_deleted_at_to_spree_shipping_methods.rb

@@ -0,0 +1,5 @@
+class AddDeletedAtToSpreeShippingMethods < ActiveRecord::Migration
+  def change
+    add_column :spree_shipping_methods, :deleted_at, :datetime
+  end
+end

data/db/migrate/20120605211305_make_users_email_index_unique.rb

@@ -0,0 +1,10 @@
+class MakeUsersEmailIndexUnique < ActiveRecord::Migration
+  def up
+    add_index "spree_users", ["email"], :name => "email_idx_unique", :unique => true
+  end
+
+  def down
+    remove_index "spree_users", :name => "email_idx_unique"
+    add_index "spree_users", ["email"], :name => "email_idx_unique"
+  end
+end

data/lib/generators/spree/dummy/templates/rails/application.rb

@@ -2,7 +2,7 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-Bundler.require(*Rails.groups)
+Bundler.require(*Rails.groups(:assets => %w(development test)))
 
 require '<%= lib_name %>'
 

data/lib/spree/core/current_order.rb

@@ -16,7 +16,8 @@ module Spree
       def current_order(create_order_if_necessary = false)
         return @current_order if @current_order
         if session[:order_id]
-          @current_order = Spree::Order.find_by_id(session[:order_id], :include => :adjustments)
+          current_order = Spree::Order.find_by_id(session[:order_id], :include => :adjustments)
+          @current_order = current_order unless current_order.try(:completed?)
         end
         if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
           @current_order = Spree::Order.new

data/lib/spree/core/engine.rb

@@ -69,9 +69,17 @@ module Spree
         app.config.filter_parameters += [:password, :password_confirmation, :number]
       end
 
-      # sets the manifests / assets to be precompiled
-      initializer "spree.assets.precompile" do |app|
-        Spree::Core::Engine.add_assets_to_precompile_list!(app)
+      # sets the manifests / assets to be precompiled, even when initialize_on_precompile is false
+      initializer "spree.assets.precompile", :group => :all do |app|
+        app.config.assets.precompile += %w[
+          store/all.*
+          admin/all.*
+          admin/orders/edit_form.js
+          admin/address_states.js
+          jqPlot/excanvas.min.js
+          admin/images/new.js
+          jquery.jstree/themes/apple/*
+        ]
       end
 
       initializer "spree.mail.settings" do |app|
@@ -80,10 +88,6 @@ module Spree
           Mail.register_interceptor(Spree::Core::MailInterceptor)
         end
       end
-
-      def self.add_assets_to_precompile_list!(app)
-        app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/orders/edit_form.js', 'admin/address_states.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js', 'jquery.jstree/themes/apple/*']
-      end
     end
   end
 end

data/lib/spree/core/relation_serialization.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Core
+    module RelationSerialization
+      def serializable_hash(options = nil)
+        self.map { |a| a.serializable_hash(options) }
+      end
+    end
+  end
+end

data/lib/spree/core/respond_with.rb

@@ -59,7 +59,7 @@ module Spree
               options = {action_name.to_sym => {format_name.to_sym => {:success => format_value}}}
             end
 
-            self.spree_responders.rmerge!(self.name.intern => options)
+            self.spree_responders.rmerge!(self.name.to_sym => options)
           end
         end
       end

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

@@ -36,10 +36,8 @@ module Spree
 
           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
+              scope_name = name.to_sym
+              if base_scope.respond_to?(:search_scopes) && base_scope.search_scopes.include?(scope_name.to_sym)
                 base_scope = base_scope.send(scope_name, *scope_attribute)
               else
                 base_scope = base_scope.merge(Spree::Product.search({scope_name => scope_attribute}).result)
@@ -61,18 +59,6 @@ module Spree
             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]
           end
       end
     end

data/lib/spree/core/ssl_requirement.rb

@@ -102,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
+        redirect_to "https://" + request.host + request.fullpath.sub("//", "/")
         flash.keep
       elsif request.ssl? && !ssl_required?
-        redirect_to "http://" + request.host + request.fullpath
+        redirect_to "http://" + request.host + request.fullpath.sub("//", "/")
         flash.keep
       end
 

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

@@ -46,6 +46,12 @@ module Spree
           process_spree_action(action, parameters, session, flash, "DELETE")
         end
 
+        def spree_xhr_get(action, parameters = nil, session = nil, flash = nil)
+          parameters ||= {}
+          parameters.merge!(:use_route => :spree)
+          xml_http_request(:get, action, parameters, session, flash)
+        end
+
         private
 
         def process_spree_action(action, parameters = nil, session = nil, flash = nil, method = "GET")

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.1.1"
+    "1.1.2.rc1"
   end
 end

data/lib/spree/product_filters.rb

@@ -8,7 +8,7 @@ module Spree
   #   2) Add it to the config load path, or require it in an initializer, e.g...
   #
   #      # config/initializers/spree.rb
-  #      require 'product_filters'
+  #      require 'spree/product_filters'
   #
 
   # set up some basic filters for use with products
@@ -58,18 +58,22 @@ module Spree
     # If user checks off three different price ranges then the argument passed to
     # below scope would be something like ["$10 - $15", "$15 - $18", "$18 - $20"]
     #
-    Spree::Product.scope :price_range_any,
-      lambda {|*opts|
-        conds = opts.map {|o| Spree::ProductFilters.price_filter[:conds][o]}.reject {|c| c.nil?}
-        Spree::Product.scoped(:joins => :master).conditions_any(conds)
-      }
+    Spree::Product.add_search_scope :price_range_any do |*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.joins(:master).where(scope)
+    end
 
     def ProductFilters.price_filter
-      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" ] ]
+      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)]]
       { :name   => I18n.t(:price_range),
         :scope  => :price_range_any,
         :conds  => Hash[*conds.flatten],
@@ -90,17 +94,21 @@ module Spree
     #   the (uniquely named) field "p_brand.value". There's also a test for brand info
     #   being blank: note that this relies on with_property doing a left outer join
     #   rather than an inner join.
-
-    if Spree::Property.table_exists? && @@brand_property = Spree::Property.find_by_name("brand")
-      Spree::Product.scope :brand_any,
-        lambda {|*opts|
-          conds = opts.map {|o| ProductFilters.brand_filter[:conds][o]}.reject {|c| c.nil?}
-          Spree::Product.with_property("brand").conditions_any(conds)
-        }
+    if Spree::Property.table_exists?
+      Spree::Product.add_search_scope :brand_any do |*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)
+      end
 
       def ProductFilters.brand_filter
-        brands = Spree::ProductProperty.where(:property_id => @@brand_property).map(&:value).compact.uniq
-        conds  = Hash[*brands.map {|b| [b, "#{Spree::ProductProperty.table_name}.value = '#{b}'"]}.flatten]
+        brand_property = Spree::Property.find_by_name("brand")
+        brands = Spree::ProductProperty.where(:property_id => brand_property).map(&:value).compact.uniq
+        pp = Spree::ProductProperty.arel_table
+        conds  = Hash[*brands.map {|b| [b, pp[:value].eq(b)]}.flatten]
         { :name   => "Brands",
           :scope  => :brand_any,
           :conds  => conds,
@@ -128,14 +136,17 @@ module Spree
     #
     #   The brand-finding code can be simplified if a few more named scopes were added to
     #   the product properties model.
-    if Spree::Property.table_exists? && @@brand_property
-      Spree::Product.scope :selective_brand_any, lambda {|*opts| Spree::Product.brand_any(*opts) }
+    if Spree::Property.table_exists?
+      Spree::Product.add_search_scope :selective_brand_any do |*opts|
+        Spree::Product.brand_any(*opts)
+      end
 
       def ProductFilters.selective_brand_filter(taxon = nil)
         if taxon.nil?
           taxon = Spree::Taxonomy.first.root
         end
-        scope = Spree::ProductProperty.scoped(:conditions => ["property_id = ?", @@brand_property]).
+        brand_property = Spree::Property.find_by_name("brand")
+        scope = Spree::ProductProperty.scoped(:conditions => ["property_id = ?", brand_property]).
                                        scoped(:joins      => {:product => :taxons},
                                               :conditions => ["#{Spree::Taxon.table_name}.id in (?)", [taxon] + taxon.descendants])
         brands = scope.map {|p| p.value}.uniq

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.1.2.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70318236789620 !ruby/object:Gem::Requirement
+  requirement: &70099197054680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70318236789620
+  version_requirements: *70099197054680
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &70318236802480 !ruby/object:Gem::Requirement
+  requirement: &70099197053340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70318236802480
+  version_requirements: *70099197053340
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70318236799920 !ruby/object:Gem::Requirement
+  requirement: &70099197052140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70318236799920
+  version_requirements: *70099197052140
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70318236798400 !ruby/object:Gem::Requirement
+  requirement: &70099197050120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *70318236798400
+  version_requirements: *70099197050120
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70318236810320 !ruby/object:Gem::Requirement
+  requirement: &70099197048020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70318236810320
+  version_requirements: *70099197048020
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70318236825880 !ruby/object:Gem::Requirement
+  requirement: &70099197045240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70318236825880
+  version_requirements: *70099197045240
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70318236822420 !ruby/object:Gem::Requirement
+  requirement: &70099197043420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70318236822420
+  version_requirements: *70099197043420
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70318236844440 !ruby/object:Gem::Requirement
+  requirement: &70099197042100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70318236844440
+  version_requirements: *70099197042100
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &70318236839880 !ruby/object:Gem::Requirement
+  requirement: &70099197040680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70318236839880
+  version_requirements: *70099197040680
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70318236853080 !ruby/object:Gem::Requirement
+  requirement: &70099197039820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,24 +120,21 @@ dependencies:
         version: 1.20.4
   type: :runtime
   prerelease: false
-  version_requirements: *70318236853080
+  version_requirements: *70099197039820
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70318236860820 !ruby/object:Gem::Requirement
+  requirement: &70099197039120 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.2
-    - - <=
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70318236860820
+  version_requirements: *70099197039120
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70318236885120 !ruby/object:Gem::Requirement
+  requirement: &70099197038300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,21 +142,21 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70318236885120
+  version_requirements: *70099197038300
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70318236881940 !ruby/object:Gem::Requirement
+  requirement: &70099197037420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70318236881940
+  version_requirements: *70099197037420
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70318236902600 !ruby/object:Gem::Requirement
+  requirement: &70099197014760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -167,7 +164,7 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70318236902600
+  version_requirements: *70099197014760
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -302,6 +299,7 @@ files:
 - app/assets/javascripts/admin/payments/new.js
 - app/assets/javascripts/admin/products.js
 - app/assets/javascripts/admin/shipping_methods.js
+- app/assets/javascripts/admin/spree.routes.js.erb
 - app/assets/javascripts/admin/spree_core.js
 - app/assets/javascripts/admin/taxonomy.js
 - app/assets/javascripts/admin/underscore-min.js
@@ -320,6 +318,7 @@ files:
 - app/assets/stylesheets/admin/token-input.css
 - app/assets/stylesheets/store/screen.css.scss
 - app/assets/stylesheets/store/spree_core.css
+- app/assets/stylesheets/store/variables.css.scss
 - app/controllers/spree/admin/adjustments_controller.rb
 - app/controllers/spree/admin/base_controller.rb
 - app/controllers/spree/admin/configurations_controller.rb
@@ -468,6 +467,7 @@ files:
 - app/views/spree/admin/inventory_settings/show.html.erb
 - app/views/spree/admin/inventory_units/adjust.html.erb
 - app/views/spree/admin/line_items/create.js.erb
+- app/views/spree/admin/line_items/destroy.js.erb
 - app/views/spree/admin/mail_methods/_form.html.erb
 - app/views/spree/admin/mail_methods/edit.html.erb
 - app/views/spree/admin/mail_methods/index.html.erb
@@ -711,6 +711,7 @@ files:
 - lib/spree/core/middleware/seo_assist.rb
 - lib/spree/core/permalinks.rb
 - lib/spree/core/preference_rescue.rb
+- lib/spree/core/relation_serialization.rb
 - lib/spree/core/respond_with.rb
 - lib/spree/core/responder.rb
 - lib/spree/core/scopes.rb
@@ -869,6 +870,9 @@ files:
 - db/migrate/20120315064358_migrate_images_from_products_to_variants.rb
 - db/migrate/20120416233427_rename_attachment_size_to_attachment_file_size.rb
 - db/migrate/20120507232704_increase_scale_of_tax_rate_amount.rb
+- db/migrate/20120523061241_convert_sales_tax_to_default_tax.rb
+- db/migrate/20120604030249_add_deleted_at_to_spree_shipping_methods.rb
+- db/migrate/20120605211305_make_users_email_index_unique.rb
 - db/sample/users.rb
 - db/seeds.rb
 - vendor/assets/images/datepicker/cal.gif
@@ -964,12 +968,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3177419443841864347
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: spree_core