comable 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56d44aba496e45370483a0b7a625fcf96f4dabf2
-  data.tar.gz: 03b299ed0c7bcfb019964d1da1758175951052d0
+  metadata.gz: fa8570f259479b4b4a76b6c53c7b0619f43268e0
+  data.tar.gz: 20638bda91ba247e08fb561a27168f8ec67423af
 SHA512:
-  metadata.gz: d97538ce5e3a49d8c47b6f98da650be04606d4e51b535fc610ef9b9c334740bd17d9c6c66e4e2931c007851a27ce20eaa0b5bf2d0b718dd649e7bdfb6d326826
-  data.tar.gz: fd264578ddb1caffef0f74ece4c72d08cd73092250b833101f9708ab34687e489d487c8cf8e5757f0f91183d1316aef9cd9c4d2bd787e6b0a498ef1b0d69e74c
+  metadata.gz: dbb7f75de40ca35dfc593a5a78bcc7808e0d183667a40c78cb36e2d097485125c9425bbee8d8d9207cf7fb01a3263c7fc6b01e3dab0b141f0b94905985d95e66
+  data.tar.gz: 3f2ccc2dd66370b11f1dfa8651b3e1a7052a18b5e953ecc6ad3cc4ec0db03c7ed878f64cc2cd246591a780d0a90e49ffe6f8cfdf47e26ff47c6b2620b160a427

data/app/controllers/comable/orders_controller.rb

@@ -5,6 +5,11 @@ module Comable
     before_filter :redirect_for_logged_in_customer, only: [:new, :orderer]
     after_filter :save_order, except: :create
 
+    rescue_from ActiveRecord::RecordInvalid, with: :record_invalid
+    rescue_from Comable::InvalidOrder, with: :order_invalid
+
+    include Decoratable
+
     def new
     end
 
@@ -16,23 +21,26 @@ module Comable
     end
 
     def delivery
+      case request.method_symbol
+      when :post
+        redirect_to comable.payment_order_path
+      end
+    end
+
+    def payment
       case request.method_symbol
       when :post
         redirect_to comable.confirm_order_path
-      when :get
-        @order.order_deliveries.build if @order.order_deliveries.empty?
       end
     end
 
     def confirm
-      @order = current_customer.preorder(build_order_nested_attributes)
     end
 
     def create
-      @order = current_customer.order(build_order_nested_attributes)
-      if @order.valid?
+      order = current_customer.order
+      if order.complete?
         flash[:notice] = I18n.t('comable.orders.success')
-        reset_session
       else
         flash[:alert] = I18n.t('comable.orders.failure')
         redirect_to comable.confirm_order_path
@@ -41,10 +49,6 @@ module Comable
 
     private
 
-    def reset_session
-      session.delete('comable.order')
-    end
-
     def verify
       return if current_customer.cart.any?
       flash[:alert] = I18n.t('comable.carts.empty')
@@ -52,27 +56,11 @@ module Comable
     end
 
     def load_order
-      order_attributes = JSON.parse(session['comable.order'] || '{}')
-      order_attributes.update(order_params) if order_params
-      @order = Comable::Order.new(order_attributes)
+      @order = current_customer.preorder(order_params || {})
     end
 
     def save_order
-      session['comable.order'] = build_order_nested_attributes.to_json
-    end
-
-    def build_order_nested_attributes
-      @order.attributes.merge(
-        order_deliveries_attributes: build_order_delivery_nested_attributes
-      )
-    end
-
-    def build_order_delivery_nested_attributes
-      @order.order_deliveries.map do |order_delivery|
-        order_delivery.attributes.merge(
-          order_details_attributes: order_delivery.order_details.map(&:attributes)
-        )
-      end
+      @order.save
     end
 
     def order_params
@@ -82,6 +70,8 @@ module Comable
         order_params_for_orderer
       when :delivery
         order_params_for_delivery
+      when :payment
+        order_params_for_payment
       end
     end
 
@@ -95,14 +85,31 @@ module Comable
     def order_params_for_delivery
       params.require(:order).permit(
         order_deliveries_attributes: [
+          :id,
           :family_name,
           :first_name
         ]
       )
     end
 
+    def order_params_for_payment
+      params.require(:order).permit(
+        Comable::Payment.table_name.singularize.foreign_key.to_sym
+      )
+    end
+
     def redirect_for_logged_in_customer
       return redirect_to delivery_order_path if current_customer.logged_in?
     end
+
+    def record_invalid
+      flash[:alert] = I18n.t('comable.orders.failure')
+      redirect_to comable.cart_path
+    end
+
+    def order_invalid(exception)
+      flash[:alert] = exception.message
+      redirect_to comable.cart_path
+    end
   end
 end

data/app/models/comable/customer.rb

@@ -1,6 +1,7 @@
 module Comable
   class Customer < ActiveRecord::Base
     include Decoratable
+    include CartOwner
 
     has_many :comable_orders, class_name: Comable::Order.name, foreign_key: table_name.singularize.foreign_key
     alias_method :orders, :comable_orders
@@ -24,52 +25,33 @@ module Comable
       !logged_in?
     end
 
-    def add_cart_item(obj, quantity: 1)
-      process_cart_item(obj) do |stock|
-        add_stock_to_cart(stock, quantity)
-      end
-    end
-
-    def remove_cart_item(obj, quantity: -1)
-      process_cart_item(obj) do |stock|
-        add_stock_to_cart(stock, quantity)
-      end
-    end
-
-    def reset_cart_item(obj, quantity: 0)
-      process_cart_item(obj) do |stock|
-        reset_stock_from_cart(stock, quantity)
-      end
-    end
-
     def reset_cart
-      cart_items.destroy_all
+      return unless @incomplete_order
+      if @incomplete_order.complete?
+        @incomplete_order = nil
+      else
+        # TODO: テストケースの作成
+        @incomplete_order.destroy
+        @incomplete_order = nil
+      end
     end
 
     def cart_items
-      Comable::CartItem.where(
-        Comable::Customer.table_name.singularize.foreign_key => id,
-        :guest_token => current_guest_token
-      )
+      incomplete_order.order_deliveries.first.order_details
     end
 
-    def cart
-      Cart.new(cart_items)
-    end
-
-    class Cart < Array
-      def price
-        cart_item_ids = map(&:id)
-        Comable::CartItem.includes(stock: :product).where(id: cart_item_ids).to_a.sum(&:price)
-      end
+    def incomplete_order
+      @incomplete_order ||= initialize_incomplete_order
     end
 
     def preorder(order_params = {})
-      Comable::CashRegister.new(customer: self, order_attributes: order_params).build_order
+      incomplete_order.attributes = order_params
+      incomplete_order.precomplete
     end
 
     def order(order_params = {})
-      Comable::CashRegister.new(customer: self, order_attributes: order_params).create_order
+      incomplete_order.attributes = order_params
+      incomplete_order.complete.tap { |completed_flag| reset_cart if completed_flag }
     end
 
     private
@@ -79,49 +61,37 @@ module Comable
       @cookies.signed[:guest_token]
     end
 
-    def process_cart_item(obj)
-      case obj
-      when Comable::Product
-        yield obj.stocks.first
-      when Comable::Stock
-        yield obj
-      when Array
-        obj.map { |item| yield item }
-      else
-        fail
-      end
+    def initialize_incomplete_order
+      orders = find_incomplete_orders
+      return orders.first if orders.any?
+      order = orders.create(family_name: family_name, first_name: first_name, order_deliveries_attributes: [{ family_name: family_name, first_name: first_name }])
+      @cookies.permanent.signed[:guest_token] = order.guest_token if not_logged_in?
+      order
     end
 
-    def add_stock_to_cart(stock, quantity)
-      fail I18n.t('comable.carts.product_not_stocked') if stock.soldout?
-
-      cart_items = find_cart_items_by(stock)
-      if cart_items.any?
-        cart_item = cart_items.first
-        cart_item.quantity += quantity
-        (cart_item.quantity > 0) ? cart_item.save : cart_item.destroy
-      else
-        cart_item = cart_items.create(quantity: quantity)
-        @cookies.permanent.signed[:guest_token] = cart_item.guest_token if not_logged_in?
-      end
+    def find_incomplete_orders
+      Comable::Order
+        .incomplete
+        .includes(order_deliveries: :order_details)
+        .where(
+          Comable::Customer.table_name.singularize.foreign_key => self,
+          :guest_token => current_guest_token
+        )
+        .limit(1)
     end
 
