spree_core 1.2.5 → 1.3.0.rc1

data/db/migrate/20120929093553_remove_unused_preference_columns.rb

@@ -0,0 +1,8 @@
+class RemoveUnusedPreferenceColumns < ActiveRecord::Migration
+  def change
+    # Columns have already been removed if the application was upgraded from an older version, but must be removed from new apps.
+    remove_column :spree_preferences, :name       if ActiveRecord::Base.connection.column_exists?(:spree_preferences, :name)
+    remove_column :spree_preferences, :owner_id   if ActiveRecord::Base.connection.column_exists?(:spree_preferences, :owner_id)
+    remove_column :spree_preferences, :owner_type if ActiveRecord::Base.connection.column_exists?(:spree_preferences, :owner_type)
+  end
+end

data/db/migrate/20121010142909_add_states_required_to_countries.rb

@@ -0,0 +1,5 @@
+class AddStatesRequiredToCountries < ActiveRecord::Migration
+  def change
+    add_column :spree_countries, :states_required, :boolean,:default => true
+  end
+end

data/db/migrate/20121012071449_add_on_demand_to_product_and_variant.rb

@@ -0,0 +1,6 @@
+class AddOnDemandToProductAndVariant < ActiveRecord::Migration
+  def change
+  	add_column :spree_products, :on_demand, :boolean, :default => false
+  	add_column :spree_variants, :on_demand, :boolean, :default => false
+  end
+end

data/db/migrate/20121031162139_split_prices_from_variants.rb

@@ -0,0 +1,30 @@
+class SplitPricesFromVariants < ActiveRecord::Migration
+  def up
+    create_table :spree_prices do |t|
+      t.integer :variant_id, :null => false
+      t.decimal :amount, :precision => 8, :scale => 2, :null => false
+      t.string :currency
+    end
+
+    Spree::Variant.all.each do |variant|
+      Spree::Price.create!(
+        :variant_id => variant.id,
+        :amount => variant.price,
+        :currency => Spree::Config[:currency]
+      )
+    end
+
+    remove_column :spree_variants, :price
+  end
+
+  def down
+    add_column :spree_variants, :price, :decimal, :after => :sku, :scale => 8, :precision => 2
+
+    Spree::Variant.all.each do |variant|
+      variant.price = variant.default_price.amount
+      variant.save!
+    end
+
+    drop_table :spree_prices
+  end
+end

data/db/migrate/20121107003422_remove_not_null_from_spree_prices_amount.rb

@@ -0,0 +1,9 @@
+class RemoveNotNullFromSpreePricesAmount < ActiveRecord::Migration
+  def up
+    change_column :spree_prices, :amount, :decimal, :precision => 8, :scale => 2, :null => true
+  end
+
+  def down
+    change_column :spree_prices, :amount, :decimal, :precision => 8, :scale => 2, :null => false
+  end
+end

data/db/migrate/20121107184631_add_currency_to_line_items.rb

@@ -0,0 +1,5 @@
+class AddCurrencyToLineItems < ActiveRecord::Migration
+  def change
+    add_column :spree_line_items, :currency, :string
+  end
+end

data/db/migrate/20121107194006_add_currency_to_orders.rb

@@ -0,0 +1,5 @@
+class AddCurrencyToOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :currency, :string
+  end
+end

data/db/migrate/20121109173623_add_cost_currency_to_variants.rb

@@ -0,0 +1,5 @@
+class AddCostCurrencyToVariants < ActiveRecord::Migration
+  def change
+    add_column :spree_variants, :cost_currency, :string, :after => :cost_price
+  end
+end

data/db/migrate/20121111231553_remove_display_on_from_payment_methods.rb

@@ -0,0 +1,5 @@
+class RemoveDisplayOnFromPaymentMethods < ActiveRecord::Migration
+  def up
+    remove_column :spree_payment_methods, :display_on
+  end
+end

data/lib/generators/spree/custom_user/custom_user_generator.rb

@@ -2,7 +2,7 @@ module Spree
   class CustomUserGenerator < Rails::Generators::NamedBase
     include Rails::Generators::ResourceHelpers
     include Rails::Generators::Migration
-    
+
 
     desc "Set up a Spree installation with a custom User class"
 

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -1,6 +1,3 @@
-<% if agent_number = ENV['TC_AGENT_NUMBER']
-database_prefix = agent_number + "_"
-end %>
 <% case ENV['DB']
   when 'sqlite' %>
 development:
@@ -15,33 +12,33 @@ production:
 <% when 'mysql' %>
 development:
   adapter: mysql2
-  database: <%= database_prefix %>spree_development
+  database: spree_development
   username:
   encoding: utf8
 test:
   adapter: mysql2
-  database: <%= database_prefix %>spree_test
+  database: spree_test
   username:
   encoding: utf8
 production:
   adapter: mysql2
