comable-core 0.6.0 → 0.7.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c695838cc0b5b98cc5c786a0065e9d2e17d6f937
-  data.tar.gz: c03b1988ad054478da5f280d9c0389017bebaf10
+  metadata.gz: bfeeb810107eafe21ff7ccc16a8796708892aa08
+  data.tar.gz: af72df7aebb8d185f96c36a9c53ad4ca3a7d769f
 SHA512:
-  metadata.gz: c4ef62d68988158a6d985c432a1744ea1e31821eff13a45ebe881da8d9e2180fe9fdaa589ef77d7042e96fed15c1e8c8e9e23d8daa6492e29648cfd2fa04b4fa
-  data.tar.gz: 2470403342475d734c7d7db9bec17b54d3dd503184525f11134ed6ccd487b17289bd3aa76addb71b915f6732f900f2482ad22c18bfa77e5050951120538d3a64
+  metadata.gz: 2b8ad2b68377430abf27f0113075d2ca0771d51b4377765e87663c6e52b63309f39a4b2ad2f59823a0dd23d513ad2763f307a5cc8401b581b7d2139ea4c4ea43
+  data.tar.gz: 909ec7862a42e7f29977abedc6eb1f9af4e99c22298469525c1ae95bac369b82d3e0462a65c01a01d2d51c259067f633200a71c457d4fc90fd65df154441d11c

data/app/controllers/comable/application_controller.rb

@@ -0,0 +1,4 @@
+module Comable
+  class ApplicationController < ActionController::Base
+  end
+end

data/app/helpers/comable/application_helper.rb

@@ -5,7 +5,9 @@ module Comable
     end
 
     def current_comable_user
-      resource = current_admin_user || current_user || Comable::User.new
+      resource = current_admin_user if defined? Comable::Backend
+      resource ||= current_user if defined? Comable::Frontend
+      resource ||= Comable::User.new
       resource.with_cookies(cookies)
     end
 
@@ -17,6 +19,10 @@ module Comable
       @curent_trackers ||= (controller_name == 'orders' && action_name == 'create') ? Comable::Tracker.activated : Comable::Tracker.activated.with_place(:everywhere)
     end
 
+    def current_navigations
+      @current_navigations ||= Comable::Navigation.all
+    end
+
     def next_order_path
       comable.next_order_path(state: current_order.state)
     end
@@ -61,24 +67,33 @@ module Comable
 
     private
 
-    def after_sign_in_path_for(_resource)
-      session.delete(:user_return_to) || comable.root_path
+    def comable_root_path
+      case resource_name
+      when :admin_user
+        comable.admin_root_path
+      else
+        defined?(Comable::Frontend) ? comable.root_path : '/'
+      end
+    end
+
+    def after_sign_in_path_for(_resource_or_scope)
+      session.delete(:user_return_to) || comable_root_path
     end
 
-    def after_sign_out_path_for(_resource)
-      session.delete(:user_return_to) || comable.root_path
+    def after_sign_out_path_for(_scope)
+      session.delete(:user_return_to) || comable_root_path
     end
 
     def after_sign_up_path_for(resource)
-      signed_in_root_path(resource) || comable.root_path
+      signed_in_root_path(resource) || comable_root_path
     end
 
     def after_update_path_for(resource)
-      signed_in_root_path(resource) || comable.root_path
+      signed_in_root_path(resource) || comable_root_path
     end
 
     def after_resetting_password_path_for(resource)
-      signed_in_root_path(resource) || comable.root_path
+      signed_in_root_path(resource) || comable_root_path
     end
   end
 end

data/app/helpers/comable/products_helper.rb

@@ -15,68 +15,5 @@ module Comable
         category.name
       end
     end
