spree_core 1.0.7 → 1.1.0.rc1

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

@@ -1,26 +1,54 @@
-login: &login
-<% if database == 'mysql' %>
+<% case ENV['DB']
+  when 'sqlite' %>
+development:
+  adapter: sqlite3
+  database: "db/spree_development.sqlite3"
+test:
+  adapter: sqlite3
+  database: "db/spree_test.sqlite3"
+production:
+  adapter: sqlite3
+  database: "db/spree_production.sqlite3"
+<% when 'mysql' %>
+development:
+  adapter: mysql2
+  database: spree_development
+  username:
+  encoding: utf8
+test:
+  adapter: mysql2
+  database: spree_test
+  username:
+  encoding: utf8
+production:
   adapter: mysql2
+  database: spree_production
+  username:
   encoding: utf8
-  reconnect: false
-  pool: 5
-  username: root
-  password:
-  #socket: /tmp/mysql.sock
+<% when 'postgres' %>
+development:
+  adapter: postgresql
+  database: spree_test
+  username: postgres
+  min_messages: warning
+test:
+  adapter: postgresql
+  database: spree_test
+  username: postgres
+  min_messages: warning
+production:
+  adapter: postgresql
+  database: spree_production
+  username: postgres
+  min_messages: warning
 <% else %>
-  adapter: sqlite3
-  pool: 5
-  timeout: 5000
-<% end %>
-
 development:
-  <<: *login
-  database: db/dummy_dev
-
+  adapter: sqlite3
+  database: "db/spree_development.sqlite3"
 test:
-  <<: *login
-  database: db/dummy_test
-
+  adapter: sqlite3
+  database: "db/spree_test.sqlite3"
 production:
-  <<: *login
-  database: db/dummy_prod
+  adapter: sqlite3
+  database: "db/spree_production.sqlite3"
+<% end %>

data/lib/generators/spree/install/install_generator.rb

@@ -114,6 +114,15 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
       end
     end
 
+    def create_database
+      say_status :creating, "database"
+      silence_stream(STDOUT) do
+        silence_stream(STDERR) do
+          silence_warnings { rake 'db:create' }
+        end
+      end
+    end
+
     def run_migrations
       if @run_migrations
         say_status :running, "migrations"
@@ -153,7 +162,14 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
 
     def notify_about_routes
       insert_into_file File.join('config', 'routes.rb'), :after => "Application.routes.draw do\n" do
-        "  # Mount Spree's routes\n  mount Spree::Core::Engine, :at => '/'\n"
+        %Q{
+  # This line mounts Spree's routes at the root of your application.
+  # This means, any requests to URLs such as /products, will go to Spree::ProductsController.
+  # If you would like to change where this engine is mounted, simply change the :at option to something different.
+  #
+  # We ask that you don't use the :as option here, as Spree relies on it being the default of "spree"
+  mount Spree::Core::Engine, :at => '/'
+        }
       end
 
       unless options[:quiet]

data/lib/generators/spree/install/templates/app/assets/javascripts/admin/all.js

@@ -7,7 +7,6 @@
 <% if options[:lib_name] == 'spree' %>
 //= require admin/spree_core
 //= require admin/spree_auth
-//= require admin/spree_api
 //= require admin/spree_promo
 <% else %>
 //= require admin/<%= options[:lib_name].gsub("/", "_") %>

data/lib/generators/spree/install/templates/app/assets/javascripts/store/all.js

@@ -7,7 +7,6 @@
 <% if options[:lib_name] == 'spree' %>
 //= require store/spree_core
 //= require store/spree_auth
-//= require store/spree_api
 //= require store/spree_promo
 <% else %>
 //= require store/<%= options[:lib_name].gsub("/", "_") %>

data/lib/generators/spree/install/templates/app/assets/stylesheets/admin/all.css

@@ -6,7 +6,6 @@
 <% if options[:lib_name] == 'spree' %>
  *= require admin/spree_core
  *= require admin/spree_auth
- *= require admin/spree_api
  *= require admin/spree_promo
 <% else %>
  *= require admin/<%= options[:lib_name].gsub("/", "_") %>

data/lib/generators/spree/install/templates/app/assets/stylesheets/store/all.css

@@ -6,7 +6,6 @@
 <% if options[:lib_name] == 'spree' %>
  *= require store/spree_core
  *= require store/spree_auth
- *= require store/spree_api
  *= require store/spree_promo
 <% else %>
  *= require store/<%= options[:lib_name].gsub("/", "_") %>

data/lib/generators/spree/sandbox/sandbox_generator.rb

@@ -4,14 +4,21 @@ module Spree
   class SandboxGenerator < Spree::DummyGenerator
     desc "Creates blank Rails application, installs Spree and all sample data"
 
-    class_option :database, :default => ''
-
     def self.source_paths
       paths = self.superclass.source_paths
       paths.unshift File.expand_path('../templates', __FILE__)
       paths.flatten
     end
 
+    def drop_database
+      say "dropping database"
+      inside dummy_path do
+        quietly do
+          rake 'db:drop -f sandbox/Rakefile'
+        end
+      end
+    end
+
     protected
     def dummy_path
       'sandbox'

data/lib/spree/core/calculated_adjustments.rb

@@ -5,51 +5,46 @@ module Spree
         def calculated_adjustments
           has_one   :calculator, :as => :calculable, :dependent => :destroy
           accepts_nested_attributes_for :calculator
-          attr_accessible :calculator_attributes
+          attr_accessible :calculator_type, :calculator_attributes
           validates :calculator, :presence => true
 
           def self.calculators
             Rails.application.config.spree.calculators.send(self.to_s.tableize.gsub('/', '_').sub('spree_', ''))
           end
-
-          include InstanceMethods
         end
       end
+        
+      def calculator_type
+        calculator.class.to_s if calculator
+      end
 
-      module InstanceMethods
-        def calculator_type
-          calculator.class.to_s if calculator
-        end
-
-        def calculator_type=(calculator_type)
-          clazz = calculator_type.constantize if calculator_type
-          self.calculator = clazz.new if clazz and not self.calculator.is_a? clazz
-        end
-
-        # Creates a new adjustment for the target object (which is any class that has_many :adjustments) and
-        # sets amount based on the calculator as applied to the calculable argument (Order, LineItems[], Shipment, etc.)
-        # By default the adjustment will not be considered mandatory
-        def create_adjustment(label, target, calculable, mandatory=false)
-          amount = compute_amount(calculable)
-          return if amount == 0 && !mandatory
-          target.adjustments.create({:amount => amount,
-                                     :source => calculable,
-                                     :originator => self,
-                                     :label => label,
-                                     :mandatory => mandatory}, :without_protection => true)
-        end
+      def calculator_type=(calculator_type)
+        clazz = calculator_type.constantize if calculator_type
+        self.calculator = clazz.new if clazz and not self.calculator.is_a? clazz
+      end
 
-        # Updates the amount of the adjustment using our Calculator and calling the +compute+ method with the +calculable+
-        # referenced passed to the method.
-        def update_adjustment(adjustment, calculable)
-          adjustment.update_attribute_without_callbacks(:amount, compute_amount(calculable))
-        end
+      # Creates a new adjustment for the target object (which is any class that has_many :adjustments) and
+      # sets amount based on the calculator as applied to the calculable argument (Order, LineItems[], Shipment, etc.)
+      # By default the adjustment will not be considered mandatory
+      def create_adjustment(label, target, calculable, mandatory=false)
+        amount = compute_amount(calculable)
+        return if amount == 0 && !mandatory
+        target.adjustments.create({ :amount => amount,
+                                    :source => calculable,
+                                    :originator => self,
+                                    :label => label,
+                                    :mandatory => mandatory}, :without_protection => true)
+      end
 
-        # Calculate the amount to be used when creating an adjustment
-        def compute_amount(calculable)
-          self.calculator.compute(calculable)
-        end
+      # Updates the amount of the adjustment using our Calculator and calling the +compute+ method with the +calculable+
+      # referenced passed to the method.
+      def update_adjustment(adjustment, calculable)
+        adjustment.update_attribute_without_callbacks(:amount, compute_amount(calculable))
+      end
 
+      # Calculate the amount to be used when creating an adjustment
+      def compute_amount(calculable)
+        self.calculator.compute(calculable)
       end
 
       def self.included(receiver)

