comable_core 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da4f11f29114534f3c55966b7021770844817bc2
-  data.tar.gz: 21a2c7ab417d1401a7b79b6ed456e22f40ce0395
+  metadata.gz: 79d30fe208de3671ba535bd99829f904cc98b3b2
+  data.tar.gz: 31a192ed59a8397d009d7bbc73bc16e4c2edcfc5
 SHA512:
-  metadata.gz: 3fa65b0505fd616f97943e355e63806c077046c614516adb4f8b5dd10d122bc7fd79221006b8705b782166b469cdce63a1dba780f1ef00f0c4115da7690a9366
-  data.tar.gz: 6f03560e17a436549e97d6993895e87e8c04a8eed78dd2e9fc50ef16a1181241f3553bdb091e0001b9a1ac412f66ba041df9fd5b24c99073909f0be41defa51f
+  metadata.gz: 5e0a6c361cd55ca06ca48fa67e8bb945ac1bbe13d8d672887bba2b325890ccc65e935cd02f089870290cc0234be47560d247a26fb6676a55820a3f738be54ae0
+  data.tar.gz: 15a3a2942bf455e146efc547c313858d6318a85abc0dbc511580501e326841ed82233f08f555e72cf3475743d9abfeba83338fec59f6578886ae5c96a170b1b1

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2015 YOSHIDA Hiroki
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -69,16 +69,28 @@ if File.exist?('comable.gemspec')
     end
   end
 
-  task default: ['app:spec:all', 'rubocop']
+  task default: ['app:spec:all', 'rubocop', 'brakeman:all']
+else
+  task default: ['app:spec', 'rubocop', 'brakeman']
 end
 
-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'
+  sh 'rubocop'
+end
+
+task :brakeman do
+  sh 'brakeman --exit-on-warn --ignore-config .brakeman.ignore'
+end
+
+namespace :brakeman do
+  task :all do
+    FRAMEWORKS.each do |framework|
+      sh "brakeman --exit-on-warn --ignore-config .brakeman.ignore #{framework}"
+    end
+  end
 end

data/app/controllers/concerns/comable/permitted_attributes.rb

@@ -0,0 +1,15 @@
+module Comable
+  module PermittedAttributes
+    def permitted_address_attributes
+      [
+        :family_name,
+        :first_name,
+        :zip_code,
+        :state_name,
+        :city,
+        :detail,
+        :phone_number
+      ]
+    end
+  end
+end

data/app/helpers/comable/application_helper.rb

@@ -15,8 +15,21 @@ module Comable
       current_customer.incomplete_order
     end
 
+    def next_order_path
+      comable.next_order_path(state: current_order.state)
+    end
+
+    def update_order_path
+      return next_order_path unless params[:state]
+      comable.next_order_path(state: params[:state])
+    end
+
+    def store_location
+      session[:customer_return_to] = request.fullpath.gsub('//', '/')
+    end
+
     def name_with_honorific(name)
-      I18n.t('comable.honorific', name: name)
+      Comable.t('honorific', name: name)
     end
 
     def name_with_quantity(name, quantity)
@@ -27,5 +40,27 @@ module Comable
         "x#{quantity}"
       ].join(' ')
     end
+
+    private
+
+    def after_sign_in_path_for(_resource)
+      session.delete(:customer_return_to) || comable.root_path
+    end
+
+    def after_sign_out_path_for(_resource)
+      session.delete(:customer_return_to) || comable.root_path
+    end
+
+    def after_sign_up_path_for(resource)
+      signed_in_root_path(resource) || comable.root_path
+    end
+
+    def after_update_path_for(resource)
+      signed_in_root_path(resource) || comable.root_path
+    end
+
+    def after_resetting_password_path_for(resource)
+      signed_in_root_path(resource) || comable.root_path
+    end
   end
 end

data/app/helpers/comable/products_helper.rb

@@ -1,5 +1,21 @@
 module Comable
   module ProductsHelper
+    def listed_categories(categories, options = {})
+      content_tag(options[:tag] || :ul, class: options[:class]) do
+        categories.map do |category|
+          content_tag(:li, link_to_category(category), class: "#{'active' if @category == category}")
+        end.join.html_safe
+      end
+    end
+
+    def link_to_category(category, force_link: false)
+      if force_link || @category != category
+        link_to category.name, comable.products_path(category_id: category.id)
+      else
+        category.name
+      end
+    end
+
     def sku_table(product, options = nil)
       stocks = product.stocks
       content_tag(:table, nil, options) do
