comable_core 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a04e83098af7da04af0085988beee96d9dfaf150
-  data.tar.gz: 30d646a65f0e590746934f8f1f34707777d54a4f
+  metadata.gz: a0847e05a0d1404a70910a95138f0666315b06db
+  data.tar.gz: 213b8f3f6e5d9f11779633b3ce76eb97a366075a
 SHA512:
-  metadata.gz: 0b51d3919bf4bd8ffc65b79d3c0142214e56ce4e1b55ed5b137b57e07e542a7231bc9ce32b1e71c24c6c301997f55e50e7dea2306ec990be9d9359391d8a593f
-  data.tar.gz: fe8b54aec6b72c0cd10a76fb86abe592de36b273879d3ffc1642ef9fda419dc25e9aa62c92fef070eb0e1174ef318d3b5edf19df4adfeedfe29dd709c158cead
+  metadata.gz: 9fcebb0bbdd4673c92acacaea3fe91ebed3591b10dbc050c86311a0026acfe431460e0a46c9fabec158fc00ea7ef59561d14ee566800d0e8e8d10aea26915483
+  data.tar.gz: d2bba80062e20dd7320057eb35e70c4c2e4f609ae522288b5fc43691a621977f2a06039d3d4caaa390f482be08dc530ce947d69fe04dd36ced4d138e8794a6f4

data/app/mailers/comable/order_mailer.rb

@@ -1,5 +1,6 @@
 module Comable
   class OrderMailer < ActionMailer::Base
+    include Comable::ApplicationHelper
     helper Comable::ApplicationHelper
     helper_method :subject_for
 
@@ -10,10 +11,6 @@ module Comable
 
     private
 
-    def current_store
-      Comable::Store.instance
-    end
-
     def subject_for(order)
       [
         current_store.name,

data/app/models/comable/order.rb

@@ -90,7 +90,7 @@ module Comable
       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, "「#{order_detail.stock.name_with_sku}」の在庫が不足しています。" if quantity < 0
+        return errors.add :base, I18n.t('comable.errors.messages.product_soldout', name: order_detail.stock.name_with_sku) if quantity < 0
       end
     end
 

data/app/models/comable/stock.rb

@@ -37,12 +37,13 @@ module Comable
     # @example
     #   stock.unsold? #=> true
     #
+    # @param quantity [Fixnum] 減算する在庫数を指定する
     # @return [Boolean] 在庫があれば true を返す
     # @see #soldout?
-    def unsold?
+    def unsold?(quantity: 1)
       return false if product_id_num.nil?
-      return false if quantity.nil?
-      quantity > 0
+      return false if self.quantity.nil?
+      (self.quantity - quantity) >= 0
     end
 
     # 在庫の有無を取得する
@@ -50,10 +51,11 @@ module Comable
     # @example
     #   stock.soldout? #=> false
     #
+    # @param quantity [Fixnum] 減算する在庫数を指定する
     # @return [Boolean] {#unsold?} の逆。在庫がなければ true を返す
     # @see #unsold?
-    def soldout?
-      !unsold?
+    def soldout?(quantity: 1)
+      !unsold?(quantity: quantity)
     end
 
     # 在庫減算を行う

data/app/models/comable/store.rb

@@ -2,7 +2,7 @@ module Comable
   class Store < ActiveRecord::Base
     class << self
       def instance
-        Comable::Store.first || Comable::Store.new(name: default_store_name)
+        first || new(name: default_store_name)
       end
 
       def default_store_name

data/config/locales/ja.yml

@@ -3,10 +3,15 @@ ja:
     honorific: &honorific
       '%{name} 様'
 
+    errors:
+      messages:
+        product_soldout: '%{name}は在庫が不足しています。'
+        products_soldout: 'ご指定の商品は在庫が不足しています。'
+        product_not_found: '%{name}は存在しないか削除された可能性があります。'
+        products_not_found: 'ご指定の商品は存在しないか削除された可能性があります。'
+
     carts:
-      add_product: '１つの商品がカートに入りしました'
-      product_not_found: 'ご指定の商品は見つかりませんでした'
-      product_not_stocked: 'ご指定の商品は在庫がありません'
+      add_product: '１つの商品がカートに入りました'
       empty: 'カートに商品が入っていません'
       update: 'カートの内容が変更されました'
     orders:

data/lib/comable/cart_owner.rb

@@ -46,25 +46,25 @@ module Comable
     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
+        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?
-        cart_item = cart_items.first
-        cart_item.quantity = quantity
-        cart_item.save
+        cart_items.first.update_attributes(quantity: quantity)
       else
         return false if cart_items.empty?
         cart_items.first.destroy
@@ -72,7 +72,8 @@ module Comable
     end
 
     def find_cart_items_by(stock)
-      fail I18n.t('comable.carts.product_not_found') unless stock.is_a?(Comable::Stock)
+      # TODO: Refactoring
+      fail unless stock.is_a?(Comable::Stock)
       cart_items.where(Comable::Stock.table_name.singularize.foreign_key => stock.id)
     end
   end

data/lib/comable/errors.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails