spree_core 1.1.6 → 1.2.0.rc1

data/app/models/spree/product/scopes.rb

@@ -27,11 +27,11 @@ module Spree
     end
 
     add_search_scope :ascend_by_master_price do
-      joins(:master).order("#{variant_table_name}.price ASC")
+      joins(:variants_with_only_master).order("#{variant_table_name}.price ASC")
     end
 
     add_search_scope :descend_by_master_price do
-      joins(:master).order("#{variant_table_name}.price DESC")
+      joins(:variants_with_only_master).order("#{variant_table_name}.price DESC")
     end
 
     add_search_scope :price_between do |low, high|
@@ -50,23 +50,8 @@ module Spree
     # If you need products only within one taxon use
     #
     #   Spree::Product.taxons_id_eq(x)
-    # 
-    # If you're using count on the result of this scope, you must use the
-    # `:distinct` option as well:
-    #
-    #   Spree::Product.in_taxon(taxon).count(:distinct => true)
-    #
-    # This is so that the count query is distinct'd:
-    #
-    #   SELECT COUNT(DISTINCT "spree_products"."id") ...
-    #
-    #   vs.
-    #
-    #   SELECT COUNT(*) ...
     add_search_scope :in_taxon do |taxon|
-      select("DISTINCT(spree_products.id), spree_products.*").
-      joins(:taxons).
-      where(Taxon.table_name => { :id => taxon.self_and_descendants.map(&:id) })
+      joins(:taxons).where(Taxon.table_name => { :id => taxon.self_and_descendants.map(&:id) })
     end
 
     # This scope selects products in all taxons AND all its descendants
@@ -128,7 +113,7 @@ module Spree
       end
 
       conditions = "#{option_values}.name = ? AND #{option_values}.option_type_id = ?", value, option_type_id
-      group("spree_products.id").joins(:variants_including_master => :option_values).where(conditions)
+      select("DISTINCT spree_products.id").joins(:variants_including_master => :option_values).where(conditions)
     end
 
     # Finds all products which have either:
@@ -203,11 +188,11 @@ module Spree
 
     add_search_scope :on_hand do
       variants_table = Variant.table_name
-      where("#{table_name}.id in (select product_id from #{variants_table} where product_id = #{table_name}.id and #{variants_table}.deleted_at IS NULL group by product_id having sum(count_on_hand) > 0)")
+      where("#{table_name}.id in (select product_id from #{variants_table} where product_id = #{table_name}.id group by product_id having sum(count_on_hand) > 0)")
     end
 
     add_search_scope :taxons_name_eq do |name|
-      group("spree_products.id").joins(:taxons).where(Taxon.arel_table[:name].eq(name))
+      select("DISTINCT spree_products.id").joins(:taxons).where(Taxon.arel_table[:name].eq(name))
     end
 
     if (ActiveRecord::Base.connection.adapter_name == 'PostgreSQL')
@@ -220,6 +205,7 @@ module Spree
     search_scopes << :group_by_products_id
 
     private
+
       def self.variant_table_name
         Variant.quoted_table_name
       end
@@ -239,16 +225,14 @@ module Spree
       end
 
       def self.get_taxons(*ids_or_records_or_names)
-        taxons = Spree::Taxon.table_name
+        taxons = Taxon.table_name
         ids_or_records_or_names.flatten.map { |t|
           case t
           when Integer then Taxon.find_by_id(t)
           when ActiveRecord::Base then t
           when String
             Taxon.find_by_name(t) ||
-            Taxon.find(:first, :conditions => [
-              "#{taxons}.permalink LIKE ? OR #{taxons}.permalink = ?", "%/#{t}/", "#{t}/"
-            ])
+            Taxon.where("#{taxons}.permalink LIKE ? OR #{taxons}.permalink = ?", "%/#{t}/", "#{t}/").first
           end
         }.compact.flatten.uniq
       end

data/app/models/spree/product_option_type.rb

@@ -1,7 +1,7 @@
 module Spree
   class ProductOptionType < ActiveRecord::Base
-    belongs_to :product, :class_name => "Spree::Product"
-    belongs_to :option_type, :class_name => "Spree::OptionType"
+    belongs_to :product
+    belongs_to :option_type
     acts_as_list :scope => :product
   end
 end

data/app/models/spree/product_property.rb

@@ -1,10 +1,10 @@
 module Spree
   class ProductProperty < ActiveRecord::Base
-    belongs_to :product, :class_name => "Spree::Product"
-    belongs_to :property, :class_name => "Spree::Property"
+    belongs_to :product
+    belongs_to :property
 
     validates :property, :presence => true
-    validates_length_of :value, :maximum => 255
+    validates :value, :length => { :maximum => 255 }
 
     attr_accessible :property_name, :value
 