-    def reset_stock_from_cart(stock, quantity)
-      cart_items = find_cart_items_by(stock)
-      if quantity > 0
-        return add_stock_to_cart(stock, quantity) if cart_items.empty?
-        cart_item = cart_items.first
-        cart_item.quantity = quantity
-        cart_item.save
-      else
-        return false if cart_items.empty?
-        cart_item.destroy
+    # Rails 3.x だと has_many 先のインスタンスが追加されても
+    # 親インスタンスが感知できないので、いちいちリロードするように変更
+    if Rails::VERSION::MAJOR == 3
+      def add_stock_to_cart_with_reload(*args)
+        add_stock_to_cart_without_reload(*args).tap { @incomplete_order = nil }
       end
-    end
+      alias_method_chain :add_stock_to_cart, :reload
 
-    def find_cart_items_by(stock)
-      fail I18n.t('comable.carts.product_not_found') unless stock.is_a?(Comable::Stock)
-      cart_items.where(Comable::Stock.table_name.singularize.foreign_key => stock.id)
+      def reset_stock_from_cart_with_reload(*args)
+        reset_stock_from_cart_without_reload(*args).tap { @incomplete_order = nil }
+      end
+      alias_method_chain :reset_stock_from_cart, :reload
     end
   end
 end

data/app/models/comable/order.rb

@@ -3,18 +3,78 @@ module Comable
     include Decoratable
 
     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
     has_many :order_deliveries, dependent: :destroy, class_name: Comable::OrderDelivery.name, foreign_key: table_name.singularize.foreign_key
 
     accepts_nested_attributes_for :order_deliveries
 
-    validates :family_name, presence: true
-    validates :first_name, presence: true
+    with_options if: :complete? do |complete_order|
+      complete_order.validates :code, presence: true
+      complete_order.validates :first_name, presence: true
+      complete_order.validates :family_name, presence: true
+      complete_order.validates Comable::Payment.table_name.singularize.foreign_key, presence: true
+    end
+
+    with_options if: :incomplete? do |incomplete_order|
+      incomplete_order.validates Comable::Customer.table_name.singularize.foreign_key, uniqueness: { scope: [Comable::Customer.table_name.singularize.foreign_key, :completed_at] }, if: :customer
+      incomplete_order.validates :guest_token, uniqueness: { scope: [:guest_token, :completed_at] }, if: :guest_token
+    end
+
+    before_create :generate_guest_token
+
+    scope :complete, -> { where.not(completed_at: nil) }
+    scope :incomplete, -> { where(completed_at: nil) }
+
+    def precomplete
+      valid_stock
+      fail Comable::InvalidOrder, errors.full_messages.join("\n") if errors.any?
+      self
+    end
+
+    def complete
+      # TODO: トランザクションの追加
+      precomplete
+      # TODO: コールバック化
+      # define_model_callbacks :complete
+      before_complete
+      save!
+      self
+    end
+
+    def complete?
+      !incomplete?
+    end
 
-    before_create :generate_code
-    before_create :generate_ordered_at
+    def incomplete?
+      completed_at.nil?
+    end
+
+    # 時価合計を取得
+    def current_total_price
+      order_deliveries.map(&:order_details).flatten.each(&:current_subtotal_price)
+    end
+
+    # 売価合計を取得
+    def total_price
+      order_deliveries.map(&:order_details).flatten.each(&:subtotal_price)
+    end
 
     private
 
+    def before_complete
+      self.completed_at = Time.now
+      generate_code
+      order_deliveries.each(&:before_complete)
+    end
+
+    def valid_stock
+      order_deliveries.map(&:order_details).flatten.each do |order_detail|
+        return errors.add :base, "「#{order_detail.stock.name}」の注文数が不正です。" if order_detail.quantity <= 0
+        quantity = order_detail.stock.quantity - order_detail.quantity
+        return errors.add :base, "「#{order_detail.stock.name}」の在庫が不足しています。" if quantity < 0
+      end
+    end
+
     def generate_code
       self.code = loop do
         random_token = "C#{Array.new(11) { rand(9) }.join}"
@@ -22,8 +82,12 @@ module Comable
       end
     end
 
