stall 0.1.1 → 0.1.2

data/lib/stall/shipping/calculator.rb

@@ -8,9 +8,9 @@ module Stall
         @config = config
       end
 
-      def available_for?(_address)
+      def available?
         raise NoMethodError,
-          'Shipping calculators must implement the #available_for? method ' \
+          'Shipping calculators must implement the #available? method ' \
           'to allow filtering available shipping methods'
       end
 
@@ -20,8 +20,41 @@ module Stall
           'the actual shipping price for the given cart'
       end
 
+      def eot_price
+        price / (1 + (vat_rate / 100.0))
+      end
+
+      def vat_rate
+        Stall.config.vat_rate
+      end
+
+      # Register a calculator from inside the class.
+      #
+      # This is useful for registering the calculator direclty in the class
+      # body, but is not suited for "auto-loaded" classes because of Rails'
+      # class unloading behavior
+      #
       def self.register(name)
-        Stall::Shipping.calculators[name] = self
+        Stall.config.shipping.register_calculator(name, self)
+      end
+
+      # Fetch a shipping calculator from a shipping method or a shipping
+      # method identifier
+      #
+      def self.for(shipping_method)
+        identifier = case shipping_method
+        when String, Symbol then shipping_method.to_s
+        else shipping_method.identifier
+        end
+
+        name = Stall::Shipping.calculators[identifier]
+        String === name ? name.constantize : name
+      end
+
+      private
+
+      def address
+        cart.shipping_address || cart.billing_address
       end
     end
   end

data/lib/stall/shipping/config.rb

@@ -1,13 +1,27 @@
 module Stall
   module Shipping
     class Config
+      # This mehtod allows for registering an in-app calculator that can be
+      # auto loaded without having to explicitly require it
+      #
+      # Use a string representing the calculator name if the target class is
+      # auto-loaded by Rails
+      #
+      def register_calculator(name, calculator)
+        Stall::Shipping.calculators[name] = calculator
+      end
+
       def configure
-        yield config
+        yield self
       end
 
       def method_missing(name, *args)
-        if (calculator = Stall::Shipping.calculators[name])
-          calculator
+        if (calculator = Stall::Shipping::Calculator.for(name))
+          if block_given?
+            yield calculator
+          else
+            calculator
+          end
         else
           super
         end

data/lib/stall/shipping/country_weight_table_calculator.rb

@@ -3,7 +3,7 @@ require 'csv'
 module Stall
   module Shipping
     class CountryWeightTableCalculator < Stall::Shipping::Calculator
-      def available_for?(address)
+      def available?
         country?(address.country)
       end
 

data/lib/stall/shipping/free_shipping_calculator.rb

@@ -9,7 +9,7 @@ module Stall
         0
       end
 
-      def available_for?(address)
+      def available?
         if Array === available
           available.include?(address.country)
         elsif Proc === available

data/lib/stall/utils.rb

@@ -8,11 +8,11 @@ module Stall
       def try_load_constant(name)
         begin
           name.constantize
-        rescue NameError
+        rescue NameError => e
           begin
             require name.underscore
             name.constantize
-          rescue LoadError, NameError
+          rescue LoadError, NameError => e
             nil
           end
         end

data/lib/stall/utils/config_dsl.rb

@@ -10,8 +10,12 @@ module Stall
         instance_variable_name = :"@#{ name }"
 
         define_method(name) do
-          instance_variable_get(instance_variable_name) ||
+          if (value = instance_variable_get(instance_variable_name))
+            value
+          else
+            default = default.call if default.is_a?(Proc)
             instance_variable_set(instance_variable_name, default)
+          end
         end
       end
     end

data/lib/stall/version.rb

@@ -1,3 +1,3 @@
 module Stall
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/tasks/stall_tasks.rake

@@ -2,3 +2,14 @@
 # task :stall do
 #   # Task goes here
 # end
+
+namespace :stall do
+  namespace :carts do
+    task clean: :environment do |task, args|
+      require 'stall/carts_cleaner'
+
+      model = (args.extras.first || 'Cart').constantize
+      Stall::CartsCleaner.new(model).clean!
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stall
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - vala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: cocoon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -274,8 +288,7 @@ files:
 - Rakefile
 - app/assets/javascripts/stall.coffee
 - app/assets/javascripts/stall/add-to-cart-form.coffee
-- app/assets/javascripts/stall/application.js
-- app/assets/javascripts/stall/carts.js
+- app/assets/javascripts/stall/cart-form.coffee
 - app/assets/stylesheets/stall/application.css
 - app/assets/stylesheets/stall/carts.css
 - app/controllers/stall/application_controller.rb
@@ -286,32 +299,54 @@ files:
 - app/controllers/stall/payments_controller.rb
 - app/helpers/stall/add_to_cart_helper.rb
 - app/helpers/stall/application_helper.rb
-- app/helpers/stall/cart_helper.rb
 - app/helpers/stall/checkout_helper.rb
-- app/models/stall/address.rb
-- app/models/stall/address_ownership.rb
-- app/models/stall/cart.rb
-- app/models/stall/customer.rb
-- app/models/stall/line_item.rb
-- app/models/stall/payment.rb
-- app/models/stall/payment_method.rb
-- app/models/stall/product_list.rb
-- app/models/stall/shipment.rb
-- app/models/stall/shipping_method.rb
+- app/helpers/stall/payments_helper.rb
+- app/mailers/stall/admin_mailer.rb
+- app/mailers/stall/base_mailer.rb
+- app/mailers/stall/customer_mailer.rb
+- app/models/address.rb
+- app/models/address_ownership.rb
+- app/models/adjustment.rb
+- app/models/cart.rb
+- app/models/customer.rb
+- app/models/line_item.rb
+- app/models/payment.rb
+- app/models/payment_method.rb
+- app/models/product_list.rb
+- app/models/shipment.rb
+- app/models/shipping_method.rb
+- app/models/stall/models.rb
+- app/models/stall/models/address.rb
+- app/models/stall/models/address_ownership.rb
+- app/models/stall/models/adjustment.rb
+- app/models/stall/models/cart.rb
+- app/models/stall/models/customer.rb
+- app/models/stall/models/line_item.rb
+- app/models/stall/models/payment.rb
+- app/models/stall/models/payment_method.rb
+- app/models/stall/models/product_list.rb
+- app/models/stall/models/shipment.rb
+- app/models/stall/models/shipping_method.rb
 - app/services/stall/add_to_cart_service.rb
 - app/services/stall/base_service.rb
+- app/services/stall/cart_update_service.rb
 - app/services/stall/payment_notification_service.rb
 - app/services/stall/shipping_fee_calculator_service.rb
 - app/views/checkout/steps/_informations.html.haml
 - app/views/checkout/steps/_payment.html.haml
 - app/views/checkout/steps/_payment_method.html.haml
+- app/views/checkout/steps/_payment_return.html.haml
 - app/views/checkout/steps/_shipping_method.html.haml
 - app/views/layouts/stall/application.html.erb
+- app/views/stall/admin_mailer/order_paid_email.html.haml
 - app/views/stall/carts/show.html.haml
 - app/views/stall/checkout/steps/show.html.haml
+- app/views/stall/customer_mailer/order_paid_email.html.haml
 - app/views/stall/line_items/_add_error.html.haml
 - app/views/stall/line_items/_added.html.haml
 - app/views/stall/line_items/_form.html.haml
+- app/views/stall/shared/mailers/_address.html.haml
+- app/views/stall/shared/mailers/_cart.html.haml
 - config/locales/stall.en.yml
 - config/locales/stall.fr.yml
 - db/migrate/20151103154313_create_stall_line_items.rb
@@ -324,6 +359,15 @@ files:
 - db/migrate/20160125100733_create_stall_payment_methods.rb
 - db/migrate/20160125100734_create_stall_payments.rb
 - db/migrate/20160127113619_add_user_to_customer.rb
+- db/migrate/20160304134849_change_all_json_columns_to_jsonb.rb
+- db/migrate/20160307142924_add_state_to_stall_addresses.rb
+- db/migrate/20160308142713_create_adjustments.rb
+- db/migrate/20160309165136_add_identifier_to_stall_product_lists.rb
+- db/migrate/20160316114649_add_data_to_stall_shipments.rb
+- db/migrate/20160317141632_add_state_to_stall_shipments.rb
+- db/migrate/20160629102943_add_active_to_stall_shipping_methods.rb
+- db/migrate/20160629104617_add_active_to_stall_payment_methods.rb
+- db/migrate/20160705110151_add_locale_to_stall_customers.rb
 - lib/generators/stall/checkout/step/step_generator.rb
 - lib/generators/stall/checkout/step/templates/step.html.haml.erb
 - lib/generators/stall/checkout/step/templates/step.rb.erb
@@ -331,19 +375,33 @@ files:
 - lib/generators/stall/checkout/wizard/wizard_generator.rb
 - lib/generators/stall/install/install_generator.rb
 - lib/generators/stall/install/templates/initializer.rb
+- lib/generators/stall/model/model_generator.rb
+- lib/generators/stall/service/service_generator.rb
+- lib/generators/stall/service/templates/service.rb.erb
+- lib/generators/stall/shipping/calculator/calculator_generator.rb
+- lib/generators/stall/shipping/calculator/templates/calculator.rb.erb
 - lib/stall.rb
 - lib/stall/addressable.rb
+- lib/stall/cart_helper.rb
+- lib/stall/carts_cleaner.rb
 - lib/stall/checkout.rb
 - lib/stall/checkout/informations_checkout_step.rb
 - lib/stall/checkout/payment_checkout_step.rb
 - lib/stall/checkout/payment_method_checkout_step.rb