@@ -14,7 +14,12 @@ module Spree
     end
 
     def property_name=(name)
-      self.property = Property.find_by_name(name) unless name.blank?
+      unless name.blank?
+        unless property = Property.find_by_name(name)
+          property = Property.create(:name => name, :presentation => name)
+        end
+        self.property = property
+      end
     end
   end
 end

data/app/models/spree/property.rb

@@ -1,6 +1,6 @@
 module Spree
   class Property < ActiveRecord::Base
-    has_and_belongs_to_many :prototypes, :join_table => 'spree_properties_prototypes'
+    has_and_belongs_to_many :prototypes, :join_table => :spree_properties_prototypes
 
     has_many :product_properties, :dependent => :destroy
     has_many :products, :through => :product_properties

data/app/models/spree/prototype.rb

@@ -1,7 +1,7 @@
 module Spree
   class Prototype < ActiveRecord::Base
-    has_and_belongs_to_many :properties, :join_table => 'spree_properties_prototypes'
-    has_and_belongs_to_many :option_types, :join_table => 'spree_option_types_prototypes'
+    has_and_belongs_to_many :properties, :join_table => :spree_properties_prototypes
+    has_and_belongs_to_many :option_types, :join_table => :spree_option_types_prototypes
 
     attr_accessible :name
 

data/app/models/spree/return_authorization.rb

@@ -1,6 +1,7 @@
 module Spree
   class ReturnAuthorization < ActiveRecord::Base
-    belongs_to :order, :class_name => "Spree::Order"
+    belongs_to :order
+
     has_many :inventory_units
     before_create :generate_number
     before_save :force_positive_amount
@@ -71,7 +72,6 @@ module Spree
         credit.source = self
         credit.adjustable = order
         credit.save
-        order.return if inventory_units.all?{ |inventory_unit| inventory_unit.returned? }
       end
 
       def allow_receive?

data/app/models/spree/role.rb

@@ -2,6 +2,6 @@ module Spree
   class Role < ActiveRecord::Base
     attr_accessible :name
 
-    has_and_belongs_to_many :users, :join_table => 'spree_roles_users'
+    has_and_belongs_to_many :users, :join_table => 'spree_roles_users', :class_name => Spree.user_class.to_s
   end
 end

data/app/models/spree/shipment.rb

@@ -2,9 +2,10 @@ require 'ostruct'
 
 module Spree
   class Shipment < ActiveRecord::Base
-    belongs_to :order, :class_name => "Spree::Order"
-    belongs_to :shipping_method, :class_name => "Spree::ShippingMethod"
-    belongs_to :address, :class_name => "Spree::Address"
+    belongs_to :order
+    belongs_to :shipping_method
+    belongs_to :address
+
     has_many :state_changes, :as => :stateful
     has_many :inventory_units, :dependent => :nullify
     has_one :adjustment, :as => :source, :dependent => :destroy
@@ -26,7 +27,7 @@ module Spree
     make_permalink :field => :number
 
     scope :shipped, where(:state => 'shipped')
-    scope :ready, where(:state => 'ready')
+    scope :ready,   where(:state => 'ready')
     scope :pending, where(:state => 'pending')
 
     def to_param
@@ -117,7 +118,7 @@ module Spree
       # shipped    if already shipped (ie. does not change the state)
       # ready      all other cases
       def determine_state(order)
-        return 'pending' if self.inventory_units.any? { |unit| unit.backordered? }
+        return 'pending' if inventory_units.any? &:backordered?
         return 'shipped' if state == 'shipped'
         order.paid? ? 'ready' : 'pending'
       end

data/app/models/spree/shipping_method.rb

@@ -1,14 +1,11 @@
 module Spree
   class ShippingMethod < ActiveRecord::Base
     DISPLAY = [:both, :front_end, :back_end]
-
-    default_scope where(:deleted_at => nil)
-
     has_many :shipments
     validates :name, :zone, :presence => true
 
-    belongs_to :shipping_category, :class_name => "Spree::ShippingCategory"
-    belongs_to :zone, :class_name => "Spree::Zone"
+    belongs_to :shipping_category
+    belongs_to :zone
 
     attr_accessible :name, :zone_id, :display_on, :shipping_category_id,
                     :match_none, :match_one, :match_all
@@ -16,16 +13,25 @@ module Spree
     calculated_adjustments
 
     def available?(order, display_on = nil)
-      display_check = (self.display_on == display_on.to_s || self.display_on.blank?)
-      calculator_check = calculator.available?(order)
-      display_check && calculator_check
+      displayable? && calculator.available?(order)
+    end
+
+    def displayable?
+      (self.display_on == display_on.to_s || self.display_on.blank?)
+    end
+
+    def calculator_available?(order)
+      caluclator.available?(order)
+    end
+
+    def within_zone?(order)
+      zone && zone.include?(order.ship_address)
     end
 
