comable_core 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b1fe7b5731e6c24383b541a3bd2552839440b58
-  data.tar.gz: b9c63920adae0de9f6c12a695e90d69a4a1ff576
+  metadata.gz: a04e83098af7da04af0085988beee96d9dfaf150
+  data.tar.gz: 30d646a65f0e590746934f8f1f34707777d54a4f
 SHA512:
-  metadata.gz: 08063df020955b295602e419a111c870572ee0fa404ea1e1a48ae2d08e5d914da7ce4914939c2089da7ef39a8e85024a29bae5cf958b1362fb0080f267643ae5
-  data.tar.gz: 306fc8020d99c8c8195c3c7d3556008545d7c9d2da04d9457bc51ad34e1ac1948ca4938d7b7f790d9923569150064fe54774686b30708314b3cd60b83c73b09e
+  metadata.gz: 0b51d3919bf4bd8ffc65b79d3c0142214e56ce4e1b55ed5b137b57e07e542a7231bc9ce32b1e71c24c6c301997f55e50e7dea2306ec990be9d9359391d8a593f
+  data.tar.gz: fe8b54aec6b72c0cd10a76fb86abe592de36b273879d3ffc1642ef9fda419dc25e9aa62c92fef070eb0e1174ef318d3b5edf19df4adfeedfe29dd709c158cead

data/Rakefile

@@ -16,27 +16,69 @@ end
 APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
-Bundler::GemHelper.install_tasks
+if File.exist?('comable.gemspec')
+  $LOAD_PATH.unshift File.expand_path('..', __FILE__)
+  require 'tasks/release'
 
-# from https://github.com/rspec/rspec-rails/issues/936
-task 'test:prepare'
+  namespace :app do
+    namespace :spec do
+      desc 'Run the code examples'
+      RSpec::Core::RakeTask.new(:all) do |t|
+        FRAMEWORKS.each do |framework|
+          t.pattern << ",#{framework}/spec/**{,/*/**}/*_spec.rb"
+        end
+      end
 
-task :rubocop do
-  exec 'rubocop'
-end
+      FRAMEWORKS.each do |framework|
+        desc "Run the code examples in #{framework}/spec"
+        RSpec::Core::RakeTask.new(framework) do |t|
+          t.pattern = "../#{framework}/spec/**{,/*/**}/*_spec.rb"
+        end
+      end
+    end
+  end
 
-namespace :app do
-  namespace :spec do
-    desc 'Run the code examples'
-    RSpec::Core::RakeTask.new(:all) do |t|
-      t.pattern << ',backend/spec/**{,/*/**}/*_spec.rb'
+  namespace :db do
+    task 'migrate' => 'app:db:migrate'
+    task 'app:db:migrate' => 'migrate:all'
+
+    namespace :migrate do
+      task :all do
+        FRAMEWORKS.each do |framework|
+          command = "cd #{framework} && test -d db && bundle exec rake db:migrate RAILS_ENV=#{Rails.env}"
+          puts command
+          system command
+        end
+      end
     end
 
-    desc 'Run the code examples in backend/spec'
-    RSpec::Core::RakeTask.new(:backend) do |t|
-      t.pattern = '../backend/spec/**{,/*/**}/*_spec.rb'
+    namespace :migrate do
+      task 'reset' => 'app:db:migrate:reset'
+      task 'app:db:migrate:reset' => 'app:db:migrate'
+      task 'app:db:migrate' => 'reset:all'
+
+      namespace :reset do
+        task :all do
+          FRAMEWORKS.each do |framework|
+            command = "cd #{framework} && test -d db && bundle exec rake db:migrate:reset RAILS_ENV=#{Rails.env}"
+            puts command
+            system command
+          end
+        end
+      end
     end
   end
+
+  task default: ['app:spec:all', 'rubocop']
 end
 
