shoppe 1.1.1 → 1.1.2

data/app/models/shoppe/order/billing.rb

@@ -4,20 +4,20 @@ module Shoppe
     # The country which this order should be billed to
     #
     # @return [Shoppe::Country]
-    belongs_to :billing_country, :class_name => 'Shoppe::Country', :foreign_key => 'billing_country_id'
+    belongs_to :billing_country, class_name: 'Shoppe::Country', foreign_key: 'billing_country_id'
 
     # Payments which have been stored for the order
-    has_many :payments, :dependent => :destroy, :class_name => 'Shoppe::Payment'
+    has_many :payments, dependent: :destroy, class_name: 'Shoppe::Payment'
 
     # Validations
-    with_options :if => Proc.new { |o| !o.building? } do |order|
-      order.validates :first_name, :presence => true
-      order.validates :last_name, :presence => true
-      order.validates :billing_address1, :presence => true
-      order.validates :billing_address3, :presence => true
-      order.validates :billing_address4, :presence => true
-      order.validates :billing_postcode, :presence => true
-      order.validates :billing_country, :presence => true
+    with_options if: Proc.new { |o| !o.building? } do |order|
+      order.validates :first_name, presence: true
+      order.validates :last_name, presence: true
+      order.validates :billing_address1, presence: true
+      order.validates :billing_address3, presence: true
+      order.validates :billing_address4, presence: true
+      order.validates :billing_postcode, presence: true
+      order.validates :billing_country, presence: true
     end
 
     # The name for billing purposes

data/app/models/shoppe/order/delivery.rb

@@ -4,29 +4,29 @@ module Shoppe
     # The associated delivery service
     #
     # @return [Shoppe::DeliveryService]
-    belongs_to :delivery_service, :class_name => 'Shoppe::DeliveryService'
+    belongs_to :delivery_service, class_name: 'Shoppe::DeliveryService'
 
     # The country where this order is being delivered to (if one has been provided)
     #
     # @return [Shoppe::Country]
-    belongs_to :delivery_country, :class_name => 'Shoppe::Country', :foreign_key => 'delivery_country_id'
+    belongs_to :delivery_country, class_name: 'Shoppe::Country', foreign_key: 'delivery_country_id'
 
     # The user who marked the order has shipped
     #
     # @return [Shoppe::User]
-    belongs_to :shipper, :class_name => 'Shoppe::User', :foreign_key => 'shipped_by'
+    belongs_to :shipper, class_name: 'Shoppe::User', foreign_key: 'shipped_by'
 
     # Set up a callback for use when an order is shipped
     define_model_callbacks :ship
 
     # Validations
-    with_options :if => :separate_delivery_address? do |order|
-      order.validates :delivery_name, :presence => true
-      order.validates :delivery_address1, :presence => true
-      order.validates :delivery_address3, :presence => true
-      order.validates :delivery_address4, :presence => true
-      order.validates :delivery_postcode, :presence => true
-      order.validates :delivery_country, :presence => true
+    with_options if: :separate_delivery_address? do |order|
+      order.validates :delivery_name, presence: true
+      order.validates :delivery_address1, presence: true
+      order.validates :delivery_address3, presence: true
+      order.validates :delivery_address4, presence: true
+      order.validates :delivery_postcode, presence: true
+      order.validates :delivery_country, presence: true
     end
 
     validate do
@@ -43,7 +43,7 @@ module Shoppe
       # Ensure that before we confirm the order that the delivery service which has been selected
       # is appropritae for the contents of the order.
       if self.delivery_required? && !self.valid_delivery_service?
-        raise Shoppe::Errors::InappropriateDeliveryService, :order => self
+        raise Shoppe::Errors::InappropriateDeliveryService, order: self
       end
       cache_delivery_pricing
     end
@@ -137,7 +137,7 @@ module Shoppe
     # @return [Array] an array of Shoppe:DeliveryServicePrice objects
     def delivery_service_prices
       if delivery_required?
-        prices = Shoppe::DeliveryServicePrice.joins(:delivery_service).where(:shoppe_delivery_services => {:active => true}).order(:price).for_weight(total_weight)
+        prices = Shoppe::DeliveryServicePrice.joins(:delivery_service).where(shoppe_delivery_services: {active: true}).order(:price).for_weight(total_weight)
         prices = prices.select { |p| p.countries.empty? || p.country?(self.delivery_country) }
         prices.sort{ |x,y| (y.delivery_service.default? ? 1 : 0) <=> (x.delivery_service.default? ? 1 : 0) } # Order by truthiness
       else
@@ -221,7 +221,7 @@ module Shoppe
         self.status = 'shipped'
         self.consignment_number = consignment_number
         self.save!
-        Shoppe::OrderMailer.shipped(self).deliver_now
+        Shoppe::OrderMailer.shipped(self).deliver
       end
     end
 

data/app/models/shoppe/order/states.rb

@@ -1,69 +1,69 @@
 module Shoppe
   class Order < ActiveRecord::Base
-    
+
     # An array of all the available statuses for an order
     STATUSES = ['building', 'confirming', 'received', 'accepted', 'rejected', 'shipped']
-    
+
     # The Shoppe::User who accepted the order
     #
     # @return [Shoppe::User]
-    belongs_to :accepter, :class_name => 'Shoppe::User', :foreign_key => 'accepted_by'
-    
+    belongs_to :accepter, class_name: 'Shoppe::User', foreign_key: 'accepted_by'
+
     # The Shoppe::User who rejected the order
     #
     # @return [Shoppe::User]
-    belongs_to :rejecter, :class_name => 'Shoppe::User', :foreign_key => 'rejected_by'
-    
+    belongs_to :rejecter, class_name: 'Shoppe::User', foreign_key: 'rejected_by'
+
     # Validations
-    validates :status, :inclusion => {:in => STATUSES}
-    
+    validates :status, inclusion: {in: STATUSES}
+
     # Set the status to building if we don't have a status
     after_initialize  { self.status = STATUSES.first if self.status.blank? }
-    
+
     # All orders which have been received
     scope :received, -> {where("received_at is not null")}
-    
+
     # All orders which are currently pending acceptance/rejection
-    scope :pending, -> { where(:status => 'received') }
-    
+    scope :pending, -> { where(status: 'received') }
+
     # All ordered ordered by their ID desending
-    scope :ordered, -> { order(:id => :desc)}
-    
+    scope :ordered, -> { order(id: :desc)}
+
     # Is this order still being built by the user?
     #
     # @return [Boolean]
     def building?
       self.status == 'building'
     end
-  
+
     # Is this order in the user confirmation step?
     #
     # @return [Boolean]
     def confirming?
       self.status == 'confirming'
     end
-  
+
     # Has this order been rejected?
     #
     # @return [Boolean]
     def rejected?
       !!self.rejected_at
     end
-  
+
     # Has this order been accepted?
     #
     # @return [Boolean]
     def accepted?
       !!self.accepted_at
     end
-  
+
     # Has the order been received?
     #
     # @return [Boolean]
     def received?
       !!self.received_at?
     end
-  
-    
+
+
   end
 end

data/app/models/shoppe/order_item.rb

@@ -6,17 +6,17 @@ module Shoppe
     # The associated order
     #
     # @return [Shoppe::Order]
-    belongs_to :order, :class_name => 'Shoppe::Order', :touch => true, :inverse_of => :order_items
+    belongs_to :order, class_name: 'Shoppe::Order', touch: true, inverse_of: :order_items
 
     # The item which has been ordered
-    belongs_to :ordered_item, :polymorphic => true
+    belongs_to :ordered_item, polymorphic: true
 
     # Any stock level adjustments which have been made for this order item
-    has_many :stock_level_adjustments, :as => :parent, :dependent => :nullify, :class_name => 'Shoppe::StockLevelAdjustment'
+    has_many :stock_level_adjustments, as: :parent, dependent: :nullify, class_name: 'Shoppe::StockLevelAdjustment'
 
     # Validations
-    validates :quantity, :numericality => true
-    validates :ordered_item, :presence => true
+    validates :quantity, numericality: true
+    validates :ordered_item, presence: true
 
     validate do
       unless in_stock?
@@ -46,13 +46,13 @@ module Shoppe
     # @param quantity [Fixnum] the number of items to order
     # @return [Shoppe::OrderItem]
     def self.add_item(ordered_item, quantity = 1)
-      raise Errors::UnorderableItem, :ordered_item => ordered_item unless ordered_item.orderable?
+      raise Errors::UnorderableItem, ordered_item: ordered_item unless ordered_item.orderable?
       transaction do
-        if existing = self.where(:ordered_item_id => ordered_item.id, :ordered_item_type => ordered_item.class.to_s).first
+        if existing = self.where(ordered_item_id: ordered_item.id, ordered_item_type: ordered_item.class.to_s).first
           existing.increase!(quantity)
           existing
         else
-          new_item = self.create(:ordered_item => ordered_item, :quantity => 0)
+          new_item = self.create(ordered_item: ordered_item, quantity: 0)
           new_item.increase!(quantity)
           new_item
         end
@@ -79,7 +79,7 @@ module Shoppe
       transaction do
         self.quantity += amount
         unless self.in_stock?
-          raise Shoppe::Errors::NotEnoughStock, :ordered_item => self.ordered_item, :requested_stock => self.quantity
+          raise Shoppe::Errors::NotEnoughStock, ordered_item: self.ordered_item, requested_stock: self.quantity
         end
         self.save!
         self.order.remove_delivery_service_if_invalid
@@ -231,7 +231,7 @@ module Shoppe
     # Allocate any unallocated stock for this order item. There is no return value.
     def allocate_unallocated_stock!
       if self.ordered_item.stock_control? && self.unallocated_stock != 0
-        self.ordered_item.stock_level_adjustments.create!(:parent => self, :adjustment => 0 - self.unallocated_stock, :description => "Order ##{self.order.number}")
+        self.ordered_item.stock_level_adjustments.create!(parent: self, adjustment: 0 - self.unallocated_stock, description: "Order ##{self.order.number}")
       end
     end
 

data/app/models/shoppe/payment.rb

@@ -8,17 +8,17 @@ module Shoppe
     # The associated order
     #
     # @return [Shoppe::Order]
-    belongs_to :order, :class_name => 'Shoppe::Order'
+    belongs_to :order, class_name: 'Shoppe::Order'
 
     # An associated payment (only applies to refunds)
     #
     # @return [Shoppe::Payment]
-    belongs_to :parent, :class_name => "Shoppe::Payment", :foreign_key => "parent_payment_id"
+    belongs_to :parent, class_name: "Shoppe::Payment", foreign_key: "parent_payment_id"
 
     # Validations
-    validates :amount, :numericality => true
-    validates :reference, :presence => true
-    validates :method, :presence => true
+    validates :amount, numericality: true
+    validates :reference, presence: true
+    validates :method, presence: true
 
     # Payments can have associated properties
     key_value_store :properties
@@ -58,12 +58,12 @@ module Shoppe
         amount = BigDecimal(amount)
         if refundable_amount >= amount
           transaction do
-            self.class.create(:parent => self, :order_id => self.order_id, :amount => 0-amount, :method => self.method, :reference => reference)
+            self.class.create(parent: self, order_id: self.order_id, amount: 0-amount, method: self.method, reference: reference)
             self.update_attribute(:amount_refunded, self.amount_refunded + amount)
             true
           end
         else
-          raise Shoppe::Errors::RefundFailed, :message => I18n.t('.refund_failed', refundable_amount: refundable_amount)
+          raise Shoppe::Errors::RefundFailed, message: I18n.t('.refund_failed', refundable_amount: refundable_amount)
         end
       end
     end

data/app/models/shoppe/product.rb

@@ -11,7 +11,7 @@ module Shoppe
     require_dependency 'shoppe/product/variants'
 
     # Attachments for this product
-    has_many :attachments, :as => :parent, :dependent => :destroy, :autosave => true, :class_name => "Shoppe::Attachment"
+    has_many :attachments, as: :parent, dependent: :destroy, autosave: true, class_name: "Shoppe::Attachment"
 
     # The product's categorizations
     #
@@ -25,38 +25,38 @@ module Shoppe
     # The product's tax rate
     #
     # @return [Shoppe::TaxRate]
