spree_core 0.60.6 → 0.70.0

data/config/initializers/workarounds_for_ruby19.rb

@@ -8,7 +8,7 @@ if RUBY_VERSION.to_f >= 1.9
 
     alias_method(:orig_concat, :concat)
     def concat(value)
-      orig_concat value.frozen? ? value : value.force_encoding(Encoding::UTF_8)
+      orig_concat value.frozen? || !value.respond_to?(:force_encoding) ? value : value.force_encoding(Encoding::UTF_8)
     end
   end
 

data/config/locales/en.yml

@@ -32,24 +32,7 @@ en:
         phone: Phone
         state: "State"
         zipcode: "Zip Code"
-      checkout:
-        bill_address:
-          address1: "Billing address street"
-          city: "Billing address city"
-          firstname: "Billing address first name"
-          lastname: "Billing address last name"
-          phone: "Billing address phone"
-          state: "Billing address state"
-          zipcode: "Billing address zipcode"
-        ship_address:
-          address1: "Shipping address street"
-          city: "Shipping address city"
-          firstname: "Shipping address first name"
-          lastname: "Shipping address last name"
-          phone: "Shipping address phone"
-          state: "Shipping address state"
-          zipcode: "Shipping address zipcode"
-      country:
+      country: 
         iso: ISO
         iso3: ISO3
         iso_name: "ISO Name"
@@ -67,6 +50,22 @@ en:
         price: Price
         quantity: Quantity
       order:
+        bill_address:
+          address1: "Billing address street"
+          city: "Billing address city"
+          firstname: "Billing address first name"
+          lastname: "Billing address last name"
+          phone: "Billing address phone"
+          state: "Billing address state"
+          zipcode: "Billing address zipcode"
+        ship_address:
+          address1: "Shipping address street"
+          city: "Shipping address city"
+          firstname: "Shipping address first name"
+          lastname: "Shipping address last name"
+          phone: "Shipping address phone"
+          state: "Shipping address state"
+          zipcode: "Shipping address zipcode"
         checkout_complete: "Checkout Complete"
         completed_at: "Completed At"
         coupon_code: "Coupon Code"
@@ -76,6 +75,11 @@ en:
         special_instructions: "Special Instructions"
         state: State
         total: Total
+      option_type:
+        name: Name
+        presentation: Presentation
+      payment_method:
+        name: Name
       product:
         available_on: "Available On"
         cost_price: "Cost Price"
@@ -119,6 +123,8 @@ en:
         name: Name
       user:
         email: Email
+        password: "Password"
+        password_confirmation: "Password Confirmation"
       variant:
         cost_price: "Cost Price"
         depth: Depth
@@ -228,11 +234,18 @@ en:
   adjustment_total: Adjustment Total
   adjustments: Adjustments
   administration: Administration
+  admin:
+    mail_methods:
+      send_testmail: 'Send Testmail'
+      testmail:
+        delivery_error: 'Testmail delivery error'
+        delivery_success: 'Testmail sent successfully'
+        error: 'Testmail error: %{e}'
   all: "All"
   all_departments: All departments
   allow_backorders: "Allow Backorders"
-  allow_ssl_to_be_used_when_in_developement_and_test_modes: Allow SSL to be used when in development and test modes
-  allow_ssl_to_be_used_when_in_production_mode: Allow SSL to be used in production mode
+  allow_ssl_in_development_and_test: Allow SSL to be used when in development and test modes
+  allow_ssl_in_production: Allow SSL to be used in production mode
   allowed_ssl_in_production_mode: "SSL will %{not} be used in production"
   already_registered: Already Registered?
   alt_text: Alternative Text
@@ -334,6 +347,9 @@ en:
   date_range: "Date Range"
   debit: Debit
   default: Default
+  default_meta_description: Default Meta Description
+  default_meta_keywords: Default Meta Keywords
+  default_seo_title: Default Seo Title
   delete: Delete
   delivery: Delivery
   depth: Depth
@@ -371,7 +387,7 @@ en:
   enable_login_via_openid: "Use OpenID instead"
   enable_mail_delivery: Enable Mail Delivery
   enter_exactly_as_shown_on_card: Please enter exactly as shown on the card
-  enter_atleast_five_letters: Enter atleast five letters of customer name
+  enter_at_least_five_letters: Enter at least five letters of customer name
   enter_password_to_confirm: "(we need your current password to confirm your changes)"
   environment: "Environment"
   error: error
@@ -383,6 +399,17 @@ en:
     one: "1 error prohibited this record from being saved"
     other: "%{count} errors prohibited this record from being saved"
   event: Event
