spree_core 2.0.4 → 2.0.5

data/app/models/spree/payment.rb

@@ -1,6 +1,9 @@
 module Spree
   class Payment < ActiveRecord::Base
     include Spree::Payment::Processing
+
+    IDENTIFIER_CHARS = (('A'..'Z').to_a + ('0'..'9').to_a - %w(0 1 I O)).freeze
+
     belongs_to :order, class_name: 'Spree::Order'
     belongs_to :source, polymorphic: true
     belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
@@ -144,15 +147,13 @@ module Spree
       # and this is it. Related to #1998.
       # See https://github.com/spree/spree/issues/1998#issuecomment-12869105
       def set_unique_identifier
-        chars = [('A'..'Z').to_a, ('0'..'9').to_a].flatten - %w(0 1 I O)
-        identifier = ''
-        8.times { identifier << chars[rand(chars.length)] }
-        if Spree::Payment.exists?(identifier: identifier)
-          # Call it again, we've got a duplicate ID.
-          set_unique_identifier
-        else
-          self.identifier = identifier
-        end
+        begin
+          self.identifier = generate_identifier
+        end while self.class.exists?(identifier: self.identifier)
+      end
+
+      def generate_identifier
+        Array.new(8){ IDENTIFIER_CHARS.sample }.join
       end
   end
 end

data/app/models/spree/preferences/store.rb

@@ -86,7 +86,7 @@ module Spree::Preferences
     end
 
     def should_persist?
-      @persistence and Spree::Preference.table_exists?
+      @persistence && Spree::Preference.connected? && Spree::Preference.table_exists?
     end
 
   end

data/app/models/spree/product.rb

@@ -106,6 +106,8 @@ module Spree
 
     after_initialize :ensure_master
 
+    before_destroy :punch_permalink
+
     def variants_with_only_master
       ActiveSupport::Deprecation.warn("[SPREE] Spree::Product#variants_with_only_master will be deprecated in Spree 1.3. Please use Spree::Product#master instead.")
       master
@@ -169,8 +171,11 @@ module Spree
     end
 
     def self.like_any(fields, values)
-      where_str = fields.map { |field| Array.new(values.size, "#{self.quoted_table_name}.#{field} #{LIKE} ?").join(' OR ') }.join(' OR ')
-      self.where([where_str, values.map { |value| "%#{value}%" } * fields.size].flatten)
+      where fields.map { |field|
+        values.map { |value|
+          arel_table[field].matches("%#{value}%")
+        }.inject(:or)
+      }.inject(:or)
     end
 
     # Suitable for displaying only variants that has at least one option value.
@@ -262,6 +267,10 @@ module Spree
         return unless new_record?
         self.master ||= Variant.new
       end
+
+      def punch_permalink
+        update_attribute :permalink, "#{Time.now.to_i}_#{permalink}" # punch permalink with date prefix
+      end  
   end
 end
 

data/app/models/spree/promotion/rules/user.rb

@@ -4,8 +4,13 @@ module Spree
       class User < PromotionRule
         attr_accessible :user_ids_string
 
-        belongs_to :user, :class_name => Spree.user_class.to_s
-        has_and_belongs_to_many :users, :class_name => Spree.user_class.to_s, :join_table => 'spree_promotion_rules_users', :foreign_key => 'promotion_rule_id'
+        if Spree.user_class
+          belongs_to :user, class_name: Spree.user_class.to_s
+          has_and_belongs_to_many :users, class_name: Spree.user_class.to_s, join_table: 'spree_promotion_rules_users', foreign_key: 'promotion_rule_id'
+        else
+          belongs_to :user
+          has_and_belongs_to_many :users, join_table: 'spree_promotion_rules_users', foreign_key: 'promotion_rule_id'
+        end
 
         def eligible?(order, options = {})
           users.include?(order.user)

data/app/models/spree/property.rb

@@ -2,7 +2,7 @@ module Spree
   class Property < ActiveRecord::Base
     has_and_belongs_to_many :prototypes, join_table: 'spree_properties_prototypes'
 