@@ -19,7 +35,6 @@ module Comable
       html = ''
       html << content_tag(:th, sku_item_name)
       stocks.group_by(&:sku_h_choice_name).keys.each do |sku_h_choice_name|
-        next if sku_h_choice_name.blank?
         html << content_tag(:th, sku_h_choice_name)
       end
       html.html_safe
@@ -29,8 +44,7 @@ module Comable
       return content_tag(:tr, build_sku_table_row(stocks)) unless product.sku_v?
 
       html = ''
-      stocks.group_by(&:sku_v_choice_name).each_pair do |sku_v_choice_name, sku_v_stocks|
-        next if sku_v_choice_name.blank?
+      stocks_groups_by_sku_v(stocks).each_pair do |sku_v_choice_name, sku_v_stocks|
         html << content_tag(:tr, build_sku_table_row(sku_v_stocks, sku_v_choice_name))
       end
       html.html_safe
@@ -44,11 +58,24 @@ module Comable
     end
 
     def build_sku_product_label(stock)
-      content_tag(:label) do
-        html = ''
-        html << radio_button_tag(:stock_id, stock.id, false, disabled: stock.soldout?)
-        html << stock.code
-        html.html_safe
+      return unless stock
+      content_tag(:div, class: 'radio') do
+        content_tag(:label) do
+          html = ''
+          html << radio_button_tag(:stock_id, stock.id, false, disabled: stock.soldout?)
+          html << stock.code
+          html.html_safe
+        end
+      end
+    end
+
+    def stocks_groups_by_sku_v(stocks)
+      sku_h_choice_names = stocks.group_by(&:sku_h_choice_name).keys
+
+      stocks.group_by(&:sku_v_choice_name).each_with_object({}) do |(sku_v_choice_name, sku_v_stocks), group|
+        group[sku_v_choice_name] = sku_h_choice_names.map do |sku_h_choice_name|
+          sku_v_stocks.find { |s| s.sku_h_choice_name == sku_h_choice_name }
+        end
       end
     end
   end

data/app/mailers/comable/order_mailer.rb

@@ -12,7 +12,7 @@ module Comable
     private
 
     def subject_for(order)
-      I18n.t('comable.order_mailer.complete.subject', store_name: current_store.name, order_code: order.code)
+      Comable.t('order_mailer.complete.subject', store_name: current_store.name, order_code: order.code)
     end
   end
 end

data/app/models/comable/ability.rb

@@ -0,0 +1,18 @@
+module Comable
+  class Ability
+    include CanCan::Ability
+
+    def initialize(user)
+      user ||= Comable::Customer.new # guest user (not logged in)
+
+      case user.role.to_sym
+      when :admin
+        can :manage, :all
+      when :reporter
+        can :read, :all
+      else
+        fail CanCan::AccessDenied
+      end
+    end
+  end
+end

data/app/models/comable/address.rb

@@ -1,6 +1,6 @@
 module Comable
   class Address < ActiveRecord::Base
-    belongs_to :customer, class_name: Comable::Customer.name, foreign_key: Comable::Customer.table_name.singularize.foreign_key, autosave: false
+    belongs_to :customer, class_name: Comable::Customer.name, autosave: false
 
     validates :family_name, presence: true, length: { maximum: 255 }
     validates :first_name, presence: true, length: { maximum: 255 }
@@ -25,7 +25,11 @@ module Comable
     end
 
     def attributes_without_id
-      attributes.except('id', Comable::Customer.table_name.singularize.foreign_key.to_s)
+      attributes.except('id', 'customer_id')
+    end
+
+    def full_name
+      "#{family_name} #{first_name}"
     end
   end
 end

data/app/models/comable/category.rb

@@ -0,0 +1,72 @@
+module Comable
+  class Category < ActiveRecord::Base
+    has_and_belongs_to_many :products, class_name: Comable::Product.name, join_table: :comable_products_categories
+    has_ancestry
+    acts_as_list scope: [:ancestry]
+
+    default_scope -> { order('position ASC') }
+
+    DEFAULT_PATH_NAME_DELIMITER = ' > '
+
+    class << self
+      def path_names(delimiter: DEFAULT_PATH_NAME_DELIMITER)
+        categoris.path(&:name).join(delimiter)
+      end
+
+      def find_by_path_names(path_names, delimiter: DEFAULT_PATH_NAME_DELIMITER)
+        path_names.map do |path_name|
+          find_by_path_name(path_name, delimiter: delimiter)
+        end.compact
+      end
+
+      def find_by_path_name(path_name, root: nil, delimiter: DEFAULT_PATH_NAME_DELIMITER)
+        names = path_name.split(delimiter)
+        names.inject(root) do |category, name|
+          (category ? category.children : roots).find_by(name: name) || return
+        end
+      end
+
+      def to_jstree(options = {})
+        build_to_jstree(arrange_serializable(order: :position), options).to_json
+      end
+
+      def from_jstree!(jstree_json)
+        jstree = JSON.parse(jstree_json)
+
+        transaction do
+          restore_from_jstree!(jstree)
+        end
+      end
+
+      private
+
+      def build_to_jstree(serialized_categories, options = {})
+        serialized_categories.map do |serialized_category|
+          options.merge(
+            id: serialized_category['id'],
+            text: serialized_category['name'],
+            children: build_to_jstree(serialized_category['children'], options)
+          )
+        end
+      end
+
+      def restore_from_jstree!(jstree, parent = nil)
+        return unless jstree
+
+        jstree.each.with_index(1) do |node, index|
+          return find(node['_destroy']).destroy! if node['_destroy'].present?
+
+          restore_from_jstree_node!(node, parent, position: index)
+        end
+      end
+
+      def restore_from_jstree_node!(node, parent, default_attributes = {})
+        attributes = default_attributes.merge(parent: parent, name: node['text'])
+        category = node['id'].to_i.zero? ? new : find(node['id'])
+        category.update_attributes!(attributes)
+
+        restore_from_jstree!(node['children'], category)
+      end
+    end
+  end
+end

data/app/models/comable/customer.rb

@@ -1,9 +1,10 @@
 module Comable
   class Customer < ActiveRecord::Base
     include CartOwner
+    include RoleOwner
 
-    has_many :orders, class_name: Comable::Order.name, foreign_key: table_name.singularize.foreign_key
-    has_many :addresses, class_name: Comable::Address.name, foreign_key: table_name.singularize.foreign_key, dependent: :destroy
+    has_many :orders, class_name: Comable::Order.name
+    has_many :addresses, class_name: Comable::Address.name, dependent: :destroy
     belongs_to :bill_address, class_name: Comable::Address.name, dependent: :destroy
     belongs_to :ship_address, class_name: Comable::Address.name, dependent: :destroy
 
@@ -11,21 +12,12 @@ module Comable
     accepts_nested_attributes_for :bill_address
     accepts_nested_attributes_for :ship_address
 
+    validates :email, presence: true, length: { maximum: 255 }
+
     devise(*Comable::Config.devise_strategies[:customer])
 
-    before_save :inherit_cart_items, if: :current_sign_in_at_changed?
-
-    def initialize(*args)
-      obj = args.first
-      case obj.class.name
-      when /Cookies/
-        Rails.logger.debug '[DEPRECATED] Comable::Customer#new(cookies) is deprecated. Please use Comable::Customer#with_cookies(cookies) method.'
-        @cookies = obj
-        super()
-      else
-        super
-      end
-    end
+    delegate :full_name, to: :bill_address, allow_nil: true, prefix: :bill
+    delegate :full_name, to: :ship_address, allow_nil: true, prefix: :ship
 
     def with_cookies(cookies)
       @cookies = cookies
@@ -35,7 +27,7 @@ module Comable
     # Add conditions for the orders association.
     # Override method of the orders association to support Rails 3.x.
     def orders
-      super.complete
+      super.complete.order('completed_at DESC, id DESC')
     end
 
     def other_addresses
@@ -58,33 +50,42 @@ module Comable
       !signed_in?
     end
 
-    def reset_cart
-      return unless incomplete_order
-
-      # TODO: テストケースの作成
-      incomplete_order.destroy if incomplete_order.incomplete?
-
-      @incomplete_order = nil
+    # TODO: Add a test case
+    def reload(*_)
+      super.tap do
+        @cart_items = nil
+        @incomplete_order = nil
+      end
     end
 
     def cart_items
-      incomplete_order.order_deliveries.first.order_details
+      @cart_items ||= incomplete_order.order_details
     end
 
     def incomplete_order
-      @incomplete_order ||= initialize_incomplete_order
-    end
-
-    def preorder(order_params = {})
-      incomplete_order.attributes = order_params
-      incomplete_order.precomplete!
-      incomplete_order
+      @incomplete_order ||= find_or_initialize_incomplete_order
     end
 
     def order(order_params = {})
+      Rails.logger.debug '[DEPRECATED] Comable::Customer#order is deprecated. Please use Comable::Order#next_state method.'
       incomplete_order.attributes = order_params
+      incomplete_order.state = 'complete'
       incomplete_order.complete!
-      incomplete_order.tap { |completed_flag| reset_cart if completed_flag }
+      incomplete_order.tap { reload }
+    end
+
+    def after_set_user
+      return unless current_guest_token
+
+      guest_order = Comable::Order.incomplete.preload(:order_details).where(guest_token: current_guest_token).first
+      return unless guest_order
+
+      inherit_order_state(guest_order)
+      inherit_cart_items(guest_order)
+    end
+
+    def human_id
+      "##{id}"
     end
 
     private
@@ -93,44 +94,43 @@ module Comable
       @cookies.signed[:guest_token] if @cookies
     end
 
+    def find_or_initialize_incomplete_order
+      find_incomplete_order || initialize_incomplete_order
+    end
+
     def initialize_incomplete_order
-      orders = find_incomplete_orders
-      return orders.first if orders.any?
-      order = orders.create(incomplete_order_attributes)
+      order = Comable::Order.create(incomplete_order_attributes)
       @cookies.permanent.signed[:guest_token] = order.guest_token if @cookies
-      order
+      # enable preload
+      find_incomplete_order
     end
 
     def incomplete_order_attributes
       {
-        self.class.table_name.singularize.foreign_key => id,
-        email: email,
-        # TODO: Remove
-        family_name: family_name,
-        first_name: first_name,
-        order_deliveries_attributes: [{ family_name: family_name, first_name: first_name }]
+        customer_id: id,
+        email: email
       }
     end
 
-    def find_incomplete_orders
-      guest_token = current_guest_token unless signed_in?
+    def find_incomplete_order
+      guest_token ||= current_guest_token unless signed_in?
       Comable::Order
         .incomplete
-        .includes(order_deliveries: :order_details)
+        .preload(:order_details)
         .where(guest_token: guest_token)
         .by_customer(self)
-        .limit(1)
+        .first
     end
 
-    def inherit_cart_items
-      return unless current_guest_token
-      guest_order = Comable::Order.incomplete.includes(order_deliveries: :order_details).where(guest_token: current_guest_token).first
-      return unless guest_order
-      guest_order.order_deliveries.map(&:order_details).flatten.each do |order_detail|
+    def inherit_order_state(guest_order)
+      return if incomplete_order.stated?(guest_order.state)
+      incomplete_order.next_state
+    end
+
+    def inherit_cart_items(guest_order)
+      guest_order.order_details.each do |order_detail|
         move_cart_item(order_detail)
       end
-      # TODO: Remove?
-      cart_items.reload
     end
   end
 end

data/app/models/comable/image.rb

@@ -0,0 +1,11 @@
+module Comable
+  class Image < ActiveRecord::Base
+    mount_uploader :file, ImageUploader
+
+    belongs_to :product, class_name: Comable::Product.name
+
+    delegate :url, to: :file, allow_nil: true
+    delegate :current_path, to: :file, allow_nil: true
+    delegate :identifier, to: :file, allow_nil: true
+  end
+end

data/app/models/comable/order.rb

@@ -1,83 +1,81 @@
 module Comable
   class Order < ActiveRecord::Base
-    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
+    include Comable::Checkout
+
+    belongs_to :customer, class_name: Comable::Customer.name, autosave: false
+    belongs_to :payment_method, class_name: Comable::PaymentMethod.name, autosave: false
     belongs_to :shipment_method, class_name: Comable::ShipmentMethod.name, autosave: false
     belongs_to :bill_address, class_name: Comable::Address.name, autosave: true, dependent: :destroy
     belongs_to :ship_address, class_name: Comable::Address.name, autosave: true, dependent: :destroy
-    has_many :order_deliveries, dependent: :destroy, class_name: Comable::OrderDelivery.name, foreign_key: table_name.singularize.foreign_key, inverse_of: :order
+    has_many :order_details, dependent: :destroy, class_name: Comable::OrderDetail.name, inverse_of: :order
 
     accepts_nested_attributes_for :bill_address
     accepts_nested_attributes_for :ship_address
-    # TODO: Remove
-    accepts_nested_attributes_for :order_deliveries
-
-    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 :email, presence: true
-      complete_order.validates :shipment_fee, presence: true
-      complete_order.validates :total_price, presence: true
-    end
-
-    with_options unless: :complete? 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
+    accepts_nested_attributes_for :order_details
 
     define_model_callbacks :complete
-    before_complete :precomplete
     before_validation :generate_guest_token, on: :create
     before_validation :clone_addresses_from_customer, on: :create
     after_complete :clone_addresses_to_customer
 
     scope :complete, -> { where.not(completed_at: nil) }
     scope :incomplete, -> { where(completed_at: nil) }
-    scope :by_customer, -> (customer) { where(Comable::Customer.table_name.singularize.foreign_key => customer) }
+    scope :by_customer, -> (customer) { where(customer_id: customer) }
+    scope :this_month, -> { where(completed_at: Time.now.beginning_of_month..Time.now.end_of_month) }
+    scope :this_week, -> { where(completed_at: Time.now.beginning_of_week..Time.now.end_of_week) }
+    scope :last_week, -> { where(completed_at: 1.week.ago.beginning_of_week..1.week.ago.end_of_week) }
 
-    def precomplete
-      valid_order_quantity?
-    end
+    delegate :full_name, to: :bill_address, allow_nil: true, prefix: :bill
+    delegate :full_name, to: :ship_address, allow_nil: true, prefix: :ship
 
-    def precomplete!
-      fail Comable::InvalidOrder unless precomplete
-      self
+    class << self
+      def morris_keys
+        %w( count price )
+      end
+
+      def to_morris
+        this = (Rails::VERSION::MAJOR == 3) ? scoped : all
+        this.group_by { |order| order.completed_at.to_date }.map do |date, orders|
+          { date: date, count: orders.count, price: orders.sum(&:total_price) }
+        end.to_json
+      end
     end
 
     def complete
-      # TODO: トランザクションの追加
-      run_callbacks :complete do
-        save_to_complete
+      ActiveRecord::Base.transaction do
+        run_callbacks :complete do
+          save_to_complete.tap { |completed| self.completed_at = nil unless completed }
+        end
       end
     end
 
     def complete!
+      Rails.logger.debug '[DEPRECATED] #complete! is deprecated. Please use #next_state method.'
       fail Comable::InvalidOrder unless complete
       self
     end
 
-    def complete?
-      !incomplete?
+    def completed?
+      !completed_at.nil?
     end
 
-    def incomplete?
-      completed_at.nil?
+    # TODO: switch to state_machine
+    def completing?
+      completed_at && completed_at_was.nil?
     end
 
-    # 氏名を取得
-    def full_name
-      [family_name, first_name].join(' ')
+    def soldout_stocks
+      order_details.to_a.select(&:soldout_stock?)
     end
 
     # 時価商品合計を取得
     def current_item_total_price
-      order_deliveries.map(&:order_details).flatten.sum(&:current_subtotal_price)
+      order_details.to_a.sum(&:current_subtotal_price)
     end
 
     # 売価商品合計を取得
     def item_total_price
-      order_deliveries.map(&:order_details).flatten.sum(&:subtotal_price)
+      order_details.to_a.sum(&:subtotal_price)
     end
 
     # 時価送料を取得
@@ -97,12 +95,10 @@ module Comable
       self.shipment_fee = current_shipment_fee
       self.total_price = current_total_price
       generate_code
-      order_deliveries.each(&:save_to_complete)
-      save
-    end
 
-    def valid_order_quantity?
-      order_deliveries.map(&:order_details).flatten.map(&:valid_order_quantity?).all?
+      order_details.each(&:complete)
+
+      save
     end
 
     def generate_code
@@ -128,9 +124,8 @@ module Comable
 
     def clone_addresses_to_customer
       return unless customer
-      # TODO: Remove conditions for compatibility.
-      customer.update_bill_address_by bill_address if bill_address
-      customer.update_ship_address_by ship_address if ship_address
+      customer.update_bill_address_by bill_address
+      customer.update_ship_address_by ship_address
     end
   end
 end