comable_core 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0847e05a0d1404a70910a95138f0666315b06db
-  data.tar.gz: 213b8f3f6e5d9f11779633b3ce76eb97a366075a
+  metadata.gz: b77ac8195add8320091e5c17e8b8eb99d3a0ef5f
+  data.tar.gz: 9b4e674341684b9d4d6807aa9283a4eee1c40594
 SHA512:
-  metadata.gz: 9fcebb0bbdd4673c92acacaea3fe91ebed3591b10dbc050c86311a0026acfe431460e0a46c9fabec158fc00ea7ef59561d14ee566800d0e8e8d10aea26915483
-  data.tar.gz: d2bba80062e20dd7320057eb35e70c4c2e4f609ae522288b5fc43691a621977f2a06039d3d4caaa390f482be08dc530ce947d69fe04dd36ced4d138e8794a6f4
+  metadata.gz: ea16779b2ba3b37d19946de36f67bdbf846914750d4e006ebf86e7483a4c415c7163854e66aa4b1d8f1b7e056d285648bd529d13d0d1000dfb545490b5f19a1d
+  data.tar.gz: 42fba0d835446368be5aec1f6deaf0a316c763751c43998035648fc64ad15e565ac27fa6d9f6f403e04243788cdef7ed43c8c3a91aa406bb791606d9746c21f7

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

@@ -10,4 +10,6 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require jquery
+//= require jquery_ujs
 //= require_tree .

data/app/helpers/comable/application_helper.rb

@@ -1,12 +1,15 @@
 module Comable
   module ApplicationHelper
     def current_store
-      @current_store || load_store
+      @current_store ||= Comable::Store.instance
     end
 
-    def current_customer
-      @current_customer || load_customer
-    end
+    # Override the devise method.
+    # The below codes move to core/lib/comable/core/engine.rb:
+    #
+    # def current_customer
+    #   ...
+    # end
 
     def current_order
       current_customer.incomplete_order
@@ -24,20 +27,5 @@ module Comable
         "x#{quantity}"
       ].join(' ')
     end
-
-    private
-
-    def load_store
-      @current_store = Comable::Store.instance
-    end
-
-    def load_customer
-      @current_customer = logged_in_customer
-      @current_customer ||= Comable::Customer.new(cookies)
-    end
-
-    def logged_in_customer
-      # Please override this method for logged in customer
-    end
   end
 end

data/app/mailers/comable/order_mailer.rb

@@ -12,11 +12,7 @@ module Comable
     private
 
     def subject_for(order)
-      [
-        current_store.name,
-        I18n.t('comable.order_mailer.complete.subject'),
-        order.code
-      ].join(' ')
+      I18n.t('comable.order_mailer.complete.subject', store_name: current_store.name, order_code: order.code)
     end
   end
 end

data/app/models/comable/address.rb

@@ -0,0 +1,13 @@
+module Comable
+  class Address < ActiveRecord::Base
+    extend Enumerize
+
+    belongs_to :customer, class_name: Comable::Customer.name, foreign_key: Comable::Customer.table_name.singularize.foreign_key, autosave: false
+
+    enumerize :assign_key, in: {
+      nothing: nil,
+      bill: 1,
+      ship: 2
+    }
+  end
+end

data/app/models/comable/customer.rb

@@ -2,8 +2,12 @@ module Comable
   class Customer < ActiveRecord::Base
     include CartOwner
 
-    has_many :comable_orders, class_name: Comable::Order.name, foreign_key: table_name.singularize.foreign_key
-    alias_method :orders, :comable_orders
+    has_many :orders, class_name: Comable::Order.name, foreign_key: table_name.singularize.foreign_key
+
+    has_many :comable_addresses, class_name: Comable::Address.name, foreign_key: table_name.singularize.foreign_key
+    alias_method :addresses, :comable_addresses
+
+    devise(*Comable::Config.devise_strategies[:customer])
 
     def initialize(*args)
       obj = args.first
@@ -16,12 +20,18 @@ module Comable
       end
     end
 
-    def logged_in?
+    # Add conditions for the orders association.
+    # Override method of the orders association to support Rails 3.x.
+    def orders
+      super.complete
+    end
+
+    def signed_in?
       !new_record?
     end
 
-    def not_logged_in?
-      !logged_in?
+    def not_signed_in?
+      !signed_in?
     end
 
     def reset_cart
