comable_frontend 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 633b7c0815b6230271e217caa3fcb309699b8a5b
-  data.tar.gz: 93fbd100f5fb435a83bf00a0ee67faad1d46d202
+  metadata.gz: ca2beaee12b666d7de3aeb8c5ba9c884b325fac9
+  data.tar.gz: b359b988a3320bf139e1cc3b9fea8925ffa733bf
 SHA512:
-  metadata.gz: 360d06fa73b0ddcc5d7598518c7edc3f27b77e01397f678e846071c8b5a7c2b8bd56cb99c37c30d8ce329c179642ccc0875bc8b907f9d0b9ad46c95a54e374c1
-  data.tar.gz: 336ad81da2599de8430ecdcb5e8bcadc9025fb86304d50b4bda80c743bc8e30a8dace03887ad366176adae8a653e3b8d629488812e80ae9f8aa845980b54410d
+  metadata.gz: 6ca78ddf6ef0ec1b15b64fba72eea53f2691a7ced2a389a54142c5c4708a53c59262161ce45f8020f593208220ec34f49129222b173671be9a81b04a7dfada30
+  data.tar.gz: f2f7f1a40860083fe4a0bdd0153458db2e0c38326af59076924189fb96a2c021b72e077ab46a65d96bf857142a4580c4385ab73be28ce0ae975d7a68746092b9

data/app/controllers/comable/carts_controller.rb

@@ -2,14 +2,9 @@ module Comable
   class CartsController < Comable::ApplicationController
     rescue_from Comable::NoStock, with: :no_stock
 
-    def show
-    end
-
     def add
-      cart_item = Comable::Stock.where(id: params[:stock_id]).first
-      cart_item ||= Comable::Product.where(id: params[:product_id]).first
+      cart_item = find_cart_item
       return redirect_by_product_not_found unless cart_item
-      return redirect_by_product_not_found if cart_item.is_a?(Comable::Product) && cart_item.sku?
 
       current_customer.add_cart_item(cart_item, cart_item_options)
 
@@ -18,10 +13,10 @@ module Comable
     end
 
     def update
-      stock = Comable::Stock.where(id: params[:stock_id]).first
-      return redirect_by_product_not_found unless stock
+      cart_item = find_cart_item
+      return redirect_by_product_not_found unless cart_item
 
-      current_customer.reset_cart_item(stock, cart_item_options)
+      current_customer.reset_cart_item(cart_item, cart_item_options)
 
       flash[:notice] = I18n.t('comable.carts.update')
       redirect_to cart_path
@@ -39,6 +34,14 @@ module Comable
       redirect_to cart_path
     end
 
+    def find_cart_item
+      cart_item = Comable::Stock.where(id: params[:stock_id]).first
+      cart_item ||= Comable::Product.where(id: params[:product_id]).first
+      return unless cart_item
+      return if cart_item.is_a?(Comable::Product) && cart_item.sku?
+      cart_item
+    end
+
     def cart_item_options
       options = {}
       options.update(quantity: params[:quantity].to_i) if params[:quantity]

data/app/controllers/comable/customers_controller.rb

@@ -0,0 +1,8 @@
+module Comable
+  class CustomersController < Comable::ApplicationController
+    before_filter :authenticate_customer!
+
+    def show
+    end
+  end
+end

data/app/controllers/comable/orders_controller.rb

@@ -5,15 +5,10 @@ module Comable
 
     before_filter :load_order
     before_filter :verify
-    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
 
-    def new
-    end
-
     def orderer
       case request.method_symbol
       when :post
@@ -28,14 +23,11 @@ module Comable
       end
     end
 
-    def confirm
-    end
-
     def create
       order = current_customer.order
       if order.complete?
-        Comable::OrderMailer.complete(order).deliver if current_store.email_activate?
         flash[:notice] = I18n.t('comable.orders.success')
+        send_order_complete_mail
       else
         flash[:alert] = I18n.t('comable.orders.failure')
         redirect_to comable.confirm_order_path
@@ -44,6 +36,10 @@ module Comable
 
     private
 
+    def send_order_complete_mail
+      Comable::OrderMailer.complete(@order).deliver if current_store.email_activate?
+    end
+
     def next_order_path(target_action_name = nil)
       case (target_action_name || action_name).to_sym
       when :delivery
@@ -97,18 +93,9 @@ module Comable
       )
     end
 
-    def redirect_for_logged_in_customer
-      return redirect_to delivery_order_path if current_customer.logged_in?
-    end
-
-    def record_invalid
+    def order_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/views/comable/carts/show.slim

@@ -19,4 +19,6 @@ ul.cart
           = submit_tag '変更'
 
 .order
-  = link_to '注文', comable.new_order_path
+  - next_path = comable.delivery_order_path if current_customer.signed_in?
+  - next_path ||= comable.new_order_path
+  = link_to '注文', next_path

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

@@ -0,0 +1,2 @@
+.customer
+  .name = current_customer.email

data/app/views/layouts/comable/application.slim

@@ -12,7 +12,16 @@ html
     = stylesheet_link_tag "comable/application", media: "all"
     = javascript_include_tag "comable/application"
     = csrf_meta_tags
+
   body
     - flash.each do |name, msg|
       = content_tag(:div, msg, id: "flash_#{name}")
+
+    nav
+      ul
+        - if current_customer.signed_in?
+          li = link_to 'Logout', comable.destroy_customer_session_path, method: :delete
+        - else
+          li = link_to 'Login', comable.new_customer_session_path
+
     == yield

data/config/routes.rb

@@ -22,4 +22,8 @@ Comable::Core::Engine.routes.draw do
       get :confirm
     end
   end
+
+  devise_for :customer, path: :member, class_name: Comable::Customer.name, module: :devise
+
+  resource :customer, path: :member
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_frontend
 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: comable_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  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 frontend functions for Comable.
 email:
 - hyoshida@appirits.com
@@ -63,11 +77,13 @@ files:
 - Rakefile
 - app/controllers/comable/application_controller.rb
 - app/controllers/comable/carts_controller.rb
+- app/controllers/comable/customers_controller.rb
 - app/controllers/comable/orders_controller.rb
 - app/controllers/comable/products_controller.rb
 - app/controllers/concerns/comable/payment_action.rb
 - app/controllers/concerns/comable/shipment_action.rb
 - app/views/comable/carts/show.slim
+- app/views/comable/customers/show.slim
 - app/views/comable/orders/confirm.slim
 - app/views/comable/orders/create.slim
 - app/views/comable/orders/delivery.slim