comable_core 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea4dbaa8dfc838607fcec82a1fc77d7c36854669
-  data.tar.gz: cabc6a6dab76d530e84c2e569aa26a6888a27aff
+  metadata.gz: eff5ae9b60000ce4171fd14e7848dc952cd084eb
+  data.tar.gz: dd80b2206c1d2ac96a99421760547bcc4bd0717f
 SHA512:
-  metadata.gz: c1a205986c287b466329fad23c3bf44a1fe6379eff5ee6a4720208ff41212a3ad96b205a0e0fa7bcd6aada1871cbccf575cb076e50df795e296fc5e85e98c39a
-  data.tar.gz: a7cff0da79f6f1070520c26c61822cf4a67b7e7b373e8e5b17ede7d34d29b2cf8f2e3e7a446787c6edb3578a164e4ef9e97c4c33529ba9691accef16fd3db466
+  metadata.gz: d6ba4f76bc521aa0fb526ce74fbdcfe7020ae7ab1db57e911da4434fbc275917436bcb02a84af19b317dfda3de47cd85e21dd83e42d37a1da4519220f57595dc
+  data.tar.gz: 598942cd5f8e84f1cc2bd6fc2e51465d99e24474cbfa2c83b1e5fe44ae92254b4b0b2308e7fbfa8819cd2c2f0d35ddb4b589a9883b26ee101e543c5f9101948f

data/app/helpers/comable/products_helper.rb

@@ -62,7 +62,7 @@ module Comable
       content_tag(:div, class: 'radio') do
         content_tag(:label) do
           html = ''
-          html << radio_button_tag(:stock_id, stock.id, false, disabled: stock.soldout?)
+          html << radio_button_tag(:stock_id, stock.id, false, disabled: stock.unstocked?)
           html << stock.code
           html.html_safe
         end

data/app/models/comable/category.rb

@@ -22,7 +22,7 @@ module Comable
       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
+          (category ? category.children : roots).find_by(name: name) || break
         end
       end
 

data/app/models/comable/customer.rb

@@ -1,7 +1,8 @@
 module Comable
   class Customer < ActiveRecord::Base
-    include CartOwner
-    include RoleOwner
+    include Comable::CartOwner
+    include Comable::RoleOwner
+    include Comable::Ransackable
 
     has_many :orders, class_name: Comable::Order.name
     has_many :addresses, class_name: Comable::Address.name, dependent: :destroy
@@ -16,6 +17,8 @@ module Comable
 
     devise(*Comable::Config.devise_strategies[:customer])
 
+    ransack_options ransackable_attributes: { except: [:encrypted_password, :reset_password_token, :reset_password_sent_at, :remember_created_at, :bill_address_id, :ship_address_id] }
+
     delegate :full_name, to: :bill_address, allow_nil: true, prefix: :bill
     delegate :full_name, to: :ship_address, allow_nil: true, prefix: :ship
 
@@ -63,7 +66,7 @@ module Comable
     end
 
     def incomplete_order
-      @incomplete_order ||= find_or_initialize_incomplete_order
+      @incomplete_order ||= find_incomplete_order || initialize_incomplete_order
     end
 
     def order(order_params = {})
@@ -94,10 +97,6 @@ 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
       order = Comable::Order.create(incomplete_order_attributes)
       @cookies.permanent.signed[:guest_token] = order.guest_token if @cookies

data/app/models/comable/order.rb

@@ -1,6 +1,8 @@
 module Comable
   class Order < ActiveRecord::Base
     include Comable::Checkout
+    include Comable::Ransackable
+    include Comable::Order::Morrisable
 
     belongs_to :customer, class_name: Comable::Customer.name, autosave: false
     belongs_to :payment_method, class_name: Comable::PaymentMethod.name, autosave: false
@@ -25,22 +27,11 @@ module Comable
     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) }
 
+    ransack_options ransackable_attributes: { except: [:shipment_method_id, :payment_method_id, :bill_address_id, :ship_address_id] }
+
     delegate :full_name, to: :bill_address, allow_nil: true, prefix: :bill
     delegate :full_name, to: :ship_address, allow_nil: true, prefix: :ship
 
-    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
       ActiveRecord::Base.transaction do
         run_callbacks :complete do
@@ -64,10 +55,13 @@ module Comable
       completed_at && completed_at_was.nil?
     end
 
-    def soldout_stocks
-      order_details.to_a.select(&:soldout_stock?)
+    def stocked_items
+      order_details.to_a.select(&:unstocked?)
     end
 
+    alias_method :soldout_stocks, :stocked_items
+    deprecate :soldout_stocks, deprecator: Comable::Deprecator.instance
+
     # 時価商品合計を取得
     def current_item_total_price
       order_details.to_a.sum(&:current_subtotal_price)

data/app/models/comable/order/morrisable.rb

@@ -0,0 +1,20 @@
+module Comable
+  class Order < ActiveRecord::Base
+    module Morrisable
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        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
+    end
+  end
+end

data/app/models/comable/order_detail.rb

@@ -44,19 +44,22 @@ module Comable
       price * quantity
     end
 
-    def soldout_stock?
+    def unstocked?
       stock_with_clean_quantity do |stock|
-        stock.soldout?(quantity: quantity)
+        stock.unstocked?(quantity: quantity)
       end
     end
 
-    def valid_stock_quantity
-      return unless soldout_stock?
-      errors.add :quantity, Comable.t('errors.messages.product_soldout', name: stock.name_with_sku)
-    end
+    alias_method :soldout_stock?, :unstocked?
+    deprecate :soldout_stock?, deprecator: Comable::Deprecator.instance
 
     private
 
+    def valid_stock_quantity
+      return unless unstocked?
+      errors.add :quantity, Comable.t('errors.messages.out_of_stock', name: stock.name_with_sku)
+    end
+
     def stock_with_clean_quantity
       quantity_will = stock.quantity
       stock.quantity = stock.quantity_was if stock.quantity_was

data/app/models/comable/product.rb

@@ -2,6 +2,7 @@ module Comable
   class Product < ActiveRecord::Base
     include Comable::SkuItem
     include Comable::Product::Search
+    include Comable::Ransackable
 
     has_many :stocks, class_name: Comable::Stock.name, dependent: :destroy
     has_many :images, class_name: Comable::Image.name, dependent: :destroy
@@ -15,6 +16,8 @@ module Comable
     validates :sku_h_item_name, length: { maximum: 255 }
     validates :sku_v_item_name, length: { maximum: 255 }
 
+    ransack_options attribute_select: { associations: :stocks }
+
     # Add conditions for the images association.
     # Override method of the images association to support Rails 3.x.
     def images
@@ -27,14 +30,20 @@ module Comable
       'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMTcxIiBoZWlnaHQ9IjE4MCIgdmlld0JveD0iMCAwIDE3MSAxODAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxkZWZzLz48cmVjdCB3aWR0aD0iMTcxIiBoZWlnaHQ9IjE4MCIgZmlsbD0iI0VFRUVFRSIvPjxnPjx0ZXh0IHg9IjU4IiB5PSI5MCIgc3R5bGU9ImZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxMHB0O2RvbWluYW50LWJhc2VsaW5lOmNlbnRyYWwiPjE3MXgxODA8L3RleHQ+PC9nPjwvc3ZnPg=='
     end
 
-    def unsold?
-      stocks.unsold.exists?
+    def stocked?
+      stocks.stocked.exists?
     end
 
-    def soldout?
-      !unsold?
+    alias_method :unsold?, :stocked?
+    deprecate :unsold?, deprecator: Comable::Deprecator.instance
+
+    def unstocked?
+      !stocked?
     end
 
+    alias_method :soldout?, :unstocked?
+    deprecate :soldout?, deprecator: Comable::Deprecator.instance
+
     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

data/app/models/comable/stock.rb

@@ -6,6 +6,7 @@ module Comable
   class Stock < ActiveRecord::Base
     include Comable::SkuItem
     include Comable::SkuChoice
+    include Comable::Ransackable
 
     belongs_to :product, class_name: Comable::Product.name
 
@@ -15,11 +16,21 @@ module Comable
 
     # @!scope class
     # 品切れでない在庫インスタンスを返す
-    scope :unsold, -> { where('quantity > ?', 0) }
+    scope :stocked, -> { where('quantity > ?', 0) }
+
+    class << self
+      alias_method :unsold, :stocked
+      deprecate :unsold, deprecator: Comable::Deprecator.instance
+    end
 
     # @!scope class
     # 品切れの在庫インスタンスを返す
-    scope :soldout, -> { where('quantity <= ?', 0) }
+    scope :unstocked, -> { where('quantity <= ?', 0) }
+
+    class << self
+      alias_method :soldout, :unstocked
+      deprecate :soldout, deprecator: Comable::Deprecator.instance
+    end
 
     #
     # @!endgroup
@@ -37,28 +48,38 @@ module Comable
     delegate :sku_h_item_name, to: :product
     delegate :sku_v_item_name, to: :product
 
+    ransack_options attribute_select: { associations: :product }, ransackable_attributes: { except: :product_id }
+
     # 在庫の有無を取得する
     #
     # @example
-    #   stock.unsold? #=> true
+    #   stock.quanaity = 1
+    #   stock.stocked? #=> true
     #
     # @param quantity [Fixnum] 減算する在庫数を指定する
     # @return [Boolean] 在庫があれば true を返す
-    # @see #soldout?
-    def unsold?(quantity: 1)
+    # @see #unstocked?
+    def stocked?(quantity: 1)
       (self.quantity - quantity) >= 0
     end
 
+    alias_method :unsold?, :stocked?
+    deprecate :unsold?, deprecator: Comable::Deprecator.instance
+
     # 在庫の有無を取得する
     #
     # @example
-    #   stock.soldout? #=> false
+    #   stock.quanaity = 1
+    #   stock.unstocked? #=> false
     #
     # @param quantity [Fixnum] 減算する在庫数を指定する
-    # @return [Boolean] {#unsold?} の逆。在庫がなければ true を返す
-    # @see #unsold?
-    def soldout?(quantity: 1)
-      !unsold?(quantity: quantity)
+    # @return [Boolean] {#stocked?} の逆。在庫がなければ true を返す
+    # @see #stocked?
+    def unstocked?(quantity: 1)
+      !stocked?(quantity: quantity)
     end
+
+    alias_method :soldout?, :unstocked?
+    deprecate :soldout?, deprecator: Comable::Deprecator.instance
   end
 end

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

@@ -0,0 +1,38 @@
+module Comable
+  module Ransackable
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      attr_reader :_ransack_options
+
+      def ransack_options(options = nil)
+        if options
+          @_ransack_options = options
+        else
+          @_ransack_options || {}
+        end
+      end
+
+      def ransackable_attribute?
+        klass.ransackable_attributes(auth_object).include? str
+      end
+
+      def ransackable_attributes(_auth_object = nil)
+        ransackable_attributes_options = ransack_options[:ransackable_attributes] || {}
+        if ransackable_attributes_options[:only]
+          [ransackable_attributes_options[:only]].flatten.map(&:to_s)
+        else
+          column_names + _ransackers.keys - [ransackable_attributes_options[:except]].flatten.map(&:to_s)
+        end
+      end
+
+      def ransackable_association?
+        klass.ransackable_associations(auth_object).include? str
+      end
+
+      def ransackable_associations(_auth_object = nil)
+        reflect_on_all_associations.map { |a| a.name.to_s }
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module Comable
         admin
         reporter
         customer
-      ), default: :customer, predicates: true
+      ), default: :customer, predicates: true, scope: true
     end
   end
 end

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

@@ -6,9 +6,14 @@ module Comable
   module SkuChoice
     def name_with_sku
       return name unless sku?
+      name + "(#{sku_name})"
+    end
+
+    def sku_name
+      return unless sku?
       sku_name = sku_h_choice_name
       sku_name += '/' + sku_v_choice_name if sku_v_choice_name.present?
-      name + "(#{sku_name})"
+      sku_name
     end
   end
 end

data/config/locales/en.yml

@@ -0,0 +1,280 @@
+en:
+  comable:
+    cart: 'Cart'
+    shopping_cart: 'Shopping Cart'
+    checkout: 'Checkout'
+    show_cart: 'Show Cart'
+    search: 'Search'
+    category: 'Category'
+    my_account: 'My Account'
+    sign_in: 'Login'
+    sign_out: 'Logout'
+    guest: 'Guest'
+    guest_order: 'Guest Checkout'
+    add_to_cart: 'Add to Cart'
+    browse_related_products: 'Browse related products'
+    reorder: 'Buy it Again'
+    change_email_or_password: 'Change email address or password'
+    edit_your_address_book: 'Edit your address book'
+    address_book: 'Address book'
+    order_history: 'Order history'
+    next_step: 'Continue'
+    use_this_address: 'Use this address'
+    complete_order: 'Place your order'
+    use_as_billing_address: 'Use as Billing Address'
+    use_as_shipping_address: 'Use as Shipping Address'
+    new_billing_address: 'New billing address'
+    new_shipping_address: 'New shiping address'
+    edit_billing_address: 'Edit billing address'
+    edit_shipping_address: 'Edit shiping address'
+    other_addresses: 'Other addresses'
+    new_address: 'New address'
+    successful: 'Successful'
+    failure: 'Failure'
+
+    price: &price
+      'Price'
+    quantity: &quantity
+      'Quantity'
+    item_total_price: &item_total_price
+      'Item total'
+    item_total_quantity: &item_total_quantity
+      'Item total quantity'
+    soldout:
+      'Soldout'
+    honorific: &honorific
+      'Dear %{name}'
+
+    checkout_flow:
+      sign_in: 'Login'
+      address_and_payment: 'Address & Payment'
+      confirm: 'Confirm'
+      complete: 'Place Order'
+
+    actions:
+      new: 'New'
+      edit: 'Edit'
+      create: 'Create'
+      update: 'Update'
+      destroy: 'Destroy'
+      cancel: 'Cancel'
+      continue: 'Continue'
+
+    errors:
+      messages:
+        out_of_stock: '(%{name}) was Sold Out.'
+        out_of_stocks: 'Sold Out Items.'
+        product_not_found: '%{name} could not be found or has been deleted.'
+        products_not_found: 'This item could not be found or has been deleted.'
+
+    carts:
+      added: 'An item is added to Cart'
+      empty: 'Cart is empty.'
+      updated: 'Cart Updated'
+      invalid: 'Cart Errored'
+
+    orders:
+      success: 'Your order has been placed.'
+      failure: 'Your order has failed. Please check your order again.'
+
+    order_mailer:
+      complete:
+        subject: 'Your %{store_name} order has been placed (Order: %{order_code})'
+        dear: *honorific
+        introductions: |-
+          Thank you for shopping with %{store_name}.
+          Your order details:
+        outroductions: |-
+          We hope to see you again soon.
+          %{store_name}
+
+    admin:
+      not_found: 'Record not found.'
+      general: 'General'
+      images: 'Images'
+      main_image: 'Main image'
+      sub_image: 'Sub image'
+      home: 'Home'
+      product: 'Product'
+      index: 'List'
+      search: 'Search'
+      back_to_store: 'Back to Store'
+      confirmation_to_remove_product: 'This operation cannot be undone. Would you like to proceed?'
+      confirmation_to_remove_stock: 'This operation cannot be undone. Would you like to proceed?'
+      you_can_drag_and_drop: 'Edit the category tree by drag-and-drop.'
+      you_can_right_click: 'Open the context menu by right click.'
+      link_to_add_new_node: 'Add a new category from the following link: '
+      link_to_add_new_stock: 'Add a new stock from the following link: '
+      check_this_product_in_frontend: 'Check this product in Store'
+      note: 'NOTE:'
+      results: 'results'
+      times: 'times'
+      more: 'More'
+      access_denied: 'Access denied'
+      order_count: 'Order count'
+      new_orders: 'New Order'
+      new_users: 'New User'
+      sales: 'Sales'
+      better_than_last_week: 'Better than last week (%{percentage}%)'
+      edit_profile: 'Edit profile'
+      please_fill_when_using_sku: 'Please fill the text fielde when using sku.'
+      operation: 'Operation'
+      stocks: 'Stocks'
+      clear_search_conditions: 'Clear search conditions'
+      add_search_condition: 'Add search condition'
+      remove_search_condition: '×'
+      advanced_search: 'Advanced search'
+      bill: 'Billing address'
+      ship: 'Shipping address'
+      add_sub_image: 'Add a sub image'
+      sign_in: 'Login'
+      sign_out: 'Logout'
+      nav:
+        dashboard: 'Dashboard'
+        order: 'Orders'
+        product: 'Products'
+        stock: 'Stocks'
+        category: 'Categories'
+        customer: 'Users'
+        general_settings: 'General settings'
+        store: 'Store'
+        shipment_method: 'Shipment methods'
+        payment_method: 'Payment methods'
+        products:
+          detail: 'Product details'
+        orders:
+          detail: 'Order details'
+          cart: 'Cart infomation'
+          customer: 'User details'
+          shipment: 'Shipment fee'
+          payment: 'Payment charge'
+        customers:
+          detail: 'User details'
+          edit: 'Editing user'
+          new_orders: 'Recently orders (%{count})'
+        stores:
+          edit: 'Editing store'
+        shipment_methods:
+          edit: 'Editing shipment method'
+        payment_methods:
+          edit: 'Editing payment method'
+      actions:
+        index: 'List'
+        new: 'New'
+        edit: 'Edit'
+        update: 'Update'
+        destroy: 'Destroy'
+        save: 'Save'
+        cancel: 'Cancel'
+      categories:
+        new_node: 'New category'
+
+  activerecord:
+    state_machines:
+      comable/order:
+        state:
+          states:
+            cart: 'Cart'
+            orderer: 'Billing address'
+            delivery: 'Shipping address'
+            shipment: 'Shipment method'
+            payment: 'Payment method'
+            confirm: 'Order confirmed'
+            complete: 'Order placed'
+
+    models:
+      comable/order: 'Orders'
+      comable/order_details: 'Order details'
+
+    attributes:
+      comable/customer:
+        id: 'ID'
+        email: 'Email address'
+        password: 'Password'
+        password_confirmation: 'Password (confirmation)'
+        current_password: 'Current password'
+        bill_address: 'Billing address'
+        ship_address: 'Shipping address'
+        bill_full_name: 'Full name of the billing address'
+        orders: 'Orders'
+        role: 'Role'
+      comable/order:
+        code: 'Order number'
+        email: 'Email address'
+        bill_address: 'Billing address'
+        ship_address: 'Shipping address'
+        payment_method: 'Payment method'
+        shipment_method: 'Shipment method'
+        shipment_fee: 'Shipment fee'
+        item_total_price: 'Item total'
+        total_price: 'Total'
+        order_details: 'Order details'
+        completed_at: 'Comleted at'
+        state: 'State'
+        bill_address: 'Billing address'
+        ship_address: 'Shipping adress'
+        bill_full_name: 'Full name of the billing address'
+        order_details: 'Order details'
+      comable/order_detail: &comable_order_detail
+        quantity: *quantity
+        price: *price
+        product: 'Product'
+        subtotal_price: 'Subtotal'
+      comable/address: &comable_address
+        full_name: 'Full name'
+        family_name: 'Last name'
+        first_name: 'First name'
+        state_name: 'State name'
+        zip_code: 'Zip code'
+        city: 'City'
+        detail: 'Detail'
+        phone_number: 'Phone number'
+      comable/product:
+        code: 'Code'
+        name: 'Name'
+        price: 'Price'
+        caption: 'Caption'
+        categories: 'Categories'
+        sku_h_item_name: 'SKU Horizontal item name'
+        sku_v_item_name: 'SKU Vertical item name'
+      comable/stock:
+        code: 'SKU Code'
+        quantity: 'Quantity'
+        sku_h_choice_name: 'SKU Horizontal choice name'
+        sku_v_choice_name: 'SKU Vertical choice name'
+      comable/store:
+        name: 'Name'
+        meta_keywords: 'Meta keywords'
+        meta_description: 'Meta description'
+        email_sender: 'Email sender'
+        email_activate_flag: 'Email activated'
+      comable/shipment_method:
+        name: 'Name'
+        fee: 'Fee'
+        activate_flag: 'Activated'
+        traking_url: 'Tracking URL'
+      comable/payment_method:
+        name: 'Name'
+        payment_provider: 'Oayment provider'
+        enable_price: 'Enable price range'
+      comable/order/order_details:
+        <<: *comable_order_detail
+      comable/order/bill_address:
+        <<: *comable_address
+      comable/order/ship_address:
+        <<: *comable_address
+
+  enumerize:
+    comable/customer:
+      role:
+        customer: 'Customer'
+        reporter: 'Reporter'
+        admin: 'Administrator'
+
+  views:
+    pagination:
+      first: "&laquo; First"
+      last: "Last &raquo;"
+      next: "Next &rsaquo;"
+      previous: "&lsaquo; Previous"
+      truncate: "&hellip;"

data/config/locales/ja.yml

@@ -40,7 +40,7 @@ ja:
       '合計価格'
     item_total_quantity: &item_total_quantity
       '合計商品数'
-    soldout: &soldout
+    soldout:
       '品切れ'
     honorific: &honorific
       '%{name} 様'
@@ -62,8 +62,8 @@ ja:
 
     errors:
       messages:
-        product_soldout: '(%{name})が在庫を超過しています。'
-        products_soldout: '在庫を超過する個数の注文が含まれている可能性があります。'
+        out_of_stock: '(%{name})が在庫を超過しています。'
+        out_of_stocks: '在庫を超過する個数の注文が含まれている可能性があります。'
         product_not_found: '%{name}は存在しないか削除された可能性があります。'
         products_not_found: 'ご指定の商品は存在しないか削除された可能性があります。'
 
@@ -72,7 +72,6 @@ ja:
       empty: 'カートに商品が入っていません'
       updated: 'カートの内容が変更されました'
       invalid: 'カートにいくつかのエラーがあります'
-      soldout: *soldout
 
     orders:
       success: '注文が完了しました'
@@ -122,6 +121,9 @@ ja:
       operation: 操作
       stocks: 在庫
       clear_search_conditions: 検索条件をクリア
+      add_search_condition: 検索条件を追加
+      remove_search_condition: '×'
+      advanced_search: 詳細検索
       bill: 請求先
       ship: 配送先
       add_sub_image: サブ画像を追加
@@ -196,7 +198,13 @@ ja:
         bill_full_name: 配送先氏名
         orders: 注文数
         role: 権限
+        sign_in_count: ログイン回数
+        current_sign_in_at: ログイン日時
+        last_sign_in_at: 最終ログイン日時
+        current_sign_in_ip: ログインIP
+        last_sign_in_ip: 最終ログインIP
       comable/order:
+        id: ID
         code: 注文番号
         email: メールアドレス
         bill_address: ご請求先
@@ -213,6 +221,9 @@ ja:
         ship_address: 配送先住所
         bill_full_name: 配送先氏名
         order_details: 注文明細
+        customer_id: ユーザーID
+        guest_token: ゲストトークン
+        shipment_tracking_number: 発送トラッキング番号
       comable/order_detail: &comable_order_detail
         quantity: *quantity
         price: *price
@@ -228,6 +239,7 @@ ja:
         detail: その他
         phone_number: 電話番号
       comable/product:
+        id: ID
         code: 商品コード
         name: 商品名
         price: 価格
@@ -236,6 +248,7 @@ ja:
         sku_h_item_name: SKU横軸項目名
         sku_v_item_name: SKU縦軸項目名
       comable/stock:
+        id: ID
         code: SKU商品コード
         quantity: 在庫
         sku_h_choice_name: SKU横軸選択肢名
@@ -276,3 +289,10 @@ ja:
       next: "次 ›"
       previous: "‹ 前"
       truncate: "…"
+
+  ransack:
+    predicates:
+      gteq: 以上
+      lteq: 以下
+      eq_any_splitted: 完全一致
+      cont_any_splitted: 部分一致

data/db/seeds.rb

@@ -0,0 +1,5 @@
+seeds_path = File.join(File.dirname(__FILE__), 'seeds')
+
+Dir.glob(File.join(seeds_path, '**/*.rb')).sort.each do |fixture_file|
+  require fixture_file
+end

data/db/seeds/comable/customers.rb