-task default: ['app:spec:all', 'rubocop']
+task default: ['app:spec', 'rubocop']
+
+Bundler::GemHelper.install_tasks
+
+# from https://github.com/rspec/rspec-rails/issues/936
+task 'test:prepare'
+
+task :rubocop do
+  exec 'rubocop'
+end

data/app/helpers/comable/application_helper.rb

@@ -1,11 +1,36 @@
 module Comable
   module ApplicationHelper
+    def current_store
+      @current_store || load_store
+    end
+
     def current_customer
       @current_customer || load_customer
     end
 
+    def current_order
+      current_customer.incomplete_order
+    end
+
+    def name_with_honorific(name)
+      I18n.t('comable.honorific', name: name)
+    end
+
+    def name_with_quantity(name, quantity)
+      return name unless quantity
+      return name if quantity <= 1
+      [
+        name,
+        "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)

data/app/mailers/comable/order_mailer.rb

@@ -0,0 +1,25 @@
+module Comable
+  class OrderMailer < ActionMailer::Base
+    helper Comable::ApplicationHelper
+    helper_method :subject_for
+
+    def complete(order)
+      @order = order
+      mail(from: current_store.email_sender, to: order.email, subject: subject_for(order))
+    end
+
+    private
+
+    def current_store
+      Comable::Store.instance
+    end
+
+    def subject_for(order)
+      [
+        current_store.name,
+        I18n.t('comable.order_mailer.complete.subject'),
+        order.code
+      ].join(' ')
+    end
+  end
+end

data/app/models/comable/customer.rb

@@ -1,6 +1,5 @@
 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
@@ -62,7 +61,7 @@ module Comable
     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 }])
+      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?
       order
     end

data/app/models/comable/order.rb

@@ -1,9 +1,8 @@
 module Comable
   class Order < ActiveRecord::Base
-    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
+    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
 
     accepts_nested_attributes_for :order_deliveries
@@ -12,7 +11,9 @@ module Comable
       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
+      complete_order.validates :email, presence: true
+      complete_order.validates :shipment_fee, presence: true
+      complete_order.validates :total_price, presence: true
     end
 
     with_options if: :incomplete? do |incomplete_order|
@@ -20,6 +21,8 @@ module Comable
       incomplete_order.validates :guest_token, uniqueness: { scope: [:guest_token, :completed_at] }, if: :guest_token
     end
 
+    define_model_callbacks :complete
+    before_complete :precomplete
     before_create :generate_guest_token
 
     scope :complete, -> { where.not(completed_at: nil) }
@@ -33,11 +36,9 @@ module Comable
 
     def complete
       # TODO: トランザクションの追加
-      precomplete
-      # TODO: コールバック化
-      # define_model_callbacks :complete
-      before_complete
-      save!
+      run_callbacks :complete do
+        save_to_complete!
+      end
       self
     end
 
@@ -49,29 +50,47 @@ module Comable
       completed_at.nil?
     end
 
-    # 時価合計を取得
-    def current_total_price
-      order_deliveries.map(&:order_details).flatten.each(&:current_subtotal_price)
+    # 氏名を取得
+    def full_name
+      [family_name, first_name].join(' ')
+    end
+
+    # 時価商品合計を取得
+    def current_item_total_price
+      order_deliveries.map(&:order_details).flatten.sum(&:current_subtotal_price)
     end
 
-    # 売価合計を取得
-    def total_price
-      order_deliveries.map(&:order_details).flatten.each(&:subtotal_price)
+    # 売価商品合計を取得
+    def item_total_price
+      order_deliveries.map(&:order_details).flatten.sum(&:subtotal_price)
+    end
+
+    # 時価送料を取得
+    def current_shipment_fee
+      shipment_method.try(:fee) || 0
+    end
+
+    # 時価合計を取得
+    def current_total_price
+      current_item_total_price + current_shipment_fee
     end
 
     private
 
-    def before_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(&:before_complete)
+      order_deliveries.each(&:save_to_complete)
+      save!
     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
+        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}」の在庫が不足しています。" if quantity < 0
+        return errors.add :base, "「#{order_detail.stock.name_with_sku}」の在庫が不足しています。" if quantity < 0
       end
     end
 

data/app/models/comable/order_delivery.rb

@@ -1,7 +1,5 @@
 module Comable
   class OrderDelivery < ActiveRecord::Base
-    include Decoratable
-
     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
 
@@ -9,8 +7,13 @@ module Comable
     delegate :guest_token, to: :order
     delegate :complete?, to: :order
 
-    def before_complete
-      order_details.each(&:before_complete)
+    def save_to_complete
+      order_details.each(&:save_to_complete)
+    end
+
+    # 氏名を取得
+    def full_name
+      [family_name, first_name].join(' ')
     end
   end
 end

data/app/models/comable/order_detail.rb

@@ -1,6 +1,7 @@
 module Comable
   class OrderDetail < ActiveRecord::Base
-    include Decoratable
+    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
@@ -11,11 +12,18 @@ module Comable
     delegate :guest_token, to: :order_delivery
     delegate :complete?, to: :order_delivery
 
-    def before_complete
-      save_price
+    before_save :save_to_add_cart, unless: :complete?
+
+    def save_to_complete
+      self.attributes = current_attributes
       decrement_stock
     end
 
+    # TODO: カート投入時との差額表示
+    def save_to_add_cart
+      self.attributes = current_attributes
+    end
+
     # 時価を取得
     def current_price
       stock.price
@@ -31,12 +39,22 @@ module Comable
       price * quantity
     end
 
+    private
+
     def decrement_stock
       stock.decrement!(quantity: quantity)
     end
 
-    def save_price
-      self.price = stock.price
+    def current_attributes
+      {
+        name: product.name,
+        code: stock.code,
+        price: stock.price,
+        sku_h_item_name: product.sku_h_item_name,
+        sku_v_item_name: product.sku_v_item_name,
+        sku_h_choice_name: stock.sku_h_choice_name,
+        sku_v_choice_name: stock.sku_v_choice_name
+      }
     end
   end
 end

data/app/models/comable/payment.rb

@@ -1,7 +1,5 @@
 module Comable
   class Payment < ActiveRecord::Base
-    include Decoratable
-
     validates :name, presence: true
     validates :payment_method_type, presence: true
     validates :payment_method_kind, presence: true

data/app/models/comable/product.rb

@@ -1,6 +1,6 @@
 module Comable
   class Product < ActiveRecord::Base
-    include Decoratable
+    include Comable::SkuItem
 
     has_many :stocks, class_name: Comable::Stock.name, foreign_key: table_name.singularize.foreign_key
     after_create :create_stock
@@ -13,16 +13,6 @@ module Comable
       !unsold?
     end
 
-    def sku_h?
-      sku_h_item_name.present?
-    end
-
-    def sku_v?
-      sku_v_item_name.present?
-    end
-
-    alias_method :sku?, :sku_h?
-
     private
 
     def create_stock

data/app/models/comable/shipment_method.rb

@@ -0,0 +1,6 @@
+module Comable
+  class ShipmentMethod < ActiveRecord::Base
+    scope :activated, -> { where(activate_flag: true) }
+    scope :deactivated, -> { where(activate_flag: false) }
+  end
+end

data/app/models/comable/stock.rb

@@ -4,7 +4,7 @@ module Comable
   # 商品に複数紐付き、品数やSKU(Stock Keeping Unit)情報を保持する。
   #
   class Stock < ActiveRecord::Base
-    include Decoratable
+    include Comable::SkuChoice
 
     belongs_to :product, class_name: Comable::Product.name, foreign_key: Comable::Product.table_name.singularize.foreign_key
 
@@ -28,16 +28,10 @@ module Comable
     # @!endgroup
     #
 
+    delegate :name, to: :product
     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

data/app/models/comable/store.rb

@@ -0,0 +1,17 @@
+module Comable
+  class Store < ActiveRecord::Base
+    class << self
+      def instance
+        Comable::Store.first || Comable::Store.new(name: default_store_name)
+      end
+
+      def default_store_name
+        'Comable store'
+      end
+    end
+
+    def email_activate?
+      email_activate_flag && email_sender.present?
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Comable
+  #
+  # SKU選択肢
+  # 商品と注文明細にSKU選択肢としての機能を付与するためのモジュール
+  #
+  module SkuChoice
+    def name_with_sku
+      return name unless sku?
+      sku_name = sku_h_choice_name
+      sku_name += '/' + sku_v_choice_name if sku_v_choice_name.present?
+      name + "(#{sku_name})"
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Comable
+  #
+  # SKU項目
+  # 商品と注文明細にSKU項目としての機能を付与するためのモジュール
+  #
+  module SkuItem
+    def sku_h?
+      sku_h_item_name.present?
+    end
+
+    def sku_v?
+      sku_v_item_name.present?
+    end
+
+    alias_method :sku?, :sku_h?
+  end
+end

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

@@ -0,0 +1,43 @@
+<%= subject_for(@order) %>
+<%= "#{@order.class.human_attribute_name(:code)}: #{@order.code}" %>
+----------------------------------------------------------------------
+
+<%= I18n.t('comable.order_mailer.complete.dear', name: @order.full_name) %>
+
+<%= I18n.t('comable.order_mailer.complete.introductions', store_name: current_store.name) %>
+
+    <%- shipment_method = @order.shipment_method %>
+    <%- if shipment_method %>
+    <%= shipment_method.class.model_name.human %>:
+            <%= shipment_method.name %>
+    <%- end %>
+
+    <%= Comable::OrderDelivery.model_name.human %>:
+<%- @order.order_deliveries.each do |order_delivery| %>
+            <%= name_with_honorific order_delivery.full_name %>
+<%- end %>
+
+======================================================================
+
+<%= Comable::Order.model_name.human %>
+
+<%= "#{@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| %>
+            <%= name_with_quantity order_detail.name_with_sku, order_detail.quantity %>
+            <%= number_to_currency order_detail.subtotal_price %>
+
+<%- end %>
+----------------------------------------------------------------------
+
+            <%= "#{@order.class.human_attribute_name(:item_total_price)}: #{number_to_currency @order.item_total_price}" %>
+            <%= "#{@order.class.human_attribute_name(:shipment_fee)}: #{number_to_currency @order.shipment_fee}" %>
+
+            <%= "#{@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 -%>
+
+======================================================================
+
+<%= I18n.t('comable.order_mailer.complete.outroductions', store_name: current_store.name) %>

data/config/locales/ja.yml

@@ -1,5 +1,8 @@
 ja:
   comable:
+    honorific: &honorific
+      '%{name} 様'
+
     carts:
       add_product: '１つの商品がカートに入りしました'
       product_not_found: 'ご指定の商品は見つかりませんでした'
@@ -9,3 +12,22 @@ ja:
     orders:
       success: '注文が完了しました'
       failure: '注文に失敗しました。入力項目を見直してください。'
+
+    order_mailer:
+      complete:
+        subject: '注文完了メール'
+        dear: *honorific
+        introductions: |-
+          %{store_name} をご利用いただきましてありがとうございます。
+          ご注文内容は下記のとおりです。
+        outroductions: |-
+          またのご利用をお待ちしております。
+          %{store_name}
+        order: 'ご注文内容'
+        order_delivery: 'お届け先'
+
+  activerecord:
+    models:
+      comable/order: ご注文
+      comable/order_delivery: お届け先
+      comable/order_details: ご注文明細

data/db/migrate/20140120032559_create_comable_customers.rb

@@ -3,6 +3,7 @@ class CreateComableCustomers < ActiveRecord::Migration
     create_table :comable_customers do |t|
       t.string :family_name, null: false
       t.string :first_name, null: false
+      t.string :email, null: false
     end
   end
 end

data/db/migrate/20140723175431_create_comable_orders.rb