-  database: <%= database_prefix %>spree_production
+  database: spree_production
   username:
   encoding: utf8
 <% when 'postgres' %>
 development:
   adapter: postgresql
-  database: <%= database_prefix %>spree_development
+  database: spree_development
   username: postgres
   min_messages: warning
 test:
   adapter: postgresql
-  database: <%= database_prefix %>spree_test
+  database: spree_test
   username: postgres
   min_messages: warning
 production:
   adapter: postgresql
-  database: <%= database_prefix %>spree_production
+  database: spree_production
   username: postgres
   min_messages: warning
 <% else %>

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -1,9 +1,9 @@
 # Configure Spree Preferences
-# 
+#
 # Note: Initializing preferences available within the Admin will overwrite any changes that were made through the user interface when you restart.
 #       If you would like users to be able to update a setting with the Admin it should NOT be set here.
 #
-# In order to initialize a setting do: 
+# In order to initialize a setting do:
 # config.setting_name = 'new value'
 Spree.config do |config|
   # Example:

data/lib/spree/core.rb

@@ -77,12 +77,9 @@ require 'spree/core/ext/active_record'
 require 'spree/core/delegate_belongs_to'
 
 require 'spree/core/responder'
-require 'spree/core/respond_with'
 require 'spree/core/ssl_requirement'
 require 'spree/core/store_helpers'
-require 'spree/core/file_utilz'
 require 'spree/core/calculated_adjustments'
-require 'spree/core/current_order'
 require 'spree/core/mail_settings'
 require 'spree/core/mail_interceptor'
 require 'spree/core/middleware/redirect_legacy_product_url'
@@ -91,10 +88,6 @@ require 'spree/core/permalinks'
 require 'spree/core/token_resource'
 require 'spree/core/s3_support'
 
-silence_warnings do
-  require 'spree/core/authorize_net_cim_hack'
-end
-
 require 'spree/core/version'
 
 require 'spree/core/engine'

data/lib/spree/core/action_callbacks.rb

@@ -3,21 +3,21 @@ module Spree
     attr_reader :before_methods
     attr_reader :after_methods
     attr_reader :fails_methods
-    
+
     def initialize
       @before_methods = []
       @after_methods = []
       @fails_methods = []
     end
-    
+
     def before(method)
       @before_methods << method
     end
-    
+
     def after(method)
       @after_methods << method
     end
-    
+
     def fails(method)
       @fails_methods << method
     end

data/lib/spree/core/calculated_adjustments.rb

@@ -3,7 +3,7 @@ module Spree
     module CalculatedAdjustments
       module ClassMethods
         def calculated_adjustments
-          has_one   :calculator, :class_name => "Spree::Calculator", :as => :calculable, :dependent => :destroy
+          has_one   :calculator, :as => :calculable, :dependent => :destroy
           accepts_nested_attributes_for :calculator
           attr_accessible :calculator_type, :calculator_attributes
           validates :calculator, :presence => true
@@ -13,7 +13,7 @@ module Spree
           end
         end
       end
-        
+
       def calculator_type
         calculator.class.to_s if calculator
       end

data/lib/spree/core/controller_helpers/auth.rb

@@ -0,0 +1,65 @@
+module Spree
+  module Core
+    module ControllerHelpers
+      module Auth
+        def self.included(base)
+          base.class_eval do
+            include SslRequirement
+
+            helper_method :try_spree_current_user
+
+            rescue_from CanCan::AccessDenied do |exception|
+              return unauthorized
+            end
+          end
+        end
+
+        # Needs to be overriden so that we use Spree's Ability rather than anyone else's.
+        def current_ability
+          @current_ability ||= Spree::Ability.new(try_spree_current_user)
+        end
+
+        # Redirect as appropriate when an access request fails.  The default action is to redirect to the login screen.
+        # Override this method in your controllers if you want to have special behavior in case the user is not authorized
+        # to access the requested action.  For example, a popup window might simply close itself.
+        def unauthorized
+          if try_spree_current_user
+            flash[:error] = t(:authorization_failure)
+            redirect_to '/unauthorized'
+          else
+            store_location
+            url = respond_to?(:spree_login_path) ? spree_login_path : root_path
+            redirect_to url
+          end
+        end
+
+        def store_location
+          # disallow return to login, logout, signup pages
+          authentication_routes = [:spree_signup_path, :spree_login_path, :spree_logout_path]
+          disallowed_urls = []
+          authentication_routes.each do |route|
+            if respond_to?(route)
+              disallowed_urls << send(route)
+            end
+          end
+
+          disallowed_urls.map!{ |url| url[/\/\w+$/] }
+          unless disallowed_urls.include?(request.fullpath)
+            session['user_return_to'] = request.fullpath.gsub('//', '/')
+          end
+        end
+
+        # proxy method to *possible* spree_current_user method
+        # Authentication extensions (such as spree_auth_devise) are meant to provide spree_current_user
+        def try_spree_current_user
+          respond_to?(:spree_current_user) ? spree_current_user : nil
+        end
+
+        def redirect_back_or_default(default)
+          redirect_to(session["user_return_to"] || default)
+          session["user_return_to"] = nil
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/controller_helpers/common.rb

