comable_core 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b77ac8195add8320091e5c17e8b8eb99d3a0ef5f
-  data.tar.gz: 9b4e674341684b9d4d6807aa9283a4eee1c40594
+  metadata.gz: da4f11f29114534f3c55966b7021770844817bc2
+  data.tar.gz: 21a2c7ab417d1401a7b79b6ed456e22f40ce0395
 SHA512:
-  metadata.gz: ea16779b2ba3b37d19946de36f67bdbf846914750d4e006ebf86e7483a4c415c7163854e66aa4b1d8f1b7e056d285648bd529d13d0d1000dfb545490b5f19a1d
-  data.tar.gz: 42fba0d835446368be5aec1f6deaf0a316c763751c43998035648fc64ad15e565ac27fa6d9f6f403e04243788cdef7ed43c8c3a91aa406bb791606d9746c21f7
+  metadata.gz: 3fa65b0505fd616f97943e355e63806c077046c614516adb4f8b5dd10d122bc7fd79221006b8705b782166b469cdce63a1dba780f1ef00f0c4115da7690a9366
+  data.tar.gz: 6f03560e17a436549e97d6993895e87e8c04a8eed78dd2e9fc50ef16a1181241f3553bdb091e0001b9a1ac412f66ba041df9fd5b24c99073909f0be41defa51f

data/app/models/comable/address.rb

@@ -1,13 +1,31 @@
 module Comable
   class Address < ActiveRecord::Base
-    extend Enumerize
-
     belongs_to :customer, class_name: Comable::Customer.name, foreign_key: Comable::Customer.table_name.singularize.foreign_key, autosave: false
 
-    enumerize :assign_key, in: {
-      nothing: nil,
-      bill: 1,
-      ship: 2
-    }
+    validates :family_name, presence: true, length: { maximum: 255 }
+    validates :first_name, presence: true, length: { maximum: 255 }
+    validates :zip_code, presence: true, length: { maximum: 8 }
+    validates :state_name, presence: true, length: { maximum: 255 }
+    validates :city, presence: true, length: { maximum: 255 }
+    validates :detail, length: { maximum: 255 }
+    validates :phone_number, length: { maximum: 18 }
+
+    class << self
+      def find_or_clone(address)
+        find { |obj| obj.same_as? address } || address.clone
+      end
+    end
+
+    def same_as?(address)
+      attributes_without_id == address.attributes_without_id
+    end
+
+    def clone
+      self.class.new(attributes_without_id)
+    end
+
+    def attributes_without_id
+      attributes.except('id', Comable::Customer.table_name.singularize.foreign_key.to_s)
+    end
   end
 end

data/app/models/comable/customer.rb

@@ -3,16 +3,23 @@ module Comable
     include CartOwner
 
     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
+    belongs_to :bill_address, class_name: Comable::Address.name, dependent: :destroy
+    belongs_to :ship_address, class_name: Comable::Address.name, dependent: :destroy
 
-    has_many :comable_addresses, class_name: Comable::Address.name, foreign_key: table_name.singularize.foreign_key
-    alias_method :addresses, :comable_addresses
+    accepts_nested_attributes_for :addresses
+    accepts_nested_attributes_for :bill_address
+    accepts_nested_attributes_for :ship_address
 
     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
@@ -20,12 +27,29 @@ module Comable
       end
     end
 
+    def with_cookies(cookies)
+      @cookies = cookies
+      self
+    end
+
     # Add conditions for the orders association.
     # Override method of the orders association to support Rails 3.x.
     def orders
       super.complete
     end
 
+    def other_addresses
+      addresses - [bill_address] - [ship_address]
+    end
+
+    def update_bill_address_by(bill_address)
+      update_attributes(bill_address: addresses.find_or_clone(bill_address))
+    end
+
+    def update_ship_address_by(ship_address)
+      update_attributes(ship_address: addresses.find_or_clone(ship_address))
+    end
+
     def signed_in?
       !new_record?
     end
@@ -66,41 +90,47 @@ module Comable
     private
 
     def current_guest_token
-      return if signed_in?
-      @cookies.signed[:guest_token]
+      @cookies.signed[:guest_token] if @cookies
     end
 
     def initialize_incomplete_order
       orders = find_incomplete_orders
       return orders.first if orders.any?
-      order = orders.create(family_name: family_name, first_name: first_name, email: email, order_deliveries_attributes: [{ family_name: family_name, first_name: first_name }])
-      @cookies.permanent.signed[:guest_token] = order.guest_token if not_signed_in?
+      order = orders.create(incomplete_order_attributes)
+      @cookies.permanent.signed[:guest_token] = order.guest_token if @cookies
       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 }]
+      }
+    end
+
     def find_incomplete_orders
+      guest_token = current_guest_token unless signed_in?
       Comable::Order
         .incomplete
         .includes(order_deliveries: :order_details)