-
-    def sku_table(product, options = nil)
-      stocks = product.stocks
-      content_tag(:table, nil, options) do
-        html = ''
-        html << build_sku_v_table_header(product, stocks)
-        html << build_sku_table_rows(product, stocks)
-        html.html_safe
-      end
-    end
-
-    private
-
-    def build_sku_v_table_header(product, stocks)
-      sku_item_name = product.sku_h_item_name
-      sku_item_name += '/' + product.sku_v_item_name if product.sku_v?
-
-      html = ''
-      html << content_tag(:th, sku_item_name)
-      stocks.group_by(&:sku_h_choice_name).keys.each do |sku_h_choice_name|
-        html << content_tag(:th, sku_h_choice_name)
-      end
-      html.html_safe
-    end
-
-    def build_sku_table_rows(product, stocks)
-      return content_tag(:tr, build_sku_table_row(stocks)) unless product.sku_v?
-
-      html = ''
-      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
-    end
-
-    def build_sku_table_row(stocks, sku_v_choice_name = nil)
-      html = ''
-      html << content_tag(:th, sku_v_choice_name)
-      html << stocks.map { |stock| content_tag(:td, build_sku_product_label(stock)) }.join
-      html.html_safe
-    end
-
-    def build_sku_product_label(stock)
-      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.unstocked?)
-          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
 end

data/app/models/comable/image.rb

@@ -2,7 +2,7 @@ module Comable
   class Image < ActiveRecord::Base
     include Comable::Liquidable
 
-    mount_uploader :file, ImageUploader
+    mount_uploader :file, Comable::ImageUploader
 
     belongs_to :product, class_name: Comable::Product.name
 

data/app/models/comable/navigation.rb

@@ -0,0 +1,12 @@
+module Comable
+  class Navigation < ActiveRecord::Base
+    include Comable::Ransackable
+
+    has_many :navigation_items
+
+    accepts_nested_attributes_for :navigation_items, allow_destroy: true
+
+    validates :name, length: { maximum: 255 }, presence: true
+    validates :navigation_items, presence: true
+  end
+end

data/app/models/comable/navigation_item.rb

@@ -0,0 +1,52 @@
+module Comable
+  class NavigationItem < ActiveRecord::Base
+    belongs_to :navigation
+    belongs_to :linkable, polymorphic: true
+
+    acts_as_list scope: :navigation
+
+    validates :linkable, presence: true, if: :linkable_id?
+    validates :url, presence: true, unless: :linkable_type?
+    validates :url, length: { maximum: 255 }
+    validates :name, length: { maximum: 255 }, presence: true
+    validates :position, uniqueness: { scope: :navigation_id }
+
+    class << self
+      # TODO: Refactor methods and modules for linkable
+      def linkable_params_lists
+        [
+          web_address_linkable_params, # Web Address
+          product_linkable_params,     # Product
+          page_linkable_params         # Page
+        ].compact
+      end
+
+      def web_address_linkable_params
+        {
+          type: nil,
+          name: Comable.t('admin.nav.navigation_items.web_address')
+        }
+      end
+
+      def product_linkable_params
+        return unless Comable::Product.linkable_exists?
+        {
+          type: Comable::Product.to_s,
+          name: Comable.t('products')
+        }
+      end
+
+      def page_linkable_params
+        return unless Comable::Page.linkable_exists?
+        {
+          type: Comable::Page.to_s,
+          name: Comable.t('pages')
+        }
+      end
+    end
+
+    def linkable_class
+      linkable_type.constantize if linkable_type.present?
+    end
+  end
+end

data/app/models/comable/option_type.rb

@@ -0,0 +1,19 @@
+module Comable
+  class OptionType < ActiveRecord::Base
+    include Comable::Ransackable
+
+    has_many :option_values, class_name: Comable::OptionValue.name
+
+    validates :name, presence: true, length: { maximum: 255 }
+
+    ransack_options ransackable_attributes: { only: :name }
+
+    def values
+      @values ? @values : option_values.map(&:name)
+    end
+
+    def values=(values)
+      @values = values.is_a?(String) ? values.split(' ') : values
+    end
+  end
+end

data/app/models/comable/option_value.rb

@@ -0,0 +1,14 @@
+module Comable
+  class OptionValue < ActiveRecord::Base
+    include Comable::Ransackable
+
+    belongs_to :option_type, class_name: Comable::OptionType.name
+    has_and_belongs_to_many :variants, class_name: Comable::Variant.name, join_table: :comable_variants_option_values
+
+    accepts_nested_attributes_for :option_type
+
+    validates :name, presence: true, length: { maximum: 255 }
+
+    ransack_options ransackable_attributes: { only: :name }
+  end
+end

data/app/models/comable/order.rb

@@ -23,6 +23,7 @@ module Comable
     delegate :full_name, to: :ship_address, allow_nil: true, prefix: :ship
     delegate :state, :human_state_name, to: :payment, allow_nil: true, prefix: true
     delegate :state, :human_state_name, to: :shipment, allow_nil: true, prefix: true