@@ -0,0 +1,90 @@
+module Spree
+  module Core
+    module ControllerHelpers
+      module Common
+        def self.included(base)
+          base.class_eval do
+            helper_method :title
+            helper_method :title=
+            helper_method :accurate_title
+            helper_method :current_order
+            helper_method :current_currency
+
+            layout :get_layout
+
+            before_filter :set_user_language
+          end
+        end
+
+        protected
+
+        # Convenience method for firing instrumentation events with the default payload hash
+        def fire_event(name, extra_payload = {})
+          ActiveSupport::Notifications.instrument(name, default_notification_payload.merge(extra_payload))
+        end
+
+        # Creates the hash that is sent as the payload for all notifications. Specific notifications will
+        # add additional keys as appropriate. Override this method if you need additional data when
+        # responding to a notification
+        def default_notification_payload
+          {:user => try_spree_current_user, :order => current_order}
+        end
+
+        # can be used in views as well as controllers.
+        # e.g. <% title = 'This is a custom title for this view' %>
+        attr_writer :title
+
+        def title
+          title_string = @title.present? ? @title : accurate_title
+          if title_string.present?
+            if Spree::Config[:always_put_site_name_in_title]
+              [default_title, title_string].join(' - ')
+            else
+              title_string
+            end
+          else
+            default_title
+          end
+        end
+
+        def default_title
+          Spree::Config[:site_name]
+        end
+
+        # this is a hook for subclasses to provide title
+        def accurate_title
+          Spree::Config[:default_seo_title]
+        end
+
+        def current_currency
+          Spree::Config[:currency]
+        end
+
+        def render_404(exception = nil)
+          respond_to do |type|
+            type.html { render :status => :not_found, :file    => "#{::Rails.root}/public/404", :formats => [:html], :layout => nil}
+            type.all  { render :status => :not_found, :nothing => true }
+          end
+        end
+        private
+
+        def set_user_language
+          locale = session[:locale]
+          locale ||= Rails.application.config.i18n.default_locale
+          locale ||= I18n.default_locale unless I18n.available_locales.include?(locale.try(:to_sym))
+          I18n.locale = locale.to_sym
+        end
+
+        # Returns which layout to render.
+        # 
+        # You can set the layout you want to render inside your Spree configuration with the +:layout+ option.
+        # 
+        # Default layout is: +app/views/spree/layouts/spree_application+
+        # 
+        def get_layout
+          layout ||= Spree::Config[:layout]
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/controller_helpers/order.rb

@@ -0,0 +1,71 @@
+module Spree
+  module Core
+    module ControllerHelpers
+      module Order
+        def self.included(base)
+          base.class_eval do
+            helper_method :current_order
+            before_filter :set_current_order
+          end
+        end
+
+        # This should be overridden by an auth-related extension which would then have the
+        # opportunity to associate the new order with the # current user before saving.
+        def before_save_new_order
+        end
+
+        # This should be overridden by an auth-related extension which would then have the
+        # opporutnity to store tokens, etc. in the session # after saving.
+        def after_save_new_order
+        end
+
+        # The current incomplete order from the session for use in cart and during checkout
+        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_and_currency(session[:order_id], current_currency, :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(currency: current_currency)
+            before_save_new_order
+            @current_order.save!
+            after_save_new_order
+          end
+          session[:order_id] = @current_order ? @current_order.id : nil
+          @current_order
+        end
+
+        def associate_user
+          @order ||= current_order
+          if try_spree_current_user && @order
+            if @order.user.blank? || @order.email.blank?
+              @order.associate_user!(try_spree_current_user)
+            end
+          end
+
+          # This will trigger any "first order" promotions to be triggered
+          # Assuming of course that this session variable was set correctly in
+          # the authentication provider's registrations controller
+          if session[:spree_user_signup]
+            fire_event('spree.user.signup', :user => try_spree_current_user, :order => current_order(true))
+          end
+
+          session[:guest_token] = nil
+          session[:spree_user_signup] = nil
+        end
+
+        def set_current_order
+          if user = try_spree_current_user
+            last_incomplete_order = user.last_incomplete_spree_order
+            if session[:order_id].nil? && last_incomplete_order
+              session[:order_id] = last_incomplete_order.id
+            elsif current_order && last_incomplete_order && current_order != last_incomplete_order
+              current_order.merge!(last_incomplete_order)
+            end
+          end
+        end
+      end
+    end
+  end
+end