+  events:
+    spree:
+      cart:
+        add: 'Add to cart'
+      checkout:
+        coupon_code_added: "Coupon code added"
+      order:
+        contents_changed: "Order contents changed"
+      user:
+        signup: 'User signup'
+      page_view: "Static page viewed"
   existing_customer: "Existing Customer"
   expiration: "Expiration"
   expiration_month: "Expiration Month"
@@ -438,6 +465,7 @@ en:
   included_in_other_shipment: Included in another Shipment
   included_in_this_shipment: Included in this Shipment
   instructions_to_reset_password: "Fill out the form below and instructions to reset your password will be emailed to you:"
+  insufficient_stock: "Insufficient stock available, only %{on_hand} remaining"
   integration_settings_warning: "If you are changing the billing integration, you must save first before you can edit the integration settings"
   intercept_email_address: Intercept Email Address
   intercept_email_instructions: "Override email recipient and replace with this address."
@@ -505,6 +533,7 @@ en:
   new_billing_integration: New Billing Integration
   new_category: "New category"
   new_customer: "New Customer"
+  new_group: New Group
   new_image: "New Image"
   new_mail_method: New Mail Method
   new_option_type: "New Option Type"
@@ -600,7 +629,7 @@ en:
   out_of_stock_products: "Out of Stock Products"
   over_paid: "Over Paid"
   overview: Overview
-  overview_welcome: "Welcome to your store overview, currently we do not have enough data to display the Overiew Dashboard.<br/><br/> The dashboard will display automatically once the system has sufficent orders to allow generation of the statistics."
+  overview_welcome: "Welcome to your store overview, currently we do not have enough data to display the Overview Dashboard.<br /><br /> The dashboard will display automatically once the system has sufficent orders to allow generation of the statistics."
   page_only_viewable_when_logged_in: You attempted to visit a page which can only be viewed when you are logged in
   page_only_viewable_when_logged_out: You attempted to visit a page which can only be viewed when you are logged out
   paid: Paid
@@ -903,12 +932,11 @@ en:
     date: Date
     time: Time
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information. Please check your information and try again."
+  spree_inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
   ssl_will_be_used_in_development_and_test_modes: "SSL will be used in development and test mode if necessary."
   ssl_will_be_used_in_production_mode: "SSL will be used in production mode"
   ssl_will_not_be_used_in_development_and_test_modes: "SSL will not be used in development and test mode if necessary."
   ssl_will_not_be_used_in_production_mode: "SSL will not be used in production mode"
-  spree_alert_checking: "Check for Spree security and release alerts"
-  spree_alert_not_checking: "Not checking for Spree security and release alerts"
   start: Start
   start_date: Valid from
   state: State
@@ -938,6 +966,7 @@ en:
   tax_type: "Tax Type"
   taxon: Taxon
   taxon_edit: Edit Taxon
+  taxonomу: Taxonomу
   taxonomies: Taxonomies
   taxonomies_setting_description: "Create and manage taxonomies."
   taxonomy_edit: "Edit taxonomy"
@@ -945,6 +974,11 @@ en:
   taxonomy_tree_instruction: "* Right click a child in the tree to access the menu for adding, deleting or sorting a child."
   taxons: Taxons
   test: "Test"
+  test_mailer:
+    test_email:
+      greeting: 'Congratulations!'
+      message: 'If you have received this email, then your email settings are correct.'
+      subject: 'Testmail'
   test_mode: Test Mode
   thank_you_for_your_order: "Thank you for your business.  Please print out a copy of this confirmation page for your records."
   there_were_problems_with_the_following_fields: "There were problems with the following fields"
@@ -992,6 +1026,7 @@ en:
     must_be_int: "must be an integer"
     must_be_non_negative: "must be a non-negative value"
   value: Value
+  variant: Variant
   variants: Variants
   vat: "VAT"
   version: Version

data/config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
 
-  root :to => 'products#index'
+  root :to => 'home#index'
 
   resources :products
 
@@ -111,7 +111,7 @@ Rails.application.routes.draw do
         post :update_positions
       end
     end
-    
+
     resources :properties do
       collection do
         get :filtered
@@ -159,11 +159,7 @@ Rails.application.routes.draw do
       end
     end
 
-    resource :general_settings do
-      collection do
-        post :dismiss_alert
-      end
-    end
+    resource :general_settings
 
     resources :taxonomies do
       member do
@@ -192,7 +188,12 @@ Rails.application.routes.draw do
 
     resources :trackers
     resources :payment_methods
-    resources :mail_methods
+    resources :mail_methods do
+      member do
+        post :testmail
+      end
+    end
+    
   end
 
   match '/admin' => 'admin/orders#index', :as => :admin

data/db/default/roles.yml

@@ -1,7 +1,5 @@
 admin_role:
-  id: 1
   name: admin
 
 user_role:
-  id: 2
-  name: user
+  name: user