@@ -7,6 +7,11 @@ class CreateComableOrders < ActiveRecord::Migration
       t.string :code
       t.string :family_name
       t.string :first_name
+      t.string :email
+      t.integer :shipment_fee, null: false, default: 0
+      t.string :shipment_tracking_number
+      t.integer :shipment_method_id
+      t.integer :total_price
       t.datetime :completed_at
     end
 

data/db/migrate/20140723175810_create_comable_order_details.rb

@@ -3,7 +3,13 @@ class CreateComableOrderDetails < ActiveRecord::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
+      t.string :name, null: false
+      t.string :code, null: false
+      t.integer :price, null: false
+      t.string :sku_h_item_name
+      t.string :sku_v_item_name
+      t.string :sku_h_choice_name
+      t.string :sku_v_choice_name
       t.integer :quantity, default: 1, null: false
     end
 

data/db/migrate/20140921191416_create_comable_shipment_methods.rb

@@ -0,0 +1,10 @@
+class CreateComableShipmentMethods < ActiveRecord::Migration
+  def change
+    create_table :comable_shipment_methods do |t|
+      t.boolean :activate_flag, null: false, default: true
+      t.string :name, null: false
+      t.integer :fee, null: false
+      t.string :traking_url
+    end
+  end
+end

data/db/migrate/20140926063541_create_comable_stores.rb

@@ -0,0 +1,11 @@
+class CreateComableStores < ActiveRecord::Migration
+  def change
+    create_table :comable_stores do |t|
+      t.string :name
+      t.string :meta_keyword
+      t.string :meta_description
+      t.string :email_sender
+      t.boolean :email_activate_flag, null: false, default: true
+    end
+  end
+end

data/lib/comable/core/engine.rb

@@ -7,6 +7,8 @@ module Comable
         g.test_framework :rspec, fixture: true
         g.fixture_replacement :factory_girl, dir: 'spec/factories'
       end
+
+      config.autoload_paths << "#{config.root}/app/models/concerns" if Rails::VERSION::MAJOR == 3
     end
   end
 end

data/lib/comable_core.rb

@@ -1,6 +1,5 @@
 require 'comable/core/engine'
 
-require 'comable/decoratable'
 require 'comable/errors'
 require 'comable/cart_owner'
 require 'comable/payment_method'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_core
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,13 +36,19 @@ files:
 - app/assets/stylesheets/comable/application.css
 - app/helpers/comable/application_helper.rb
 - app/helpers/comable/products_helper.rb
+- app/mailers/comable/order_mailer.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/shipment_method.rb
 - app/models/comable/stock.rb
+- app/models/comable/store.rb
+- app/models/concerns/comable/sku_choice.rb
+- app/models/concerns/comable/sku_item.rb
+- app/views/comable/order_mailer/complete.text.erb
 - config/locales/ja.yml
 - db/migrate/20131214194807_create_comable_products.rb
 - db/migrate/20140120032559_create_comable_customers.rb
@@ -51,9 +57,10 @@ files:
 - db/migrate/20140723175624_create_comable_order_deliveries.rb
 - db/migrate/20140723175810_create_comable_order_details.rb
 - db/migrate/20140817194104_create_comable_payments.rb
+- db/migrate/20140921191416_create_comable_shipment_methods.rb
+- db/migrate/20140926063541_create_comable_stores.rb
 - lib/comable/cart_owner.rb
 - lib/comable/core/engine.rb
-- lib/comable/decoratable.rb
 - lib/comable/errors.rb
 - lib/comable/payment_method.rb
 - lib/comable/payment_method/base.rb

data/lib/comable/decoratable.rb

@@ -1,10 +0,0 @@
-module Comable
-  module Decoratable
-    def self.included(base)
-      # refs: http://edgeguides.rubyonrails.org/engines.html#overriding-models-and-controllers
-      Dir.glob(Rails.root + "app/decorators/comable/#{base.name.demodulize.underscore}_decorator*.rb").each do |c|
-        require_dependency(c)
-      end
-    end
-  end
-end