spree_core 1.0.0.rc1 → 1.0.0.rc2

data/app/views/spree/shared/_filters.html.erb

@@ -1,7 +1,7 @@
 <%= form_tag '', :method => :get, :id => 'sidebar_products_search' do %>
   <% params[:search] ||= {} %>
   <%= hidden_field_tag 'per_page', params[:per_page] %>
-  <% filters = @taxon ? @taxon.applicable_filters : [ProductFilters.all_taxons] %>
+  <% filters = @taxon ? @taxon.applicable_filters : [Spree::ProductFilters.all_taxons] %>
   <% filters.each do |filter| %>
     <% labels = filter[:labels] || filter[:conds].map {|m,c| [m,m]} %>
     <% next if labels.empty? %>

data/config/locales/en.yml

@@ -263,6 +263,7 @@ en:
   assign_taxons: "Assign Taxons"
   authorization_failure: "Authorization Failure"
   authorized: Authorized
+  availability: "Availability"
   available_on: "Available On"
   available_taxons: "Available Taxons"
   awaiting_return: Awaiting Return
@@ -493,12 +494,11 @@ en:
   live: "Live"
   loading: Loading
   locale_changed: "Locale Changed"
-  log_in: "Log In"
   logged_in_as: "Logged in as"
   logged_in_succesfully: "Logged in successfully"
   logged_out: "You have been logged out."
   login: Login
-  login_as_existing: "Log In as Existing Customer"
+  login_as_existing: "Login as Existing Customer"
   login_failed: "Login authentication failed."
   login_name: Login
   logout: Logout
@@ -511,6 +511,11 @@ en:
   make_refund: Make refund
   mark_shipped: "Mark Shipped"
   master_price: "Master Price"
+  match_choices:
+    none: "None"
+    one: "One"
+    all: "All"
+  match_rule: "Products That Must Match:"
   max_items: Max Items
   meta_description: "Meta Description"
   meta_keywords: "Meta Keywords"
@@ -662,6 +667,7 @@ en:
   previous: Previous
   price: Price
   price_bucket: Price Bucket
+  price_range: Price Range
   problem_authorizing_card: "Problem authorizing credit card"
   problem_capturing_card: "Problem capturing credit card"
   problems_processing_order: "We had problems processing your order"
@@ -884,6 +890,7 @@ en:
   shipping_categories: "Shipping Categories"
   shipping_categories_description: "Manage shipping categories to identify which products can be shipped via which method."
   shipping_category: Shipping Category
+  shipping_category_choose: "Shipping Category"
   shipping_cost: Cost
   shipping_error: "Shipping Error"
   shipping_instructions: "Shipping Instructions"

data/config/routes.rb

@@ -57,6 +57,7 @@ Spree::Core::Engine.routes.draw do
 
 
   namespace :admin do
+    resources :adjustments
     resources :zones
     resources :users
     resources :countries do

data/db/migrate/20120105193911_associate_shipping_methods_and_shipping_categories.rb

@@ -0,0 +1,7 @@
+class AssociateShippingMethodsAndShippingCategories < ActiveRecord::Migration
+  def change
+    change_table :spree_shipping_methods do |t|
+      t.references :shipping_category
+    end
+  end
+end

data/db/migrate/20120105195817_add_match_rules_to_shipping_methods.rb

@@ -0,0 +1,7 @@
+class AddMatchRulesToShippingMethods < ActiveRecord::Migration
+  def change
+    add_column :spree_shipping_methods, :match_none, :boolean
+    add_column :spree_shipping_methods, :match_all, :boolean
+    add_column :spree_shipping_methods, :match_one, :boolean
+  end
+end

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

@@ -41,6 +41,7 @@ module Spree
       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
+      template "rails/script/rails", "#{dummy_path}/spec/dummy/script/rails", :force => true
     end
 
     def test_dummy_clean

data/lib/generators/spree/dummy/templates/rails/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

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