-    def available_to_order?(order, display_on = nil)
-      availability_check = available?(order,display_on)
-      zone_check = zone && zone.include?(order.ship_address)
-      category_check = category_match?(order)
-      availability_check && zone_check && category_check
+    def available_to_order?(order, display_on= nil)
+      available?(order, display_on) &&
+      within_zone?(order) &&
+      category_match?(order)
     end
 
     # Indicates whether or not the category rules for this shipping method

data/app/models/spree/state.rb

@@ -1,9 +1,6 @@
 module Spree
   class State < ActiveRecord::Base
-    belongs_to :country, :class_name => "Spree::Country"
-
-    has_one :zone_member, :as => :zoneable
-    has_one :zone, :through => :zone_member
+    belongs_to :country
 
     validates :country, :name, :presence => true
 
@@ -17,7 +14,7 @@ module Spree
     # blank is added elsewhere, if needed
     def self.states_group_by_country_id
       state_info = Hash.new { |h, k| h[k] = [] }
-      Spree::State.order('name ASC').each { |state|
+      self.order('name ASC').each { |state|
         state_info[state.country_id.to_s].push [state.id, state.name]
       }
       state_info

data/app/models/spree/state_change.rb

@@ -1,6 +1,6 @@
 module Spree
   class StateChange < ActiveRecord::Base
-    belongs_to :user, :class_name => "Spree::User"
+    belongs_to :user
     belongs_to :stateful, :polymorphic => true
     before_create :assign_user
 

data/app/models/spree/tax_rate.rb

@@ -30,6 +30,13 @@ module Spree
       end
     end
 
+    def self.adjust(order)
+      order.clear_adjustments!
+      self.match(order).each do |rate|
+        rate.adjust(order)
+      end
+    end
+
     # For Vat the default rate is the rate that is configured for the default category
     # It is needed for every price calculation (as all customer facing prices include vat )
     # The function returns the actual amount, which may be 0 in case of wrong setup, but is never nil
@@ -64,9 +71,9 @@ module Spree
     end
 
     private
+
       def create_label
         "#{tax_category.name} #{amount * 100}%"
       end
   end
-
 end

data/app/models/spree/taxon.rb

@@ -2,8 +2,9 @@ module Spree
   class Taxon < ActiveRecord::Base
     acts_as_nested_set :dependent => :destroy
 
-    belongs_to :taxonomy, :class_name => "Spree::Taxonomy"
+    belongs_to :taxonomy
     has_and_belongs_to_many :products, :join_table => 'spree_products_taxons'
+
     before_create :set_permalink
 
     attr_accessible :name, :parent_id, :position, :icon, :description, :permalink, :taxonomy_id
@@ -17,6 +18,9 @@ module Spree
       :path => ':rails_root/public/spree/taxons/:id/:style/:basename.:extension',
       :default_url => '/assets/default_taxon.png'
 
+    include Spree::Core::S3Support
+    supports_s3 :icon
+
     include ::Spree::ProductFilters  # for detailed defs of filters
 
     # indicate which filters should be used for a taxon

data/app/models/spree/taxonomy.rb

@@ -5,7 +5,7 @@ module Spree
     attr_accessible :name
 
     has_many :taxons
-    has_one :root, :conditions => { :parent_id => nil }, :class_name => 'Spree::Taxon',
+    has_one :root, :conditions => { :parent_id => nil }, :class_name => "Spree::Taxon",
                    :dependent => :destroy
 
     after_save :set_name

data/app/models/spree/tokenized_permission.rb

@@ -0,0 +1,6 @@
+module Spree
+  class TokenizedPermission < ActiveRecord::Base
+    belongs_to :permissable, :polymorphic => true
+  end
+end
+

data/app/models/spree/tracker.rb

@@ -3,7 +3,7 @@ module Spree
     attr_accessible :analytics_id, :environment, :active
 
     def self.current
-      tracker = first(:conditions => { :active => true, :environment => Rails.env })
+      tracker = where(:active => true, :environment => Rails.env).first
       tracker.analytics_id.present? ? tracker : nil if tracker
     end
   end

data/app/models/spree/variant.rb

@@ -1,6 +1,6 @@
 module Spree
   class Variant < ActiveRecord::Base
-    belongs_to :product, :touch => true, :class_name => "Spree::Product"
+    belongs_to :product, :touch => true
 
     delegate_belongs_to :product, :name, :description, :permalink, :available_on,
                         :tax_category_id, :shipping_category_id, :meta_description,
@@ -13,7 +13,7 @@ module Spree
 
     has_many :inventory_units
     has_many :line_items
-    has_and_belongs_to_many :option_values, :join_table => 'spree_option_values_variants'
+    has_and_belongs_to_many :option_values, :join_table => :spree_option_values_variants
     has_many :images, :as => :viewable, :order => :position, :dependent => :destroy
 
     validate :check_price
@@ -21,19 +21,12 @@ module Spree
     validates :cost_price, :numericality => { :greater_than_or_equal_to => 0, :allow_nil => true } if self.table_exists? && self.column_names.include?('cost_price')
     validates :count_on_hand, :numericality => true
 
-    before_save :touch_product
     after_save :recalculate_product_on_hand, :if => :is_master?
 
     # default variant scope only lists non-deleted variants
     scope :active, where(:deleted_at => nil)
     scope :deleted, where('deleted_at IS NOT NULL')
 
-    # default extra fields for shipping purposes
-    @fields = [{ :name => 'Weight', :only => [:variant], :format => '%.2f' },
-               { :name => 'Height', :only => [:variant], :format => '%.2f' },
-               { :name => 'Width',  :only => [:variant], :format => '%.2f' },
-               { :name => 'Depth',  :only => [:variant], :format => '%.2f' }]
-
     # Returns number of inventory units for this variant (new records haven't been saved to database, yet)
     def on_hand
       Spree::Config[:track_inventory_levels] ? count_on_hand : (1.0 / 0) # Infinity
@@ -58,12 +51,18 @@ module Spree
       end
     end
 
+    # strips all non-price-like characters from the price.
     def price=(price)
-      self[:price] = parse_price(price) if price.present?
+      if price.present?
+        self[:price] = price.to_s.gsub(/[^0-9\.-]/, '').to_f
+      end
     end
 
+    # and cost_price
     def cost_price=(price)
-      self[:cost_price] = parse_price(price) if price.present?
+      if price.present?
+        self[:cost_price] = price.to_s.gsub(/[^0-9\.-]/, '').to_f
+      end
     end
 
     # returns number of units currently on backorder for this variant.
@@ -77,17 +76,6 @@ module Spree
     end
     alias in_stock in_stock?
 
-    def self.additional_fields
-      ActiveSupport::Deprecation.warn("[SPREE] Spree::Variant.additional_fields will be deprecated in Spree 1.2. Please use Deface and decorators as an alternative to this functionality now.")
-      @fields
-    end
-
-    def self.additional_fields=(new_fields)
-      ActiveSupport::Deprecation.warn("[SPREE] Spree::Variant.additional_fields= will be deprecated in Spree 1.2. Please use Deface and decorators as an alternative to this functionality now.")
-      attr_accessible *new_fields
-      @fields = new_fields
-    end
-
     # returns true if this variant is allowed to be placed on a new order
     def available?
       Spree::Config[:track_inventory_levels] ? (Spree::Config[:allow_backorders] || in_stock?) : true
@@ -118,7 +106,7 @@ module Spree
       # no option values on master
       return if self.is_master
 
-      option_type = Spree::OptionType.find_or_initialize_by_name(opt_name) do |o|
+      option_type = Spree::OptionType.where(:name => opt_name).first_or_initialize do |o|
         o.presentation = opt_name
         o.save!
       end
@@ -136,7 +124,7 @@ module Spree
         end
       end
 
-      option_value = Spree::OptionValue.find_or_initialize_by_option_type_id_and_name(option_type.id, opt_value) do |o|
+      option_value = Spree::OptionValue.where(:option_type_id => option_type.id, :name => opt_value).first_or_initialize do |o|
         o.presentation = opt_value
         o.save!
       end
@@ -149,19 +137,8 @@ module Spree
       self.option_values.detect { |o| o.option_type.name == opt_name }.try(:presentation)
     end
 
-    private
-
-      # strips all non-price-like characters from the price, taking into account locale settings
-      def parse_price(price)
-        return price unless price.is_a?(String)
 
-        separator, delimiter = I18n.t([:'number.currency.format.separator', :'number.currency.format.delimiter'])
-        non_price_characters = /[^0-9\-#{separator}]/
-        price.gsub!(non_price_characters, '') # strip everything else first
-        price.gsub!(separator, '.') unless separator == '.' # then replace the locale-specific decimal separator with the standard separator if necessary
-
-        price.to_d
-      end
+    private
 
       # Ensures a new variant takes the product master price when price is not supplied
       def check_price
@@ -171,10 +148,6 @@ module Spree
         end
       end
 
-      def touch_product
-        product.touch unless is_master?
-      end
-
       def recalculate_product_on_hand
         on_hand = product.on_hand
         if Spree::Config[:track_inventory_levels] && on_hand != (1.0 / 0) # Infinity