@@ -0,0 +1,51 @@
+require 'highline/import'
+
+def default_email
+  'comable@example.com'
+end
+
+def default_password
+  'password'
+end
+
+def ask_admin_email
+  if ENV['ADMIN_EMAIL']
+    ENV['ADMIN_EMAIL']
+  else
+    ask("Email [#{default_email}]: ") do |q|
+      q.echo = true
+      q.whitespace = :strip
+    end
+  end.presence || default_email
+end
+
+def ask_admin_password
+  if ENV['ADMIN_PASSWORD']
+    ENV['ADMIN_PASSWORD']
+  else
+    ask("Password [#{default_password}]: ") do |q|
+      q.echo = false
+      q.whitespace = :strip
+    end
+  end.presence || default_password
+end
+
+def create_admin_user
+  email = ask_admin_email
+  password = ask_admin_password
+
+  if Comable::Customer.where(email: email).exists?
+    puts "WARNING: The email address has already existed: #{email}"
+  else
+    Comable::Customer.with_role(:admin).new do |obj|
+      obj.email = email
+      obj.password = password
+    end.save!
+  end
+end
+
+if Comable::Customer.with_role(:admin).exists?
+  puts 'Admin user has already been previously created.'
+else
+  create_admin_user
+end

data/lib/comable/deprecator.rb

@@ -0,0 +1,26 @@
+if Rails::VERSION::MAJOR > 3
+  module Comable
+    class Deprecator < ActiveSupport::Deprecation
+      def initialize(deprecation_horizon = '0.4.0', gem_name = 'Comable')
+        super
+      end
+    end
+  end
+else
+  # TODO: Deprecated itself!
+  module Comable
+    class Deprecator
+      include Singleton
+    end
+  end
+
+  class Module
+    def deprecate_with_deprecator(*method_names)
+      options = method_names.extract_options!
+      options.delete(:deprecator) if options.present?
+      deprecate_without_deprecator
+    end
+
+    alias_method_chain :deprecate, :deprecator
+  end
+end

data/lib/comable_core.rb

@@ -12,6 +12,7 @@ require 'comable/core/engine'
 require 'comable/errors'
 require 'comable/payment_provider'
 require 'comable/state_machine_patch'
+require 'comable/deprecator'
 
 module Comable
   class << self

data/lib/generators/comable/install/install_generator.rb

@@ -0,0 +1,128 @@
+require 'rails/generators'
+require 'bundler'
+require 'bundler/cli'
+
+module Comable
+  class InstallGenerator < Rails::Generators::Base
+    class_option :migrate, type: :boolean, default: true, banner: 'Run Comable migrations'
+    class_option :seed, type: :boolean, default: true, banner: 'Load seed data (migrations must be run)'
+    class_option :admin_email, type: :string
+    class_option :admin_password, type: :string
+
+    class << self
+      def source_paths
+        paths = superclass.source_paths
+        paths << File.expand_path('../templates', __FILE__)
+        paths.flatten
+      end
+    end
+
+    def prepare_options
+      @migrate_flag = options[:migrate]
+      @seed_flag = @migrate_flag ? options[:seed] : false
+    end
+
+    def add_files
+      template 'config/initializers/comable.rb', 'config/initializers/comable.rb'
+    end
+
+    def configure_application
+      application <<-APP
+    config.to_prepare do
+      # Overriding Models and Controllers
+      # refs: http://edgeguides.rubyonrails.org/engines.html#overriding-models-and-controllers
+      Dir.glob(Rails.root.join('app/**/*_decorator*.rb')).each do |c|
+        Rails.configuration.cache_classes ? require_dependency(c) : load(c)
+      end
+    end
+      APP
+    end
+
+    def append_seeds
+      append_file 'db/seeds.rb', <<-SEEDS
+# Seed data for Comable
+Comable::Core::Engine.load_seed if defined?(Comable::Core)
+      SEEDS
+    end
+
+    def install_migrations
+      say_status :copying, 'migrations'
+      quietly { rake 'comable:install:migrations' }
+    end
+
+    def create_database
+      say_status :creating, 'database'
+      quietly { rake 'db:create' }
+    end
+
+    def run_migrations
+      if @migrate_flag
+        say_status :running, 'migrations'
+        quietly { rake 'db:migrate' }
+      else
+        say_status :skipping, "migrations (don't forget to run rake db:migrate)"
+      end
+    end
+
+    def load_seed_data
+      if @seed_flag
+        say_status :loading, 'seed data'
+        rake_seed
+      else
+        say_status :skipping, 'seed data (you can always run rake db:seed)'
+      end
+    end
+
+    def insert_routes
+      insert_into_file File.join('config', 'routes.rb'), after: "Rails.application.routes.draw do\n" do
+        <<-ROUTES
+  # This line mounts Comable's routes at the root of your application.
+  # This means, any requests to URLs such as /products, will go to Comable::ProductsController.
+  # If you would like to change where this engine is mounted, simply change the :at option to something different.
+  #
+  # We ask that you don't use the :as option here, as Comable relies on it being the default of "comable"
+  mount Comable::Core::Engine, at: '/'
+        ROUTES
+      end
+
+      message_for_insert_routes unless options[:quiet]
+    end
+
+    def complete
+      message_for_complete unless options[:quiet]
+    end
+
+    private
+
+    def rake_seed
+      cmd = -> { rake("db:seed #{rake_seed_arguments.join(' ')}") }
+
+      if options[:admin_email] && options[:admin_password]
+        quietly { cmd.call }
+      else
+        cmd.call
+      end
+    end
+
+    def rake_seed_arguments
+      arguments = []
+      arguments << "ADMIN_EMAIL=#{options[:admin_email]}" if options[:admin_email]
+      arguments << "ADMIN_PASSWORD=#{options[:admin_password]}" if options[:admin_password]
+      arguments
+    end
+
+    def message_for_insert_routes
+      puts '*' * 50
+      puts "We added the following line to your application's config/routes.rb file:"
+      puts ' '
+      puts "    mount Comable::Core::Engine, at: '/'"
+    end
+
+    def message_for_complete
+      puts '*' * 50
+      puts "Comable has been installed successfully. You're all ready to go!"
+      puts ' '
+      puts 'Enjoy!'
+    end
+  end
+end

data/lib/generators/comable/install/templates/config/initializers/comable.rb

@@ -0,0 +1,16 @@
+# Comable Configurations
+#
+Comable.setup do |config|
+  # Example:
+  #
+  # Uncomment to change devise strategies
+  # config.devise_strategies[:customer] = %i(
+  #   database_authenticatable
+  #   timeoutable
+  #   registerable
+  #   confirmable
+  #   recoverable
+  #   rememberable
+  #   trackable
+  # )
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_core
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.21
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.21
 description: Provide core functions for Comable.
 email:
 - hyoshida@appirits.com
@@ -149,6 +163,7 @@ files:
 - app/models/comable/customer.rb
 - app/models/comable/image.rb
 - app/models/comable/order.rb
+- app/models/comable/order/morrisable.rb
 - app/models/comable/order_detail.rb
 - app/models/comable/payment_method.rb
 - app/models/comable/product.rb
@@ -158,11 +173,13 @@ files:
 - app/models/concerns/comable/cart_owner.rb
 - app/models/concerns/comable/checkout.rb
 - app/models/concerns/comable/product/search.rb
+- app/models/concerns/comable/ransackable.rb
 - app/models/concerns/comable/role_owner.rb
 - app/models/concerns/comable/sku_choice.rb
 - app/models/concerns/comable/sku_item.rb
 - app/uploaders/image_uploader.rb
 - app/views/comable/order_mailer/complete.text.erb
+- config/locales/en.yml
 - config/locales/ja.yml
 - db/migrate/20131214194807_create_comable_products.rb
 - db/migrate/20140120032559_create_comable_customers.rb
@@ -176,14 +193,19 @@ files:
 - db/migrate/20150111031228_create_comable_categories.rb
 - db/migrate/20150111031229_create_comable_products_categories.rb
 - db/migrate/20150112173706_create_comable_images.rb
+- db/seeds.rb
+- db/seeds/comable/customers.rb
 - lib/comable/core/configuration.rb
 - lib/comable/core/engine.rb
+- lib/comable/deprecator.rb
 - lib/comable/errors.rb
 - lib/comable/payment_provider.rb
 - lib/comable/payment_provider/base.rb
 - lib/comable/payment_provider/general.rb
 - lib/comable/state_machine_patch.rb
 - lib/comable_core.rb
+- lib/generators/comable/install/install_generator.rb
+- lib/generators/comable/install/templates/config/initializers/comable.rb
 - lib/tasks/comable_tasks.rake
 homepage: https://github.com/hyoshida/comable#comable
 licenses: