spree_core 2.1.3 → 2.1.4

data/app/models/spree/zone.rb

@@ -128,7 +128,7 @@ module Spree
 
       def remove_defunct_members
         if zone_members.any?
-          zone_members.where('zoneable_id IS NULL OR zoneable_type != ?', "Spree::#{kind.capitalize}").destroy_all
+          zone_members.where('zoneable_id IS NULL OR zoneable_type != ?', "Spree::#{kind.classify}").destroy_all
         end
       end
 

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

@@ -6,5 +6,5 @@
     Spree.routes = {}
   }
   Spree.routes.states_search = "<%= spree.api_states_path(:format => 'json') %>"
+  Spree.routes.root = "<%= spree.root_url if spree.respond_to? :root_url %>"
 </script>
-

data/config/locales/en.yml

@@ -357,12 +357,15 @@ en:
     attachment_url: Attachments URL
     authorization_failure: Authorization Failure
     available_on: Available On
+    avs_response: AVS Response
     back: Back
     back_end: Backend
+    backordered: Backordered
     back_to_adjustments_list: Back To Adjustments List
     back_to_images_list: Back To Images List
     back_to_option_types_list: Back To Option Types List
     back_to_orders_list: Back To Orders List
+    back_to_payment: Back To Payment
     back_to_payment_methods_list: Back To Payment Methods List
     back_to_payments_list: Back To Payments List
     back_to_products_list: Back To Products List
@@ -466,6 +469,7 @@ en:
     customer_details_updated: Customer Details Updated
     customer_search: Customer Search
     cut: Cut
+    cvv_response: CVV Response
     dash:
       jirafe:
         app_id: App ID
@@ -550,6 +554,7 @@ en:
       count_on_hand_setter: Cannot set count_on_hand manually, as it is set automatically by the recalculate_count_on_hand callback. Please use `update_column(:count_on_hand, value)` instead.
     expiration: Expiration
     extension: Extension
+    failed_payment_attempts: Failed Payment Attempts
     filename: Filename
     fill_in_customer_info: Please fill in customer info
     filter_results: Filter Results
@@ -635,6 +640,8 @@ en:
     locale_changed: Locale Changed
     location: Location
     lock: Lock
+    log_entries: "Log Entries"
+    logs: "Logs"
     logged_in_as: Logged in as
     logged_in_succesfully: Logged in successfully
     logged_out: You have been logged out.
@@ -762,7 +769,7 @@ en:
         thanks: Thank you for your business.
         total: ! 'Order Total: %{total}'
     order_not_found: We couldn't find your order. Please try that action again.
-    order_number: Order
+    order_number: Order %{number}
     order_populator:
       out_of_stock: ! '%{item} is out of stock.'
       selected_quantity_not_available: ! 'Selected quantity of %{item} is not available.'
@@ -917,6 +924,8 @@ en:
     return_quantity: Return Quantity
     returned: Returned
     review: Review
+    risk: Risk
+    risk_analysis: Risk Analysis
     rma_credit: RMA Credit
     rma_number: RMA Number
     rma_value: RMA Value
@@ -931,6 +940,7 @@ en:
     sales_total_description: Sales Total For All Orders
     sales_totals: Sales Totals
     save_and_continue: Save and Continue
+    save_my_address: Save my address
     say_no: 'No'
     say_yes: 'Yes'
     scope: Scope
@@ -964,6 +974,7 @@ en:
     shipment_state: Shipment State
     shipment_states:
       backorder: backorder
+      canceled: canceled
       partial: partial
       pending: pending
       ready: ready
@@ -1028,6 +1039,7 @@ en:
     street_address_2: Street Address (cont'd)
     subtotal: Subtotal
     subtract: Subtract
+    success: Success
     successfully_created: ! '%{resource} has been successfully created!'
     successfully_removed: ! '%{resource} has been successfully removed!'
     successfully_signed_up_for_analytics: Successfully signed up for Spree Analytics
@@ -1062,6 +1074,8 @@ en:
     time: Time
     to_add_variants_you_must_first_define: To add variants, you must first define
     total: Total
+    total_price: Total price
+    track_inventory: Track Inventory
     tracking: Tracking
     tracking_number: Tracking Number
     tracking_url: Tracking URL

data/db/default/spree/countries.rb

@@ -27,7 +27,7 @@ Spree::Country.create!([
   { name: "Jamaica", iso3: "JAM", iso: "JM", iso_name: "JAMAICA", numcode: "388" },
   { name: "Japan", iso3: "JPN", iso: "JP", iso_name: "JAPAN", numcode: "392" },
   { name: "Jordan", iso3: "JOR", iso: "JO", iso_name: "JORDAN", numcode: "400" },
-  { name: "Belgium", iso3: "BEL", iso: "BE", iso_name: "BELGIUM", numcode: "56", states_required: true },
+  { name: "Belgium", iso3: "BEL", iso: "BE", iso_name: "BELGIUM", numcode: "56" },
   { name: "Belize", iso3: "BLZ", iso: "BZ", iso_name: "BELIZE", numcode: "84" },
   { name: "Kazakhstan", iso3: "KAZ", iso: "KZ", iso_name: "KAZAKHSTAN", numcode: "398" },
   { name: "Uganda", iso3: "UGA", iso: "UG", iso_name: "UGANDA", numcode: "800" },
@@ -48,7 +48,7 @@ Spree::Country.create!([
   { name: "South Korea", iso3: "KOR", iso: "KR", iso_name: "KOREA, REPUBLIC OF", numcode: "410" },
   { name: "Moldova, Republic of", iso3: "MDA", iso: "MD", iso_name: "MOLDOVA, REPUBLIC OF", numcode: "498" },
   { name: "United States", iso3: "USA", iso: "US", iso_name: "UNITED STATES", numcode: "840", states_required: true },
-  { name: "Bosnia and Herzegovina", iso3: "BIH", iso: "BA", iso_name: "BOSNIA AND HERZEGOVINA", numcode: "70", states_required: true },
+  { name: "Bosnia and Herzegovina", iso3: "BIH", iso: "BA", iso_name: "BOSNIA AND HERZEGOVINA", numcode: "70" },
   { name: "Czech Republic", iso3: "CZE", iso: "CZ", iso_name: "CZECH REPUBLIC", numcode: "203" },
   { name: "Kuwait", iso3: "KWT", iso: "KW", iso_name: "KUWAIT", numcode: "414" },
   { name: "Monaco", iso3: "MCO", iso: "MC", iso_name: "MONACO", numcode: "492" },
@@ -99,7 +99,7 @@ Spree::Country.create!([
   { name: "Sweden", iso3: "SWE", iso: "SE", iso_name: "SWEDEN", numcode: "752" },
   { name: "Honduras", iso3: "HND", iso: "HN", iso_name: "HONDURAS", numcode: "340" },
   { name: "Rwanda", iso3: "RWA", iso: "RW", iso_name: "RWANDA", numcode: "646" },
-  { name: "Switzerland", iso3: "CHE", iso: "CH", iso_name: "SWITZERLAND", numcode: "756", states_required: true },
+  { name: "Switzerland", iso3: "CHE", iso: "CH", iso_name: "SWITZERLAND", numcode: "756" },
   { name: "Hong Kong", iso3: "HKG", iso: "HK", iso_name: "HONG KONG", numcode: "344" },
   { name: "Syrian Arab Republic", iso3: "SYR", iso: "SY", iso_name: "SYRIAN ARAB REPUBLIC", numcode: "760" },
   { name: "Taiwan", iso3: "TWN", iso: "TW", iso_name: "TAIWAN, PROVINCE OF CHINA", numcode: "158" },
@@ -109,7 +109,7 @@ Spree::Country.create!([
   { name: "Aruba", iso3: "ABW", iso: "AW", iso_name: "ARUBA", numcode: "533" },
   { name: "Australia", iso3: "AUS", iso: "AU", iso_name: "AUSTRALIA", numcode: "36", states_required: true },
   { name: "Thailand", iso3: "THA", iso: "TH", iso_name: "THAILAND", numcode: "764" },
-  { name: "Austria", iso3: "AUT", iso: "AT", iso_name: "AUSTRIA", numcode: "40", states_required: true },
+  { name: "Austria", iso3: "AUT", iso: "AT", iso_name: "AUSTRIA", numcode: "40" },
   { name: "Madagascar", iso3: "MDG", iso: "MG", iso_name: "MADAGASCAR", numcode: "450" },
   { name: "Togo", iso3: "TGO", iso: "TG", iso_name: "TOGO", numcode: "768" },
   { name: "Azerbaijan", iso3: "AZE", iso: "AZ", iso_name: "AZERBAIJAN", numcode: "31" },
@@ -118,7 +118,7 @@ Spree::Country.create!([
   { name: "Tokelau", iso3: "TKL", iso: "TK", iso_name: "TOKELAU", numcode: "772" },
   { name: "Bahamas", iso3: "BHS", iso: "BS", iso_name: "BAHAMAS", numcode: "44" },
   { name: "China", iso3: "CHN", iso: "CN", iso_name: "CHINA", numcode: "156" },
-  { name: "Malaysia", iso3: "MYS", iso: "MY", iso_name: "MALAYSIA", numcode: "458", states_required: true },
+  { name: "Malaysia", iso3: "MYS", iso: "MY", iso_name: "MALAYSIA", numcode: "458" },
   { name: "Tonga", iso3: "TON", iso: "TO", iso_name: "TONGA", numcode: "776" },
   { name: "Bahrain", iso3: "BHR", iso: "BH", iso_name: "BAHRAIN", numcode: "48" },
   { name: "Colombia", iso3: "COL", iso: "CO", iso_name: "COLOMBIA", numcode: "170" },
@@ -153,7 +153,7 @@ Spree::Country.create!([
   { name: "Sierra Leone", iso3: "SLE", iso: "SL", iso_name: "SIERRA LEONE", numcode: "694" },
   { name: "Tuvalu", iso3: "TUV", iso: "TV", iso_name: "TUVALU", numcode: "798" },
   { name: "Costa Rica", iso3: "CRI", iso: "CR", iso_name: "COSTA RICA", numcode: "188" },
-  { name: "Germany", iso3: "DEU", iso: "DE", iso_name: "GERMANY", numcode: "276", states_required: true },
+  { name: "Germany", iso3: "DEU", iso: "DE", iso_name: "GERMANY", numcode: "276" },
   { name: "Mauritius", iso3: "MUS", iso: "MU", iso_name: "MAURITIUS", numcode: "480" },
   { name: "Palau", iso3: "PLW", iso: "PW", iso_name: "PALAU", numcode: "585" },
   { name: "Cote D'Ivoire", iso3: "CIV", iso: "CI", iso_name: "COTE D'IVOIRE", numcode: "384" },
@@ -201,7 +201,7 @@ Spree::Country.create!([
   { name: "Nepal", iso3: "NPL", iso: "NP", iso_name: "NEPAL", numcode: "524", states_required: true },
   { name: "Wallis and Futuna", iso3: "WLF", iso: "WF", iso_name: "WALLIS AND FUTUNA", numcode: "876" },
   { name: "Western Sahara", iso3: "ESH", iso: "EH", iso_name: "WESTERN SAHARA", numcode: "732" },
-  { name: "Argentina", iso3: "ARG", iso: "AR", iso_name: "ARGENTINA", numcode: "32", states_required: true },
+  { name: "Argentina", iso3: "ARG", iso: "AR", iso_name: "ARGENTINA", numcode: "32" },
   { name: "Canada", iso3: "CAN", iso: "CA", iso_name: "CANADA", numcode: "124", states_required: true },
   { name: "Eritrea", iso3: "ERI", iso: "ER", iso_name: "ERITREA", numcode: "232" },
   { name: "Lithuania", iso3: "LTU", iso: "LT", iso_name: "LITHUANIA", numcode: "440" },

data/db/migrate/20130417120034_add_index_to_source_columns_on_adjustments.rb

@@ -0,0 +1,5 @@
+class AddIndexToSourceColumnsOnAdjustments < ActiveRecord::Migration
+  def change
+    add_index :spree_adjustments, [:source_type, :source_id]
+  end
+end

data/db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb

@@ -1,7 +1,10 @@
 class MigrateTaxCategoriesToLineItems < ActiveRecord::Migration
   def change
-  	Spree::LineItem.includes(:variant => { :product => :tax_category }).find_in_batches do |line_items|
-  	  line_items.each do |line_item|
+    Spree::LineItem.includes(:variant => { :product => :tax_category }).find_in_batches do |line_items|
+      line_items.each do |line_item|
+        next if line_item.variant.nil?
+        next if line_item.variant.product.nil?
+        next if line_item.product.nil?
         line_item.update_column(:tax_category_id, line_item.product.tax_category_id)
       end
     end

data/db/migrate/20131026154747_add_track_inventory_to_variant.rb

@@ -0,0 +1,5 @@
+class AddTrackInventoryToVariant < ActiveRecord::Migration
+  def change
+    add_column :spree_variants, :track_inventory, :boolean, :default => true
+  end
+end

data/db/migrate/20131120234456_add_updated_at_to_variants.rb

@@ -0,0 +1,5 @@
+class AddUpdatedAtToVariants < ActiveRecord::Migration
+  def change
+    add_column :spree_variants, :updated_at, :datetime
+  end
+end

data/db/migrate/20131211192741_unique_shipping_method_categories.rb

@@ -0,0 +1,24 @@
+class UniqueShippingMethodCategories < ActiveRecord::Migration
+  def change
+    klass   = Spree::ShippingMethodCategory
+    columns = %w[shipping_category_id shipping_method_id]
+
+    say "Find duplicate #{klass} records"
+    duplicates = klass.
+      select((columns + %w[COUNT(*)]).join(',')).
+      group(columns.join(',')).
+      having('COUNT(*) > 1').
+      map { |row| row.attributes.slice(*columns) }
+
+    say "Delete all but the oldest duplicate #{klass} record"
+    duplicates.each do |conditions|
+      klass.where(conditions).order(:created_at).drop(1).each(&:destroy)
+    end
+
+    say "Add unique index to #{klass.table_name} for #{columns.inspect}"
+    add_index klass.table_name, columns, unique: true, name: 'unique_spree_shipping_method_categories'
+
+    say "Remove redundant simple index on #{klass.table_name}"
+    remove_index klass.table_name, name: 'index_spree_shipping_method_categories_on_shipping_category_id'
+  end
+end

data/db/migrate/20140120160805_add_index_to_variant_id_and_currency_on_prices.rb

@@ -0,0 +1,5 @@
+class AddIndexToVariantIdAndCurrencyOnPrices < ActiveRecord::Migration
+  def change
+    add_index :spree_prices, [:variant_id, :currency]
+  end
+end

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

@@ -53,9 +53,9 @@ module Spree
     def test_dummy_inject_extension_requirements
       if DummyGeneratorHelper.inject_extension_requirements
         inside dummy_path do
-          %w(spree_frontend spree_backend spree_api).each do |requirement|
-            inject_into_file 'config/application.rb', "require '#{requirement}'\n", :before => /require '#{@lib_name}'/, :verbose => true
-          end
+          inject_require_for('spree_frontend')
+          inject_require_for('spree_backend')
+          inject_require_for('spree_api')
         end
       end
     end
@@ -82,6 +82,17 @@ module Spree
     attr :database
 
     protected
+
+    def inject_require_for(requirement)
+      inject_into_file 'config/application.rb', %Q[
+begin
+  require '#{requirement}'
+rescue LoadError
+  # #{requirement} is not available.
+end
+      ], :before => /require '#{@lib_name}'/, :verbose => true
+    end
+
     def dummy_path
       ENV['DUMMY_PATH'] || 'spec/dummy'
     end

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

@@ -27,21 +27,31 @@ production:
   database: <%= database_prefix %>spree_production
   encoding: utf8
 <% when 'postgres' %>
+<% db_host = ENV['DB_HOST'] -%>
 development:
   adapter: postgresql
   database: <%= database_prefix %>spree_development
   username: postgres
   min_messages: warning
+<% unless db_host.blank? %>
+  host: <%= db_host %>
+<% end %>
 test:
   adapter: postgresql
   database: <%= database_prefix %>spree_test
   username: postgres
   min_messages: warning
+<% unless db_host.blank? %>
+  host: <%= db_host %>
+<% end %>
 production:
   adapter: postgresql
   database: <%= database_prefix %>spree_production
   username: postgres
   min_messages: warning
+<% unless db_host.blank? %>
+  host: <%= db_host %>
+<% end %>
 <% else %>
 development:
   adapter: sqlite3

data/lib/spree/core.rb

@@ -38,6 +38,7 @@ module Spree
 end
 
 require 'spree/core/version'
+require 'spree/migrations'
 require 'spree/core/engine'
 
 require 'spree/i18n'
@@ -49,6 +50,8 @@ require 'spree/core/permalinks'
 require 'spree/core/token_resource'
 require 'spree/core/calculated_adjustments'
 require 'spree/core/product_duplicator'
+require 'spree/core/mail_method'
+require 'spree/core/mail_settings'
 
 ActiveRecord::Base.class_eval do
   include CollectiveIdea::Acts::NestedSet

data/lib/spree/core/controller_helpers/order.rb

@@ -13,10 +13,12 @@ module Spree
         # The current incomplete order from the session for use in cart and during checkout
         def current_order(create_order_if_necessary = false)
           return @current_order if @current_order
+
           if session[:order_id]
             current_order = Spree::Order.includes(:adjustments).find_by(id: session[:order_id], currency: current_currency)
             @current_order = current_order unless current_order.try(:completed?)
           end
+
           if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
             @current_order = Spree::Order.new(currency: current_currency)
             @current_order.user ||= try_spree_current_user
@@ -29,6 +31,7 @@ module Spree
               session[:access_token] = @current_order.token
             end
           end
+
           if @current_order
             @current_order.last_ip_address = ip_address
             session[:order_id] = @current_order.id
@@ -58,7 +61,7 @@ module Spree
             last_incomplete_order = user.last_incomplete_spree_order
             if session[:order_id].nil? && last_incomplete_order
               session[:order_id] = last_incomplete_order.id
-            elsif current_order(true) && last_incomplete_order && current_order != last_incomplete_order
+            elsif current_order && last_incomplete_order && current_order != last_incomplete_order
               current_order.merge!(last_incomplete_order, user)
             end
           end

data/lib/spree/core/controller_helpers/ssl.rb

@@ -15,16 +15,14 @@ module Spree
 
           def self.ssl_required(*actions)
             ssl_allowed *actions
-            if ssl_supported?
-              if actions.empty? or Rails.application.config.force_ssl
-                force_ssl
-              else
-                force_ssl :only => actions
-              end
+            if actions.empty? or Rails.application.config.force_ssl
+              force_ssl :if => :ssl_supported?
+            else
+              force_ssl :if => :ssl_supported?, :only => actions
             end
           end
 
-          def self.ssl_supported?
+          def ssl_supported?
             return Spree::Config[:allow_ssl_in_production] if Rails.env.production?
             return Spree::Config[:allow_ssl_in_staging] if Rails.env.staging?
             return Spree::Config[:allow_ssl_in_development_and_test] if (Rails.env.development? or Rails.env.test?)

data/lib/spree/core/controller_helpers/strong_parameters.rb

@@ -30,6 +30,12 @@ module Spree
             :line_items_attributes => permitted_line_item_attributes
           ]
         end
+
+        def permitted_product_attributes
+          permitted_attributes.product_attributes + [
+            :product_properties_attributes => permitted_product_properties_attributes
+          ]
+        end
       end
     end
   end

data/lib/spree/core/delegate_belongs_to.rb

@@ -38,14 +38,11 @@ module DelegateBelongsTo
       attrs.concat get_association_column_names(association) if attrs.delete :defaults
       attrs.each do |attr|
         class_def attr do |*args|
-          if args.empty?
-            send(:delegator_for, association).send(attr)
-          else
-            send(:delegator_for, association).send(attr, *args)
-          end
+          send(:delegator_for, association, attr, *args)
         end
+
         class_def "#{attr}=" do |val|
-          send(:delegator_for, association).send("#{attr}=", val)
+          send(:delegator_for_setter, association, attr, val)
         end
       end
     end
@@ -71,19 +68,28 @@ module DelegateBelongsTo
       end
 
     private
-
       def class_def(name, method=nil, &blk)
         class_eval { method.nil? ? define_method(name, &blk) : define_method(name, method) }
       end
+  end
 
+  def delegator_for(association, attr, *args)
+    return if self.class.column_names.include?(attr.to_s)
+    send("#{association}=", self.class.reflect_on_association(association).klass.new) if send(association).nil?
+    if args.empty?
+      send(association).send(attr)
+    else
+      send(association).send(attr, *args)
+    end
   end
 
-  def delegator_for(association)
+  def delegator_for_setter(association, attr, val)
+    return if self.class.column_names.include?(attr.to_s)
     send("#{association}=", self.class.reflect_on_association(association).klass.new) if send(association).nil?
-    send(association)
+    send(association).send("#{attr}=", val)
   end
   protected :delegator_for
-
+  protected :delegator_for_setter
 end
 
 ActiveRecord::Base.send :include, DelegateBelongsTo

data/lib/spree/core/engine.rb

@@ -52,6 +52,7 @@ module Spree
       end
 
       initializer "spree.mail.settings" do |app|
+        ActionMailer::Base.add_delivery_method :spree, Spree::Core::MailMethod
         Spree::Core::MailSettings.init
         Mail.register_interceptor(Spree::Core::MailInterceptor)
       end
@@ -76,7 +77,11 @@ module Spree
         ]
       end
 
-      initializer 'spree.promo.register.promotion.calculators' do
+      # Promotion rules need to be evaluated on after initialize otherwise
+      # Spree.user_class would be nil and users might experience errors related
+      # to malformed model associations (Spree.user_class is only defined on
+      # the app initializer)
+      config.after_initialize do
         Rails.application.config.spree.promotions.rules.concat [
           Spree::Promotion::Rules::ItemTotal,
           Spree::Promotion::Rules::Product,
@@ -98,8 +103,12 @@ module Spree
           :number,
           :verification_value]
       end
+
+      initializer "spree.core.checking_migrations" do |app|
+        Migrations.new(config, engine_name).check
+      end
     end
   end
 end
 
-require 'spree/core/routes'
+require 'spree/core/routes'