data/db/migrate/20100419194457_fix_existing_coupon_credits.rb

@@ -0,0 +1,9 @@
+class FixExistingCouponCredits < ActiveRecord::Migration
+  def self.up
+    execute("UPDATE adjustments SET type='PromotionCredit' WHERE type='CouponCredit'")
+    execute("UPDATE adjustments SET adjustment_source_type='Promotion' WHERE adjustment_source_type='Coupon'")
+  end
+
+  def self.down
+  end
+end

data/db/migrate/20110329141434_create_activators.rb

@@ -0,0 +1,21 @@
+class CreateActivators < ActiveRecord::Migration
+  def self.up
+    create_table "activators", :force => true do |t|
+      t.string   "description"
+      t.datetime "expires_at"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.datetime "starts_at"
+      t.string   "name"
+      t.string   "event_name"
+      t.string   "type"
+    end
+  end
+
+  def self.down
+    drop_table :activators
+  end
+
+end
+
+

data/db/migrate/20110418151136_eligible_for_adjustments.rb

@@ -0,0 +1,9 @@
+class EligibleForAdjustments < ActiveRecord::Migration
+  def self.up
+    add_column :adjustments, :eligible, :boolean, :default => true
+  end
+
+  def self.down
+    remove_column :adjustments, :eligible
+  end
+end

data/db/seeds.rb

@@ -1,3 +1,5 @@
 # Loads seed data out of default dir
-Rake::Task["db:load_dir"].invoke( "default" )
-puts "Default data has been loaded"
+default_path = File.join(File.dirname(__FILE__), 'default')
+
+Rake::Task['db:load_dir'].reenable
+Rake::Task["db:load_dir"].invoke( default_path )

data/lib/custom_fixtures.rb

@@ -1,7 +1,68 @@
 require 'active_record/fixtures'
 
-class Fixtures < (RUBY_VERSION < '1.9' ? YAML::Omap : Hash)
-  def delete_existing_fixtures
-    # do nothing - we're intentionally not emptying the database since it has some structural data in it
+module Spree
+  class Fixtures < ActiveRecord::Fixtures
+    # Replace this method to prevent the table being emptied on each call. Needed
+    # when both core & auth have user fixtures, see below for code commented out.
+    #
+    def self.create_fixtures(fixtures_directory, table_names, class_names = {})
+      table_names = [table_names].flatten.map { |n| n.to_s }
+      table_names.each { |n|
+        class_names[n.tr('/', '_').to_sym] = n.classify if n.include?('/')
+      }
+
+      # FIXME: Apparently JK uses this.
+      connection = block_given? ? yield : ActiveRecord::Base.connection
+
+      files_to_read = table_names.reject { |table_name|
+        fixture_is_cached?(connection, table_name)
+      }
+
+      unless files_to_read.empty?
+        connection.disable_referential_integrity do
+          fixtures_map = {}
+
+          fixture_files = files_to_read.map do |path|
+            table_name = path.tr '/', '_'
+
+            fixtures_map[path] = ActiveRecord::Fixtures.new(
+              connection,
+              table_name,
+              class_names[table_name.to_sym] || table_name.classify,
+              File.join(fixtures_directory, path))
+          end
+
+          all_loaded_fixtures.update(fixtures_map)
+
+          connection.transaction(:requires_new => true) do
+            fixture_files.each do |ff|
+              conn = ff.model_class.respond_to?(:connection) ? ff.model_class.connection : connection
+              table_rows = ff.table_rows
+
+              # REMOVED BY SPREE
+              # table_rows.keys.each do |table|
+              #   conn.delete "DELETE FROM #{conn.quote_table_name(table)}", 'Fixture Delete'
+              # end
+
+              table_rows.each do |table_name,rows|
+                rows.each do |row|
+                  conn.insert_fixture(row, table_name)
+                end
+              end
+            end
+
+            # Cap primary key sequences to max(pk).
+            if connection.respond_to?(:reset_pk_sequence!)
+              table_names.each do |table_name|
+                connection.reset_pk_sequence!(table_name.tr('/', '_'))
+              end
+            end
+          end
+
+          cache_fixtures(connection, fixtures_map)
+        end
+      end
+      cached_fixtures(connection, table_names)
+    end
   end
 end

data/lib/environment_extension.rb

@@ -0,0 +1,26 @@
+module EnvironmentExtension
+  extend ActiveSupport::Concern
+
+  module InstanceMethods
+
+    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 ) { 
+        instance_variable_get( "@" + name ) 
+      }
+    end
+
+    private
+
+      def create_method( name, &block )
+        self.class.send( :define_method, name, &block )
+      end
+
+  end
+
+end
+

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

@@ -0,0 +1,106 @@
+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
+      opts[:old_style_hash] = 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