-        .where(
-          Comable::Customer.table_name.singularize.foreign_key => self,
-          :guest_token => current_guest_token
-        )
+        .where(guest_token: guest_token)
+        .by_customer(self)
         .limit(1)
     end
 
-    # Rails 3.x だと has_many 先のインスタンスが追加されても
-    # 親インスタンスが感知できないので、いちいちリロードするように変更
-    if Rails::VERSION::MAJOR == 3
-      def add_stock_to_cart_with_reload(*args)
-        add_stock_to_cart_without_reload(*args).tap { @incomplete_order = nil }
-      end
-      alias_method_chain :add_stock_to_cart, :reload
-
-      def reset_stock_from_cart_with_reload(*args)
-        reset_stock_from_cart_without_reload(*args).tap { @incomplete_order = nil }
+    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|
+        move_cart_item(order_detail)
       end
-      alias_method_chain :reset_stock_from_cart, :reload
+      # TODO: Remove?
+      cart_items.reload
     end
   end
 end

data/app/models/comable/order.rb

@@ -3,8 +3,13 @@ module Comable
     belongs_to :customer, class_name: Comable::Customer.name, foreign_key: Comable::Customer.table_name.singularize.foreign_key, autosave: false
     belongs_to :payment, class_name: Comable::Payment.name, foreign_key: Comable::Payment.table_name.singularize.foreign_key, autosave: false
     belongs_to :shipment_method, class_name: Comable::ShipmentMethod.name, autosave: false
+    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
 
+    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|
@@ -16,17 +21,20 @@ module Comable
       complete_order.validates :total_price, presence: true
     end
 
-    with_options if: :incomplete? do |incomplete_order|
+    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
 
     define_model_callbacks :complete
     before_complete :precomplete
-    before_create :generate_guest_token
+    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) }
 
     def precomplete
       valid_order_quantity?
@@ -105,11 +113,24 @@ module Comable
     end
 
     def generate_guest_token
-      return if send(Comable::Customer.table_name.singularize.foreign_key)
+      return if customer
       self.guest_token ||= loop do
         random_token = SecureRandom.urlsafe_base64(nil, false)
         break random_token unless self.class.exists?(guest_token: random_token)
       end
     end
+
+    def clone_addresses_from_customer
+      return unless customer
+      self.bill_address ||= customer.bill_address.try(:clone)
+      self.ship_address ||= customer.ship_address.try(:clone)
+    end
+
+    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
+    end
   end
 end

data/db/migrate/20140120032559_create_comable_customers.rb

@@ -31,6 +31,10 @@ class CreateComableCustomers < ActiveRecord::Migration
       # t.datetime :locked_at
 
       ## Others
+      t.references :bill_address
+      t.references :ship_address
+
+      # TODO: Remove
       t.string :family_name
       t.string :first_name
     end

data/db/migrate/20140723175431_create_comable_orders.rb

@@ -12,6 +12,8 @@ class CreateComableOrders < ActiveRecord::Migration
       t.string :shipment_tracking_number
       t.integer :shipment_method_id
       t.integer :total_price
+      t.references :bill_address
+      t.references :ship_address
       t.datetime :completed_at
     end
 

data/db/migrate/20141024025526_create_comable_addresses.rb

@@ -1,8 +1,7 @@
 class CreateComableAddresses < ActiveRecord::Migration
   def change
     create_table :comable_addresses do |t|
-      t.integer :comable_customer_id, null: false
-      t.integer :assign_key
+      t.integer :comable_customer_id
       t.string :family_name, null: false
       t.string :first_name, null: false
       t.string :zip_code, null: false, limit: 8
@@ -13,7 +12,5 @@ class CreateComableAddresses < ActiveRecord::Migration
       t.string :phone_number, null: false, limit: 18
       t.datetime :last_used_at
     end
-
-    add_index :comable_addresses, [:comable_customer_id, :assign_key], unique: true, name: :comable_addresses_idx_01
   end
 end

data/lib/comable/cart_owner.rb

@@ -16,6 +16,10 @@ module Comable
       end
     end
 
+    def move_cart_item(cart_item)
+      add_cart_item(cart_item.stock, quantity: cart_item.quantity) && cart_item.destroy
+    end
+
     def cart_items
       fail 'You should implement cart_items method.'
     end

data/lib/comable/core/engine.rb

@@ -47,7 +47,9 @@ module Comable
               class_eval <<-METHODS, __FILE__, __LINE__ + 1
                 alias_method :devise_current_#{mapping}, :current_#{mapping}
                 def current_#{mapping}
-                  @current_#{mapping} ||= devise_current_#{mapping} || Comable::Customer.new(cookies)
+                  @current_#{mapping}_guest ||= Comable::Customer.new
+                  #{mapping} = devise_current_#{mapping} || @current_#{mapping}_guest
+                  #{mapping}.with_cookies(cookies)
                 end
               METHODS
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_core
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails