spree_core 0.60.6 → 0.70.0

data/lib/generators/spree/site/site_generator.rb

@@ -0,0 +1,87 @@
+require 'rails/generators'
+
+module Spree
+  class SiteGenerator < Rails::Generators::Base
+    argument :after_bundle_only, :type => :string, :default => "false"
+
+    class_option :lib_name, :default => 'spree'
+    attr :lib_name
+
+    def self.source_paths
+      [File.expand_path('../templates', __FILE__)]
+    end
+
+    def config_spree_yml
+      create_file "config/spree.yml" do
+        settings = { 'version' => Spree.version }
+
+        settings.to_yaml
+      end
+    end
+
+    def remove_unneeded_files
+      remove_file "public/index.html"
+    end
+
+    def additional_tweaks
+      @lib_name = options[:lib_name]
+
+      return unless File.exists? 'public/robots.txt'
+      append_file "public/robots.txt", <<-ROBOTS
+User-agent: *
+Disallow: /checkouts
+Disallow: /orders
+Disallow: /countries
+Disallow: /line_items
+Disallow: /password_resets
+Disallow: /states
+Disallow: /user_sessions
+Disallow: /users
+      ROBOTS
+    end
+
+    def setup_assets
+      remove_file "app/assets/javascripts/application.js"
+      remove_file "app/assets/stylesheets/application.css"
+      remove_file "app/assets/images/rails.png"
+
+      %w{javascripts stylesheets images}.each do |path|
+        empty_directory "app/assets/#{path}/store"
+        empty_directory "app/assets/#{path}/admin"
+      end
+
+      template "app/assets/javascripts/store/all.js"
+      template "app/assets/javascripts/admin/all.js"
+      template "app/assets/stylesheets/store/all.css"
+      template "app/assets/stylesheets/admin/all.css"
+    end
+
+    def configure_application
+      application <<-APP
+  config.middleware.use "SeoAssist"
+    config.middleware.use "RedirectLegacyProductUrl"
+
+    config.to_prepare do
+      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
+      end
+    end
+      APP
+
+      append_file "config/environment.rb", "\nActiveRecord::Base.include_root_in_json = true\n"
+    end
+
+    def include_seed_data
+      append_file "db/seeds.rb", <<-SEEDS
+\n
+SpreeCore::Engine.load_seed if defined?(SpreeCore)
+SpreeAuth::Engine.load_seed if defined?(SpreeAuth)
+      SEEDS
+    end
+
+    def install_migrations
+      silence_warnings { run 'bundle exec rake railties:install:migrations' }
+    end
+
+  end
+end

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

@@ -0,0 +1,16 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+<% if lib_name == 'spree' %>
+//= require admin/spree_core
+//= require admin/spree_auth
+//= require admin/spree_api
+//= require admin/spree_dash
+//= require admin/spree_promo
+<% else %>
+//= require admin/<%= lib_name %>
+<% end %>
+//= require_tree .

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

@@ -0,0 +1,16 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+<% if lib_name == 'spree' %>
+//= require store/spree_core
+//= require store/spree_auth
+//= require store/spree_api
+//= require store/spree_dash
+//= require store/spree_promo
+<% else %>
+//= require store/<%= lib_name %>
+<% end %>
+//= require_tree .

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

@@ -0,0 +1,17 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *
+<% if lib_name == 'spree' %>
+ *= require admin/spree_core
+ *= require admin/spree_auth
+ *= require admin/spree_api
+ *= require admin/spree_promo
+ *= require admin/spree_dash
+<% else %>
+ *= require admin/<%= lib_name %>
+<% end %>
+ *= require_self
+ *= require_tree .
+*/

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

@@ -0,0 +1,17 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *
+<% if lib_name == 'spree' %>
+ *= require store/spree_core
+ *= require store/spree_auth
+ *= require store/spree_api
+ *= require store/spree_promo
+ *= require store/spree_dash
+<% else %>
+ *= require store/<%= lib_name %>
+<% end %>
+ *= require_self
+ *= require_tree .
+*/

data/lib/product_filters.rb

@@ -2,6 +2,14 @@
 #   the exact code probably won't be useful, though you're welcome to modify and reuse
 #   the current contents are mainly for testing and documentation
 
+# To override this file...
+#   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'
+#
+
 # set up some basic filters for use with products
 #
 # Each filter has two parts

data/lib/scopes/product.rb

@@ -50,9 +50,9 @@ module Scopes::Product
     Product.send(:scope, name.to_s, Product.send(:relation).order(order_text) )
   end
 
-  ::Product.scope :ascend_by_master_price, Product.joins(:variants_with_only_master).order('variants.price asc')
+  ::Product.scope :ascend_by_master_price, Product.joins(:variants_with_only_master).order("#{Variant.table_name}.price asc")
 
-  ::Product.scope :descend_by_master_price, Product.joins(:variants_with_only_master).order('variants.price desc')
+  ::Product.scope :descend_by_master_price, Product.joins(:variants_with_only_master).order("#{Variant.table_name}.price desc")
 
   ATTRIBUTE_HELPER_METHODS = {
     :with_ids => :product_picker_field
@@ -74,15 +74,15 @@ module Scopes::Product
 
 
   ::Product.scope :price_between, lambda { |low, high|
-    { :joins => :master, :conditions => ["variants.price BETWEEN ? AND ?", low, high] }
+    { :joins => :master, :conditions => ["#{Variant.table_name}.price BETWEEN ? AND ?", low, high] }
   }
 
   ::Product.scope :master_price_lte, lambda { |price|
-    { :joins => :master, :conditions => ["variants.price <= ?", price] }
+    { :joins => :master, :conditions => ["#{Variant.table_name}.price <= ?", price] }
   }
 
   ::Product.scope :master_price_gte, lambda { |price|
-    { :joins => :master, :conditions => ["variants.price >= ?", price] }
+    { :joins => :master, :conditions => ["#{Variant.table_name}.price >= ?", price] }
   }
 
 
@@ -92,7 +92,7 @@ module Scopes::Product
   #   Product.taxons_id_eq(x)
   #
   ::Product.scope :in_taxon, lambda {|taxon|
-    { :joins => :taxons, :conditions => ["taxons.id IN (?) ", taxon.self_and_descendants.map(&:id)]}
+    { :joins => :taxons, :conditions => ["#{Taxon.table_name}.id IN (?) ", taxon.self_and_descendants.map(&:id)]}
   }
 
   # This scope selects products in all taxons AND all its descendants

data/lib/scopes.rb

@@ -66,4 +66,4 @@ end
 #   def to_sql
 #     construct_finder_sql({})
 #   end
-# end
+# end

data/lib/spree/calculated_adjustments.rb

@@ -5,15 +5,9 @@ module Spree::CalculatedAdjustments
       accepts_nested_attributes_for :calculator
       validates :calculator, :presence => true if options[:require]
 
-      class_attribute :calculators
-      self.calculators = Set.new
-      # @available_calculators = []
-      def register_calculator(calculator)
-        self.calculators.add(calculator)
+      def self.calculators
+        Rails.application.config.spree.calculators.send(self.to_s.tableize.gsub("/", "_"))
       end
-      # def calculators
-      #   @available_calculators
-      # end
 
       if options[:default]
         default_calculator_class = options[:default]
@@ -31,6 +25,11 @@ module Spree::CalculatedAdjustments
         end
       end
 
+      #Remove in 0.80.0
+      def self.register(*args)
+        ActiveSupport::Deprecation.warn("Calculator registration has changed, add your calculator to the relevant Rails.application.config.spree.calculators collection.", caller)
+      end
+
       include InstanceMethods
     end
   end
@@ -49,8 +48,7 @@ module Spree::CalculatedAdjustments
     # 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 = self.calculator.compute(calculable)
-      target.adjustments.create(:amount => amount,  :source => calculable,
+      a = target.adjustments.create(:amount => compute_amount(calculable),  :source => calculable,
                                                     :originator => self,
                                                     :label => label,
                                                     :mandatory => mandatory)
@@ -59,11 +57,18 @@ module Spree::CalculatedAdjustments
     # 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, self.calculator.compute(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
+
   end
 
   def self.included(receiver)
     receiver.extend Spree::CalculatedAdjustments::ClassMethods
   end
 end
+

data/lib/spree/environment/calculators.rb

@@ -0,0 +1,10 @@
+module Spree
+  class Environment
+    class Calculators
+      include EnvironmentExtension
+
+      attr_accessor :shipping_methods, :tax_rates
+    end
+  end
+end
+

data/lib/spree/environment.rb

@@ -0,0 +1,12 @@
+module Spree
+
+  class Environment
+    include EnvironmentExtension
+
+    attr_accessor :calculators, :payment_methods
+
+    def initialize
+      @calculators = Calculators.new
+    end
+  end
+end

data/lib/spree/search/base.rb

@@ -12,11 +12,7 @@ module Spree::Search
       @products_scope = @product_group.apply_on(base_scope)
       curr_page = manage_pagination && keywords ? 1 : page
 
-      @products = @products_scope.paginate({
-          :include  => [:images, :master],
-          :per_page => per_page,
-          :page     => curr_page
-        })
+      @products = @products_scope.includes([:images, :master]).page(curr_page).per(per_page)
     end
 
     def method_missing(name)

data/lib/spree_base.rb

@@ -9,15 +9,15 @@ module SpreeBase
     attr_writer :title
 
     def title
-      title_string = @title.blank? ? accurate_title : @title
-      if title_string.blank?
-        default_title
-      else
+      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
 
@@ -58,6 +58,18 @@ module SpreeBase
       end
     end
 
+    # 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 => (respond_to?(:current_user) && current_user), :order => current_order}
+    end
+
     private
 
     def redirect_back_or_default(default)
@@ -71,8 +83,7 @@ module SpreeBase
     end
 
     def get_taxonomies
-      @taxonomies ||= Taxonomy.includes(:root => :children)
-      @taxonomies.reject { |t| t.root.nil? }
+      @taxonomies ||= Taxonomy.includes(:root => :children).joins(:root)
     end
 
     def current_gateway

data/lib/spree_core/ext/active_record.rb

@@ -2,7 +2,7 @@ module ActiveRecord::Persistence
 
   # Update attributes of a record in the database without callbacks, validations etc.
   def update_attributes_without_callbacks(attributes)
-    self.send(:attributes=, attributes, false)
+    self.assign_attributes(attributes, :without_protection => true)
     self.class.update_all(attributes, { :id => id })
   end
 

data/lib/spree_core/preferences/model_hooks.rb

@@ -96,10 +96,10 @@ module Spree
         #   user.save!  # => true
         def preference(name, *args)
           unless included_modules.include?(InstanceMethods)
-            class_inheritable_hash :preference_definitions
+            class_attribute :preference_definitions
             self.preference_definitions = {}
 
-            class_inheritable_hash :default_preferences
+            class_attribute :default_preferences
             self.default_preferences = {}
 
             has_many  :stored_preferences, :as => :owner, :class_name => 'Preference'
@@ -108,7 +108,11 @@ module Spree
 
             include Spree::Preferences::ModelHooks::InstanceMethods
           end
-
+          
+          # Reset definitions so that other subclass definitions aren't inherited
+          self.preference_definitions = self.preference_definitions.dup
+          self.default_preferences = self.default_preferences.dup
+          
           # Create the definition
           name = name.to_s
           definition = PreferenceDefinition.new(name, *args)

data/lib/spree_core/railtie.rb

@@ -1,18 +1,42 @@
 module SpreeCore
   class Engine < Rails::Engine
+    engine_name 'spree_core'
 
     config.autoload_paths += %W(#{config.root}/lib)
-    # TODO - register state monitor observer?
 
     def self.activate
+    end
+
+    config.to_prepare &method(:activate).to_proc
 
-      Spree::ThemeSupport::HookListener.subclasses.each do |hook_class|
-        Spree::ThemeSupport::Hook.add_listener(hook_class)
+    config.after_initialize do
+      ActiveSupport::Notifications.subscribe(/^spree\./) do |*args|
+        event_name, start_time, end_time, id, payload = args
+        Activator.active.event_name_starts_with(event_name).each do |activator|
+          activator.activate(payload)
+        end
       end
+    end
 
-      #register all payment methods (unless we're in middle of rake task since migrations cannot be run for this first time without this check)
-      if File.basename( $0 ) != "rake"
-        [
+    initializer "spree.environment" do |app|
+      app.config.spree = Spree::Environment.new
+    end
+
+    initializer "spree.register.calculators" do |app|
+      app.config.spree.calculators.shipping_methods = [
+          Calculator::FlatPercentItemTotal,
+          Calculator::FlatRate,
+          Calculator::FlexiRate,
+          Calculator::PerItem,
+          Calculator::PriceBucket]
+
+       app.config.spree.calculators.tax_rates = [
+          Calculator::SalesTax,
+          Calculator::Vat]
+    end
+
+    initializer "spree.register.payment_methods" do |app|
+      app.config.spree.payment_methods = [
           Gateway::Bogus,
           Gateway::AuthorizeNet,
           Gateway::AuthorizeNetCim,
@@ -22,42 +46,24 @@ module SpreeCore
           Gateway::SagePay,
           Gateway::Beanstream,
           Gateway::Braintree,
-          PaymentMethod::Check
-        ].each{|gw|
-          begin
-            gw.register
-          rescue Exception => e
-            $stderr.puts "Error registering gateway #{gw}: #{e}"
-          end
-        }
-
-        #register all calculators
-        [
-          Calculator::FlatPercentItemTotal,
-          Calculator::FlatRate,
-          Calculator::FlexiRate,
-          Calculator::PerItem,
-          Calculator::SalesTax,
-          Calculator::Vat,
-          Calculator::PriceBucket
-        ].each{|c_model|
-          begin
-            c_model.register if c_model.table_exists?
-          rescue Exception => e
-            $stderr.puts "Error registering calculator #{c_model}"
-          end
-        }
-
-      end
-
+          PaymentMethod::Check ]
     end
 
-    config.to_prepare &method(:activate).to_proc
-
     # filter sensitive information during logging
     initializer "spree.params.filter" do |app|
       app.config.filter_parameters += [:password, :password_confirmation, :number]
     end
 
+    # sets the manifests / assets to be precompiled
+    initializer "spree.assets.precompile", :group => :assets do |app|
+      app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/spree_dash.*', 'admin/orders/edit_form.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js']
+    end
+
+    # turn off asset debugging since that kills performance in development mode
+    initializer "spree.asset.pipeline" do |app|
+      app.config.assets.debug = false
+    end
+
+
   end
 end

data/lib/spree_core/ssl_requirement.rb

@@ -1,5 +1,5 @@
 # ++
-# Copyright (c) 2007-2010, Rails Dog LLC and other contributors
+# Copyright (c) 2007-2011, Rails Dog LLC and other contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/spree_core/testing_support/common_rake.rb

@@ -0,0 +1,12 @@
+desc "Generates a dummy app for testing"
+namespace :common do
+  task :test_app do
+    require "#{ENV['LIB_NAME']}"
+
+    Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--database=#{ENV['DB_NAME']}"]
+    Spree::SiteGenerator.start ["--lib_name=#{ENV['LIB_NAME']}"]
+
+    cmd = "bundle exec rake db:drop db:create db:migrate db:seed RAILS_ENV=test AUTO_ACCEPT=true"
+    puts cmd; system cmd
+  end
+end

data/lib/spree_core/testing_support/factories/activator_factory.rb

@@ -0,0 +1,6 @@
+Factory.define :activator do |f|
+  f.name 'Activator name'
+  f.event_name 'spree.order.contents_changed'
+  f.starts_at 2.weeks.ago
+  f.expires_at 2.weeks.from_now
+end

data/lib/spree_core/testing_support/factories/adjustment_factory.rb

@@ -3,4 +3,5 @@ Factory.define :adjustment do  |f|
   f.amount "100.0"
   f.label 'Shipping'
   f.source { Factory(:shipment) }
+  f.eligible true
 end

data/lib/spree_core/testing_support/factories/calculator_factory.rb

@@ -3,3 +3,9 @@ Factory.define :calculator, :class => Calculator::FlatRate do |f|
     c.set_preference(:amount, 10.0)
   end
 end
+
+Factory.define :no_amount_calculator, :class => Calculator::FlatRate do |f|
+  f.after_create do |c|
+    c.set_preference(:amount, 0)
+  end
+end

data/lib/spree_core/testing_support/factories/order_factory.rb

@@ -1,10 +1,11 @@
-Factory.define(:order) do |record|
+Factory.define(:order) do |f|
   # associations:
-  record.association(:user, :factory => :user)
-  record.association(:bill_address, :factory => :address)
-  record.completed_at nil
-  record.bill_address_id nil
-  record.ship_address_id nil
+  f.association(:user, :factory => :user)
+  f.association(:bill_address, :factory => :address)
+  f.completed_at nil
+  f.bill_address_id nil
+  f.ship_address_id nil
+  f.email 'foo@example.com'
 end
 
 Factory.define :order_with_totals, :parent => :order do |f|

data/lib/spree_core/testing_support/factories/product_factory.rb

@@ -14,3 +14,9 @@ Factory.define :product do |f|
   f.available_on { 1.year.ago }
   f.deleted_at nil
 end
+
+Factory.define :product_with_option_types, :parent => :product do |f|
+  f.after_create do |product|
+    Factory(:product_option_type, :product => product)
+  end
+end

data/lib/spree_core/testing_support/factories/user_factory.rb

@@ -1,15 +1,19 @@
-unless Factory.factories.keys.include?(:user)
-  Factory.define(:user) do |f|
-    f.email { Faker::Internet.email }
-    f.password "spree123"
-    f.password_confirmation "spree123"
-  end
+Factory.sequence :login do |n|
+  Faker::Internet.user_name + n.to_s
 end
 
-Factory.define(:admin_user, :parent => :user) do |u|
-  u.roles { [Role.find_by_name("admin") || Factory(:role, :name => "admin")]}
+Factory.sequence :user_authentication_token do |n|
+  "xxxx#{Time.now.to_i}#{rand(1000)}#{n}xxxxxxxxxxxxx"
 end
 
-Factory.sequence :login do |n|
-  Faker::Internet.user_name + n.to_s
+Factory.define :user do |f|
+  f.email { Faker::Internet.email }
+  f.login { |u| u.email }
+  f.password "secret"
+  f.password_confirmation "secret"
+  f.authentication_token { Factory.next(:user_authentication_token) } if User.attribute_method? :authentication_token
+end
+
+Factory.define(:admin_user, :parent => :user) do |u|
+  u.roles { [Role.find_by_name("admin") || Factory(:role, :name => "admin")]}
 end

data/lib/spree_core/testing_support/factories/zone_factory.rb

@@ -10,7 +10,7 @@ Factory.define(:global_zone, :class => Zone) do |record|
 end
 
 Factory.define(:zone) do |f|
-  f.name { Faker::Lorem.words }
+  f.name { Faker::Lorem.words.join(' ') }
   f.description { Faker::Lorem.sentence }
   f.zone_members do |member|
     [ZoneMember.create(:zoneable => Factory(:country) )]