+    delegate :cancel!, :resume!, to: :payment, allow_nil: true, prefix: true
 
     def complete!
       ActiveRecord::Base.transaction do

data/app/models/comable/order_item/csvable.rb

@@ -18,7 +18,7 @@ module Comable
           __association__ order: { bill_address: :detail }
           __association__ order: { bill_address: :phone_number }
           name
-          code
+          sku
           price
           sku_h_item_name
           sku_v_item_name

data/app/models/comable/order_item.rb

@@ -5,14 +5,16 @@ module Comable
     include Comable::Liquidable
     include Comable::OrderItem::Csvable
 
-    belongs_to :stock, class_name: Comable::Stock.name, autosave: true
+    belongs_to :variant, class_name: Comable::Variant.name, autosave: true
     belongs_to :order, class_name: Comable::Order.name, inverse_of: :order_items
 
     validates :quantity, numericality: { greater_than: 0 }
+    validates :sku, length: { maximum: 255 }
     validate :valid_stock_quantity
 
     liquid_methods :name, :name_with_sku, :code, :quantity, :price, :subtotal_price
 
+    delegate :stock, to: :variant
     delegate :product, to: :stock
     delegate :image_url, to: :product
     delegate :guest_token, to: :order
@@ -58,6 +60,39 @@ module Comable
       end
     end
 
+    def sku_h_item_name
+      product.option_types.first.try(:name)
+    end
+
+    def sku_v_item_name
+      product.option_types.second.try(:name)
+    end
+
+    def sku_h_choice_name
+      variant.option_values.first.try(:name)
+    end
+
+    def sku_v_choice_name
+      variant.option_values.second.try(:name)
+    end
+
+    def stock=(stock)
+      if variant
+        variant.stock = stock
+      else
+        build_variant(stock: stock)
+      end
+    end
+
+    #
+    # Deprecated methods
+    #
+    deprecate :stock, deprecator: Comable::Deprecator.instance
+    deprecate :sku_h_item_name, deprecator: Comable::Deprecator.instance
+    deprecate :sku_v_item_name, deprecator: Comable::Deprecator.instance
+    deprecate :sku_h_choice_name, deprecator: Comable::Deprecator.instance
+    deprecate :sku_v_choice_name, deprecator: Comable::Deprecator.instance
+
     private
 
     def valid_stock_quantity
@@ -85,13 +120,9 @@ module Comable
 
     def current_attributes
       {
-        name: product.name,
-        code: stock.code,
+        name: stock.name,
         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
+        sku: variant.sku
       }
     end
   end

data/app/models/comable/page.rb

@@ -1,8 +1,10 @@
 module Comable
   class Page < ActiveRecord::Base
     include Comable::Ransackable
-
+    include Comable::Linkable
     extend FriendlyId
+
+    linkable_columns_keys name: :title
     friendly_id :title, use: :slugged
 
     validates :title, length: { maximum: 255 }, presence: true

data/app/models/comable/payment.rb

@@ -48,7 +48,7 @@ module Comable
       before_transition to: :ready, do: -> (s) { s.provider_authorize! }
       before_transition to: :completed, do: -> (s) { s.complete! }
       before_transition to: :canceled, do: -> (s) { s.provider_cancel! }
-      before_transition to: :canceled, do: -> (s) { s.provider_resume! }
+      before_transition to: :resumed, do: -> (s) { s.provider_resume! }
     end
 
     class << self

data/app/models/comable/product/csvable.rb

@@ -11,6 +11,7 @@ module Comable
           code
           price
           caption
+          published_at
           sku_h_item_name
           sku_v_item_name
         end

data/app/models/comable/product.rb

@@ -5,22 +5,26 @@ module Comable
     include Comable::Liquidable
     include Comable::Product::Search
     include Comable::Product::Csvable
+    include Comable::Linkable
 
-    has_many :stocks, class_name: Comable::Stock.name, dependent: :destroy
+    has_many :variants, class_name: Comable::Variant.name, inverse_of: :product, dependent: :destroy
     has_many :images, class_name: Comable::Image.name, dependent: :destroy
     has_and_belongs_to_many :categories, class_name: Comable::Category.name, join_table: :comable_products_categories
 
+    accepts_nested_attributes_for :variants, allow_destroy: true
     accepts_nested_attributes_for :images, allow_destroy: true
 
+    scope :published, -> (published_at = nil) { where('published_at <= ?', published_at || Time.now) }
+
     validates :name, presence: true, length: { maximum: 255 }
-    validates :code, presence: true, length: { maximum: 255 }
-    validates :price, presence: true, numericality: { greater_than_or_equal_to: 0, allow_blank: true }
-    validates :sku_h_item_name, length: { maximum: 255 }
-    validates :sku_v_item_name, length: { maximum: 255 }
 
     liquid_methods :id, :code, :name, :price, :images, :image_url
 
-    ransack_options attribute_select: { associations: :stocks }
+    ransack_options attribute_select: { associations: [:variants, :stocks, :option_types] }
+
+    linkable_columns_keys use_index: true
+
+    PREVIEW_SESSION_KEY = :preview_product
 
     # Add conditions for the images association.
     # Override method of the images association to support Rails 3.x.
@@ -42,14 +46,69 @@ module Comable
       !stocked?
     end
 
+    def published?
+      published_at.present? && published_at <= Time.now
+    end
+
     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
 
-    private
+    def master?
+      option_types.empty?
+    end
+
+    def sku_h_item_name
+      option_types.first.try(:name)
+    end
+
+    def sku_v_item_name
+      option_types.second.try(:name)
+    end
+
+    def code
+      variants.first.try(:sku)
+    end
+
+    def code=(code)
+      variants.each { |v| v.sku = code }
+    end
+
+    def price
+      variants.first.try(:price)
+    end
 
-    def create_stock
-      stocks.create(code: code) unless stocks.exists?
+    def price=(price)
+      variants.each { |v| v.price = price }
     end
+
+    has_many :stocks, class_name: Comable::Stock.name, through: :variants
+
+    def stocks=(stocks)
+      stocks.map { |stock| variants.build(stock: stock) }
+    end
+
+    def build_option_type
+      Comable::OptionType.new
+    end
+
+    def option_types
+      option_types = variants.map { |variant| variant.option_values.map(&:option_type) }.flatten.uniq
+      option_types.singleton_class.send(:define_method, :build, -> { Comable::OptionType.new })
+      option_types
+    end
+
+    def option_types_attributes=(_option_types_attributes)
+    end
+
+    #
+    # Deprecated methods
+    #
+    deprecate :stocks, deprecator: Comable::Deprecator.instance
+    deprecate :sku_h_item_name, deprecator: Comable::Deprecator.instance
+    deprecate :sku_v_item_name, deprecator: Comable::Deprecator.instance
+    deprecate :code, deprecator: Comable::Deprecator.instance
+    deprecate :code=, deprecator: Comable::Deprecator.instance
+    deprecate :option_types_attributes=, deprecator: Comable::Deprecator.instance
   end
 end

data/app/models/comable/stock/csvable.rb

@@ -7,19 +7,18 @@ module Comable
 
       included do
         comma do
-          product_code
-          code
+          product_id
+          id
           quantity
           sku_h_choice_name
           sku_v_choice_name
         end
       end
 
-      delegate :code, to: :product, prefix: true, allow_nil: true
+      delegate :id, to: :product, prefix: true, allow_nil: true
 
-      def product_code=(code)
-        return if product_code == code
-        self.product = Comable::Product.find_by(code: code)
+      def product_id=(id)
+        self.product = Comable::Product.find_by(id: id)
       end
     end
   end

data/app/models/comable/stock.rb

@@ -10,7 +10,7 @@ module Comable
     include Comable::Liquidable
     include Comable::Stock::Csvable
 
-    belongs_to :product, class_name: Comable::Product.name
+    belongs_to :variant, class_name: Comable::Variant.name, inverse_of: :stock
 
     #
     # @!group Scope
@@ -28,19 +28,16 @@ module Comable
     # @!endgroup
     #
 
-    validates :product, presence: { message: Comable.t('admin.is_not_exists') }
-    validates :code, presence: true, length: { maximum: 255 }
-    validates :sku_h_choice_name, length: { maximum: 255 }
-    validates :sku_v_choice_name, length: { maximum: 255 }
     # TODO: add conditions (by limitless flag, backoder flag and etc..)
     validates :quantity, numericality: { greater_than_or_equal_to: 0 }
 