data/lib/spree/core/controller_helpers.rb

@@ -2,8 +2,7 @@ module Spree
   module Core
     module ControllerHelpers
       def self.included(receiver)
-        receiver.send :include, InstanceMethods
-        receiver.send :layout, '/spree/layouts/spree_application'
+        receiver.send :layout, :get_layout
         receiver.send :helper, 'spree/hook'
         receiver.send :before_filter, 'instantiate_controller_and_action_names'
         receiver.send :before_filter, 'set_user_language'
@@ -12,35 +11,33 @@ module Spree
         receiver.send :helper_method, 'title='
         receiver.send :helper_method, 'accurate_title'
         receiver.send :helper_method, 'get_taxonomies'
-        receiver.send :helper_method, 'current_gateway'
         receiver.send :helper_method, 'current_order'
         receiver.send :include, SslRequirement
         receiver.send :include, Spree::Core::CurrentOrder
       end
 
-      module InstanceMethods
-        def access_forbidden
-          render :text => 'Access Forbidden', :layout => true, :status => 401
-        end
+      def access_forbidden
+        render :text => 'Access Forbidden', :layout => true, :status => 401
+      end
+
+      # can be used in views as well as controllers.
+      # e.g. <% title = 'This is a custom title for this view' %>
+      attr_writer :title
 
-        # 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
+      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
-            default_title
+            title_string
           end
+        else
+          default_title
         end
+      end
 
-        protected
+      protected
 
         def default_title
           Spree::Config[:site_name]
@@ -53,7 +50,7 @@ module Spree
 
         def render_404(exception = nil)
           respond_to do |type|
-            type.html { render :status => :not_found, :file    => "#{::Rails.root}/public/404.html", :layout => nil}
+            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
@@ -67,11 +64,10 @@ module Spree
         # add additional keys as appropriate. Override this method if you need additional data when
         # responding to a notification
         def default_notification_payload
-          { :user => (respond_to?(:current_user) && current_user),
-            :order => current_order(true) }
+          {:user => (respond_to?(:current_user) && current_user), :order => current_order}
         end
 
-        private
+      private
 
         def redirect_back_or_default(default)
           redirect_to(session["user_return_to"] || default)
@@ -87,11 +83,6 @@ module Spree
           @taxonomies ||= Taxonomy.includes(:root => :children).joins(:root)
         end
 
-        def current_gateway
-          ActiveSupport::Deprecation.warn "current_gateway is deprecated and will be removed in Spree > 1.0"
-          @current_gateway ||= Gateway.current
-        end
-
         def associate_user
           return unless current_user and current_order
           current_order.associate_user!(current_user)
@@ -99,11 +90,22 @@ module Spree
         end
 
         def set_user_language
-          locale = session[:locale] || Spree::Config[:default_locale] || Rails.application.config.i18n.default_locale
-          locale = I18n.default_locale unless locale && I18n.available_locales.map(&:to_s).include?(locale)
-          I18n.locale = locale
+          locale = session[:locale]
+          locale ||= Spree::Config[:default_locale] unless Spree::Config[:default_locale].blank?
+          locale ||= Rails.application.config.i18n.default_locale
+          locale ||= I18n.default_locale unless I18n.available_locales.include?(locale.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/custom_fixtures.rb

@@ -30,7 +30,7 @@ module Spree
                 connection,
                 table_name,
                 class_names[table_name.to_sym] || table_name.classify,
-                File.join(fixtures_directory, path))
+                ::File.join(fixtures_directory, path))
             end
 
             all_loaded_fixtures.update(fixtures_map)

data/lib/spree/core/delegate_belongs_to.rb

@@ -52,39 +52,37 @@ module DelegateBelongsTo
 
     protected
 
-    def get_association_column_names(association, without_default_rejected_delegate_columns=true)
-      begin
-        association_klass = reflect_on_association(association).klass
-        methods = association_klass.column_names
-        methods.reject!{|x|default_rejected_delegate_columns.include?(x.to_s)} if without_default_rejected_delegate_columns
-        return methods
-      rescue
-        return []
+      def get_association_column_names(association, without_default_rejected_delegate_columns=true)
+        begin
+          association_klass = reflect_on_association(association).klass
+          methods = association_klass.column_names
+          methods.reject!{|x|default_rejected_delegate_columns.include?(x.to_s)} if without_default_rejected_delegate_columns
+          return methods
+        rescue
+          return []
+        end
       end
-    end
 
-    ##
-    # initialize_association :belongs_to, :contact
-    def initialize_association(type, association, opts={})
-      raise 'Illegal or unimplemented association type.' unless [:belongs_to].include?(type.to_s.to_sym)
-      send type, association, opts if reflect_on_association(association).nil?
-    end
+      ##
+      # initialize_association :belongs_to, :contact
+      def initialize_association(type, association, opts={})
+        raise 'Illegal or unimplemented association type.' unless [:belongs_to].include?(type.to_s.to_sym)
+        send type, association, opts if reflect_on_association(association).nil?
+      end
 
     private
 
-    def class_def(name, method=nil, &blk)
-      class_eval { method.nil? ? define_method(name, &blk) : define_method(name, method) }
-    end
+      def class_def(name, method=nil, &blk)
+        class_eval { method.nil? ? define_method(name, &blk) : define_method(name, method) }
+      end
 
   end
 
-  module InstanceMethods
-    protected
-    def delegator_for(association)
-      send("#{association}=", self.class.reflect_on_association(association).klass.new) if send(association).nil?
-      send(association)
-    end
+  def delegator_for(association)
+    send("#{association}=", self.class.reflect_on_association(association).klass.new) if send(association).nil?
+    send(association)
   end
+  protected :delegator_for
 
 end
 

data/lib/spree/core/engine.rb

@@ -25,11 +25,11 @@ module Spree
 
       end
 
-      # We need to reload the routes here due to how Spree sets them up
-      # The different facets of Spree, (auth, promo, etc.) appends/prepends routes to Core
+      # We need to reload the routes here due to how Spree sets them up.
+      # The different facets of Spree (auth, promo, etc.) append/prepend routes to Core
       # *after* Core has been loaded.
       #
-      # So we wait until after initialization is complete to do one final reload
+      # So we wait until after initialization is complete to do one final reload.
       # This then makes the appended/prepended routes available to the application.
       config.after_initialize do
         Rails.application.routes_reloader.reload!

data/lib/spree/core/environment_extension.rb

@@ -3,26 +3,23 @@ module Spree
     module EnvironmentExtension
       extend ActiveSupport::Concern
 
-      module InstanceMethods
+      def add_class(name)
+        self.instance_variable_set "@#{name}", Set.new
 
-        def add_class(name)
-          self.instance_variable_set "@#{name}", Set.new
-          create_method( "#{name}=".to_sym ) { |val| 
-            instance_variable_set( "@" + name, val)
-          }
+        create_method( "#{name}=".to_sym ) { |val|
+          instance_variable_set( "@" + name, val)
+        }
 
-          create_method( name.to_sym ) { 
-            instance_variable_get( "@" + name ) 
-          }
+        create_method(name.to_sym) do
+          instance_variable_get( "@" + name )
         end
+      end
 
-        private
-
-          def create_method( name, &block )
-            self.class.send( :define_method, name, &block )
-          end
+      private
 
-      end
+        def create_method(name, &block)
+          self.class.send(:define_method, name, &block)
+        end
     end
   end
 end

data/lib/spree/core/mail_settings.rb

@@ -6,6 +6,7 @@ module Spree
       # This makes it possible to configure the mail settings
       # through an admin interface instead of requiring changes to the Rails envrionment file.
       def self.init
+        ActionMailer::Base.default_url_options[:host] = Spree::Config[:site_url]
         return unless mail_method = Spree::MailMethod.current
         if mail_method.prefers_enable_mail_delivery?
           mail_server_settings = {
@@ -24,7 +25,6 @@ module Spree
 
           ActionMailer::Base.smtp_settings = mail_server_settings
           ActionMailer::Base.perform_deliveries = true
-          ActionMailer::Base.default_url_options[:host] = Spree::Config[:site_url]
         else
           #logger.warn "NOTICE: Mail not enabled"
           ActionMailer::Base.perform_deliveries = false

data/lib/spree/core/permalinks.rb

@@ -11,10 +11,10 @@ module Spree
 
       module ClassMethods
         def make_permalink(options={})
-          options[:field] ||= "permalink"
+          options[:field] ||= :permalink
           self.permalink_options = options
 
-          validates_uniqueness_of permalink_options[:field]
+          validates permalink_options[:field], :uniqueness => true
 
           if self.table_exists? && self.column_names.include?(permalink_options[:field].to_s)
             before_validation(:on => :create) { save_permalink }
@@ -33,20 +33,29 @@ module Spree
           permalink_options[:field]
         end
 
+        def permalink_order
+          order = permalink_options[:order]
+
+          if order
+            "#{order} ASC,"
+          end
+        end
+
       end
 
-      module InstanceMethods
-        def save_permalink
-          permalink_value = self.to_param
-          field = self.class.permalink_field
-          # Do other links exist with this permalink?
-          other = self.class.first(
-            :conditions => "#{field} LIKE '#{permalink_value}%'",
-            :order => "LENGTH(#{field}) DESC, #{field} DESC"
-          )
-          if other
-            # Find the number of that permalink and add one.
-            if /-(\d+)$/.match(other.send(field))
+      def save_permalink
+        permalink_value = self.to_param
+        field = self.class.permalink_field
+        order = self.class.permalink_order
+        # Do other links exist with this permalink?
+        other = self.class.first(
+          :conditions => "#{field} LIKE '#{permalink_value}%'",
+          :order => "#{order} LENGTH(#{field}) DESC, #{field} DESC"
+        )
+        if other
+          # Find existence of that permalink or the number of that permalink and add one.
+          if ( permalink_value == other.send(field) || /-(\d+)$/.match(other.send(field)) )
+            if $1
               number = $1.to_i + 1
             # Otherwise default to suffixing it with a 1.
             else
@@ -55,9 +64,8 @@ module Spree
 
             permalink_value += "-#{number.to_s}"
           end
-          write_attribute(field, permalink_value)
         end
-
+        write_attribute(field, permalink_value)
       end
     end
   end

data/lib/spree/core/preference_rescue.rb

@@ -1,6 +1,6 @@
 module Spree
   class OldPrefs < ActiveRecord::Base
-    set_table_name "spree_preferences"
+    self.table_name = "spree_preferences"
     belongs_to  :owner, :polymorphic => true
     attr_accessor :owner_klass
   end

data/lib/spree/core/respond_with.rb

@@ -4,21 +4,26 @@ module ActionController
       raise "In order to use respond_with, first you need to declare the formats your " <<
             "controller responds to in the class level" if self.class.mimes_for_respond_to.empty?
 
-      if response = retrieve_response_from_mimes(&block)
+      if collector = retrieve_collector_from_mimes(&block)
         options = resources.size == 1 ? {} : resources.extract_options!
-        options.merge!(:default_response => response)
 
-        # following statement is not present in rails code. The action name is needed for processing
-        options.merge!(:action_name => action_name.to_sym)
-
-        # if responder is not specified then pass in Spree::Responder
-        (options.delete(:responder) || Spree::Responder).call(self, resources, options)
+        if defined_response = collector.response and Spree::BaseController.spree_responders.empty?
+          if action = options.delete(:action)
+            render :action => action
+          else
+            defined_response.call
+          end
+        else
+          # The action name is needed for processing
+          options.merge!(:action_name => action_name.to_sym)
+          # If responder is not specified then pass in Spree::Responder
+          (options.delete(:responder) || Spree::Responder).call(self, resources, options)
+        end
       end
     end
   end
 end
 
-
 module Spree
   module Core
     module RespondWith

data/lib/spree/core/responder.rb

@@ -9,8 +9,7 @@ module Spree
       class_name = controller.class.name.to_sym
       action_name = options.delete(:action_name)
 
-      if result = Spree::BaseController.spree_responders[class_name].try(:[],action_name).try(:[], self.format.to_sym)
-
+      if result = Spree::BaseController.spree_responders[class_name].try(:[], action_name).try(:[], self.format.to_sym)
         self.on_success = handler(controller, result, :success)
         self.on_failure = handler(controller, result, :failure)
       end