comable_core 0.2.3 → 0.3.0

data/app/models/comable/order_detail.rb

@@ -3,28 +3,29 @@ module Comable
     include Comable::SkuItem
     include Comable::SkuChoice
 
-    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
+    belongs_to :stock, class_name: Comable::Stock.name, autosave: true
+    belongs_to :order, class_name: Comable::Order.name, inverse_of: :order_details
 
-    accepts_nested_attributes_for :stock
-
-    # TODO: バリデーションの追加
+    validates :quantity, numericality: { greater_than: 0 }
+    validate :valid_stock_quantity
 
     delegate :product, to: :stock
-    delegate :guest_token, to: :order_delivery
-    delegate :complete?, to: :order_delivery
-    delegate :order, to: :order_delivery
+    delegate :image_url, to: :product
+    delegate :guest_token, to: :order
+    delegate :completed?, to: :order, allow_nil: true
+    delegate :completing?, to: :order, allow_nil: true
 
-    before_save :save_to_add_cart, unless: :complete?
-    before_save :verify_quantity, unless: :complete?
+    with_options if: -> { !completed? || completing? } do |incomplete|
+      incomplete.before_validation :copy_attributes
+    end
 
-    def save_to_complete
-      self.attributes = current_attributes
+    def complete
+      copy_attributes
       decrement_stock
     end
 
     # TODO: カート投入時との差額表示
-    def save_to_add_cart
+    def copy_attributes
       self.attributes = current_attributes
     end
 
@@ -43,30 +44,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
+    def soldout_stock?
+      stock_with_clean_quantity do |stock|
+        stock.soldout?(quantity: quantity)
       end
+    end
 
-      true
+    def valid_stock_quantity
+      return unless soldout_stock?
+      errors.add :quantity, Comable.t('errors.messages.product_soldout', name: stock.name_with_sku)
     end
 
     private
 
-    def decrement_stock
-      return unless quantity
-      return unless stock.quantity
-      stock.quantity -= quantity
+    def stock_with_clean_quantity
+      quantity_will = stock.quantity
+      stock.quantity = stock.quantity_was if stock.quantity_was
+      yield stock
+    ensure
+      stock.quantity = quantity_will
     end
 
-    def verify_quantity
-      fail Comable::NoStock if stock.soldout?(quantity: quantity)
+    def decrement_stock
+      stock.lock!
+      stock.quantity -= quantity
     end
 
     def current_attributes
@@ -80,13 +81,5 @@ 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/app/models/comable/payment_method.rb

@@ -0,0 +1,26 @@
+module Comable
+  class PaymentMethod < ActiveRecord::Base
+    validates :name, presence: true, length: { maximum: 255 }
+    validates :payment_provider_type, presence: true, length: { maximum: 255 }
+    validates :payment_provider_kind, presence: true, numericality: { greater_than_or_equal_to: 0 }
+    validates :enable_price_from, numericality: { greater_than_or_equal_to: 0, allow_blank: true }
+    validates :enable_price_to, numericality: { greater_than_or_equal_to: 0, allow_blank: true }
+
+    def payment_provider
+      return unless Object.const_defined?(payment_provider_type)
+      Object.const_get(payment_provider_type)
+    end
+
+    def payment_provider_name
+      payment_provider.display_name
+    end
+
+    def payment_provider_kind_key
+      payment_provider.kind.keys.slice(payment_provider_kind)
+    end
+
+    def payment_provider_kind_name
+      payment_provider.kind.slice(payment_provider_kind_key).values.first
+    end
+  end
+end

data/app/models/comable/product.rb

@@ -1,18 +1,44 @@
 module Comable
   class Product < ActiveRecord::Base
     include Comable::SkuItem
+    include Comable::Product::Search
 
-    has_many :stocks, class_name: Comable::Stock.name, foreign_key: table_name.singularize.foreign_key
-    after_create :create_stock
+    has_many :stocks, class_name: Comable::Stock.name, dependent: :destroy
+    has_many :images, class_name: Comable::Image.name, dependent: :destroy
+    has_and_belongs_to_many :categories, class_name: Comable::Category.name, join_table: :comable_products_categories
+
+    accepts_nested_attributes_for :images, allow_destroy: true
+
+    validates :name, presence: true, length: { maximum: 255 }
+    validates :code, presence: true, length: { maximum: 255 }
+    validates :price, presence: true, numericality: { greater_than_or_equal_to: 0, allow_blank: true }
+    validates :sku_h_item_name, length: { maximum: 255 }
+    validates :sku_v_item_name, length: { maximum: 255 }
+
+    # Add conditions for the images association.
+    # Override method of the images association to support Rails 3.x.
+    def images
+      super.order(:id)
+    end
+
+    def image_url
+      image = images.first
+      return image.url if image
+      'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMTcxIiBoZWlnaHQ9IjE4MCIgdmlld0JveD0iMCAwIDE3MSAxODAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxkZWZzLz48cmVjdCB3aWR0aD0iMTcxIiBoZWlnaHQ9IjE4MCIgZmlsbD0iI0VFRUVFRSIvPjxnPjx0ZXh0IHg9IjU4IiB5PSI5MCIgc3R5bGU9ImZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxMHB0O2RvbWluYW50LWJhc2VsaW5lOmNlbnRyYWwiPjE3MXgxODA8L3RleHQ+PC9nPjwvc3ZnPg=='
+    end
 
     def unsold?
-      stocks.activated.unsold.exists?
+      stocks.unsold.exists?
     end
 
     def soldout?
       !unsold?
     end
 
+    def category_path_names=(category_path_names, delimiter: Comable::Category::DEFAULT_PATH_NAME_DELIMITER)
+      self.categories = Comable::Category.find_by_path_names(category_path_names, delimiter: delimiter)
+    end
+
     private
 
     def create_stock

data/app/models/comable/shipment_method.rb

@@ -1,5 +1,9 @@
 module Comable
   class ShipmentMethod < ActiveRecord::Base
+    validates :name, presence: true, length: { maximum: 255 }
+    validates :fee, presence: true, numericality: { greater_than_or_equal_to: 0 }
+    validates :traking_url, length: { maximum: 255 }
+
     scope :activated, -> { where(activate_flag: true) }
     scope :deactivated, -> { where(activate_flag: false) }
   end

data/app/models/comable/stock.rb

@@ -6,16 +6,12 @@ module Comable
   class Stock < ActiveRecord::Base
     include Comable::SkuChoice
 
-    belongs_to :product, class_name: Comable::Product.name, foreign_key: Comable::Product.table_name.singularize.foreign_key
+    belongs_to :product, class_name: Comable::Product.name
 
     #
     # @!group Scope
     #
 
-    # @!scope class
-    # 有効な在庫インスタンスを返す
-    scope :activated, -> { where.not(product_id_num: nil) }
-
     # @!scope class
     # 品切れでない在庫インスタンスを返す
     scope :unsold, -> { where('quantity > ?', 0) }
@@ -28,6 +24,13 @@ module Comable
     # @!endgroup
     #
 
+    validates :product, presence: true
+    validates :code, presence: true, length: { maximum: 255 }
+    validates :sku_h_choice_name, length: { maximum: 255 }
+    validates :sku_v_choice_name, length: { maximum: 255 }
+    # TODO: add conditions (by limitless flag, backoder flag and etc..)
+    validates :quantity, numericality: { greater_than_or_equal_to: 0 }
+
     delegate :name, to: :product
     delegate :price, to: :product
     delegate :sku?, to: :product
@@ -41,8 +44,6 @@ module Comable
     # @return [Boolean] 在庫があれば true を返す
     # @see #soldout?
     def unsold?(quantity: 1)
-      return false if product_id_num.nil?
-      return false if self.quantity.nil?
       (self.quantity - quantity) >= 0
     end
 
@@ -57,22 +58,5 @@ module Comable
     def soldout?(quantity: 1)
       !unsold?(quantity: quantity)
     end
-
-    # 在庫減算を行う
-    #
-    # @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メソッドへの対応
-        self.quantity -= quantity
-        save!
-      end
-    end
   end
 end

data/app/models/comable/store.rb

@@ -1,11 +1,16 @@
 module Comable
   class Store < ActiveRecord::Base
+    validates :name, length: { maximum: 255 }
+    validates :meta_keywords, length: { maximum: 255 }
+    validates :meta_description, length: { maximum: 255 }
+    validates :email_sender, length: { maximum: 255 }
+
     class << self
       def instance
-        first || new(name: default_store_name)
+        first || new(name: default_name)
       end
 
-      def default_store_name
+      def default_name
         'Comable store'
       end
     end

data/{lib → app/models/concerns}/comable/cart_owner.rb

@@ -32,6 +32,21 @@ module Comable
       def price
         sum(&:current_subtotal_price)
       end
+
+      def count
+        sum(&:quantity)
+      end
+
+      alias_method :size, :count
+
+      # TODO: Refactoring
+      def errors
+        ActiveModel::Errors.new(self).tap do |obj|
+          map(&:errors).map(&:full_messages).flatten.each do |full_message|
+            obj[:base] << full_message
+          end
+        end
+      end
     end
 
     private
@@ -50,31 +65,30 @@ module Comable
     end
 
     def add_stock_to_cart(stock, quantity)
-      cart_items = find_cart_items_by(stock)
-      if cart_items.any?
-        cart_item = cart_items.first
+      cart_item = find_cart_item_by(stock)
+      if cart_item
         cart_item.quantity += quantity
         (cart_item.quantity > 0) ? cart_item.save : cart_item.destroy
       else
-        cart_items.create(quantity: quantity)
+        cart_items.build(stock_id: stock.id, quantity: quantity).save
       end
     end
 
     def reset_stock_from_cart(stock, quantity)
-      cart_items = find_cart_items_by(stock)
+      cart_item = find_cart_item_by(stock)
       if quantity > 0
-        return add_stock_to_cart(stock, quantity) if cart_items.empty?
-        cart_items.first.update_attributes(quantity: quantity)
+        return add_stock_to_cart(stock, quantity) unless cart_item
+        cart_item.update_attributes(quantity: quantity)
       else
-        return false if cart_items.empty?
-        cart_items.first.destroy
+        return false unless cart_item
+        cart_items.destroy(cart_item)
       end
     end
 
-    def find_cart_items_by(stock)
+    def find_cart_item_by(stock)
       # TODO: Refactoring
       fail unless stock.is_a?(Comable::Stock)
-      cart_items.where(Comable::Stock.table_name.singularize.foreign_key => stock.id)
+      cart_items.find { |cart_item| cart_item.stock.id == stock.id }
     end
   end
 end

data/app/models/concerns/comable/checkout.rb

@@ -0,0 +1,90 @@
+module Comable
+  module Checkout
+    extend ActiveSupport::Concern
+
+    included do
+      state_machine initial: :cart do
+        state :cart
+        state :orderer
+        state :delivery
+        state :shipment
+        state :payment
+        state :confirm
+        state :complete
+
+        event :next_state do
+          transition :cart => :orderer, if: :orderer_required?
+          transition [:cart, :orderer] => :delivery, if: :delivery_required?
+          transition [:cart, :orderer, :delivery] => :shipment, if: :shipment_required?
+          transition [:cart, :orderer, :delivery, :shipment] => :payment, if: :payment_required?
+          transition all - [:confirm, :complete] => :confirm
+          transition :confirm => :complete
+        end
+
+        before_transition to: :complete do |order, _transition|
+          order.complete
+        end
+      end
+
+      # TODO: Remove with_options
+      with_options if: -> { state?(:cart) } do |context|
+        context.validates :customer_id, presence: true, uniqueness: { scope: [:customer_id, :completed_at] }, unless: :guest_token
+        context.validates :guest_token, presence: true, uniqueness: { scope: [:guest_token, :completed_at] }, unless: :customer
+      end
+
+      with_options if: -> { stated?(:cart) } do |context|
+        context.validates :email, presence: true
+      end
+
+      with_options if: -> { stated?(:orderer) } do |context|
+        context.validates :bill_address, presence: true
+      end
+
+      with_options if: -> { stated?(:delivery) } do |context|
+        context.validates :ship_address, presence: true
+      end
+
+      with_options if: -> { stated?(:payment) && payment_required? } do |context|
+        context.validates :payment_method, presence: true
+      end
+
+      with_options if: -> { stated?(:shipment) && shipment_required? } do |context|
+        context.validates :shipment_method, presence: true
+      end
+
+      with_options if: -> { stated?(:complete) } do |context|
+        context.validates :code, presence: true
+        context.validates :shipment_fee, presence: true
+        context.validates :total_price, presence: true
+      end
+    end
+
+    module ClassMethods
+      def state_names
+        state_machine.states.keys
+      end
+    end
+
+    def stated?(target_state)
+      target_state_index = self.class.state_names.index(target_state.to_sym)
+      current_state_index = self.class.state_names.index(state_name)
+      target_state_index < current_state_index
+    end
+
+    def orderer_required?
+      bill_address.nil? || bill_address.new_record?
+    end
+
+    def delivery_required?
+      ship_address.nil? || ship_address.new_record?
+    end
+
+    def payment_required?
+      Comable::PaymentMethod.exists?
+    end
+
+    def shipment_required?
+      Comable::ShipmentMethod.activated.exists?
+    end
+  end
+end

data/app/models/concerns/comable/product/search.rb

@@ -0,0 +1,41 @@
+module Comable
+  class Product
+    module Search
+      extend ActiveSupport::Concern
+
+      SEARCH_COLUMNS = %i( code name caption )
+
+      module ClassMethods
+        def search(query)
+          keywords = parse_to_keywords(query)
+          return (Rails::VERSION::MAJOR == 3) ? scoped : all if keywords.empty?
+          where(keywords_to_arel(keywords))
+        end
+
+        private
+
+        def keywords_to_arel(keywords)
+          keywords.inject(nil) do |arel_chain, keyword|
+            arel = keyword_to_arel(keyword)
+            arel_chain ? arel_chain.and(arel) : arel
+          end
+        end
+
+        def keyword_to_arel(keyword)
+          SEARCH_COLUMNS.inject(nil) do |arel_chain, column|
+            arel = arel_table[column].matches("%#{keyword}%")
+            arel_chain ? arel_chain.or(arel) : arel
+          end
+        end
+
+        def parse_to_keywords(query)
+          return [] if query.blank?
+          query
+            .delete('%')
+            .tr('　', ' ')
+            .split(' ')
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/comable/role_owner.rb

@@ -0,0 +1,15 @@
+module Comable
+  module RoleOwner
+    extend ActiveSupport::Concern
+
+    included do
+      extend Enumerize
+
+      enumerize :role, in: %i(
+        admin
+        reporter
+        customer
+      ), default: :customer, predicates: true
+    end
+  end
+end

data/app/uploaders/image_uploader.rb

@@ -0,0 +1,7 @@
+class ImageUploader < CarrierWave::Uploader::Base
+  storage :file
+
+  def store_dir
+    "#{model.class.to_s.underscore}/#{model.id}"
+  end
+end

data/app/views/comable/order_mailer/complete.text.erb

@@ -2,9 +2,9 @@
 <%= "#{@order.class.human_attribute_name(:code)}: #{@order.code}" %>
 ----------------------------------------------------------------------
 
-<%= I18n.t('comable.order_mailer.complete.dear', name: @order.full_name) %>
+<%= Comable.t('order_mailer.complete.dear', name: @order.bill_full_name) %>
 
-<%= I18n.t('comable.order_mailer.complete.introductions', store_name: current_store.name) %>
+<%= Comable.t('order_mailer.complete.introductions', store_name: current_store.name) %>
 
     <%- shipment_method = @order.shipment_method %>
     <%- if shipment_method %>
@@ -12,10 +12,8 @@
             <%= shipment_method.name %>
     <%- end %>
 
-    <%= Comable::OrderDelivery.model_name.human %>:
-<%- @order.order_deliveries.each do |order_delivery| %>
-            <%= name_with_honorific order_delivery.full_name %>
-<%- end %>
+    <%= @order.class.human_attribute_name(:ship_address) %>:
+            <%= name_with_honorific @order.ship_full_name %>
 
 ======================================================================
 
@@ -24,7 +22,7 @@
 <%= "#{@order.class.human_attribute_name(:code)}: #{@order.code}" %>
 <%= "#{@order.class.human_attribute_name(:completed_at)}: #{I18n.l @order.completed_at.to_date}" %>
 
-<%- @order.order_deliveries.map(&:order_details).flatten.each do |order_detail| %>
+<%- @order.order_details.each do |order_detail| %>
             <%= name_with_quantity order_detail.name_with_sku, order_detail.quantity %>
             <%= number_to_currency order_detail.subtotal_price %>
 
@@ -36,8 +34,8 @@
 
             <%= "#{@order.class.human_attribute_name(:total_price)}: #{number_to_currency @order.total_price}" %>
 
-            <%= "#{@order.class.human_attribute_name(:payment)}: #{@order.payment.name}\n" if @order.payment -%>
+            <%= "#{@order.class.human_attribute_name(:payment_method)}: #{@order.payment_method.name}\n" if @order.payment_method -%>
 
 ======================================================================
 
-<%= I18n.t('comable.order_mailer.complete.outroductions', store_name: current_store.name) %>
+<%= Comable.t('order_mailer.complete.outroductions', store_name: current_store.name) %>