spree_promo 1.0.0.rc4 → 1.0.0

data/db/migrate/20120119024707_namespace_promo_tables.rb

@@ -1,4 +1,36 @@
+require 'spree/core/preference_rescue'
+
 class NamespacePromoTables < ActiveRecord::Migration
+
+  def concat(str1, str2)
+    dbtype = Rails.configuration.database_configuration[Rails.env]['adapter'].to_sym
+
+    case dbtype
+    when :mysql, :mysql2
+      "CONCAT(#{str1}, #{str2})"
+    when :sqlserver
+      "(#{str1} + #{str2})"
+    else
+      "(#{str1} || #{str2})"
+    end
+  end
+
+  def update_column_data(table_names, column_name)
+    tables = Array.wrap(table_names)
+    tables.each do |table|
+      execute "UPDATE #{table} SET #{column_name} = #{concat("'Spree::'", column_name)}" +
+        " where #{column_name} NOT LIKE 'Spree::%' AND #{column_name} IS NOT NULL"
+    end
+  end
+
+  def replace_column_data(table_names, column_name)
+    tables = Array.wrap(table_names)
+    tables.each do |table|
+      execute "UPDATE #{table} SET #{column_name} = REPLACE(#{column_name}, 'Spree::', '') " +
+        " where #{column_name} LIKE 'Spree::%'"
+    end
+  end
+
   def self.up
     # namespace promo tables
     rename_table :promotion_actions, :spree_promotion_actions
@@ -7,59 +39,47 @@ class NamespacePromoTables < ActiveRecord::Migration
     rename_table :promotion_action_line_items, :spree_promotion_action_line_items
     rename_table :products_promotion_rules, :spree_products_promotion_rules
 
+    update_column_data('spree_promotion_actions', 'type')
+    update_column_data('spree_promotion_rules', 'type')
+
     # add old promo preferences as columns
     add_column :spree_activators, :usage_limit, :integer
     add_column :spree_activators, :match_policy, :string, :default => 'all'
     add_column :spree_activators, :code, :string
     add_column :spree_activators, :advertise, :boolean, :default => false
 
-    Spree::Promotion.class_eval do
-      preference :usage_limit, :integer
-      preference :match_policy, :string, :default => 'all'
-      preference :code, :string
-      preference :advertise, :boolean, :default => false
-    end
+    Spree::Activator.reset_column_information
 
-    # manually update old promotions to use the new promotion style
-    Spree::Preference.where(:owner_type => 'Spree::Activator').group_by(&:owner_id).each do |key, pref_group|
-      @promo = Spree::Promotion.new
-      pref_group.each do |pref|
-        case pref.name
-        when 'code'
-          @promo.code = pref.value.to_s
-          @promo.name = pref.value.to_s
-        when 'advertise'
-          @promo.advertise = pref.value
-        when 'usage_limit'
-          @promo.usage_limit = pref.value
-        when 'match_policy'
-          @promo.match_policy = pref.value
-        end
-        @promo.event_name = Spree::Promotion.find(pref.owner_id).event_name
+    Spree::Preference.where(:owner_type => 'Spree::Activator').each do |preference|
+      unless Spree::Activator.exists? preference.owner_id
+        preference.destroy
+        next
       end
-      @promo.save!
+
+      @activator = Spree::Activator.find(preference.owner_id)
+      @activator.update_attribute(preference.name, preference.raw_value)
+      preference.destroy
     end
 
-    # Remove old promotions
-    Spree::Promotion.where(:code => nil).delete_all
+    Spree::PreferenceRescue.try
 
     # This *should* be in the new_preferences migration inside of Core but...
     # This is migration needs to have these keys around so that
     # we can convert the promotions over correctly.
     # So they hang around until we're *finally* done with them, since promo's
     # migrations are copied over *after* core, and then we ditch them.
-    remove_column :spree_preferences, :name
-    remove_column :spree_preferences, :owner_id
-    remove_column :spree_preferences, :owner_type
     remove_column :spree_preferences, :group_id
     remove_column :spree_preferences, :group_type
   end
 
   def self.down
+    replace_column_data('spree_promotion_actions', 'type')
+    replace_column_data('spree_promotion_rules', 'type')
+
     rename_table :spree_promotion_actions, :promotion_actions
     rename_table :spree_promotion_rules, :promotion_rules
     rename_table :spree_promotion_rules_users, :promotion_rules_users
     rename_table :spree_promotion_action_line_items, :promotion_action_line_items
     rename_table :spree_products_promotion_rules, :products_promotion_rules
   end
-end
+end

data/lib/spree/promo/engine.rb

@@ -8,11 +8,6 @@ module Spree
         Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
           Rails.configuration.cache_classes ? require(c) : load(c)
         end
-
-        Dir.glob(File.join(File.dirname(__FILE__), '../../../app/overrides/*.rb')) do |c|
-          Rails.configuration.cache_classes ? require(c) : load(c)
-        end
-
       end
 
       config.autoload_paths += %W(#{config.root}/lib)

metadata

@@ -1,38 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - David North
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000 Z
+date: 2012-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70121130062120 !ruby/object:Gem::Requirement
+  requirement: &70095898283920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc4
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70121130062120
+  version_requirements: *70095898283920
 - !ruby/object:Gem::Dependency
   name: spree_auth
-  requirement: &70121130076380 !ruby/object:Gem::Requirement
+  requirement: &70095898282920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc4
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70121130076380
+  version_requirements: *70095898282920
 description: Required dependency for Spree
 email: david@spreecommerce.com
 executables: []
@@ -128,9 +128,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 3112461834869644105
 requirements:
 - none
 rubyforge_project: