shoppe 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 014344c47bbbb180aaaaae7a97080439479c52bc
-  data.tar.gz: 027ad42e612ff511c693b1b20abec1cef3b30215
+  metadata.gz: e0acd52b00e0edd053fa7d90446d5a9b556810b0
+  data.tar.gz: d98f37c7e28f5826f2e94858d74989a24acbac37
 SHA512:
-  metadata.gz: 29ee8152ec86c82a103f3f44f3b45852e36846a9f25218b5720ae762346f1f2fc31c72d4535fe30231f577c0135057a6378362454e93f687c59f371b3bf291c7
-  data.tar.gz: 1c7b097aedf74a907c00ef5ff0d6a2299b895188382660e468f5f4f10271db26c1580bfc59531f18f1b8fd0e753f35042a7baf4caf8675779b90b7a2cab76d05
+  metadata.gz: 4ed7c349f5f0a0a3c2fe8d4aa006412529663c6e33cb1f98865e3eff5de9a51f171d312b476ff01820a714334fe724fc9227c883f8ae58929213039d3122ceaf
+  data.tar.gz: e9b4983307d928a4cdad022d1de88aa00166634a4ef571ca90ba69a2f42720ac12a372c6cbfa919b6bf5e4487f0685a615c5581f7c20f444f99b34dc7b721e4e

data/README.md

@@ -3,15 +3,21 @@
 Shoppe is an Rails-based e-commerce platform which allows you to easily introduce a
 catalogue-based store into your Rails 4 applications. 
 
+[![Build Status](https://travis-ci.org/tryshoppe/shoppe.svg?branch=master)](https://travis-ci.org/tryshoppe/shoppe)
 ![GemVersion](https://badge.fury.io/rb/shoppe.png)
 [![Code Climate](https://codeclimate.com/github/tryshoppe/core/badges/gpa.svg)](https://codeclimate.com/github/tryshoppe/core)
 
 * [Check out the website](http://tryshoppe.com)
 * [View the demo site](http://demo.tryshoppe.com)
+* [Read the Getting Started guide](http://tryshoppe.com/docs/tutorials/getting-started)
 * [Check out the demo site source](http://github.com/tryshoppe/example-store)
 * [Read the release notes](https://github.com/tryshoppe/core/blob/master/CHANGELOG.md)
 * [Read API documentation](http://api.tryshoppe.com)
 
+## Is it any good?
+
+[Yes](http://news.ycombinator.com/item?id=3067434)
+
 ## Features
 
 * An attractive & easy to use admin interface with integrated authentication

data/app/assets/stylesheets/shoppe/application.scss

@@ -425,11 +425,22 @@ header.main {
 			border:1px solid #DCE2EB;
 			padding:15px;
 			dl {
-				width:23%;float:left;
+				float:left;
 				dt {  margin-bottom:4px; font-size:0.9em;color:#A9AEB5; font-weight:500;}
-				&.text { width:27%;margin-right:2%;}
-				&.amount { width:25%;}
-				&.submit { width:15%; text-align:right; margin-top:15px;}
+				&.text {
+					width: 37%;
+					margin-right: 2%;
+				}
+
+				&.amount {
+					min-width: 131px;
+					margin-right: 2%;
+				}
+
+				&.submit {
+					text-align: right;
+					margin-top: 15px;
+				}
 			}
 		}
 		p.notice {

data/app/controllers/shoppe/application_controller.rb

@@ -27,7 +27,7 @@ module Shoppe
     end
     
     def current_user
-      @current_user ||= login_from_session || login_with_demo_mdoe || :false
+      @current_user ||= login_from_session || login_with_demo_mode || :false
     end
 
     def login_from_session
@@ -36,7 +36,7 @@ module Shoppe
       end
     end
     
-    def login_with_demo_mdoe
+    def login_with_demo_mode
       if Shoppe.settings.demo_mode?
         @user = User.first
       end

data/app/controllers/shoppe/customers_controller.rb

@@ -1,8 +1,7 @@
 module Shoppe
   class CustomersController < Shoppe::ApplicationController
-
-    before_filter { @active_nav = :customers }  
-    before_filter { params[:id] && @customer = Shoppe::Customer.find(params[:id])}
+    before_filter { @active_nav = :customers }
+    before_filter { params[:id] && @customer = Shoppe::Customer.find(params[:id]) }
 
     def index
       @query = Shoppe::Customer.ordered.page(params[:page]).search(params[:q])
@@ -21,35 +20,34 @@ module Shoppe
     def create
       @customer = Shoppe::Customer.new(safe_params)
       if @customer.save
-        redirect_to @customer, :flash => {:notice => "Customer has been created successfully"}
+        redirect_to @customer, flash: { notice: t('shoppe.customers.created_successfully') }
       else
-        render :action => "new"
+        render action: 'new'
       end
     end
 
     def update
       if @customer.update(safe_params)
-        redirect_to @customer, :flash => {:notice => "Customer has been updated successfully"}
+        redirect_to @customer, flash: { notice: t('shoppe.customers.updated_successfully') }
       else
-        render :action => "edit"
+        render action: 'edit'
       end
     end
 
     def destroy
       @customer.destroy
-      redirect_to customers_path, :flash => {:notice => "Customer has been deleted successfully"}
+      redirect_to customers_path, flash: { notice: t('shoppe.customers.deleted_successfully') }
     end
 
     def search
       index
-      render :action => "index"
+      render action: 'index'
     end
 
     private
-  
+
     def safe_params
       params[:customer].permit(:first_name, :last_name, :company, :email, :phone, :mobile)
     end
-
   end
-end
+end

data/app/models/shoppe/address.rb

@@ -6,32 +6,32 @@ module Shoppe
 
     # Set the table name
     self.table_name = "shoppe_addresses"
-    
+
     # The customer which this address should be linked to
-    # 
+    #
     # @return [Shoppe::Customer]
-    belongs_to :customer, :class_name => "Shoppe::Customer"
-    
+    belongs_to :customer, class_name: "Shoppe::Customer"
+
     # The order which this address should be linked to
-    # 
+    #
     # @return [Shoppe::Order]
-    belongs_to :order, :class_name => "Shoppe::Order"
+    belongs_to :order, class_name: "Shoppe::Order"
 
     # The country which this address should be linked to
     #
     # @return [Shoppe::Country]
-    belongs_to :country, :class_name => "Shoppe::Country"
+    belongs_to :country, class_name: "Shoppe::Country"
 
     # Validations
-    validates :address_type, :presence => true, :inclusion => {:in => TYPES}
-    validates :address1, :presence => true
-    validates :address3, :presence => true
-    validates :address4, :presence => true
-    validates :postcode, :presence => true
-    validates :country, :presence => true
+    validates :address_type, presence: true, inclusion: {in: TYPES}
+    validates :address1, presence: true
+    validates :address3, presence: true
+    validates :address4, presence: true
+    validates :postcode, presence: true
+    validates :country, presence: true
 
     # All addresses ordered by their id asending
-    scope :ordered, -> { order(:id => :desc)}
+    scope :ordered, -> { order(id: :desc)}
     scope :default, -> { where(default: true)}
     scope :billing, -> { where(address_type: "billing")}
     scope :delivery, -> { where(address_type: "delivery")}

data/app/models/shoppe/attachment.rb

@@ -8,14 +8,14 @@ module Shoppe
     mount_uploader :file, AttachmentUploader
 
     # Relationships
-    belongs_to :parent, :polymorphic => true
+    belongs_to :parent, polymorphic: true
 
     # Validations
-    validates :file_name, :presence => true
-    validates :file_type, :presence => true
-    validates :file_size, :presence => true
-    validates :file, :presence => true
-    validates :token, :presence => true, :uniqueness => true
+    validates :file_name, presence: true
+    validates :file_type, presence: true
+    validates :file_size, presence: true
+    validates :file, presence: true
+    validates :token, presence: true, uniqueness: true
 
     # All attachments should have a token assigned to this
     before_validation { self.token = SecureRandom.uuid if self.token.blank? }
@@ -31,7 +31,7 @@ module Shoppe
 
     # Return the attachment for a given role
     def self.for(role)
-      self.where(:role => role).first
+      self.where(role: role).first
     end
 
     # Return the path to the attachment
@@ -43,6 +43,6 @@ module Shoppe
     def image?
       file_type.match(/\Aimage\//).present?
     end
-    
+
   end
-end
+end

data/app/models/shoppe/country.rb

@@ -1,27 +1,27 @@
 module Shoppe
-  
+
   # The Shoppe::Country model stores countries which can be used for delivery & billing
   # addresses for orders.
   #
-  # You can use the Shoppe::CountryImporter to import a pre-defined list of countries 
-  # into your database. This automatically happens when you run the 'shoppe:setup' 
+  # You can use the Shoppe::CountryImporter to import a pre-defined list of countries
+  # into your database. This automatically happens when you run the 'shoppe:setup'
   # rake task.
-  
+
   class Country < ActiveRecord::Base
-    
+
     self.table_name = 'shoppe_countries'
-    
+
     # All orders which have this country set as their billing country
-    has_many :billed_orders, :dependent => :restrict_with_exception, :class_name => 'Shoppe::Order', :foreign_key => 'billing_country_id'
-    
+    has_many :billed_orders, dependent: :restrict_with_exception, class_name: 'Shoppe::Order', foreign_key: 'billing_country_id'
+
     # All orders which have this country set as their delivery country
-    has_many :delivered_orders, :dependent => :restrict_with_exception, :class_name => 'Shoppe::Order', :foreign_key => 'delivery_country_id'
-    
+    has_many :delivered_orders, dependent: :restrict_with_exception, class_name: 'Shoppe::Order', foreign_key: 'delivery_country_id'
+
     # All countries ordered by their name asending
-    scope :ordered, -> { order(:name => :asc) }
-    
+    scope :ordered, -> { order(name: :asc) }
+
     # Validations
-    validates :name, :presence => true
-    
+    validates :name, presence: true
+
   end
 end

data/app/models/shoppe/customer.rb

@@ -1,18 +1,21 @@
 module Shoppe
   class Customer < ActiveRecord::Base
 
+    EMAIL_REGEX = /\A\b[A-Z0-9\.\_\%\-\+]+@(?:[A-Z0-9\-]+\.)+[A-Z]{2,6}\b\z/i
+    PHONE_REGEX = /\A[+?\d\ \-x\(\)]{7,}\z/
+
     self.table_name = "shoppe_customers"
 
-    has_many :addresses, :dependent => :restrict_with_exception, :class_name => "Shoppe::Address"
+    has_many :addresses, dependent: :restrict_with_exception, class_name: "Shoppe::Address"
 
-    has_many :orders, :dependent => :restrict_with_exception, :class_name => "Shoppe::Order"
+    has_many :orders, dependent: :restrict_with_exception, class_name: "Shoppe::Order"
 
     # Validations
-    validates :email, :presence => true, :uniqueness => true, :format => {:with => /\A\b[A-Z0-9\.\_\%\-\+]+@(?:[A-Z0-9\-]+\.)+[A-Z]{2,6}\b\z/i}
-    validates :phone, :presence => true, :format => {:with => /\A[\d\ \-x\(\)]{7,}\z/}
+    validates :email, presence: true, uniqueness: true, format: { with: EMAIL_REGEX}
+    validates :phone, presence: true, format: { with: PHONE_REGEX }
 
     # All customers ordered by their ID desending
-    scope :ordered, -> { order(:id => :desc)}
+    scope :ordered, -> { order(id: :desc)}
 
     # The name of the customer in the format of "Company (First Last)" or if they don't have
     # company specified, just "First Last".
@@ -29,13 +32,13 @@ module Shoppe
       "#{first_name} #{last_name}"
     end
 
-    def self.ransackable_attributes(auth_object = nil) 
+    def self.ransackable_attributes(auth_object = nil)
       ["id", "first_name", "last_name", "company", "email", "phone", "mobile"] + _ransackers.keys
     end
-  
+
     def self.ransackable_associations(auth_object = nil)
       []
     end
 
   end
-end
+end

data/app/models/shoppe/delivery_service.rb

@@ -1,21 +1,21 @@
 module Shoppe
   class DeliveryService < ActiveRecord::Base
-  
+
     self.table_name = 'shoppe_delivery_services'
 
     # Validations
-    validates :name, :presence => true
-    validates :courier, :presence => true
-  
+    validates :name, presence: true
+    validates :courier, presence: true
+
     # Orders which are assigned to this delivery service
-    has_many :orders, :dependent => :restrict_with_exception, :class_name => 'Shoppe::Order'
-    
+    has_many :orders, dependent: :restrict_with_exception, class_name: 'Shoppe::Order'
+
     # Prices for the different levels of service within this delivery service
-    has_many :delivery_service_prices, :dependent => :destroy, :class_name => 'Shoppe::DeliveryServicePrice'
-  
+    has_many :delivery_service_prices, dependent: :destroy, class_name: 'Shoppe::DeliveryServicePrice'
+
     # All active delivery services
-    scope :active, -> { where(:active => true)}
-    
+    scope :active, -> { where(active: true)}
+
     # Returns a tracking URL for the passed order
     #
     # @param order [Shoppe::Order]

data/app/models/shoppe/delivery_service_price.rb

@@ -3,29 +3,29 @@ module Shoppe
 
     # Set the table name
     self.table_name = 'shoppe_delivery_service_prices'
-  
+
     include Shoppe::AssociatedCountries
-  
+
     # The delivery service which this price belongs to
-    belongs_to :delivery_service, :class_name => 'Shoppe::DeliveryService'
-    
+    belongs_to :delivery_service, class_name: 'Shoppe::DeliveryService'
+
     # The tax rate which should be applied
-    belongs_to :tax_rate, :class_name => "Shoppe::TaxRate"
-    
+    belongs_to :tax_rate, class_name: "Shoppe::TaxRate"
+
     # Validations
-    validates :code, :presence => true
-    validates :price, :numericality => true
-    validates :cost_price, :numericality => true, :allow_blank => true
-    validates :min_weight, :numericality => true
-    validates :max_weight, :numericality => true
-  
+    validates :code, presence: true
+    validates :price, numericality: true
+    validates :cost_price, numericality: true, allow_blank: true
+    validates :min_weight, numericality: true
+    validates :max_weight, numericality: true
+
     # All prices ordered by their price ascending
-    scope :ordered, -> { order(:price => :asc) }
-    
+    scope :ordered, -> { order(price: :asc) }
+
     # All prices which are suitable for the weight passed.
     #
     # @param weight [BigDecimal] the weight of the order
     scope :for_weight, -> weight { where("min_weight <= ? AND max_weight >= ?", weight, weight) }
-  
+
   end
 end

data/app/models/shoppe/order.rb

@@ -1,6 +1,9 @@
 module Shoppe
   class Order < ActiveRecord::Base
 
+    EMAIL_REGEX = /\A\b[A-Z0-9\.\_\%\-\+]+@(?:[A-Z0-9\-]+\.)+[A-Z]{2,6}\b\z/i
+    PHONE_REGEX = /\A[+?\d\ \-x\(\)]{7,}\z/
+
     self.table_name = 'shoppe_orders'
 
     # Orders can have properties
@@ -13,21 +16,21 @@ module Shoppe
     require_dependency 'shoppe/order/delivery'
 
     # All items which make up this order
-    has_many :order_items, :dependent => :destroy, :class_name => 'Shoppe::OrderItem', :inverse_of => :order
-    accepts_nested_attributes_for :order_items, :allow_destroy => true, :reject_if => Proc.new { |a| a['ordered_item_id'].blank? }
+    has_many :order_items, dependent: :destroy, class_name: 'Shoppe::OrderItem', inverse_of: :order
+    accepts_nested_attributes_for :order_items, allow_destroy: true, reject_if: Proc.new { |a| a['ordered_item_id'].blank? }
 
     # All products which are part of this order (accessed through the items)
-    has_many :products, :through => :order_items, :class_name => 'Shoppe::Product', :source => :ordered_item, :source_type => 'Shoppe::Product'
+    has_many :products, through: :order_items, class_name: 'Shoppe::Product', source: :ordered_item, source_type: 'Shoppe::Product'
 
     # The order can belong to a customer
-    belongs_to :customer, :class_name => 'Shoppe::Customer'
-    has_many :addresses, :through => :customers, :class_name => "Shoppe::Address"
+    belongs_to :customer, class_name: 'Shoppe::Customer'
+    has_many :addresses, through: :customers, class_name: 'Shoppe::Address'
 
     # Validations
-    validates :token, :presence => true
-    with_options :if => Proc.new { |o| !o.building? } do |order|
-      order.validates :email_address, :format => {:with => /\A\b[A-Z0-9\.\_\%\-\+]+@(?:[A-Z0-9\-]+\.)+[A-Z]{2,6}\b\z/i}
-      order.validates :phone_number, :format => {:with => /\A[\d\ \-x\(\)]{7,}\z/}
+    validates :token, presence: true
+    with_options if: Proc.new { |o| !o.building? } do |order|
+      order.validates :email_address, format: { with: EMAIL_REGEX }
+      order.validates :phone_number, format: { with: PHONE_REGEX }
     end
 
     # Set some defaults

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

@@ -1,13 +1,13 @@
 module Shoppe
   class Order < ActiveRecord::Base
-    
+
     extend ActiveModel::Callbacks
-    
+
     # These additional callbacks allow for applications to hook into other
     # parts of the order lifecycle.
     define_model_callbacks :confirmation, :acceptance, :rejection
-  
-    # This method should be called by the base application when the user has completed their 
+
+    # This method should be called by the base application when the user has completed their
     # first round of entering details. This will mark the order as "confirming" which means
     # the customer now just must confirm.
     #
@@ -21,7 +21,7 @@ module Shoppe
         false
       end
     end
-  
+
     # This method should be executed by the application when the order should be completed
     # by the customer. It will raise exceptions if anything goes wrong or return true if
     # the order has been confirmed successfully
@@ -30,9 +30,9 @@ module Shoppe
     def confirm!
       no_stock_of = self.order_items.select(&:validate_stock_levels)
       unless no_stock_of.empty?
-        raise Shoppe::Errors::InsufficientStockToFulfil, :order => self, :out_of_stock_items => no_stock_of
+        raise Shoppe::Errors::InsufficientStockToFulfil, order: self, out_of_stock_items: no_stock_of
       end
-    
+
       run_callbacks :confirmation do
         # If we have successfully charged the card (i.e. no exception) we can go ahead and mark this
         # order as 'received' which means it can be accepted by staff.
@@ -45,14 +45,14 @@ module Shoppe
         # Send an email to the customer
         deliver_received_order_email
       end
-    
+
       # We're all good.
       true
     end
-  
+
     # Mark order as accepted
     #
-    # @param user [Shoppe::User] the user who carried out this action    
+    # @param user [Shoppe::User] the user who carried out this action
     def accept!(user = nil)
       run_callbacks :acceptance do
         self.accepted_at = Time.now
@@ -63,7 +63,7 @@ module Shoppe
         deliver_accepted_order_email
       end
     end
-  
+
     # Mark order as rejected
     #
     # @param user [Shoppe::User] the user who carried out the action
@@ -79,16 +79,16 @@ module Shoppe
     end
 
     def deliver_accepted_order_email
-      Shoppe::OrderMailer.accepted(self).deliver_now
+      Shoppe::OrderMailer.accepted(self).deliver
     end
 
     def deliver_rejected_order_email
-      Shoppe::OrderMailer.rejected(self).deliver_now
+      Shoppe::OrderMailer.rejected(self).deliver
     end
 
     def deliver_received_order_email
-      Shoppe::OrderMailer.received(self).deliver_now
+      Shoppe::OrderMailer.received(self).deliver
     end
-    
+
   end
 end