comable-core 0.7.0.beta1 → 0.7.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfeeb810107eafe21ff7ccc16a8796708892aa08
-  data.tar.gz: af72df7aebb8d185f96c36a9c53ad4ca3a7d769f
+  metadata.gz: 324ed7d3cdee480e0d7b0529fd7a90195cc69a37
+  data.tar.gz: 487980666fa2ccbfc92028700433a741eb610afb
 SHA512:
-  metadata.gz: 2b8ad2b68377430abf27f0113075d2ca0771d51b4377765e87663c6e52b63309f39a4b2ad2f59823a0dd23d513ad2763f307a5cc8401b581b7d2139ea4c4ea43
-  data.tar.gz: 909ec7862a42e7f29977abedc6eb1f9af4e99c22298469525c1ae95bac369b82d3e0462a65c01a01d2d51c259067f633200a71c457d4fc90fd65df154441d11c
+  metadata.gz: 24bb175945a7065c8589e02f665e420ae56823c69bea0472ac27194a9abcc70675acfcbfa20eb3028f3e4826c814080bde8d85a97f5b226f544b094a81d235b6
+  data.tar.gz: 8e6a2a6ca8dc65d329c985ed4f01415da7b6fe5a01d4e78c4688aa2122b9a5252f8e3cb0f1244d9a5dd439172408de351b43e97cdfb15479e968ad412bf4916b

data/Rakefile

@@ -4,6 +4,7 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
+require 'rspec/core/rake_task'
 require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
@@ -69,9 +70,9 @@ if File.exist?('comable.gemspec')
     end
   end
 
-  task default: ['app:spec:all', 'rubocop', 'brakeman:all']
+  task default: ['app:spec:all', 'jasmine', 'rubocop', 'brakeman:all']
 else
-  task default: ['app:spec', 'rubocop', 'brakeman']
+  task default: ['app:spec', 'jasmine', 'rubocop', 'brakeman']
 end
 
 Bundler::GemHelper.install_tasks
@@ -79,6 +80,10 @@ Bundler::GemHelper.install_tasks
 # from https://github.com/rspec/rspec-rails/issues/936
 task 'test:prepare'
 
+task :jasmine do
+  sh 'bundle exec rake app:spec:javascript RAILS_ENV=test'
+end
+
 task :rubocop do
   sh 'rubocop'
 end

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

@@ -2,6 +2,7 @@ module Comable
   module PermittedAttributes
     def permitted_address_attributes
       [
+        :id,
         :family_name,
         :first_name,
         :zip_code,

data/app/helpers/comable/application_helper.rb

@@ -65,6 +65,10 @@ module Comable
       ).stringify_keys
     end
 
+    def page_name
+      [controller_name, action_name].join(':')
+    end
+
     private
 
     def comable_root_path

data/app/models/comable/inventory/adjuster.rb

@@ -0,0 +1,40 @@
+module Comable
+  module Inventory
+    class Adjuster
+      attr_accessor :packages
+      attr_accessor :units
+
+      def initialize(packages, units)
+        @packages = packages.map(&:clone)
+        @units = units
+      end
+
+      def adjusted_packages
+        remove_duplicated_items
+        packages
+      end
+
+      private
+
+      def remove_duplicated_items
+        units.each do |unit|
+          remove_duplicated(unit)
+        end
+      end
+
+      def remove_duplicated(unit)
+        duplicated = false
+
+        packages.each do |package|
+          next unless package.find(unit)
+
+          if duplicated
+            package.remove(unit)
+          else
+            duplicated = true
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/comable/inventory/coordinator.rb

@@ -0,0 +1,56 @@
+module Comable
+  module Inventory
+    class Coordinator
+      attr_accessor :order
+      attr_accessor :units
+
+      def initialize(order)
+        @order = order
+        @units = build_units
+      end
+
+      def shipments
+        packages.map(&:to_shipment)
+      end
+
+      private
+
+      def packages
+        packages = build_packages
+        adjusted_packages = adjust_packages(packages)
+        compact_packages(adjusted_packages)
+      end
+
+      def build_packages
+        Comable::StockLocation.active.map do |stock_location|
+          next unless units_exists_in? stock_location
+          build_packer(stock_location).package
+        end.compact
+      end
+
+      def adjust_packages(packages)
+        Adjuster.new(packages, units).adjusted_packages
+      end
+
+      def compact_packages(packages)
+        packages.reject(&:empty?)
+      end
+
+      def units_exists_in?(stock_location)
+        stock_location.stocks.where(variant_id: units.map(&:variant).map(&:id).uniq).exists?
+      end
+
+      def build_packer(stock_location)
+        Packer.new(stock_location, units)
+      end
+
+      def build_units
+        order.order_items.map do |order_item|
+          order_item.quantity.times.map do
+            Unit.new(order_item.variant)
+          end
+        end.flatten
+      end
+    end
+  end
+end

data/app/models/comable/inventory/package.rb

@@ -0,0 +1,47 @@
+module Comable
+  module Inventory
+    class Package
+      attr_accessor :stock_location
+      attr_accessor :units
+
+      delegate :empty?, :size, :count, to: :units
+
+      def initialize(stock_location)
+        @stock_location = stock_location
+        @units = []
+      end
+
+      def initialize_copy(package)
+        super
+        self.units = package.units.clone
+      end
+
+      def to_shipment
+        shipment = Comable::Shipment.new(stock_location: stock_location)
+        shipment.shipment_items = build_shipment_items(shipment)
+        shipment
+      end
+
+      def find(unit)
+        units.detect { |u| u == unit }
+      end
+
+      def add(unit)
+        unit = [unit] unless unit.is_a? Array
+        units.concat(unit)
+      end
+
+      def remove(unit)
+        units.delete(unit)
+      end
+
+      private
+
+      def build_shipment_items(shipment)
+        units.map do |unit|
+          unit.to_shipment_item(shipment)
+        end
+      end
+    end
+  end
+end

data/app/models/comable/inventory/packer.rb

@@ -0,0 +1,25 @@
+module Comable
+  module Inventory
+    class Packer
+      attr_accessor :stock_location
+      attr_accessor :units
+
+      def initialize(stock_location, units)
+        @stock_location = stock_location
+        @units = units
+      end
+
+      def package
+        package = Package.new(stock_location)
+
+        units.group_by(&:variant).each do |variant, variant_units|
+          stock = stock_location.find_stock_item(variant)
+          next unless stock
+          package.add variant_units.take(stock.quantity) if stock.stocked?
+        end
+
+        package
+      end
+    end
+  end
+end

data/app/models/comable/inventory/unit.rb

@@ -0,0 +1,22 @@
+module Comable
+  module Inventory
+    class Unit
+      attr_accessor :variant
+
+      def initialize(variant)
+        @variant = variant
+      end
+
+      def to_shipment_item(shipment)
+        stock = find_stock_item(shipment)
+        Comable::ShipmentItem.new(stock: stock)
+      end
+
+      private
+
+      def find_stock_item(shipment)
+        shipment.stock_location.find_stock_item(variant)
+      end
+    end
+  end
+end

data/app/models/comable/navigation.rb

@@ -8,5 +8,7 @@ module Comable
 
     validates :name, length: { maximum: 255 }, presence: true
     validates :navigation_items, presence: true
+
+    scope :by_newest, -> { reorder(created_at: :desc) }
   end
 end

data/app/models/comable/navigation_item.rb

@@ -1,5 +1,7 @@
 module Comable
   class NavigationItem < ActiveRecord::Base
+    include Comable::Linkable
+
     belongs_to :navigation
     belongs_to :linkable, polymorphic: true
 
@@ -12,7 +14,6 @@ module Comable
     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
@@ -21,26 +22,40 @@ module Comable
         ].compact
       end
 
+      def linkable_id_options(type)
+        params = linkable_params(type)
+        params ? params[:linkable_id_options] : [[]]
+      end
+
+      private
+
+      def linkable_params(type)
+        linkable_params_lists.find do |params|
+          params[:type].to_s == type.to_s
+        end
+      end
+
       def web_address_linkable_params
         {
           type: nil,
-          name: Comable.t('admin.nav.navigation_items.web_address')
+          name: Comable.t('admin.nav.navigation_items.web_address'),
+          linkable_id_options: [[]]
         }
       end
 
       def product_linkable_params
-        return unless Comable::Product.linkable_exists?
         {
           type: Comable::Product.to_s,
-          name: Comable.t('products')
+          name: Comable.t('products'),
+          linkable_id_options: calc_linkable_id_options(Comable::Product, use_index: true)
         }
       end
 
       def page_linkable_params
-        return unless Comable::Page.linkable_exists?
         {
           type: Comable::Page.to_s,
-          name: Comable.t('pages')
+          name: Comable.t('pages'),
+          linkable_id_options: calc_linkable_id_options(Comable::Page, name: :title)
         }
       end
     end
@@ -48,5 +63,13 @@ module Comable
     def linkable_class
       linkable_type.constantize if linkable_type.present?
     end
+
+    def linkable_id_options
+      self.class.linkable_id_options(linkable_type)
+    end
+
+    def linkable_exists?
+      linkable_id_options.all?(&:present?)
+    end
   end
 end

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

@@ -9,13 +9,13 @@ module Comable
         belongs_to :ship_address, class_name: Comable::Address.name, autosave: true, dependent: :destroy
         has_many :order_items, dependent: :destroy, class_name: Comable::OrderItem.name, inverse_of: :order
         has_one :payment, dependent: :destroy, class_name: Comable::Payment.name, inverse_of: :order
-        has_one :shipment, dependent: :destroy, class_name: Comable::Shipment.name, inverse_of: :order
+        has_many :shipments, dependent: :destroy, class_name: Comable::Shipment.name, inverse_of: :order
 
         accepts_nested_attributes_for :bill_address
         accepts_nested_attributes_for :ship_address
         accepts_nested_attributes_for :order_items
         accepts_nested_attributes_for :payment
-        accepts_nested_attributes_for :shipment
+        accepts_nested_attributes_for :shipments
       end
     end
   end

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

@@ -0,0 +1,27 @@
+module Comable
+  class Order < ActiveRecord::Base
+    module DeprecatedMethods
+      extend ActiveSupport::Concern
+
+      def shipment
+        shipments.first
+      end
+
+      def shipment=(shipment)
+        shipments << shipment unless shipments.include? shipment
+      end
+
+      included do
+        delegate :state, :human_state_name, to: :shipment, allow_nil: true, prefix: true
+
+        #
+        # Deprecated methods
+        #
+        deprecate :shipment, deprecator: Comable::Deprecator.instance
+        deprecate :shipment=, deprecator: Comable::Deprecator.instance
+        deprecate :shipment_state, deprecator: Comable::Deprecator.instance
+        deprecate :shipment_human_state_name, deprecator: Comable::Deprecator.instance
+      end
+    end
+  end
+end

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

@@ -20,7 +20,7 @@ module Comable
         end
 
         with_options if: -> { stated?(:shipment) && shipment_required? } do |context|
-          context.validates :shipment, presence: true
+          context.validates :shipments, presence: true
         end
 
         with_options if: -> { stated?(:payment) && payment_required? } do |context|

data/app/models/comable/order.rb

@@ -3,6 +3,7 @@ require_dependency 'comable/order/callbacks'
 require_dependency 'comable/order/scopes'
 require_dependency 'comable/order/validations'
 require_dependency 'comable/order/morrisable'
+require_dependency 'comable/order/deprecated_methods'
 
 module Comable
   class Order < ActiveRecord::Base
@@ -14,15 +15,15 @@ module Comable
     include Comable::Order::Scopes
     include Comable::Order::Validations
     include Comable::Order::Morrisable
+    include Comable::Order::DeprecatedMethods
 
-    ransack_options attribute_select: { associations: [:payment, :shipment] }, ransackable_attributes: { except: [:bill_address_id, :ship_address_id] }
+    ransack_options attribute_select: { associations: [:payment, :shipments] }, ransackable_attributes: { except: [:bill_address_id, :ship_address_id] }
 
     liquid_methods :code, :payment_fee, :shipment_fee, :item_total_price, :total_price, :order_items
 
     delegate :full_name, to: :bill_address, allow_nil: true, prefix: :bill
     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!
@@ -34,7 +35,7 @@ module Comable
           save!
 
           payment.next_state! if payment
-          shipment.next_state! if shipment
+          shipments.each(&:next_state!)
 
           touch(:completed_at)
         end
@@ -45,16 +46,24 @@ module Comable
     deprecate :complete, deprecator: Comable::Deprecator.instance
 
     def restock!
-      order_items.each(&:restock)
-      save!
+      shipments.each(&:restock!)
     end
 
     def unstock!
-      order_items.each(&:unstock)
+      shipments.each(&:unstock!)
+    end
+
+    def assign_inventory_units_to_shipments
+      reset_shipments
+      self.shipments = Comable::Inventory::Coordinator.new(self).shipments
       save!
     end
 
-    def stocked_items
+    def reset_shipments
+      shipments.destroy_all
+    end
+
+    def unstocked_items
       order_items.to_a.select(&:unstocked?)
     end
 
@@ -70,7 +79,7 @@ module Comable
 
     # 時価送料を取得
     def current_shipment_fee
-      shipment.try(:fee) || 0
+      shipments.to_a.sum(&:fee)
     end
 
     # Get the current payment fee
@@ -88,7 +97,7 @@ module Comable
       self.bill_address ||= order.bill_address
       self.ship_address ||= order.ship_address
       self.payment ||= order.payment
-      self.shipment ||= order.shipment
+      self.shipments = order.shipments if shipments.empty?
 
       stated?(order.state) ? save! : next_state!
     end
@@ -102,11 +111,16 @@ module Comable
     end
 
     def shipped?
-      shipment ? shipment.completed? : true
+      return true if shipments.empty?
+      shipments.all?(&:completed?)
     end
 
     def can_ship?
-      shipment && shipment.ready? && paid? && completed?
+      shipments.any?(&:can_ship?)
+    end
+
+    def ship!
+      shipments.with_state(:ready).each(&:ship!)
     end
 
     private

data/app/models/comable/order_item.rb

@@ -14,8 +14,7 @@ module Comable
 
     liquid_methods :name, :name_with_sku, :code, :quantity, :price, :subtotal_price
 
-    delegate :stock, to: :variant
-    delegate :product, to: :stock
+    delegate :product, to: :variant
     delegate :image_url, to: :product
     delegate :guest_token, to: :order
     delegate :completed?, to: :order, allow_nil: true
@@ -23,15 +22,7 @@ module Comable
     before_validation :copy_attributes, unless: :completed?
 
     def complete
-      unstock
-    end
-
-    def unstock
-      decrement_stock
-    end
-
-    def restock
-      increment_stock
+      # Nothing to do
     end
 
     # TODO: カート投入時との差額表示
@@ -41,7 +32,7 @@ module Comable
 
     # 時価を取得
     def current_price
-      stock.price
+      variant.price
     end
 
     # 時価小計を取得
@@ -55,9 +46,7 @@ module Comable
     end
 
     def unstocked?
-      stock_with_clean_quantity do |stock|
-        stock.unstocked?(quantity: quantity)
-      end
+      !variant.can_supply? quantity
     end
 
     def sku_h_item_name
@@ -76,18 +65,19 @@ module Comable
       variant.option_values.second.try(:name)
     end
 
+    def stock
+      variant.stocks.first
+    end
+
     def stock=(stock)
-      if variant
-        variant.stock = stock
-      else
-        build_variant(stock: stock)
-      end
+      self.variant = stock.variant || stock.build_variant
     end
 
     #
     # Deprecated methods
     #
     deprecate :stock, deprecator: Comable::Deprecator.instance
+    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
@@ -100,28 +90,10 @@ module Comable
       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
-      yield stock
-    ensure
-      stock.quantity = quantity_will
-    end
-
-    def decrement_stock
-      stock.lock!
-      stock.quantity -= quantity
-    end
-
-    def increment_stock
-      stock.lock!
-      stock.quantity += quantity
-    end
-
     def current_attributes
       {
-        name: stock.name,
-        price: stock.price,
+        name: variant.name,
+        price: variant.price,
         sku: variant.sku
       }
     end

data/app/models/comable/page.rb

@@ -1,10 +1,10 @@
 module Comable
   class Page < ActiveRecord::Base
     include Comable::Ransackable
-    include Comable::Linkable
     extend FriendlyId
 
-    linkable_columns_keys name: :title
+    PREVIEW_SESSION_KEY = :preview_page
+
     friendly_id :title, use: :slugged
 
     validates :title, length: { maximum: 255 }, presence: true
@@ -14,7 +14,7 @@ module Comable
     validates :meta_keywords, length: { maximum: 255 }
     validates :slug, length: { maximum: 255 }, presence: true, uniqueness: true
 
-    PREVIEW_SESSION_KEY = :preview_page
+    scope :by_newest, -> { reorder(created_at: :desc) }
 
     def published?
       published_at.present? && published_at <= Time.now

data/app/models/comable/payment_method.rb

@@ -7,6 +7,8 @@ module Comable
     validates :enable_price_from, numericality: { greater_than_or_equal_to: 0, allow_blank: true }
     validates :enable_price_to, numericality: { greater_than_or_equal_to: 0, allow_blank: true }
 
+    scope :by_newest, -> { reorder(created_at: :desc) }
+
     def payment_provider
       return unless Object.const_defined?(payment_provider_type)
       Object.const_get(payment_provider_type)