@@ -43,18 +53,20 @@ module Comable
 
     def preorder(order_params = {})
       incomplete_order.attributes = order_params
-      incomplete_order.precomplete
+      incomplete_order.precomplete!
+      incomplete_order
     end
 
     def order(order_params = {})
       incomplete_order.attributes = order_params
-      incomplete_order.complete.tap { |completed_flag| reset_cart if completed_flag }
+      incomplete_order.complete!
+      incomplete_order.tap { |completed_flag| reset_cart if completed_flag }
     end
 
     private
 
     def current_guest_token
-      return if logged_in?
+      return if signed_in?
       @cookies.signed[:guest_token]
     end
 
@@ -62,7 +74,7 @@ module Comable
       orders = find_incomplete_orders
       return orders.first if orders.any?
       order = orders.create(family_name: family_name, first_name: first_name, email: email, order_deliveries_attributes: [{ family_name: family_name, first_name: first_name }])
-      @cookies.permanent.signed[:guest_token] = order.guest_token if not_logged_in?
+      @cookies.permanent.signed[:guest_token] = order.guest_token if not_signed_in?
       order
     end
 

data/app/models/comable/order.rb

@@ -3,7 +3,7 @@ module Comable
     belongs_to :customer, class_name: Comable::Customer.name, foreign_key: Comable::Customer.table_name.singularize.foreign_key, autosave: false
     belongs_to :payment, class_name: Comable::Payment.name, foreign_key: Comable::Payment.table_name.singularize.foreign_key, autosave: false
     belongs_to :shipment_method, class_name: Comable::ShipmentMethod.name, autosave: false
-    has_many :order_deliveries, dependent: :destroy, class_name: Comable::OrderDelivery.name, foreign_key: table_name.singularize.foreign_key
+    has_many :order_deliveries, dependent: :destroy, class_name: Comable::OrderDelivery.name, foreign_key: table_name.singularize.foreign_key, inverse_of: :order
 
     accepts_nested_attributes_for :order_deliveries
 
@@ -29,16 +29,23 @@ module Comable
     scope :incomplete, -> { where(completed_at: nil) }
 
     def precomplete
-      valid_stock
-      fail Comable::InvalidOrder, errors.full_messages.join("\n") if errors.any?
+      valid_order_quantity?
+    end
+
+    def precomplete!
+      fail Comable::InvalidOrder unless precomplete
       self
     end
 
     def complete
       # TODO: トランザクションの追加
       run_callbacks :complete do
-        save_to_complete!
+        save_to_complete
       end
+    end
+
+    def complete!
+      fail Comable::InvalidOrder unless complete
       self
     end
 
@@ -77,21 +84,17 @@ module Comable
 
     private
 
-    def save_to_complete!
+    def save_to_complete
       self.completed_at = Time.now
       self.shipment_fee = current_shipment_fee
       self.total_price = current_total_price
       generate_code
       order_deliveries.each(&:save_to_complete)
-      save!
+      save
     end
 
-    def valid_stock
-      order_deliveries.map(&:order_details).flatten.each do |order_detail|
-        return errors.add :base, "「#{order_detail.stock.name_with_sku}」の注文数が不正です。" if order_detail.quantity <= 0
-        quantity = order_detail.stock.quantity - order_detail.quantity
-        return errors.add :base, I18n.t('comable.errors.messages.product_soldout', name: order_detail.stock.name_with_sku) if quantity < 0
-      end
+    def valid_order_quantity?
+      order_deliveries.map(&:order_details).flatten.map(&:valid_order_quantity?).all?
     end
 
     def generate_code

data/app/models/comable/order_delivery.rb

@@ -1,7 +1,9 @@
 module Comable
   class OrderDelivery < ActiveRecord::Base
     belongs_to :order, class_name: Comable::Order.name, foreign_key: Comable::Order.table_name.singularize.foreign_key
-    has_many :order_details, dependent: :destroy, class_name: Comable::OrderDetail.name, foreign_key: table_name.singularize.foreign_key
+    has_many :order_details, dependent: :destroy, class_name: Comable::OrderDetail.name, foreign_key: table_name.singularize.foreign_key, inverse_of: :order_delivery
+
+    accepts_nested_attributes_for :order_details
 
     delegate :customer, to: :order
     delegate :guest_token, to: :order

data/app/models/comable/order_detail.rb

@@ -6,13 +6,17 @@ module Comable
     belongs_to :stock, class_name: Comable::Stock.name, foreign_key: Comable::Stock.table_name.singularize.foreign_key
     belongs_to :order_delivery, class_name: Comable::OrderDelivery.name, foreign_key: Comable::OrderDelivery.table_name.singularize.foreign_key
 
+    accepts_nested_attributes_for :stock
+
     # TODO: バリデーションの追加
 
     delegate :product, to: :stock
     delegate :guest_token, to: :order_delivery
     delegate :complete?, to: :order_delivery
+    delegate :order, to: :order_delivery
 
     before_save :save_to_add_cart, unless: :complete?
+    before_save :verify_quantity, unless: :complete?
 
     def save_to_complete
       self.attributes = current_attributes
@@ -39,10 +43,30 @@ module Comable
       price * quantity
     end
 
+    def valid_order_quantity?
+      if quantity <= 0
+        add_order_quantity_invalid_error_to_order
+        return false
+      end
+
+      if stock.soldout?(quantity: quantity)
+        add_product_soldout_error_to_order
+        return false
+      end
+
+      true
+    end
+
     private
 
     def decrement_stock
-      stock.decrement!(quantity: quantity)
+      return unless quantity
+      return unless stock.quantity
+      stock.quantity -= quantity
+    end
+
+    def verify_quantity
+      fail Comable::NoStock if stock.soldout?(quantity: quantity)
     end
 
     def current_attributes
@@ -56,5 +80,13 @@ module Comable
         sku_v_choice_name: stock.sku_v_choice_name
       }
     end
+
+    def add_order_quantity_invalid_error_to_order
+      order.errors.add :base, I18n.t('comable.errors.messages.order_quantity_invalid', name: stock.name_with_sku)
+    end
+
+    def add_product_soldout_error_to_order
+      order.errors.add :base, I18n.t('comable.errors.messages.product_soldout', name: stock.name_with_sku)
+    end
   end
 end

data/config/locales/ja.yml

@@ -9,6 +9,7 @@ ja:
         products_soldout: 'ご指定の商品は在庫が不足しています。'
         product_not_found: '%{name}は存在しないか削除された可能性があります。'
         products_not_found: 'ご指定の商品は存在しないか削除された可能性があります。'
+        order_quantity_invalid: '%{name}の注文数が不正です。'
 
     carts:
       add_product: '１つの商品がカートに入りました'
@@ -20,7 +21,7 @@ ja:
 
     order_mailer:
       complete:
-        subject: '注文完了メール'
+        subject: '%{store_name} 注文完了メール %{order_code}'
         dear: *honorific
         introductions: |-
           %{store_name} をご利用いただきましてありがとうございます。

data/db/migrate/20140120032559_create_comable_customers.rb

@@ -1,9 +1,43 @@
 class CreateComableCustomers < ActiveRecord::Migration
   def change
     create_table :comable_customers do |t|
-      t.string :family_name, null: false
-      t.string :first_name, null: false
+      ## Database authenticatable
       t.string :email, null: false
+      t.string :encrypted_password
+
+      ## Recoverable
+      t.string :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string :current_sign_in_ip
+      t.string :last_sign_in_ip
+
+      ## Confirmable
+      # t.string :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+
+      ## Others
+      t.string :family_name
+      t.string :first_name
     end
+
+    add_index :comable_customers, :email, unique: true
+    add_index :comable_customers, :reset_password_token, unique: true
+    # add_index :comable_customers, :confirmation_token, unique: true
+    # add_index :comable_customers, :unlock_token, unique: true
   end
 end

data/db/migrate/20141024025526_create_comable_addresses.rb

@@ -0,0 +1,19 @@
+class CreateComableAddresses < ActiveRecord::Migration
+  def change
+    create_table :comable_addresses do |t|
+      t.integer :comable_customer_id, null: false
+      t.integer :assign_key
+      t.string :family_name, null: false
+      t.string :first_name, null: false
+      t.string :zip_code, null: false, limit: 8
+      t.integer :comable_state_id
+      t.string :state_name, null: false
+      t.string :city, null: false
+      t.string :detail
+      t.string :phone_number, null: false, limit: 18
+      t.datetime :last_used_at
+    end
+
+    add_index :comable_addresses, [:comable_customer_id, :assign_key], unique: true, name: :comable_addresses_idx_01
+  end
+end

data/lib/comable/cart_owner.rb

@@ -49,18 +49,14 @@ module Comable
       cart_items = find_cart_items_by(stock)
       if cart_items.any?
         cart_item = cart_items.first
-        fail Comable::NoStock if stock.soldout?(quantity: quantity + cart_item.quantity)
         cart_item.quantity += quantity
         (cart_item.quantity > 0) ? cart_item.save : cart_item.destroy
       else
-        fail Comable::NoStock if stock.soldout?(quantity: quantity)
         cart_items.create(quantity: quantity)
       end
     end
 
     def reset_stock_from_cart(stock, quantity)
-      fail Comable::NoStock if stock.soldout?(quantity: quantity)
-
       cart_items = find_cart_items_by(stock)
       if quantity > 0
         return add_stock_to_cart(stock, quantity) if cart_items.empty?

data/lib/comable/core/configuration.rb

@@ -0,0 +1,10 @@
+module Comable
+  module Core
+    module Configuration
+      mattr_accessor :devise_strategies
+      @@devise_strategies = {
+        customer: [:database_authenticatable, :registerable, :recoverable, :rememberable, :trackable]
+      }
+    end
+  end
+end

data/lib/comable/core/engine.rb

@@ -9,6 +9,53 @@ module Comable
       end
 
       config.autoload_paths << "#{config.root}/app/models/concerns" if Rails::VERSION::MAJOR == 3
+
+      initializer 'comable.congiguration', before: :load_config_initializers do |app|
+        app.config.comable = Comable::Core::Configuration
+        Comable::Config = app.config.comable
+      end
+
+      # refs: https://github.com/plataformatec/devise/wiki/How-To:-Use-devise-inside-a-mountable-engine
+      initializer 'comable.devise.setup', before: :load_config_initializers do
+        Devise.setup do |config|
+          config.mailer_sender = 'comable@example.com'
+
+          require 'devise/orm/active_record'
+
+          config.case_insensitive_keys = [:email]
+          config.strip_whitespace_keys = [:email]
+          config.skip_session_storage = [:http_auth]
+          config.stretches = Rails.env.test? ? 1 : 10
+          config.reconfirmable = true
+          config.password_length = 8..128
+          config.reset_password_within = 6.hours
+          config.sign_out_via = :delete
+
+          # ==> Mountable engine configurations
+          config.router_name = :comable
+          config.parent_controller = 'Comable::ApplicationController'
+        end
+      end
+
+      initializer 'comable.devise.helpers' do
+        module DeviseHelperPrepender
+          def define_helpers(mapping)
+            super.tap do
+              mapping = mapping.name
+              return if mapping.to_sym != :customer
+
+              class_eval <<-METHODS, __FILE__, __LINE__ + 1
+                alias_method :devise_current_#{mapping}, :current_#{mapping}
+                def current_#{mapping}
+                  @current_#{mapping} ||= devise_current_#{mapping} || Comable::Customer.new(cookies)
+                end
+              METHODS
+            end
+          end
+        end
+
+        Devise::Controllers::Helpers.singleton_class.send(:prepend, DeviseHelperPrepender)
+      end
     end
   end
 end

data/lib/comable_core.rb

@@ -1,3 +1,8 @@
+require 'devise'
+require 'jquery-rails'
+require 'enumerize'
+
+require 'comable/core/configuration'
 require 'comable/core/engine'
 
 require 'comable/errors'
@@ -5,4 +10,9 @@ require 'comable/cart_owner'
 require 'comable/payment_method'
 
 module Comable
+  class << self
+    def setup(&_)
+      yield Comable::Config
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_core
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: enumerize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provide core functions for Comable.
 email:
 - hyoshida@appirits.com
@@ -37,6 +65,7 @@ files:
 - app/helpers/comable/application_helper.rb
 - app/helpers/comable/products_helper.rb
 - app/mailers/comable/order_mailer.rb
+- app/models/comable/address.rb
 - app/models/comable/customer.rb
 - app/models/comable/order.rb
 - app/models/comable/order_delivery.rb
@@ -59,7 +88,9 @@ files:
 - db/migrate/20140817194104_create_comable_payments.rb
 - db/migrate/20140921191416_create_comable_shipment_methods.rb
 - db/migrate/20140926063541_create_comable_stores.rb
+- db/migrate/20141024025526_create_comable_addresses.rb
 - lib/comable/cart_owner.rb
+- lib/comable/core/configuration.rb
 - lib/comable/core/engine.rb
 - lib/comable/errors.rb
 - lib/comable/payment_method.rb