-    delegate :name, to: :product
-    delegate :price, to: :product
+    # TODO: Remove the columns for compatible
+    delegate :product, to: :variant
+    delegate :price, to: :variant
     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 }
+    ransack_options attribute_select: { associations: :variant }, ransackable_attributes: { only: :quantity }
 
     # 在庫の有無を取得する
     #
@@ -67,5 +64,45 @@ module Comable
     def unstocked?(quantity: 1)
       !stocked?(quantity: quantity)
     end
+
+    def name
+      if variant.options.any?
+        "#{variant.product.name} (#{variant.options.map(&:value).join('/')})"
+      else
+        variant.product.name
+      end
+    end
+
+    def sku_h_choice_name
+      variant.option_values.first.try(:name)
+    end
+
+    def sku_v_choice_name
+      variant.option_values.second.try(:name)
+    end
+
+    def code
+      variant.sku
+    end
+
+    def product=(product)
+      if variant
+        variant.product = product
+      else
+        build_variant(product: product)
+      end
+    end
+
+    #
+    # Deprecated methods
+    #
+    deprecate :product, deprecator: Comable::Deprecator.instance
+    deprecate :name, deprecator: Comable::Deprecator.instance
+    deprecate :code, deprecator: Comable::Deprecator.instance
+    deprecate :price, deprecator: Comable::Deprecator.instance
+    deprecate :sku_h_item_name, deprecator: Comable::Deprecator.instance
+    deprecate :sku_v_item_name, deprecator: Comable::Deprecator.instance
+    deprecate :sku_h_choice_name, deprecator: Comable::Deprecator.instance
+    deprecate :sku_v_choice_name, deprecator: Comable::Deprecator.instance
   end
 end

data/app/models/comable/store.rb

@@ -11,8 +11,6 @@ module Comable
 
     liquid_methods :name, :meta_keywords, :meta_description, :email
 
-    delegate :name, to: :theme, prefix: true, allow_nil: true
-
     class << self
       def instance
         first || new(name: default_name)

data/app/models/comable/theme.rb

@@ -10,6 +10,16 @@ module Comable
     validates :homepage, length: { maximum: 255 }
     validates :author, length: { maximum: 255 }
 
+    class << self
+      def dir
+        Rails.root.join('themes')
+      end
+    end
+
+    def dir
+      self.class.dir + name
+    end
+
     def default_version
       '0.1.0'
     end

data/app/models/comable/variant.rb

@@ -0,0 +1,46 @@
+module Comable
+  class Variant < ActiveRecord::Base
+    include Comable::Ransackable
+
+    belongs_to :product, class_name: Comable::Product.name, inverse_of: :variants
+    has_one :stock, class_name: Comable::Stock.name, inverse_of: :variant, dependent: :destroy, autosave: true
+
+    has_and_belongs_to_many :option_values, class_name: Comable::OptionValue.name, join_table: :comable_variants_option_values
+
+    accepts_nested_attributes_for :option_values, allow_destroy: true
+    accepts_nested_attributes_for :stock
+
+    validates :product, presence: { message: Comable.t('admin.is_not_exists') }
+    validates :price, presence: true, numericality: { greater_than_or_equal_to: 0 }
+    validates :sku, length: { maximum: 255 }
+
+    ransack_options attribute_select: { associations: [:product, :stock, :option_values] }, ransackable_attributes: { except: :product_id }
+
+    def quantity
+      stock.try(:quantity) || build_stock.quantity
+    end
+
+    def quantity=(quantity)
+      if stock
+        stock.quantity = quantity
+      else
+        build_stock(quantity: quantity)
+      end
+    end
+
+    def options
+      option_values.map do |option_value|
+        OpenStruct.new(type: option_value.option_type.try(:name), value: option_value.name)
+      end
+    end
+
+    def options=(options)
+      options = JSON.parse(options) if options.is_a? String
+      self.option_values = options.map do |option|
+        hash = option.symbolize_keys
+        option_type = Comable::OptionType.where(name: hash[:name]).first_or_initialize(&:save!)
+        Comable::OptionValue.where(name: hash[:value], option_type: option_type).first_or_initialize(&:save!)
+      end
+    end
+  end
+end