関連モデル呼び出し時にエイリアスモデルが参照されてしまう不具合を修正

hyoshida · Jul 2, 2014 · 32b5558 · 32b5558
1 parent b106424
commit 32b5558
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/app/models/comable/cart_item.rb b/app/models/comable/cart_item.rb
@@ -1,7 +1,7 @@
 module Comable
   class CartItem < ActiveRecord::Base
-    belongs_to :customer, class_name: Comable::Customer.model.name, foreign_key: Comable::Customer.foreign_key
-    belongs_to :comable_stock, class_name: Comable::Stock.model.name, foreign_key: Comable::Stock.foreign_key
+    belongs_to :customer, class_name: Comable::Customer.model_name, foreign_key: Comable::Customer.foreign_key
+    belongs_to :comable_stock, class_name: Comable::Stock.model_name, foreign_key: Comable::Stock.foreign_key
 
     validates Comable::Customer.foreign_key, uniqueness: { scope: [Comable::Customer.foreign_key, Comable::Stock.foreign_key] }
 

diff --git a/app/models/comable/order.rb b/app/models/comable/order.rb
@@ -1,6 +1,6 @@
 module Comable
   class Order < ActiveRecord::Base
-    belongs_to :customer, class_name: Comable::Customer.model.name, foreign_key: Comable::Customer.foreign_key, autosave: false
+    belongs_to :customer, class_name: Comable::Customer.model_name, foreign_key: Comable::Customer.foreign_key, autosave: false
     has_many :comable_order_deliveries, dependent: :destroy, class_name: 'Comable::OrderDelivery', foreign_key: 'comable_order_id'
 
     accepts_nested_attributes_for :comable_order_deliveries

diff --git a/app/models/comable/order_detail.rb b/app/models/comable/order_detail.rb
@@ -1,6 +1,6 @@
 module Comable
   class OrderDetail < ActiveRecord::Base
-    belongs_to :comable_stock, class_name: Comable::Stock.model.name, foreign_key: Comable::Stock.foreign_key
+    belongs_to :comable_stock, class_name: Comable::Stock.model_name, foreign_key: Comable::Stock.foreign_key
     belongs_to :comable_order_deliveries, class_name: 'Comable::OrderDelivery'
 
     after_create :decrement_stock

diff --git a/lib/acts_as_comable_product/base.rb b/lib/acts_as_comable_product/base.rb
@@ -7,7 +7,7 @@ def self.included(base)
 
       module ClassMethods
         def acts_as_comable_product
-          has_many :comable_stocks, class_name: Comable::Stock.model.name
+          has_many :comable_stocks, class_name: Comable::Stock.model_name
 
           after_create :create_stock
 

diff --git a/lib/acts_as_comable_stock/base.rb b/lib/acts_as_comable_stock/base.rb
@@ -7,7 +7,7 @@ def self.included(base)
 
       module ClassMethods
         def acts_as_comable_stock
-          belongs_to :comable_product, class_name: Comable::Product.model.name, foreign_key: Comable::Product.foreign_key
+          belongs_to :comable_product, class_name: Comable::Product.model_name, foreign_key: Comable::Product.foreign_key
 
           scope :activated, -> { where.not(product_id_num: nil) }
           scope :unsold, -> { where('quantity > ?', 0) }

diff --git a/lib/comable/mapper.rb b/lib/comable/mapper.rb
@@ -19,13 +19,17 @@ def new(*args, &block)
       model.comable(comable_type).new(*args, &block)
     end
 
-    def model
+    def model_name
       # TODO: テーブル名とモデル名が異なるケースに対応できるよう検討
-      "::#{Comable::Engine.config.send("#{comable_type}_table").to_s.classify}".constantize
+      "::#{Comable::Engine.config.send("#{comable_type}_table").to_s.classify}"
+    end
+
+    def model
+      model_name.constantize
     end
 
     def foreign_key
-      "#{model_name.singular}_id"
+      "#{model.model_name.singular}_id"
     end
 
     private