+- lib/stall/checkout/payment_return_checkout_step.rb
 - lib/stall/checkout/shipping_method_checkout_step.rb
 - lib/stall/checkout/step.rb
+- lib/stall/checkout/step_form.rb
 - lib/stall/checkout/wizard.rb
 - lib/stall/config.rb
 - lib/stall/engine.rb
+- lib/stall/payable.rb
 - lib/stall/payments.rb
+- lib/stall/payments/config.rb
+- lib/stall/payments/fake_gateway_payment_notification.rb
 - lib/stall/payments/gateway.rb
+- lib/stall/payments/urls_config.rb
+- lib/stall/priceable.rb
 - lib/stall/rails/currency_helper.rb
 - lib/stall/rails/routing_mapper.rb
 - lib/stall/routes.rb

data/app/assets/javascripts/stall/application.js

@@ -1,13 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree .

data/app/assets/javascripts/stall/carts.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

data/app/helpers/stall/cart_helper.rb

@@ -1,28 +0,0 @@
-module Stall
-  module CartHelper
-    def current_cart
-      RequestStore.store[cart_store_key_for(:default)] ||= load_current_cart
-    end
-
-    private
-
-    def load_current_cart
-      if (cart_token = session[cart_store_key_for(:default)])
-        if (current_cart = Stall::Cart.find_by_token(cart_token))
-          return current_cart
-        end
-      end
-
-      # If no token was stored or the token does not exist anymore, create a
-      # new cart and store the new token
-      #
-      Stall::Cart.create!.tap do |cart|
-        session[cart_store_key_for(:default)] = cart.token
-      end
-    end
-
-    def cart_store_key_for(identifier)
-      ['stall', 'cart', identifier.to_s].join('.')
-    end
-  end
-end

data/app/models/stall/address.rb

@@ -1,5 +0,0 @@
-module Stall
-  class Address < ActiveRecord::Base
-    has_one :addressable_ownership, dependent: :destroy
-  end
-end

data/app/models/stall/address_ownership.rb

@@ -1,8 +0,0 @@
-module Stall
-  class AddressOwnership < ActiveRecord::Base
-    belongs_to :address
-    accepts_nested_attributes_for :address
-
-    belongs_to :addressable, polymorphic: true
-  end
-end

data/app/models/stall/cart.rb

@@ -1,31 +0,0 @@
-module Stall
-  class Cart < Stall::ProductList
-    include Stall::Addressable
-
-    store_accessor :data, :reference
-
-    has_one :shipment, dependent: :destroy, inverse_of: :cart
-    accepts_nested_attributes_for :shipment
-
-    has_one :payment, dependent: :destroy, inverse_of: :cart
-    accepts_nested_attributes_for :payment
-
-    after_save :ensure_reference, on: :create
-
-    def total_weight
-      line_items.reduce(0) do |total, line_item|
-        total + (line_item.weight || Stall.config.default_product_weight)
-      end
-    end
-
-    private
-
-    def ensure_reference
-      unless reference.present?
-        reference = [Time.now.strftime('%Y%m%d'), ('%05d' % id)].join('-')
-        self.reference = reference
-        save(validate: false)
-      end
-    end
-  end
-end

data/app/models/stall/customer.rb

@@ -1,8 +0,0 @@
-module Stall
-  class Customer < ActiveRecord::Base
-    include Stall::Addressable
-
-    belongs_to :user, polymorphic: true, inverse_of: :customer
-    accepts_nested_attributes_for :user
-  end
-end

data/app/models/stall/line_item.rb

@@ -1,49 +0,0 @@
-module Stall
-  class LineItem < ActiveRecord::Base
-    store_accessor :data, :weight
-
-    monetize :unit_eot_price_cents, :unit_price_cents,
-             :eot_price_cents, :price_cents,
-             with_model_currency: :currency, allow_nil: true
-
-    belongs_to :sellable, polymorphic: true
-    belongs_to :product_list
-
-    validates :name, :unit_price, :unit_eot_price, :vat_rate, :price, :quantity,
-              :eot_price, :sellable, presence: true
-
-    validates :unit_price, :unit_eot_price, :vat_rate, :price, :eot_price,
-              numericality: true
-
-    validates :quantity, numericality: { greater_than: 0 }
-
-    validate  :stock_availability
-
-    before_validation :refresh_total_prices
-
-    def like?(other)
-      [:sellable_id, :sellable_type].all? do |property|
-        public_send(property) == other.public_send(property)
-      end
-    end
-
-    def currency
-      product_list.try(:currency) || Money.default_currency
-    end
-
-    def vat
-      price - eot_price
-    end
-
-    private
-
-    # TODO : Stocks availibility handling
-    def stock_availability
-    end
-
-    def refresh_total_prices
-      self.eot_price = unit_eot_price * quantity if unit_eot_price && quantity
-      self.price     = unit_price     * quantity if unit_price     && quantity
-    end
-  end
-end