spree_core 0.60.6 → 0.70.RC1

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -0,0 +1,105 @@
+require "rails/generators/rails/app/app_generator"
+
+module Spree
+  class DummyGenerator  < Rails::Generators::Base
+    desc "Creates blank Rails application, installs Spree and all sample data"
+
+    class_option :lib_name, :default => ''
+    class_option :database, :default => ''
+
+    def self.source_paths
+      paths = self.superclass.source_paths
+      paths << File.expand_path('../templates', __FILE__)
+      paths.flatten
+    end
+
+    def clean_up
+      remove_directory_if_exists(dummy_path)
+    end
+
+    PASSTHROUGH_OPTIONS = [
+      :skip_active_record, :skip_javascript, :database, :javascript, :quiet, :pretend, :force, :skip
+    ]
+
+    def generate_test_dummy
+      opts = (options || {}).slice(*PASSTHROUGH_OPTIONS)
+      opts[:database] = 'sqlite3' if opts[:database].blank?
+      opts[:force] = true
+      opts[:skip_bundle] = true
+
+      invoke Rails::Generators::AppGenerator,
+        [ File.expand_path(dummy_path, destination_root) ], opts
+    end
+
+    def test_dummy_config
+      @lib_name = options[:lib_name]
+      @database = options[:database]
+
+      template "rails/database.yml", "#{dummy_path}/config/database.yml", :force => true
+      template "rails/boot.rb", "#{dummy_path}/config/boot.rb", :force => true
+      template "rails/application.rb", "#{dummy_path}/config/application.rb", :force => true
+      template "rails/routes.rb", "#{dummy_path}/config/routes.rb", :force => true
+    end
+
+    def test_dummy_clean
+      inside dummy_path do
+        remove_file ".gitignore"
+        remove_file "doc"
+        remove_file "Gemfile"
+        remove_file "lib/tasks"
+        remove_file "app/assets/images/rails.png"
+        remove_file "public/index.html"
+        remove_file "public/robots.txt"
+        remove_file "README"
+        remove_file "test"
+        remove_file "vendor"
+      end
+    end
+
+    def cucumber_environment
+      template "cucumber/cucumber.rb", "#{dummy_path}/config/environments/cucumber.rb", :force => true
+    end
+
+    attr :lib_name
+    attr :database
+
+    protected
+    def dummy_path
+      'spec/dummy'
+    end
+
+    def module_name
+      'Dummy'
+    end
+
+    def application_definition
+      @application_definition ||= begin
+
+        dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
+        unless options[:pretend] || !File.exists?(dummy_application_path)
+          contents = File.read(dummy_application_path)
+          contents[(contents.index("module #{module_name}"))..-1]
+        end
+      end
+    end
+    alias :store_application_definition! :application_definition
+
+    def camelized
+      @camelized ||= name.gsub(/\W/, '_').squeeze('_').camelize
+    end
+
+    def remove_directory_if_exists(path)
+      run "rm -r #{path}" if File.directory?(path)
+    end
+
+    def gemfile_path
+      version_file = File.expand_path("../../Versionfile", Dir.pwd)
+      if File.exist?(version_file)
+        '../../../../Gemfile'
+      else
+        '../../../../../Gemfile'
+      end
+    end
+
+  end
+end

data/lib/generators/spree/dummy/templates/cucumber/cucumber.rb

@@ -0,0 +1,38 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+
+  config.action_mailer.default_url_options = { :host => 'testapp.com' }
+
+end

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

@@ -0,0 +1,10 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require(Rails.env)
+
+require '<%= lib_name %>'
+
+<%= application_definition %>
+

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

@@ -0,0 +1,6 @@
+require 'rubygems'
+gemfile = File.expand_path("<%= gemfile_path %>", __FILE__)
+
+ENV['BUNDLE_GEMFILE'] = gemfile
+require 'bundler'
+Bundler.setup

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

@@ -0,0 +1,30 @@
+login: &login
+<% if database == 'mysql' %>
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  pool: 5
+  username: root
+  password:
+  #socket: /tmp/mysql.sock
+<% else %>
+  adapter: sqlite3
+  pool: 5
+  timeout: 5000
+<% end %>
+
+development:
+  <<: *login
+  database: dummy_dev
+
+test:
+  <<: *login
+  database: dummy_test
+
+cucumber:
+  <<: *login
+  database: dummy_test
+
+production:
+  <<: *login
+  database: dummy_prod

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

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  mount <%= lib_name.classify %>::Engine => "/"
+end

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

@@ -0,0 +1,27 @@
+require "rails/generators/rails/app/app_generator"
+
+module Spree
+  class SandboxGenerator < Spree::DummyGenerator
+    desc "Creates blank Rails application, installs Spree and all sample data"
+
+    class_option :database, :default => ''
+
+    # skip cucumber environment for sandbox
+    def cucumber_environment
+    end
+
+    protected
+    def dummy_path
+      'sandbox'
+    end
+
+    def gemfile_path
+      '../../../Gemfile'
+    end
+
+    def module_name
+      'Sandbox'
+    end
+
+  end
+end

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

@@ -0,0 +1,79 @@
+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 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/scopes.rb

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

data/lib/spree/calculated_adjustments.rb

@@ -49,8 +49,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,8 +58,14 @@ 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)

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

@@ -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)