@@ -0,0 +1,167 @@
+require 'rails/generators'
+require 'highline/import'
+require 'bundler'
+require 'bundler/cli'
+
+module Spree
+  class InstallGenerator < Rails::Generators::Base
+    class_option :migrate, :type => :boolean, :default => true, :banner => 'Run Spree migrations'
+    class_option :seed, :type => :boolean, :default => true, :banner => 'load seed data (migrations must be run)'
+    class_option :sample, :type => :boolean, :default => true, :banner => 'load sample data (migrations must be run)'
+    class_option :auto_accept, :type => :boolean
+    class_option :lib_name, :type => :string, :default => 'spree'
+
+    def self.source_paths
+      paths = self.superclass.source_paths
+      paths << File.expand_path('../templates', "../../#{__FILE__}")
+      paths << File.expand_path('../templates', "../#{__FILE__}")
+      paths << File.expand_path('../templates', __FILE__)
+      paths.flatten
+    end
+
+    def prepare_options
+      @run_migrations = options[:migrate]
+      @load_seed_data = options[:seed]
+      @load_sample_data = options[:sample]
+
+      unless @run_migrations
+         @load_seed_data = false
+         @load_sample_data = false
+      end
+    end
+
+    def add_files
+      template 'config/initializers/spree.rb', 'config/initializers/spree.rb'
+    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
+      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
+      @lib_name = 'spree'
+      %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 create_overrides_directory
+      empty_directory "app/overrides"
+    end
+
+    def configure_application
+      application <<-APP
+
+    config.to_prepare do
+      # Load application's model / class decorators
+      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
+      end
+
+      # Load application's view overrides
+      Dir.glob(File.join(File.dirname(__FILE__), "../app/overrides/*.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
+Spree::Core::Engine.load_seed if defined?(Spree::Core)
+Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
+      SEEDS
+    end
+
+    def install_migrations
+      say_status :copying, "migrations"
+      silence_stream(STDOUT) do
+        silence_warnings { rake 'railties:install:migrations' }
+      end
+    end
+
+    def run_migrations
+      if @run_migrations
+        say_status :running, "migrations"
+        rake('db:migrate')
+      else
+        say_status :skipping, "migrations (don't forget to run rake db:migrate)"
+      end
+    end
+
+    def populate_seed_data
+      if @load_seed_data
+        say_status :loading,  "seed data"
+        rake_options=[]
+        rake_options << "AUTO_ACCEPT=1" if options[:auto_accept]
+        rake("db:seed #{rake_options.join(' ')}")
+      else
+        say_status :skipping, "seed data (you can always run rake db:seed)"
+      end
+    end
+
+    def load_sample_data
+      if @load_sample_data
+        say_status :loading, "sample data"
+        rake('spree_sample:load')
+      else
+        say_status :skipping, "sample data (you can always run rake spree_sample:load)"
+      end
+    end
+
+    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"
+      end
+
+      unless options[:quiet]
+        puts "*" * 50
+        puts "We added the following line to your application's config/routes.rb file:"
+        puts " "
+        puts "    mount Spree::Core::Engine, :at => '/'"
+      end
+    end
+
+    def complete
+      unless options[:quiet]
+        puts "*" * 50
+        puts "Spree has been installed successfully. You're all ready to go!"
+        puts " "
+        puts "Enjoy!"
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,15 @@
+// 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 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("/", "_") %>
+<% end %>
+//= require_tree .

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

@@ -0,0 +1,15 @@
+// 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 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("/", "_") %>
+<% end %>
+//= require_tree .

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

@@ -0,0 +1,16 @@
+/*
+ * 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 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("/", "_") %>
+<% end %>
+ *= require_self
+ *= require_tree .
+*/

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

@@ -0,0 +1,16 @@
+/*
+ * 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 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("/", "_") %>
+<% end %>
+ *= require_self
+ *= require_tree .
+*/

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

@@ -0,0 +1,9 @@
+# Used to configure Spree Preferences
+# 
+# In order to override a default setting set: config.setting_name = 'new value'
+#
+Spree.config do |config|
+  # Example:
+  # Uncomment to override the default site name.
+  # config.site_name = "Spree Demo Site"
+end

data/lib/spree/core.rb

@@ -1,5 +1,5 @@
 #++
-# Copyright (c) 2007-2011, Rails Dog LLC and other contributors
+# Copyright (c) 2007-2012, Spree Commerce, Inc. and other contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -10,7 +10,7 @@
 #     * Redistributions in binary form must reproduce the above copyright notice,
 #       this list of conditions and the following disclaimer in the documentation
 #       and/or other materials provided with the distribution.
-#     * Neither the name of the Rails Dog LLC nor the names of its
+#     * Neither the name of the Spree Commerce, Inc. nor the names of its
 #       contributors may be used to endorse or promote products derived from this
 #       software without specific prior written permission.
 #

data/lib/spree/core/controller_helpers.rb

@@ -111,6 +111,12 @@ module Spree
           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)
+          session[:guest_token] = nil
+        end
 
         #RAILS 3 TODO
         # # Load all models using STI to fix associations such as @order.credits giving no results and resulting in incorrect order totals

data/lib/spree/core/engine.rb

@@ -69,7 +69,7 @@ module Spree
       end
 
       # sets the manifests / assets to be precompiled
-      initializer "spree.assets.precompile", :group => :assets do |app|
+      initializer "spree.assets.precompile" do |app|
         app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/orders/edit_form.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js', 'jquery.jstree/themes/apple/*']
       end
 

data/lib/spree/core/middleware/seo_assist.rb

@@ -10,13 +10,14 @@ module Spree
         def call(env)
           request = Rack::Request.new(env)
           params = request.params
+
           taxon_id = params['taxon']
 
           #redirect requests using taxon id's to their permalinks
           if !taxon_id.blank? && !taxon_id.is_a?(Hash) && taxon = Taxon.find(taxon_id)
             params.delete('taxon')
 
-            return build_response(params, "/t/#{taxon.permalink}" )
+            return build_response(params, "#{request.script_name}/t/#{taxon.permalink}" )
           elsif env["PATH_INFO"] =~ /^\/(t|products)(\/\S+)?\/$/
             #ensures no trailing / for taxon and product urls
 

data/lib/spree/core/ssl_requirement.rb

@@ -1,5 +1,5 @@
 # ++
-# Copyright (c) 2007-2011, Rails Dog LLC and other contributors
+# Copyright (c) 2007-2012, Spree Commerce, Inc. and other contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -10,7 +10,7 @@
 #     * Redistributions in binary form must reproduce the above copyright notice,
 #       this list of conditions and the following disclaimer in the documentation
 #       and/or other materials provided with the distribution.
-#     * Neither the name of the Rails Dog LLC nor the names of its
+#     * Neither the name of the Spree Commerce, Inc. nor the names of its
 #       contributors may be used to endorse or promote products derived from this
 #       software without specific prior written permission.
 #

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

@@ -8,7 +8,7 @@ namespace :common do
     require "#{ENV['LIB_NAME']}"
 
     Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--database=#{ENV['DB_NAME']}", "--quiet"]
-    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--quiet", "--auto-accept", "--skip-install-data", "--test_app"]
+    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--auto-accept", "--migrate=false", "--seed=false", "--sample=false"]
 
     puts "Setting up dummy database..."
     cmd = "bundle exec rake db:drop db:create db:migrate RAILS_ENV=test AUTO_ACCEPT=true"

data/lib/spree/core/testing_support/factories/shipping_method_factory.rb

@@ -10,4 +10,14 @@ FactoryGirl.define do
     name 'UPS Ground'
     calculator { |sm| Factory(:no_amount_calculator, :calculable_id => sm.object_id, :calculable_type => 'Spree::ShippingMethod') }
   end
+
+  factory :shipping_method_with_category, :class => Spree::ShippingMethod do
+    zone { |a| Spree::Zone.find_by_name('GlobalZone') || a.association(:global_zone) }
+    name 'UPS Ground'
+    calculator { |sm| Factory(:calculator, :calculable_id => sm.object_id, :calculable_type => 'Spree::ShippingMethod') }
+    match_none nil
+    match_one nil
+    match_all nil
+    association(:shipping_category, :factory => :shipping_category)
+  end
 end