solidus_core 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 230b3381580409e57183114635859cadf3a87f95
-  data.tar.gz: 5d5c36600b0a347d48704541db654fa13df20fff
+  metadata.gz: 09e11d086ed1dd97b17e5c5cf72d546d5a80fc0d
+  data.tar.gz: 1b3f4c7bc481f39eeb4555e1f07b3017dfb33e45
 SHA512:
-  metadata.gz: 271be6c98555a1782033872a437bf979919ff06a2d94cf6f5a0b31f2ca98f0ca41d770342a28140a9724dd8bde8a2ef1d6a1845759e161b3922082964d50d289
-  data.tar.gz: b61583b962acfc39e26ceb869a4179921e5979bfbfb48f43f17056a9814ed381e6e0e392874b2507ceaa2a5ac549e8a910c58f527f47f5510bb33bd7366c3a4f
+  metadata.gz: ecc25b96d2b0ab0d4c44ff369544c13bd59c3ab71f62007b3be308b826615cc031ab766d650171e78a105007ecad763df4ab7daacbf7b702930fb20a90f34a7c
+  data.tar.gz: 8786ed0bc75a690a6f57741f05039c4063f8e7ec9d61e79d8cfd3355dbd0206b20e43f7204153a2589d0cdab36da0a38c50fa5a7888e0ef14cb9c557cc4a7aef

data/app/models/spree/product_property.rb

@@ -1,5 +1,6 @@
 module Spree
   class ProductProperty < Spree::Base
+    acts_as_list
     belongs_to :product, touch: true, class_name: 'Spree::Product', inverse_of: :product_properties
     belongs_to :property, class_name: 'Spree::Property', inverse_of: :product_properties
 

data/app/models/spree/promotion/rules/user.rb

@@ -4,10 +4,9 @@ module Spree
       class User < PromotionRule
         belongs_to :user, class_name: Spree::UserClassHandle.new
 
-        has_and_belongs_to_many :users, class_name: Spree::UserClassHandle.new,
-          join_table: 'spree_promotion_rules_users',
-          foreign_key: 'promotion_rule_id',
-          association_foreign_key: :user_id
+        has_many :promotion_rule_users, class_name: 'Spree::PromotionRuleUser',
+                                        foreign_key: :promotion_rule_id
+        has_many :users, through: :promotion_rule_users, class_name: Spree::UserClassHandle.new
 
         def applicable?(promotable)
           promotable.is_a?(Spree::Order)

data/app/models/spree/promotion_rule_user.rb

@@ -0,0 +1,8 @@
+module Spree
+  class PromotionRuleUser < Spree::Base
+    self.table_name = 'spree_promotion_rules_users'
+
+    belongs_to :promotion_rule, class_name: 'Spree::PromotionRule'
+    belongs_to :user, class_name: Spree::UserClassHandle.new
+  end
+end

data/config/initializers/spree_user.rb

@@ -3,7 +3,7 @@
 # are still doing for compatability, but with a warning.
 
 Spree::Core::Engine.config.to_prepare do
-  unless Spree.user_class.included_modules.include?(Spree::UserMethods)
+  if Spree.user_class && !Spree.user_class.included_modules.include?(Spree::UserMethods)
     ActiveSupport::Deprecation.warn "#{Spree.user_class} must include Spree::UserMethods"
     Spree.user_class.include Spree::UserMethods
   end

data/db/migrate/20150806190833_add_id_and_timestamp_to_promotion_rule_user.rb

@@ -0,0 +1,13 @@
+class AddIdAndTimestampToPromotionRuleUser < ActiveRecord::Migration
+  def up
+    add_column :spree_promotion_rules_users, :id, :primary_key
+    add_column :spree_promotion_rules_users, :created_at, :datetime
+    add_column :spree_promotion_rules_users, :updated_at, :datetime
+  end
+
+  def down
+    remove_column :spree_promotion_rules_users, :updated_at
+    remove_column :spree_promotion_rules_users, :created_at
+    remove_column :spree_promotion_rules_users, :id
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -505,6 +505,7 @@ files:
 - app/models/spree/promotion_handler/free_shipping.rb
 - app/models/spree/promotion_handler/page.rb
 - app/models/spree/promotion_rule.rb
+- app/models/spree/promotion_rule_user.rb
 - app/models/spree/property.rb
 - app/models/spree/prototype.rb
 - app/models/spree/refund.rb
@@ -864,6 +865,7 @@ files:
 - db/migrate/20150630175644_copy_order_bill_address_to_credit_card.rb
 - db/migrate/20150723224133_remove_unnecessary_indexes.rb
 - db/migrate/20150724163716_remove_state_lock_version_from_order.rb
+- db/migrate/20150806190833_add_id_and_timestamp_to_promotion_rule_user.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt