spree_core 1.0.7 → 1.1.0.rc1

data/app/helpers/spree/base_helper.rb

@@ -1,7 +1,19 @@
 module Spree
   module BaseHelper
+
+    # Defined because Rails' current_page? helper is not working when Spree is mounted at root.
+    def current_spree_page?(url)
+      path = request.fullpath.gsub(/^\/\//, '/')
+      if url.is_a?(String)
+        return path == url
+      elsif url.is_a?(Hash)
+        return path == spree.url_for(url)
+      end
+      return false
+    end
+
     def link_to_cart(text = nil)
-      return "" if current_page?(cart_path)
+      return "" if current_spree_page?(cart_path)
 
       text = text ? h(text) : t('cart')
       css_class = nil
@@ -36,7 +48,6 @@ module Spree
 
     # human readable list of variant options
     def variant_options(v, allow_back_orders = Spree::Config[:allow_backorders], include_style = true)
-      ActiveSupport::Deprecation.warn('variant_options method is deprecated, and will be removed in 0.80.0', caller)
       list = v.options_text
 
       # We shouldn't show out of stock if the product is infact in stock
@@ -110,7 +121,7 @@ module Spree
         crumbs << content_tag(:li, content_tag(:span, t(:products)))
       end
       crumb_list = content_tag(:ul, raw(crumbs.flatten.map{|li| li.mb_chars}.join), :class => 'inline')
-      content_tag(:div, crumb_list, :id => 'breadcrumbs')
+      content_tag(:nav, crumb_list, :id => 'breadcrumbs')
     end
 
     def taxons_tree(root_taxon, current_taxon, max_level = 1)
@@ -159,5 +170,13 @@ module Spree
         return current_order.item_count
       end
     end
+
+    def gem_available?(name)
+       Gem::Specification.find_by_name(name)
+    rescue Gem::LoadError
+       false
+    rescue
+       Gem.available?(name)
+    end
   end
 end

data/app/models/spree/activator.rb

@@ -13,7 +13,10 @@ module Spree
     end
 
     scope :event_name_starts_with, lambda{ |name| where('event_name LIKE ?', "#{name}%") }
-    scope :active, where('(starts_at IS NULL OR starts_at < ?) AND (expires_at IS NULL OR expires_at > ?)', Time.now, Time.now)
+
+    def self.active
+      where('(starts_at IS NULL OR starts_at < ?) AND (expires_at IS NULL OR expires_at > ?)', Time.now, Time.now)
+    end
 
     def activate(payload)
     end

data/app/models/spree/address.rb

@@ -23,49 +23,9 @@ module Spree
       end
     end
 
-    def state_validate
-      #skip state validation without country (also required)
-      #or when disabled by perfernce
-      return if self.country_id.blank? || !Spree::Config[:address_requires_state]
-
-      #ensure associated state belongs to country
-      if self.state_id.present?
-        if self.state.country_id == self.country_id
-          self.state_name = nil #not required as we have a valid state and country combo
-        else
-          if self.state_name.present?
-
-            self.state_id = nil
-          else
-            errors.add(:state, :invalid)
-          end
-        end
-      end
-
-      #ensure state_name belongs to country without states, or that it matches a predefined state name/abbr
-      if self.state_name.present?
-        if country.states.present?
-          states = country.states.find_all_by_name_or_abbr(self.state_name)
-
-          if states.size == 1
-            self.state = states.first
-            self.state_name = nil
-          else
-            errors.add(:state, :invalid)
-          end
-        end
-      end
-
-      #ensure at least one state field is populated
-      if self.state_id.blank? && self.state_name.blank?
-        errors.add(:state, :blank)
-      end
-
-    end
-
     def self.default
-      country = Spree::Country.find_by_id(Spree::Config[:default_country_id])
-      new(:country => country || Country.first)
+      country = Spree::Country.find(Spree::Config[:default_country_id]) rescue Spree::Country.first
+      new({:country => country}, :without_protection => true)
     end
 
     # can modify an address if it's not been used in an order (but checkouts controller has finer control)
@@ -74,7 +34,7 @@ module Spree
     # end
 
     def full_name
-      self.firstname + ' ' + self.lastname
+      "#{firstname} #{lastname}".strip
     end
 
     def state_text
@@ -82,8 +42,7 @@ module Spree
     end
 
     def zone
-      (state && state.zone) ||
-      (country && country.zone)
+      (state && state.zone) || (country && country.zone)
     end
 
     def zones
@@ -117,5 +76,46 @@ module Spree
     def empty?
       attributes.except('id', 'created_at', 'updated_at', 'order_id', 'country_id').all? { |_, v| v.nil? }
     end
+
+    private
+
+      def state_validate
+        #skip state validation without country (also required)
+        #or when disabled by perfernce
+        return if !country.present? || !Spree::Config[:address_requires_state]
+
+        #ensure associated state belongs to country
+        if state.present?
+          if state.country == country
+            self.state_name = nil #not required as we have a valid state and country combo
+          else
+            if state_name.present?
+              self.state = nil
+            else
+              errors.add(:state, :invalid)
+            end
+          end
+        end
+
+        #ensure state_name belongs to country without states, or that it matches a predefined state name/abbr
+        if state_name.present?
+          if country.states.present?
+            states = country.states.find_all_by_name_or_abbr(state_name)
+
+            if states.size == 1
+              self.state = states.first
+              self.state_name = nil
+            else
+              errors.add(:state, :invalid)
+            end
+          end
+        end
+
+        #ensure at least one state field is populated
+        if !state.present? && state_name.blank?
+          errors.add(:state, :blank)
+        end
+      end
+
   end
 end

data/app/models/spree/adjustment.rb

@@ -33,7 +33,7 @@ module Spree
 
     scope :tax, lambda { where(:originator_type => 'Spree::TaxRate', :adjustable_type => 'Spree::Order') }
     scope :price, lambda { where(:adjustable_type => 'Spree::LineItem') }
-    scope :shipping, lambda { where(:originator_type => 'Spree::ShippingMethod') }
+    scope :shipping, lambda { where(:label => I18n.t(:shipping)) }
     scope :optional, where(:mandatory => false)
     scope :eligible, where(:eligible => true)
     scope :charge, where("amount >= 0")
@@ -75,9 +75,9 @@ module Spree
 
     private
 
-    def update_adjustable
-      adjustable.update! if adjustable.is_a? Spree::Order
-    end
+      def update_adjustable
+        adjustable.update! if adjustable.is_a? Order
+      end
 
   end
 end

data/app/models/spree/app_configuration.rb

@@ -48,6 +48,7 @@ module Spree
     preference :default_seo_title, :string, :default => ''
     preference :dismissed_spree_alerts, :string, :default => ''
     preference :last_check_for_spree_alerts, :string, :default => nil
+    preference :layout, :string, :default => '/spree/layouts/spree_application'
     preference :logo, :string, :default => 'admin/bg/spree_50.png'
     preference :max_level_in_taxons_menu, :integer, :default => 1 # maximum nesting level in taxons menu
     preference :orders_per_page, :integer, :default => 15
@@ -64,6 +65,17 @@ module Spree
     preference :tax_using_ship_address, :boolean, :default => true
     preference :track_inventory_levels, :boolean, :default => true # will not track on_hand values for variants /products
 
+    # Preferences related to image settings
+    preference :attachment_default_url, :string, :default => '/spree/products/:id/:style/:basename.:extension'
+    preference :attachment_path, :string, :default => ':rails_root/public/spree/products/:id/:style/:basename.:extension'
+    preference :attachment_styles, :string, :default => "{\"mini\":\"48x48>\",\"small\":\"100x100>\",\"product\":\"240x240>\",\"large\":\"600x600>\"}"
+    preference :attachment_default_style, :string, :default => 'product'
+    preference :s3_access_key, :string
+    preference :s3_bucket, :string
+    preference :s3_secret, :string
+    preference :s3_headers, :string, :default => "{\"Cache-Control\":\"max-age=31557600\"}"
+    preference :use_s3, :boolean, :default => false # Use S3 for images rather than the file system
+
     # searcher_class allows spree extension writers to provide their own Search class
     def searcher_class
       @searcher_class ||= Spree::Core::Search::Base

data/app/models/spree/calculator/default_tax.rb

@@ -1,5 +1,3 @@
-require_dependency 'spree/calculator'
-
 module Spree
   class Calculator::DefaultTax < Calculator
     def self.description
@@ -19,7 +17,7 @@ module Spree
     private
 
       def rate
-        rate = self.calculable
+        self.calculable
       end
 
       def compute_order(order)

data/app/models/spree/calculator/flat_percent_item_total.rb

@@ -1,5 +1,3 @@
-require_dependency 'spree/calculator'
-
 module Spree
   class Calculator::FlatPercentItemTotal < Calculator
     preference :flat_percent, :decimal, :default => 0

data/app/models/spree/calculator/flat_rate.rb

@@ -1,9 +1,6 @@
-require_dependency 'spree/calculator'
-
 module Spree
   class Calculator::FlatRate < Calculator
     preference :amount, :decimal, :default => 0
-
     attr_accessible :preferred_amount
 
     def self.description

data/app/models/spree/calculator/flexi_rate.rb

@@ -1,12 +1,10 @@
-require_dependency 'spree/calculator'
-
 module Spree
   class Calculator::FlexiRate < Calculator
     preference :first_item,      :decimal, :default => 0.0
     preference :additional_item, :decimal, :default => 0.0
     preference :max_items,       :integer, :default => 0
 
-    attr_accessible :preferred_first_item, :preferred_additional_item, :preferred_max_items
+    attr_accessible :preferred_first_item, :preferred_additional_tiem, :preferred_max_items
 
     def self.description
       I18n.t(:flexible_rate)

data/app/models/spree/calculator/per_item.rb

@@ -1,5 +1,3 @@
-require_dependency 'spree/calculator'
-
 module Spree
   class Calculator::PerItem < Calculator
     preference :amount, :decimal, :default => 0
@@ -11,10 +9,7 @@ module Spree
     end
 
     def compute(object=nil)
-      return 0 if object.nil?
-      self.preferred_amount * object.line_items.reduce(0) do |sum, value|
-        sum + value.quantity
-      end
+      self.preferred_amount * object.line_items.length
     end
   end
 end

data/app/models/spree/calculator/price_sack.rb

@@ -1,5 +1,3 @@
-require_dependency 'spree/calculator'
-
 module Spree
   class Calculator::PriceSack < Calculator
     preference :minimal_amount, :decimal, :default => 0

data/app/models/spree/country.rb

@@ -1,6 +1,6 @@
 module Spree
   class Country < ActiveRecord::Base
-    has_many :states
+    has_many :states, :order => "name ASC"
 
     has_one :zone_member, :as => :zoneable
     has_one :zone, :through => :zone_member

data/app/models/spree/creditcard.rb

@@ -11,8 +11,7 @@ module Spree
     validates :number, :presence => true, :unless => :has_payment_profile?, :on => :create
     validates :verification_value, :presence => true, :unless => :has_payment_profile?, :on => :create
 
-    attr_accessible :first_name, :last_name, :number, :verification_value, :year,
-                :month, :gateway_customer_profile_id, :gateway_payment_profile_id
+    attr_accessible :first_name, :last_name, :number, :verification_value, :year, :month, :gateway_customer_profile_id
 
     def process!(payment)
       if Spree::Config[:auto_capture]
@@ -174,12 +173,12 @@ module Spree
       record_log payment, response
 
       if response.success?
-        Payment.create({ :order => payment.order,
-                         :source => payment,
-                         :payment_method => payment.payment_method,
-                         :amount => amount.abs * -1,
-                         :response_code => response.authorization,
-                         :state => 'completed'}, :without_protection => true)
+        Payment.create({:order => payment.order,
+                       :source => payment,
+                       :payment_method => payment.payment_method,
+                       :amount => amount.abs * -1,
+                       :response_code => response.authorization,
+                       :state => 'completed'}, :without_protection => true)
       else
         gateway_error(response)
       end
@@ -214,7 +213,7 @@ module Spree
     end
 
     def record_log(payment, response)
-      payment.log_entries.create(:details => response.to_yaml)
+      payment.log_entries.create({:details => response.to_yaml}, :without_protection => true)
     end
 
     def gateway_error(error)
@@ -261,7 +260,7 @@ module Spree
     end
 
     def spree_cc_type
-      return 'visa' if Rails.env == 'development'
+      return 'visa' if Rails.env.development?
       self.cc_type
     end
 

data/app/models/spree/gateway.rb

@@ -7,8 +7,6 @@ module Spree
     preference :server, :string, :default => 'test'
     preference :test_mode, :boolean, :default => true
 
-    attr_accessible :preferred_server, :preferred_test_mode
-
     def payment_source_class
       Creditcard
     end

data/app/models/spree/image.rb

@@ -1,19 +1,35 @@
 module Spree
   class Image < Asset
+    validates_attachment_presence :attachment
     validate :no_attachment_errors
 
-    attr_accessible :alt, :attachment, :position, :viewable_type, :viewable_id
+    attr_accessible :attachment, :alt, :viewable_id
 
     has_attached_file :attachment,
                       :styles => { :mini => '48x48>', :small => '100x100>', :product => '240x240>', :large => '600x600>' },
                       :default_style => :product,
                       :url => '/spree/products/:id/:style/:basename.:extension',
                       :path => ':rails_root/public/spree/products/:id/:style/:basename.:extension'
-
     # save the w,h of the original image (from which others can be calculated)
     # we need to look at the write-queue for images which have not been saved yet
     after_post_process :find_dimensions
 
+    attr_accessible :attachment, :position
+
+    # Load user defined paperclip settings
+    if Spree::Config[:use_s3]
+      s3_creds = { :access_key_id => Spree::Config[:s3_access_key], :secret_access_key => Spree::Config[:s3_secret], :bucket => Spree::Config[:s3_bucket] }
+      Spree::Image.attachment_definitions[:attachment][:storage] = :s3
+      Spree::Image.attachment_definitions[:attachment][:s3_credentials] = s3_creds
+      Spree::Image.attachment_definitions[:attachment][:s3_headers] = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
+      Spree::Image.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
+    end
+
+    Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
+    Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
+    Spree::Image.attachment_definitions[:attachment][:default_url] = Spree::Config[:attachment_default_url]
+    Spree::Image.attachment_definitions[:attachment][:default_style] = Spree::Config[:attachment_default_style]
+
     #used by admin products autocomplete
     def mini_url
       attachment.url(:mini, false)

data/app/models/spree/inventory_unit.rb

@@ -99,8 +99,10 @@ module Spree
 
         shipment = order.shipments.detect { |shipment| !shipment.shipped? }
 
-        sold.times { order.inventory_units.create(:variant => variant, :state => 'sold', :shipment => shipment) }
-        back_order.times { order.inventory_units.create(:variant => variant, :state => 'backordered', :shipment => shipment) }
+        attr_accessible :shipment
+
+        sold.times { order.inventory_units.create({:variant => variant, :state => 'sold', :shipment => shipment}, :without_protection => true) }
+        back_order.times { order.inventory_units.create({:variant => variant, :state => 'backordered', :shipment => shipment}, :without_protection => true) }
       end
 
       def update_order

data/app/models/spree/mail_method.rb

@@ -16,12 +16,7 @@ module Spree
     preference :mail_bcc, :string, :default => 'spree@example.com'
     preference :intercept_email, :string, :default => nil
 
-    attr_accessible :environment, :preferred_enable_mail_delivery,
-                :preferred_mails_from, :preferred_mail_bcc,
-                :preferred_intercept_email, :preferred_mail_domain,
-                :preferred_mail_host, :preferred_mail_port,
-                :preferred_secure_connection_type, :preferred_mail_auth_type,
-                :preferred_smtp_username, :preferred_smtp_password
+    attr_accessible :environment, :preferred_enable_mail_delivery, :preferred_mails_from, :preferred_mail_bcc, :preferred_intercept_email, :preferred_mail_domain, :preferred_mail_host, :preferred_mail_port, :preferred_secure_connection_type, :preferred_mail_auth_type, :preferred_smtp_username, :preferred_smtp_password
 
     validates :environment, :presence => true
 

data/app/models/spree/option_type.rb

@@ -4,11 +4,13 @@ module Spree
     has_many :product_option_types, :dependent => :destroy
     has_and_belongs_to_many :prototypes, :join_table => 'spree_option_types_prototypes'
 
-    attr_accessible :name, :presentation, :option_values_attributes
+    attr_accessible :name, :presentation
 
     validates :name, :presentation, :presence => true
     default_scope :order => "#{self.table_name}.position"
 
+    attr_accessible :option_values_attributes
+
     accepts_nested_attributes_for :option_values, :reject_if => lambda { |ov| ov[:name].blank? || ov[:presentation].blank? }, :allow_destroy => true
   end
 end