-    has_many :product_properties, dependent: :destroy
+    has_many :product_properties, dependent: :delete_all
     has_many :products, through: :product_properties
 
     attr_accessible :name, :presentation

data/app/models/spree/shipment.rb

@@ -6,10 +6,10 @@ module Spree
     belongs_to :address, class_name: 'Spree::Address'
     belongs_to :stock_location, class_name: 'Spree::StockLocation'
 
-    has_many :shipping_rates, dependent: :destroy
+    has_many :shipping_rates, dependent: :delete_all
     has_many :shipping_methods, through: :shipping_rates
     has_many :state_changes, as: :stateful
-    has_many :inventory_units, dependent: :destroy
+    has_many :inventory_units, dependent: :delete_all
     has_one :adjustment, as: :source, dependent: :destroy
 
     before_create :generate_shipment_number
@@ -105,13 +105,11 @@ module Spree
     def refresh_rates
       return shipping_rates if shipped?
 
-      shipping_method_id = shipping_method.try(:id)
       self.shipping_rates = Stock::Estimator.new(order).shipping_rates(to_package)
 
-
-      if shipping_method_id
+      if shipping_method
         selected_rate = shipping_rates.detect { |rate|
-          rate.shipping_method_id == shipping_method_id
+          rate.shipping_method_id == shipping_method.id
         }
         self.selected_shipping_rate_id = selected_rate.id if selected_rate
       end
@@ -158,7 +156,7 @@ module Spree
     end
 
     def manifest
-      inventory_units.includes(:variant).group_by(&:variant).map do |variant, units|
+      inventory_units.joins(:variant).includes(:variant).group_by(&:variant).map do |variant, units|
         states = {}
         units.group_by(&:state).each { |state, iu| states[state] = iu.count }
         OpenStruct.new(variant: variant, quantity: units.length, states: states)
@@ -229,6 +227,13 @@ module Spree
       package
     end
 
+    def set_up_inventory(state, variant, order)
+      self.inventory_units.create(
+        { variant_id: variant.id, state: state, order_id: order.id },
+        without_protection: true
+      )
+    end
+
     private
 
       def manifest_unstock(item)

data/app/models/spree/shipping_method.rb

@@ -14,7 +14,7 @@ module Spree
                                     :class_name => 'Spree::Zone',
                                     :foreign_key => 'shipping_method_id'
 
-    attr_accessible :name, :zones, :display_on, :shipping_category_id,
+    attr_accessible :name, :admin_name, :zones, :display_on, :shipping_category_id,
                     :match_none, :match_one, :match_all, :tracking_url
 
     validates :name, presence: true

data/app/models/spree/stock/availability_validator.rb

@@ -2,9 +2,17 @@ module Spree
   module Stock
     class AvailabilityValidator < ActiveModel::Validator
       def validate(line_item)
+        if shipment = line_item.target_shipment
+          units = shipment.inventory_units_for(line_item.variant)
+          return if units.count > line_item.quantity
+          quantity = line_item.quantity - units.count
+        else
+          quantity = line_item.quantity
+        end
+
         quantifier = Stock::Quantifier.new(line_item.variant_id)
 
-        unless quantifier.can_supply? line_item.quantity
+        unless quantifier.can_supply? quantity
           variant = line_item.variant
           display_name = %Q{#{variant.name}}
           display_name += %Q{ (#{variant.options_text})} unless variant.options_text.blank?

data/app/models/spree/stock/coordinator.rb

@@ -24,9 +24,7 @@ module Spree
       # Returns an array of Package instances
       def build_packages(packages = Array.new)
         StockLocation.active.each do |stock_location|
-          next unless order.line_items.any? do |item|
-            stock_location.stock_item(item.variant)
-          end
+          next unless stock_location.stock_items.where(:variant_id => order.line_items.pluck(:variant_id)).exists?
 
           packer = build_packer(stock_location, order)
           packages += packer.packages

data/app/models/spree/stock/estimator.rb

@@ -15,7 +15,7 @@ module Spree
 
         shipping_methods.each do |shipping_method|
           cost = calculate_cost(shipping_method, package)
-          shipping_rates << shipping_method.shipping_rates.new(:cost => cost)
+          shipping_rates << shipping_method.shipping_rates.new(:cost => cost) unless cost.nil?
         end
 
         shipping_rates.sort_by! { |r| r.cost || 0 }

data/app/models/spree/stock/packer.rb

@@ -10,17 +10,25 @@ module Spree
       end
 
       def packages
-        build_splitter.split [default_package]
+        if splitters.empty?
+          [default_package]
+        else
+          build_splitter.split [default_package]
+        end
       end
 
       def default_package
         package = Package.new(stock_location, order)
         order.line_items.each do |line_item|
-          next unless stock_location.stock_item(line_item.variant)
+          if Config.track_inventory_levels
+            next unless stock_location.stock_item(line_item.variant)
 
-          on_hand, backordered = stock_location.fill_status(line_item.variant, line_item.quantity)
-          package.add line_item.variant, on_hand, :on_hand if on_hand > 0
-          package.add line_item.variant, backordered, :backordered if backordered > 0
+            on_hand, backordered = stock_location.fill_status(line_item.variant, line_item.quantity)
+            package.add line_item.variant, on_hand, :on_hand if on_hand > 0
+            package.add line_item.variant, backordered, :backordered if backordered > 0
+          else
+            package.add line_item.variant, line_item.quantity, :on_hand
+          end
         end
         package
       end

data/app/models/spree/stock_item.rb

@@ -1,8 +1,10 @@
 module Spree
   class StockItem < ActiveRecord::Base
+    acts_as_paranoid
+
     belongs_to :stock_location, class_name: 'Spree::StockLocation'
     belongs_to :variant, class_name: 'Spree::Variant'
-    has_many :stock_movements, dependent: :destroy
+    has_many :stock_movements
 
     validates_presence_of :stock_location, :variant
     validates_uniqueness_of :variant_id, scope: :stock_location_id
@@ -28,6 +30,13 @@ module Spree
       end
     end
 
+    def set_count_on_hand(value)
+      self.count_on_hand = value
+      process_backorders if in_stock?
+
+      self.save!
+    end
+
     def in_stock?
       self.count_on_hand > 0
     end

data/app/models/spree/stock_location.rb

@@ -10,7 +10,7 @@ module Spree
 
     attr_accessible :name, :active, :address1, :address2, :city, :zipcode,
         :backorderable_default, :state_name, :state_id, :country_id, :phone,
-        :country_id, :propagate_all_variants
+        :country_id, :propagate_all_variants, :admin_name
 
     scope :active, -> { where(active: true) }
 

data/app/models/spree/tax_rate.rb

@@ -33,7 +33,9 @@ module Spree
     end
 
     def self.adjust(order)
-      order.clear_adjustments!
+      order.adjustments.tax.destroy_all
+      order.line_item_adjustments.where(originator_type: 'Spree::TaxRate').destroy_all
+
       self.match(order).each do |rate|
         rate.adjust(order)
       end

data/app/models/spree/zone.rb

@@ -14,7 +14,7 @@ module Spree
     accepts_nested_attributes_for :zone_members, allow_destroy: true, reject_if: proc { |a| a['zoneable_id'].blank? }
 
     attr_accessible :name, :description, :default_tax, :kind, :zone_members,
-                    :zone_members_attributes
+                    :zone_members_attributes, :state_ids, :country_ids
 
     def kind
       if members.any? && !members.any? { |member| member.try(:zoneable_type).nil? }
@@ -75,6 +75,42 @@ module Spree
       members.collect(&:zoneable)
     end
 
+    def country_ids
+      if kind == 'country'
+        members.collect(&:zoneable_id)
+      else
+        []
+      end
+    end
+
+    def state_ids
+      if kind == 'state'
+        members.collect(&:zoneable_id)
+      else
+        []
+      end
+    end
+
+    def country_ids=(ids)
+      zone_members.destroy_all
+      ids.reject{ |id| id.blank? }.map do |id|
+        member = ZoneMember.new
+        member.zoneable_type = 'Spree::Country'
+        member.zoneable_id = id
+        members << member
+      end
+    end
+
+    def state_ids=(ids)
+      zone_members.destroy_all
+      ids.reject{ |id| id.blank? }.map do |id|
+        member = ZoneMember.new
+        member.zoneable_type = 'Spree::State'
+        member.zoneable_id = id
+        members << member
+      end
+    end
+
     def self.default_tax
       where(default_tax: true).first
     end

data/app/views/spree/test_mailer/test_email.text.erb

@@ -0,0 +1,4 @@
+<%= t('test_mailer.test_email.greeting') %>
+================
+
+<%= t('test_mailer.test_email.message') %>

data/config/locales/en.yml

@@ -63,6 +63,7 @@ en:
         zipcode: Shipping address zipcode
       spree/payment:
         amount: Amount
+        one: "Payment"
       spree/payment_method:
         name: Name
       spree/product:
@@ -148,9 +149,15 @@ en:
       spree/payment:
         one: Payment
         other: Payments
+      spree/payment_method:
+        one: Payment Method
+        other: Payment Methods
       spree/product:
         one: Product
         other: Products
+      spree/promotion:
+        one: Promotion
+        other: Promotions
       spree/property:
         one: Property
         other: Properties
@@ -169,9 +176,18 @@ en:
       spree/shipping_category:
         one: Shipping Category
         other: Shipping Categories
+      spree/shipping_method:
+        one: Shipping Method
+        other: Shipping Methods
       spree/state:
         one: State
         other: States
+      spree/stock_location:
+        one: Stock Location
+        other: Stock Locations
+      spree/stock_transfer:
+        one: Stock Transfer
+        other: Stock Transfers
       spree/tax_category:
         one: Tax Category
         other: Tax Categories
@@ -184,6 +200,9 @@ en:
       spree/taxonomy:
         one: Taxonomy
         other: Taxonomies
+      spree/tracker:
+        one: Tracker
+        other: Trackers
       spree/user:
         one: User
         other: Users
@@ -360,6 +379,7 @@ en:
     back_to_users_list: Back To Users List
     back_to_zones_list: Back To Zones List
     backorderable: Backorderable
+    backorders_allowed: backorders allowed
     balance_due: Balance Due
     bill_address: Bill Address
     billing: Billing
@@ -454,6 +474,7 @@ en:
     date: Date
     date_completed: Date Completed
     date_picker:
+      first_day: 0
       format: ! '%Y/%m/%d'
       js_format: yy/mm/dd
     date_range: Date Range
@@ -575,6 +596,7 @@ en:
     insufficient_stock: Insufficient stock available, only %{on_hand} remaining
     intercept_email_address: Intercept Email Address
     intercept_email_instructions: Override email recipient and replace with this address.
+    internal_name: Internal Name
     invalid_payment_provider: Invalid payment provider.
     invalid_promotion_action: Invalid promotion action.
     invalid_promotion_rule: Invalid promotion rule.
@@ -590,7 +612,7 @@ en:
       operators:
         gt: greater than
         gte: greater than or equal to
-    items_cannot_be_shipped: We are unable to ship the selected items to your shipping address. Please choose another shipping address.
+    items_cannot_be_shipped: We are unable to calculate shipping rates for the selected items.
     jirafe: Jirafe
     landing_page_rule:
       path: Path
@@ -674,6 +696,7 @@ en:
     no_promotions_found: No promotions found
     no_results: No results
     no_rules_added: No rules added
+    no_resource_found: ! 'No %{resource} found'
     no_shipping_methods_found: No shipping methods found
     no_trackers_found: No Trackers Found
     no_stock_locations_found: No stock locations found

data/db/default/spree/roles.rb

@@ -1,2 +1,2 @@
-Spree::Role.create!(:name => "admin")
-Spree::Role.create!(:name => "user")
+Spree::Role.where(:name => "admin").first_or_create
+Spree::Role.where(:name => "user").first_or_create

data/db/migrate/20130213191427_create_default_stock.rb

@@ -2,7 +2,8 @@ class CreateDefaultStock < ActiveRecord::Migration
   def up
     Spree::StockLocation.skip_callback(:create, :after, :create_stock_items)
     Spree::StockItem.skip_callback(:save, :after, :process_backorders)
-    location = Spree::StockLocation.create(name: 'default')
+    location = Spree::StockLocation.new(name: 'default')
+    location.save(validate: false)
     Spree::Variant.all.each do |variant|
       stock_item = location.stock_items.build(variant: variant)
       stock_item.send(:count_on_hand=, variant.count_on_hand)

data/db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb

@@ -2,7 +2,7 @@ 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|
-        line_item.update_column(:tax_category_id, line_item.product.tax_category.id)
+        line_item.update_column(:tax_category_id, line_item.product.tax_category_id)
       end
     end
   end

data/db/migrate/20130806022521_drop_spree_mail_methods.rb

@@ -0,0 +1,12 @@
+class DropSpreeMailMethods < ActiveRecord::Migration
+  def up
+    drop_table :spree_mail_methods
+  end
+
+  def down
+    create_table(:spree_mail_methods) do |t|
+      t.string :environment
+      t.boolean :active
+    end
+  end
+end

data/db/migrate/20130806145853_set_default_stock_location_on_shipments.rb

@@ -0,0 +1,8 @@
+class SetDefaultStockLocationOnShipments < ActiveRecord::Migration
+  def change
+    if Spree::Shipment.where('stock_location_id IS NULL').count > 0
+      location = Spree::StockLocation.find_by_name('default') || Spree::StockLocation.first
+      Spree::Shipment.where('stock_location_id IS NULL').update_all(stock_location_id: location.id)
+    end
+  end
+end

data/db/migrate/20130809164245_add_admin_name_column_to_spree_shipping_methods.rb

@@ -0,0 +1,5 @@
+class AddAdminNameColumnToSpreeShippingMethods < ActiveRecord::Migration
+  def change
+    add_column :spree_shipping_methods, :admin_name, :string
+  end
+end

data/db/migrate/20130809164330_add_admin_name_column_to_spree_stock_locations.rb

@@ -0,0 +1,5 @@
+class AddAdminNameColumnToSpreeStockLocations < ActiveRecord::Migration
+  def change
+    add_column :spree_stock_locations, :admin_name, :string
+  end
+end

data/db/migrate/20130813140619_expand_order_number_size.rb

@@ -0,0 +1,9 @@
+class ExpandOrderNumberSize < ActiveRecord::Migration
+  def up
+    change_column :spree_orders, :number, :string, :limit => 32
+  end
+
+  def down
+    change_column :spree_orders, :number, :string, :limit => 15
+  end
+end

data/db/migrate/20130826062534_add_depth_to_spree_taxons.rb

@@ -0,0 +1,16 @@
+class AddDepthToSpreeTaxons < ActiveRecord::Migration
+  def up
+    if !Spree::Taxon.column_names.include?('depth')
+      add_column :spree_taxons, :depth, :integer
+
+      say_with_time 'Update depth on all taxons' do
+        Spree::Taxon.reset_column_information
+        Spree::Taxon.all.each { |t| t.save }
+      end
+    end
+  end
+
+  def down
+    remove_column :spree_taxons, :depth
+  end
+end

data/db/migrate/20130915032339_add_deleted_at_to_spree_stock_items.rb

@@ -0,0 +1,5 @@
+class AddDeletedAtToSpreeStockItems < ActiveRecord::Migration
+  def change
+    add_column :spree_stock_items, :deleted_at, :datetime
+  end
+end

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

@@ -17,17 +17,14 @@ production:
 development:
   adapter: mysql2
   database: <%= database_prefix %>spree_development
-  username:
   encoding: utf8
 test:
   adapter: mysql2
   database: <%= database_prefix %>spree_test
-  username:
   encoding: utf8
 production:
   adapter: mysql2
   database: <%= database_prefix %>spree_production
-  username:
   encoding: utf8
 <% when 'postgres' %>
 development:

data/lib/spree/core/engine.rb

@@ -86,11 +86,7 @@ module Spree
         ]
       end
 
-      # 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
+      initializer 'spree.promo.register.promotion.calculators' do
         Rails.application.config.spree.promotions.rules.concat [
           Spree::Promotion::Rules::ItemTotal,
           Spree::Promotion::Rules::Product,

data/lib/spree/core/permalinks.rb

@@ -14,8 +14,10 @@ module Spree
           options[:field] ||= :permalink
           self.permalink_options = options
 
-          if self.table_exists? && self.column_names.include?(permalink_options[:field].to_s)
-            before_validation(:on => :create) { save_permalink }
+          if self.connected?
+            if self.table_exists? && self.column_names.include?(permalink_options[:field].to_s)
+              before_validation(:on => :create) { save_permalink }
+            end
           end
         end
 

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.0.4"
+    "2.0.5"
   end
 end

data/lib/spree/promo/coupon_applicator.rb

@@ -32,8 +32,8 @@ module Spree
         return promotion_usage_limit_exceeded if promotion.usage_limit_exceeded?
 
         event_name = "spree.checkout.coupon_code_added"
-        ActiveSupport::Notifications.instrument(event_name, :coupon_code => @order.coupon_code, :order => @order)
-        promo = @order.adjustments.promotion.detect { |p| p.originator.promotion.code == @order.coupon_code }
+        promotion.activate(:coupon_code => @order.coupon_code, :order => @order)
+        promo = @order.adjustments.includes(:originator).promotion.detect { |p| p.originator.promotion.code == @order.coupon_code }
         determine_promotion_application_result(promo)
       end
 

data/lib/spree/testing_support/capybara_ext.rb

@@ -104,7 +104,7 @@ end
 
 RSpec::Matchers.define :have_meta do |name, expected|
   match do |actual|
-    has_css?("meta[name='#{name}'][content='#{expected}']")
+    has_css?("meta[name='#{name}'][content='#{expected}']", visible: false)
   end
 
   failure_message_for_should do |actual|
@@ -119,7 +119,7 @@ end
 
 RSpec::Matchers.define :have_title do |expected|
   match do |actual|
-    has_css?("title", :text => expected)
+    has_css?("title", :text => expected, visible: false)
   end
 
   failure_message_for_should do |actual|

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

@@ -33,14 +33,18 @@ FactoryGirl.define do
         state 'complete'
         completed_at { Time.now }
 
+        after(:create) do |order|
+          order.refresh_shipment_rates
+        end
+
         factory :order_ready_to_ship do
           payment_state 'paid'
           shipment_state 'ready'
           after(:create) do |order|
             create(:payment, amount: order.total, order: order, state: 'completed')
             order.shipments.each do |shipment|
-              shipment.inventory_units.each { |u| u.update_attribute('state', 'on_hand') }
-              shipment.update_attribute('state', 'ready')
+              shipment.inventory_units.each { |u| u.update_column('state', 'on_hand') }
+              shipment.update_column('state', 'ready')
             end
             order.reload
           end
@@ -49,8 +53,8 @@ FactoryGirl.define do
         factory :shipped_order do
           after(:create) do |order|
             order.shipments.each do |shipment|
-              shipment.inventory_units.each { |u| u.update_attribute('state', 'shipped') }
-              shipment.update_attribute('state', 'shipped')
+              shipment.inventory_units.each { |u| u.update_column('state', 'shipped') }
+              shipment.update_column('state', 'shipped')
             end
             order.reload
           end