-    belongs_to :tax_rate, :class_name => "Shoppe::TaxRate"
+    belongs_to :tax_rate, class_name: "Shoppe::TaxRate"
 
     # Ordered items which are associated with this product
-    has_many :order_items, :dependent => :restrict_with_exception, :class_name => 'Shoppe::OrderItem', :as => :ordered_item
+    has_many :order_items, dependent: :restrict_with_exception, class_name: 'Shoppe::OrderItem', as: :ordered_item
 
     # Orders which have ordered this product
-    has_many :orders, :through => :order_items, :class_name => 'Shoppe::Order'
+    has_many :orders, through: :order_items, class_name: 'Shoppe::Order'
 
     # Stock level adjustments for this product
-    has_many :stock_level_adjustments, :dependent => :destroy, :class_name => 'Shoppe::StockLevelAdjustment', :as => :item
+    has_many :stock_level_adjustments, dependent: :destroy, class_name: 'Shoppe::StockLevelAdjustment', as: :item
 
     # Validations
-    with_options :if => Proc.new { |p| p.parent.nil? } do |product|
+    with_options if: Proc.new { |p| p.parent.nil? } do |product|
       product.validate :has_at_least_one_product_category
-      product.validates :description, :presence => true
-      product.validates :short_description, :presence => true
+      product.validates :description, presence: true
+      product.validates :short_description, presence: true
     end
-    validates :name, :presence => true
-    validates :permalink, :presence => true, :uniqueness => true, :permalink => true
-    validates :sku, :presence => true
-    validates :weight, :numericality => true
-    validates :price, :numericality => true
-    validates :cost_price, :numericality => true, :allow_blank => true
+    validates :name, presence: true
+    validates :permalink, presence: true, uniqueness: true, permalink: true
+    validates :sku, presence: true
+    validates :weight, numericality: true
+    validates :price, numericality: true
+    validates :cost_price, numericality: true, allow_blank: true
 
     # Before validation, set the permalink if we don't already have one
     before_validation { self.permalink = self.name.parameterize if self.permalink.blank? && self.name.is_a?(String) }
 
     # All active products
-    scope :active, -> { where(:active => true) }
+    scope :active, -> { where(active: true) }
 
     # All featured products
-    scope :featured, -> {where(:featured => true)}
+    scope :featured, -> {where(featured: true)}
 
     # Localisations
     translates :name, :permalink, :description, :short_description
@@ -123,7 +123,7 @@ module Shoppe
 
     # Set attachment for the default_image role
     def default_image_file=(file)
-      self.attachments.build(:file => file, :role => 'default_image')
+      self.attachments.build(file: file, role: 'default_image')
     end
 
     # Return attachment for the data_sheet role
@@ -141,8 +141,8 @@ module Shoppe
     #
     # @return [Enumerable]
     def self.with_attributes(key, values)
-      product_ids = Shoppe::ProductAttribute.searchable.where(:key => key, :value => values).pluck(:product_id).uniq
-      where(:id => product_ids)
+      product_ids = Shoppe::ProductAttribute.searchable.where(key: key, value: values).pluck(:product_id).uniq
+      where(id: product_ids)
     end
 
     # Imports products from a spreadsheet file
@@ -158,10 +158,10 @@ module Shoppe
 
         # Don't import products where the name is blank
         unless row["name"].nil?
-          if product = find_by(name: row["name"])
-            # Dont import products with the same name but update quantities if they're not the same
+          if product = where(name: row["name"]).take
+            # Dont import products with the same name but update quantities
             qty = row["qty"].to_i
-            if qty > 0 && qty != product.stock
+            if qty > 0
               product.stock_level_adjustments.create!(description: I18n.t('shoppe.import'), adjustment: qty)
             end
           else
@@ -175,8 +175,8 @@ module Shoppe
             product.permalink  = row["permalink"]
 
             product.product_categories << begin
-              if Shoppe::ProductCategory.find_by(name: row["category_name"]).present?
-                Shoppe::ProductCategory.find_by(name: row["category_name"])
+              if Shoppe::ProductCategory.where(name: row["category_name"]).present?
+                Shoppe::ProductCategory.where(name: row["category_name"]).take
               else
                 Shoppe::ProductCategory.create(name: row["category_name"])
               end

data/app/models/shoppe/product/product_attributes.rb

@@ -1,13 +1,13 @@
 module Shoppe
   class Product < ActiveRecord::Base
-  
+
     # Product attributes for this product
-    has_many :product_attributes, -> { order(:position) }, :class_name => 'Shoppe::ProductAttribute'
-  
+    has_many :product_attributes, -> { order(:position) }, class_name: 'Shoppe::ProductAttribute'
+
     # Used for setting an array of product attributes which will be updated. Usually
     # received from a web browser.
     attr_accessor :product_attributes_array
-    
+
     # After saving automatically try to update the product attributes based on the
     # the contents of the product_attributes_array array.
     after_save do
@@ -15,6 +15,6 @@ module Shoppe
         self.product_attributes.update_from_array(product_attributes_array)
       end
     end
-  
+
   end
 end

data/app/models/shoppe/product/variants.rb

@@ -5,13 +5,13 @@ module Shoppe
     validate { errors.add :base, :can_belong_to_root if self.parent && self.parent.parent }
 
     # Variants of the product
-    has_many :variants, :class_name => 'Shoppe::Product', :foreign_key => 'parent_id', :dependent => :destroy
+    has_many :variants, class_name: 'Shoppe::Product', foreign_key: 'parent_id', dependent: :destroy
 
     # The parent product (only applies to variants)
-    belongs_to :parent, :class_name => 'Shoppe::Product', :foreign_key => 'parent_id'
+    belongs_to :parent, class_name: 'Shoppe::Product', foreign_key: 'parent_id'
 
     # All products which are not variants
-    scope :root, -> { where(:parent_id => nil) }
+    scope :root, -> { where(parent_id: nil) }
 
     # If a variant is created, the base product should be updated so that it doesn't have stock control enabled
     after_save do

data/app/models/shoppe/product_attribute.rb

@@ -1,23 +1,23 @@
 module Shoppe
   class ProductAttribute < ActiveRecord::Base
-  
-    self.table_name = 'shoppe_product_attributes'  
-    
+
+    self.table_name = 'shoppe_product_attributes'
+
     # Validations
-    validates :key, :presence => true
-  
+    validates :key, presence: true
+
     # The associated product
     #
     # @return [Shoppe::Product]
-    belongs_to :product, :class_name => 'Shoppe::Product'
-  
+    belongs_to :product, class_name: 'Shoppe::Product'
+
     # All attributes which are searchable
-    scope :searchable, -> { where(:searchable => true) }
-    
+    scope :searchable, -> { where(searchable: true) }
+
     # All attributes which are public
-    scope :publicly_accessible, -> { where(:public => true) }
-  
-    # Return the the available options as a hash
+    scope :publicly_accessible, -> { where(public: true) }
+
+    # Return the available options as a hash
     #
     # @return [Hash]
     def self.grouped_hash
@@ -26,7 +26,7 @@ module Shoppe
         h
       end
     end
-  
+
     # Create/update attributes for a product based on the provided hash of
     # keys & values.
     #
@@ -38,11 +38,11 @@ module Shoppe
         next if hash['key'].blank?
         index += 1
         params = hash.merge({
-          :searchable => hash['searchable'].to_s == '1',
-          :public => hash['public'].to_s == '1',
-          :position => index
+          searchable: hash['searchable'].to_s == '1',
+          public: hash['public'].to_s == '1',
+          position: index
         })
-        if existing_attr = self.where(:key => hash['key']).first
+        if existing_attr = self.where(key: hash['key']).first
           if hash['value'].blank?
             existing_attr.destroy
             index -= 1
@@ -53,14 +53,14 @@ module Shoppe
           attribute = self.create(params)
         end
       end
-      self.where(:key => existing_keys - array.map { |h| h['key']}).delete_all
+      self.where(key: existing_keys - array.map { |h| h['key']}).delete_all
       true
     end
-    
+
     def self.public
       ActiveSupport::Deprecation.warn("The use of Shoppe::ProductAttribute.public is deprecated. use Shoppe::ProductAttribute.publicly_accessible.")
       self.publicly_accessible
     end
-  
+
   end
 end