-    def generate_ordered_at
-      self.ordered_at = Time.now
+    def generate_guest_token
+      return if send(Comable::Customer.table_name.singularize.foreign_key)
+      self.guest_token ||= loop do
+        random_token = SecureRandom.urlsafe_base64(nil, false)
+        break random_token unless self.class.exists?(guest_token: random_token)
+      end
     end
   end
 end

data/app/models/comable/order_delivery.rb

@@ -5,8 +5,12 @@ module Comable
     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
 
-    accepts_nested_attributes_for :order_details
-
     delegate :customer, to: :order
+    delegate :guest_token, to: :order
+    delegate :complete?, to: :order
+
+    def before_complete
+      order_details.each(&:before_complete)
+    end
   end
 end

data/app/models/comable/order_detail.rb

@@ -5,9 +5,38 @@ 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
 
-    after_create :decrement_quantity!
-    delegate :decrement_quantity!, to: :stock
+    # TODO: バリデーションの追加
 
     delegate :product, to: :stock
+    delegate :guest_token, to: :order_delivery
+    delegate :complete?, to: :order_delivery
+
+    def before_complete
+      save_price
+      decrement_stock
+    end
+
+    # 時価を取得
+    def current_price
+      stock.price
+    end
+
+    # 時価小計を取得
+    def current_subtotal_price
+      current_price * quantity
+    end
+
+    # 売価小計を取得
+    def subtotal_price
+      price * quantity
+    end
+
+    def decrement_stock
+      stock.decrement!(quantity: quantity)
+    end
+
+    def save_price
+      self.price = stock.price
+    end
   end
 end

data/app/models/comable/payment.rb

@@ -0,0 +1,26 @@
+module Comable
+  class Payment < ActiveRecord::Base
+    include Decoratable
+
+    validates :name, presence: true
+    validates :payment_method_type, presence: true
+    validates :payment_method_kind, presence: true
+
+    def payment_method
+      return unless Object.const_defined?(payment_method_type)
+      Object.const_get(payment_method_type)
+    end
+
+    def payment_method_name
+      payment_method.display_name
+    end
+
+    def payment_method_kind_key
+      payment_method.kind.keys.slice(payment_method_kind)
+    end
+
+    def payment_method_kind_name
+      payment_method.kind.slice(payment_method_kind_key).values.first
+    end
+  end
+end

data/app/models/comable/stock.rb

@@ -1,30 +1,81 @@
 module Comable
+  #
+  # 在庫モデル。
+  # 商品に複数紐付き、品数やSKU(Stock Keeping Unit)情報を保持する。
+  #
   class Stock < ActiveRecord::Base
     include Decoratable
 
     belongs_to :product, class_name: Comable::Product.name, foreign_key: Comable::Product.table_name.singularize.foreign_key
 
+    #
+    # @!group Scope
+    #
+
+    # @!scope class
+    # 有効な在庫インスタンスを返す
     scope :activated, -> { where.not(product_id_num: nil) }
+
+    # @!scope class
+    # 品切れでない在庫インスタンスを返す
     scope :unsold, -> { where('quantity > ?', 0) }
+
+    # @!scope class
+    # 品切れの在庫インスタンスを返す
     scope :soldout, -> { where('quantity <= ?', 0) }
 
+    #
+    # @!endgroup
+    #
+
     delegate :price, to: :product
     delegate :sku?, to: :product
 
+    def name
+      return product.name unless product.sku?
+      sku_name = sku_h_choice_name
+      sku_name += '/' + sku_v_choice_name if sku_v_choice_name.present?
+      product.name + "(#{sku_name})"
+    end
+
+    # 在庫の有無を取得する
+    #
+    # @example
+    #   stock.unsold? #=> true
+    #
+    # @return [Boolean] 在庫があれば true を返す
+    # @see #soldout?
     def unsold?
       return false if product_id_num.nil?
       return false if quantity.nil?
       quantity > 0
     end
 
+    # 在庫の有無を取得する
+    #
+    # @example
+    #   stock.soldout? #=> false
+    #
+    # @return [Boolean] {#unsold?} の逆。在庫がなければ true を返す
+    # @see #unsold?
     def soldout?
       !unsold?
     end
 
-    def decrement_quantity!
+    # 在庫減算を行う
+    #
+    # @example
+    #   stock.quantity #=> 10
+    #   stock.decrement!(quantity: 1) #=> true
+    #   stock.quantity #=> 9
+    #
+    # @param quantity [Fixnum] 減算する在庫数を指定する
+    # @return [Boolean] レコードの保存に成功すると true を返す
+    def decrement!(quantity: 1)
       with_lock do
         # TODO: カラムマッピングのdecrementメソッドへの対応
-        update_attributes!(quantity: quantity.pred)
+        self.quantity -= quantity
+        save!
       end
     end
   end

data/app/views/comable/carts/show.slim

@@ -7,12 +7,7 @@ ul.cart
       - product = stock.product
       li.product
         h2.name
-          - if stock.sku?
-            - sku_name = stock.sku_h_choice_name
-            - sku_name += '/' + stock.sku_v_choice_name if stock.sku_v_choice_name.present?
-            = link_to product.name + "(#{sku_name})", comable.product_path(product)
-          - else
-            = link_to product.name, comable.product_path(product)
+          = link_to stock.name, comable.product_path(product)
         .caption
           = product.caption
         .price

data/app/views/comable/orders/confirm.slim

@@ -16,10 +16,10 @@ h1 注文情報確認
         - order_delivery.order_details.each do |order_detail|
           .name
             = order_detail.product.name
-          .quantity
+          .price
             = order_detail.price
           .quantity
             = order_detail.quantity
 
-  = form_for @order, as: :order, url: comable.order_path do |f|
+  = form_for @order, as: :order, url: comable.order_path, method: :post do |f|
     = f.submit

data/app/views/comable/orders/delivery.slim

@@ -1,7 +1,7 @@
 h1 配送先情報入力
 
 .orderer
-  = form_for @order, as: :order, url: comable.delivery_order_path do |f|
+  = form_for @order, as: :order, url: comable.delivery_order_path, method: :put do |f|
     = f.fields_for :order_deliveries do |order_delivery|
       = order_delivery.text_field :family_name, placeholder: '姓'
       = order_delivery.text_field :first_name, placeholder: '名'

data/app/views/comable/orders/orderer.slim

@@ -1,7 +1,7 @@
 h1 注文者情報入力
 
 .orderer
-  = form_for @order, as: :order, url: comable.orderer_order_path do |f|
+  = form_for @order, as: :order, url: comable.orderer_order_path, method: :put do |f|
     = f.text_field :family_name, placeholder: '姓'
     = f.text_field :first_name, placeholder: '名'
     = f.submit

data/app/views/comable/orders/payment.slim

@@ -0,0 +1,12 @@
+h1 決済方法
+
+.order.payment
+  = form_for @order, as: :order, url: comable.payment_order_path, method: :put do |f|
+    ul
+      - Comable::Payment.all.each.with_index do |payment, index|
+        li
+          - payment_foreign_key = Comable::Payment.table_name.singularize.foreign_key.to_sym
+          - checked_flag = @order.payment ? (@order.payment.id == payment.id) : index.zero?
+          = f.radio_button payment_foreign_key, payment.id, checked: checked_flag
+          = f.label payment_foreign_key, payment.name, value: payment.id
+    = f.submit

data/config/routes.rb

@@ -12,9 +12,11 @@ Comable::Engine.routes.draw do
   resource :order do
     collection do
       get :orderer
-      post :orderer
+      put :orderer
       get :delivery
-      post :delivery
+      put :delivery
+      get :payment
+      put :payment
       get :confirm
     end
   end

data/db/migrate/20140723175431_create_comable_orders.rb

@@ -2,10 +2,12 @@ class CreateComableOrders < Comable::Migration
   def change
     create_table :comable_orders do |t|
       t.integer :comable_customer_id
-      t.string :code, null: false
-      t.string :family_name, null: false
-      t.string :first_name, null: false
-      t.datetime :ordered_at, null: false
+      t.integer :comable_payment_id
+      t.string :guest_token
+      t.string :code
+      t.string :family_name
+      t.string :first_name
+      t.datetime :completed_at
     end
 
     add_index :comable_orders, :code, unique: true, name: :comable_orders_idx_01

data/db/migrate/20140723175624_create_comable_order_deliveries.rb

@@ -2,8 +2,8 @@ class CreateComableOrderDeliveries < Comable::Migration
   def change
     create_table :comable_order_deliveries do |t|
       t.integer :comable_order_id, null: false
-      t.string :family_name, null: false
-      t.string :first_name, null: false
+      t.string :family_name
+      t.string :first_name
     end
   end
 end

data/db/migrate/20140723175810_create_comable_order_details.rb

@@ -3,8 +3,10 @@ class CreateComableOrderDetails < Comable::Migration
     create_table :comable_order_details do |t|
       t.integer :comable_order_delivery_id, null: false
       t.integer :comable_stock_id, null: false
-      t.integer :price, null: false
+      t.integer :price
       t.integer :quantity, default: 1, null: false
     end
+
+    add_index :comable_order_details, [:comable_order_delivery_id, :comable_stock_id], unique: true, name: :comable_order_details_idx_01
   end
 end

data/db/migrate/20140817194104_create_comable_payments.rb

@@ -0,0 +1,11 @@
+class CreateComablePayments < ActiveRecord::Migration
+  def change
+    create_table :comable_payments do |t|
+      t.string :name, null: false
+      t.string :payment_method_type, null: false
+      t.integer :payment_method_kind, null: false
+      t.integer :enable_price_from
+      t.integer :enable_price_to
+    end
+  end
+end

data/lib/comable.rb

@@ -1,8 +1,9 @@
 require 'comable/engine'
 require 'comable/migration'
 require 'comable/decoratable'
-
-require 'comable/cash_register'
+require 'comable/errors'
+require 'comable/cart_owner'
+require 'comable/payment_method'
 
 module Comable
 end

data/lib/comable/cart_owner.rb

@@ -0,0 +1,79 @@
+module Comable
+  module CartOwner
+    def add_cart_item(obj, quantity: 1)
+      process_cart_item(obj) do |stock|
+        add_stock_to_cart(stock, quantity)
+      end
+    end
+
+    def remove_cart_item(obj, quantity: -1)
+      add_cart_item(obj, quantity: quantity)
+    end
+
+    def reset_cart_item(obj, quantity: 0)
+      process_cart_item(obj) do |stock|
+        reset_stock_from_cart(stock, quantity)
+      end
+    end
+
+    def cart_items
+      fail 'You should implement cart_items method.'
+    end
+
+    def cart
+      Cart.new(cart_items)
+    end
+
+    class Cart < Array
+      def price
+        sum(&:current_subtotal_price)
+      end
+    end
+
+    private
+
+    def process_cart_item(obj)
+      case obj
+      when Comable::Product
+        yield obj.stocks.first
+      when Comable::Stock
+        yield obj
+      when Array
+        obj.map { |item| yield item }
+      else
+        fail
+      end
+    end
+
+    def add_stock_to_cart(stock, quantity)
+      fail I18n.t('comable.carts.product_not_stocked') if stock.soldout?
+
+      cart_items = find_cart_items_by(stock)
+      if cart_items.any?
+        cart_item = cart_items.first
+        cart_item.quantity += quantity
+        (cart_item.quantity > 0) ? cart_item.save : cart_item.destroy
+      else
+        cart_items.create(quantity: quantity)
+      end
+    end
+
+    def reset_stock_from_cart(stock, quantity)
+      cart_items = find_cart_items_by(stock)
+      if quantity > 0
+        return add_stock_to_cart(stock, quantity) if cart_items.empty?
+        cart_item = cart_items.first
+        cart_item.quantity = quantity
+        cart_item.save
+      else
+        return false if cart_items.empty?
+        cart_item.destroy
+      end
+    end
+
+    def find_cart_items_by(stock)
+      fail I18n.t('comable.carts.product_not_found') unless stock.is_a?(Comable::Stock)
+      cart_items.where(Comable::Stock.table_name.singularize.foreign_key => stock.id)
+    end
+  end
+end

data/lib/comable/errors.rb

@@ -0,0 +1,4 @@
+module Comable
+  class InvalidOrder < StandardError
+  end
+end

data/lib/comable/payment_method.rb

@@ -0,0 +1,14 @@
+require 'comable/payment_method/base'
+require 'comable/payment_method/general'
+
+module Comable
+  module PaymentMethod
+    class << self
+      def all
+        (constants - [:Base]).map do |constant_name|
+          const_get(constant_name)
+        end
+      end
+    end
+  end
+end

data/lib/comable/payment_method/base.rb

@@ -0,0 +1,26 @@
+module Comable
+  module PaymentMethod
+    class Base
+      class << self
+        def name_symbol
+          name.demodulize.underscore.to_sym
+        end
+
+        def display_name
+          please_implement_method
+        end
+
+        def kind
+          please_implement_method
+        end
+
+        private
+
+        def please_implement_method
+          calling_method_name = caller_locations(1, 1).first.label
+          fail "You should implement '#{calling_method_name}' method in #{name}."
+        end
+      end
+    end
+  end
+end

data/lib/comable/payment_method/general.rb

@@ -0,0 +1,15 @@
+module Comable
+  module PaymentMethod
+    class General < Base
+      class << self
+        def display_name
+          '汎用決済モジュール'
+        end
+
+        def kind
+          { none: 'なし' }
+        end
+      end
+    end
+  end
+end

data/lib/comable/version.rb

@@ -1,3 +1,3 @@
 module Comable
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/tasks/comable_yardoc.task

@@ -0,0 +1,14 @@
+require 'yard'
+require 'yard/rake/yardoc_task'
+
+YARD::Rake::YardocTask.new do |t|
+  t.files = %w(
+      app/models/**/*.rb
+      app/controllers/**/*.rb
+      app/helpers/**/*.rb
+      app/mailers/**/*.rb
+      lib/**/*.rb
+    )
+  t.options = []
+  t.options = %w(--debug --verbose) if $trace
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -206,6 +206,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: inch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Comable provides a simple way to add e-commerce features to your Ruby
   on Rails application.
 email:
@@ -225,11 +253,11 @@ files:
 - app/controllers/comable/products_controller.rb
 - app/helpers/comable/application_helper.rb
 - app/helpers/comable/products_helper.rb
-- app/models/comable/cart_item.rb
 - app/models/comable/customer.rb
 - app/models/comable/order.rb
 - app/models/comable/order_delivery.rb
 - app/models/comable/order_detail.rb
+- app/models/comable/payment.rb
 - app/models/comable/product.rb
 - app/models/comable/stock.rb
 - app/views/comable/carts/show.slim
@@ -238,25 +266,31 @@ files:
 - app/views/comable/orders/delivery.slim
 - app/views/comable/orders/new.slim
 - app/views/comable/orders/orderer.slim
+- app/views/comable/orders/payment.slim
 - app/views/comable/products/index.slim
 - app/views/comable/products/show.slim
 - app/views/layouts/comable/application.slim
 - config/locales/ja.yml
 - config/routes.rb
 - db/migrate/20131214194807_create_comable_products.rb
-- db/migrate/20140120024159_create_comable_cart_items.rb
 - db/migrate/20140120032559_create_comable_customers.rb
 - db/migrate/20140502060116_create_comable_stocks.rb
 - db/migrate/20140723175431_create_comable_orders.rb
 - db/migrate/20140723175624_create_comable_order_deliveries.rb
 - db/migrate/20140723175810_create_comable_order_details.rb
+- db/migrate/20140817194104_create_comable_payments.rb
 - lib/comable.rb
-- lib/comable/cash_register.rb
+- lib/comable/cart_owner.rb
 - lib/comable/decoratable.rb
 - lib/comable/engine.rb
+- lib/comable/errors.rb
 - lib/comable/migration.rb
+- lib/comable/payment_method.rb
+- lib/comable/payment_method/base.rb
+- lib/comable/payment_method/general.rb
 - lib/comable/version.rb
 - lib/tasks/comable_tasks.rake
+- lib/tasks/comable_yardoc.task
 homepage: https://github.com/hyoshida/comable#comable
 licenses: []
 metadata: {}
@@ -282,3 +316,4 @@ specification_version: 4
 summary: Comable provides a simple way to add e-commerce features to your Ruby on
   Rails application.
 test_files: []
+has_rdoc: 

data/app/models/comable/cart_item.rb

@@ -1,34 +0,0 @@
-module Comable
-  class CartItem < ActiveRecord::Base
-    belongs_to :customer, class_name: Comable::Customer.name, foreign_key: Comable::Customer.table_name.singularize.foreign_key
-    belongs_to :stock, class_name: Comable::Stock.name, foreign_key: Comable::Stock.table_name.singularize.foreign_key
-
-    with_options if: :customer do |customer|
-      customer.validates Comable::Customer.table_name.singularize.foreign_key, uniqueness: { scope: [Comable::Customer.table_name.singularize.foreign_key, Comable::Stock.table_name.singularize.foreign_key] }
-      customer.validates Comable::Customer.table_name.singularize.foreign_key, presence: true
-    end
-
-    with_options if: :guest_token do |guest|
-      guest.validates :guest_token, uniqueness: { scope: [:guest_token, Comable::Stock.table_name.singularize.foreign_key] }
-      guest.validates :guest_token, presence: true
-    end
-
-    delegate :product, to: :stock
-
-    before_create :generate_guest_token
-
-    def price
-      stock.price * quantity
-    end
-
-    private
-
-    def generate_guest_token
-      return if send(Comable::Customer.table_name.singularize.foreign_key)
-      self.guest_token ||= loop do
-        random_token = SecureRandom.urlsafe_base64(nil, false)
-        break random_token unless self.class.exists?(guest_token: random_token)
-      end
-    end
-  end
-end

data/db/migrate/20140120024159_create_comable_cart_items.rb

@@ -1,12 +0,0 @@
-class CreateComableCartItems < ActiveRecord::Migration
-  def change
-    create_table :comable_cart_items do |t|
-      t.integer :comable_customer_id
-      t.integer :comable_stock_id, null: false
-      t.integer :quantity, default: 1, null: false
-      t.string :guest_token
-    end
-
-    add_index :comable_cart_items, [:comable_customer_id, :comable_stock_id], unique: true, name: :comable_cart_items_idx_01
-  end
-end

data/lib/comable/cash_register.rb

@@ -1,90 +0,0 @@
-module Comable
-  class InvalidOrder < StandardError; end
-
-  class CashRegister
-    attr_accessor :customer
-    attr_accessor :order
-
-    def initialize(attributes)
-      @customer = attributes[:customer]
-      @order = @customer.orders.build(attributes[:order_attributes])
-    end
-
-    def build_order
-      assign_default_attributes_to_order
-      fail Comable::InvalidOrder if invalid
-      order
-    end
-
-    def create_order
-      order = build_order
-      order.save
-      customer.reset_cart
-      order
-    end
-
-    def valid
-      valid_cart && valid_stock
-    end
-
-    def invalid
-      !valid
-    end
-
-    private
-
-    def valid_cart
-      cart = customer.cart
-
-      order.order_deliveries.map(&:order_details).flatten.each do |order_detail|
-        next unless order_detail.stock
-        result = cart.reject! { |cart_item| cart_item.stock == order_detail.stock }
-        return false if result.nil?
-      end
-
-      cart.empty?
-    end
-
-    def valid_stock
-      order.order_deliveries.map(&:order_details).flatten.each do |order_detail|
-        next unless order_detail.stock
-        return false unless order_detail.stock.unsold?
-      end
-    end
-
-    def assign_default_attributes_to_order
-      order.family_name ||= customer.family_name
-      order.first_name ||= customer.first_name
-
-      order.order_deliveries.build if order.order_deliveries.empty?
-      assign_default_attributes_to_order_deliveries
-    end
-
-    def assign_default_attributes_to_order_deliveries
-      order.order_deliveries.each do |order_delivery|
-        assign_default_attributes_to_order_delivery(order_delivery)
-      end
-    end
-
-    def assign_default_attributes_to_order_delivery(order_delivery)
-      order_delivery.family_name ||= customer.family_name
-      order_delivery.first_name ||= customer.first_name
-
-      assign_default_attributes_to_order_details(order_delivery) if first_order_detail?
-    end
-
-    def assign_default_attributes_to_order_details(order_delivery)
-      customer.cart.each do |cart_item|
-        order_delivery.order_details.build(
-          Comable::Stock.table_name.singularize.foreign_key => cart_item.stock.id,
-          :quantity => cart_item.quantity,
-          :price => cart_item.price
-        )
-      end
-    end
-
-    def first_order_detail?
-      order.order_deliveries.map(&:order_details).all?(&:empty?)
-    end
-  end
-end