spree_promo 0.70.0.rc2 → 0.70.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2010, Rails Dog LLC and other contributors
+Copyright (c) 2007-2011, Rails Dog LLC and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/app/assets/javascripts/admin/promotions.js

@@ -51,24 +51,21 @@ var initProductActions = function(){
     // Autocomplete product and populate variant select
     if($('.promotion_action.create_line_items ').is('*')){
       $(".promotion_action.create_line_items input[name='add_product_name']").autocomplete("/admin/products.json?authenticity_token=" + $('meta[name=csrf-token]').attr("content"), {
-        parse: prep_autocomplete_data,
+        parse: prep_product_autocomplete_data,
         formatItem: function(item) {
-          return format_autocomplete(item);
+          return format_product_autocomplete(item);
         }
       }).result(function(event, data, formatted) {
         if(data){
-          // $('#add_product_id').val(data.product.id);
-          var url = "/admin/products/" + data.product.permalink + "/variants.json?authenticity_token=" + $('meta[name=csrf-token]').attr("content");
-          var $variant_select = $("select[name='add_line_item_variant_id']");
-          $variant_select.html('');
-          $.getJSON(url, {}, function(variants_data){
-            $.each(variants_data, function(){
-              $variant_select.append($("<option />").val(this.id).text(this.label));
-            });
-          });
+          if(data['variant']==undefined){
+            // product
+            $('#add_line_item_variant_id').val(data['product']['master']['id']);
+          }else{
+            // variant
+            $('#add_line_item_variant_id').val(data['variant']['id']);
+          }
         }
-      }
-      );
+      });
     }
 
     var hideOrShowItemTables = function(){
@@ -99,15 +96,14 @@ var initProductActions = function(){
     };
     setupRemoveLineItems();
     // Add line item to list
-    $(".promotion_action.create_line_items button.add").click(function(){
+    $(".promotion_action.create_line_items button.add").live('click',function(){
       var $container = $(this).parents('.promotion_action');
       var product_name = $container.find("input[name='add_product_name']").val();
-      var variant_id = $container.find("select[name='add_line_item_variant_id']").val();
-      var variant_name = $container.find("select[name='add_line_item_variant_id'] option:selected").text();
+      var variant_id = $container.find("input[name='add_line_item_variant_id']").val();
       var quantity = $container.find("input[name='add_quantity']").val();
       if(variant_id){
         // Add to the table
-        var newRow = "<tr><td>" + product_name + "</td><td>" + variant_name + "</td><td>" + quantity + "</td><td><img src='/admin/images/icons/cross.png' /></td></tr>";
+        var newRow = "<tr><td>" + product_name + "</td><td>" + quantity + "</td><td><img src='/assets/admin/icons/cross.png' /></td></tr>";
         $container.find('table').append(newRow);
         // Add to serialized string in hidden text field
         var $hiddenField = $container.find("input[type='hidden']");

data/app/controllers/admin/promotions_controller.rb

@@ -16,6 +16,6 @@ class Admin::PromotionsController < Admin::ResourceController
   end
 
   def load_data
-    @calculators = Promotion::Actions::CreateAdjustment.calculators
+    @calculators = Rails.application.config.spree.calculators.promotion_actions_create_adjustments
   end
 end

data/app/models/calculator/free_shipping.rb

@@ -4,11 +4,6 @@ class Calculator::FreeShipping < ::Calculator
     I18n.t("free_shipping")
   end
 
-  def self.register
-    super
-    Promotion.register_calculator(self)
-  end
-
   def compute(object)
     if object.is_a?(Array)
       return if object.empty?

data/app/models/promotion.rb

@@ -31,7 +31,11 @@ class Promotion < Activator
   validates :name, :presence => true
   validates :preferred_code, :presence => true, :if => lambda{|r| r.event_name == 'spree.ceckout.coupon_code_added' }
 
-  scope :advertised, includes(:stored_preferences).where(:preferences => {:name => 'advertise', :value => '1'})
+  class << self
+    def advertised
+      includes(:stored_preferences).where(:preferences => {:name => 'advertise', :value => '1'})
+    end
+  end
 
   # TODO: Remove that after fix for https://rails.lighthouseapp.com/projects/8994/tickets/4329-has_many-through-association-does-not-link-models-on-association-save
   # is provided

data/app/models/promotion_action.rb

@@ -1,8 +1,6 @@
 # Base class for all types of promotion action.
 # PromotionActions perform the necessary tasks when a promotion is activated by an event and determined to be eligible.
 class PromotionAction < ActiveRecord::Base
-  include SubclassRegistration
-
   belongs_to :promotion, :foreign_key => 'activator_id'
 
   scope :of_type, lambda {|t| {:conditions => {:type => t}}}

data/app/models/promotion_rule.rb

@@ -1,7 +1,5 @@
 # Base class for all promotion rules
 class PromotionRule < ActiveRecord::Base
-  include SubclassRegistration
-
   belongs_to :promotion, :foreign_key => 'activator_id'
 
   scope :of_type, lambda {|t| {:conditions => {:type => t}}}

data/app/views/admin/promotion_actions/create.js.erb

@@ -1,7 +1,7 @@
-jQuery('#actions_container').html('<%= escape_javascript( render(:partial => 'admin/promotions/actions') ) %>');
+$('#actions_container').html('<%= escape_javascript( render(:partial => 'admin/promotions/actions') ) %>');
 initProductActions();
 
-jQuery('#<%= dom_id @promotion_action %>').hide();
-jQuery('#<%= dom_id @promotion_action %>').fadeIn();
-jQuery('#<%= dom_id @promotion_action %> .tokeninput.products').productPicker();
+$('#<%= dom_id @promotion_action %>').hide();
+$('#<%= dom_id @promotion_action %>').fadeIn();
+$('#<%= dom_id @promotion_action %> .tokeninput.products').productPicker();
 

data/app/views/admin/promotion_actions/destroy.js.erb

@@ -1,2 +1,2 @@
-jQuery('#<%= dom_id @promotion_action %>').fadeOut().remove();
+$('#<%= dom_id @promotion_action %>').fadeOut().remove();
 

data/app/views/admin/promotion_rules/create.js.erb

@@ -1,6 +1,6 @@
-jQuery('#rules').append('<%= escape_javascript( render(:partial => 'admin/promotions/promotion_rule', :object => @promotion_rule) ) %>');
-jQuery('#<%= dom_id @promotion_rule %>').hide();
-jQuery('#<%= dom_id @promotion_rule %>').fadeIn();
+$('#rules').append('<%= escape_javascript( render(:partial => 'admin/promotions/promotion_rule', :object => @promotion_rule) ) %>');
+$('#<%= dom_id @promotion_rule %>').hide();
+$('#<%= dom_id @promotion_rule %>').fadeIn();
 initProductRuleSourceField();
-jQuery('#<%= dom_id @promotion_rule %> .tokeninput.products').productPicker();
-jQuery('#<%= dom_id @promotion_rule %> .tokeninput.users').userPicker();
+$('#<%= dom_id @promotion_rule %> .tokeninput.products').productPicker();
+$('#<%= dom_id @promotion_rule %> .tokeninput.users').userPicker();

data/app/views/admin/promotion_rules/destroy.js.erb

@@ -1 +1 @@
-jQuery('#<%= dom_id @promotion_rule %>').fadeOut().remove();
+$('#<%= dom_id @promotion_rule %>').fadeOut().remove();

data/app/views/admin/promotions/_actions.html.erb

@@ -1,7 +1,7 @@
 <fieldset id="action_fields">
   <legend><%= t(:promotion_actions) %></legend>
 
-  <%= form_for(@promotion, :url => admin_promotion_path(@promotion), :html => { :method => :put }) do |f| %>
+  <%= form_for @promotion, :url => admin_promotion_path(@promotion), :html => { :method => :put } do |f| %>
     <div id="actions" class="filter_list">
       <% if @promotion.actions.any? %>
         <%#= render :partial => 'promotion_action', :collection => @promotion.actions, :locals => {:f => f} %>
@@ -11,22 +11,21 @@
         <% end %>
 
       <% else %>
-        <!-- <p><%= t('no_actions_added') %></p> -->
+        <!-- <p><%= t(:no_actions_added) %></p> -->
       <% end %>
     </div>
     <p class="form-buttons">
-      <%= button t("update") %>
+      <%= button t(:update) %>
     </p>
   <% end %>
 
-  <%= form_tag(admin_promotion_promotion_actions_path(@promotion), :remote => true, :id => 'new_promotion_action_form') do  %>
-    <% options = options_for_select( PromotionAction.registered_class_names.map {|name| [ t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
+  <%= form_tag admin_promotion_promotion_actions_path(@promotion), :remote => true, :id => 'new_promotion_action_form' do  %>
+    <% options = options_for_select(  Rails.application.config.spree.promotions.actions.map(&:name).map {|name| [ t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
     <p>
-      <label for="promotion_action_type"><%= t('add_action_of_type') %></label>
-      <%= select_tag("promotion_action[type]", options) %>
-      <input type="submit" value="<%= t('add') %>" />
+      <%= label_tag :promotion_action_type, t(:add_action_of_type) %>
+      <%= select_tag 'promotion_action[type]', options %>
+      <%= submit_tag t(:add) %>
     </p>
   <% end %>
 
 </fieldset>
-

data/app/views/admin/promotions/_form.html.erb

@@ -1,4 +1,4 @@
-<%= render "shared/error_messages", :target => @promotion %>
+<%= render 'shared/error_messages', :target => @promotion %>
 <fieldset id="general_fields">
   <legend><%= t(:general) %></legend>
   <%= f.field_container :name do %>
@@ -18,12 +18,12 @@
 
   <%= f.field_container :description do %>
     <%= f.label :description %><br />
-    <%= f.text_area :description, :style => "height:50px" %>
+    <%= f.text_area :description, :style => "height:50px;" %>
   <% end %>
 
   <%= f.field_container :preferred_advertise do %>
     <%= f.check_box :preferred_advertise %>
-    <%= f.label :preferred_advertise, t('advertise') %>
+    <%= f.label :preferred_advertise, t(:advertise) %>
   <% end %>
 
 </fieldset>

data/app/views/admin/promotions/_promotion_action.html.erb

@@ -6,7 +6,7 @@
   <% type_name = promotion_action.class.name.demodulize.underscore %>
   <% param_prefix = "promotion[promotion_actions_attributes][#{promotion_action.id}]" %>
   <%#= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>
-  <p><%= t "promotion_action_types.#{type_name}.description" %></p>
+  <p><%= t("promotion_action_types.#{type_name}.description") %></p>
 
   <%= render "admin/promotions/actions/#{type_name}", :action_form => action_form, :promotion_action => promotion_action, :param_prefix => param_prefix %>
 </div>

data/app/views/admin/promotions/_promotion_rule.html.erb

@@ -3,6 +3,6 @@
   <% type_name = promotion_rule.class.name.demodulize.underscore %>
   <% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>
-  <p><%= t "promotion_rule_types.#{type_name}.description" %></p>
+  <p><%= t("promotion_rule_types.#{type_name}.description") %></p>
   <%= render "admin/promotions/rules/#{type_name}", :promotion_rule => promotion_rule, :param_prefix => param_prefix %>
 </div>

data/app/views/admin/promotions/_rules.html.erb

@@ -1,9 +1,9 @@
 <fieldset id="rule_fields">
   <legend><%= t(:rules) %></legend>
 
-  <%= form_for(@promotion, :url => object_url, :html => { :method => :put }) do |f| %>
+  <%= form_for @promotion, :url => object_url, :html => { :method => :put } do |f| %>
     <p>
-      <% for policy in Promotion::MATCH_POLICIES %>
+      <% Promotion::MATCH_POLICIES.each do |policy| %>
         <label><%= f.radio_button :preferred_match_policy, policy %> <%= t "promotion_form.match_policies.#{policy}" %></label> &nbsp;
       <% end %>
     </p>
@@ -11,21 +11,21 @@
       <% if @promotion.rules.any? %>
         <%= render :partial => 'promotion_rule', :collection => @promotion.rules, :locals => {} %>
       <% else %>
-        <!-- <p><%= t('no_rules_added') %></p> -->
+        <!-- <p><%= t(:no_rules_added) %></p> -->
       <% end %>
     </div>
     <p class="form-buttons">
-      <%= button t("update") %>
+      <%= button t(:update) %>
     </p>
   <% end %>
 
-  <%= form_tag(admin_promotion_promotion_rules_path(@promotion), :remote => true,
-                                                                 :id => 'new_product_rule_form') do  %>
-    <% options = options_for_select( PromotionRule.registered_class_names.map {|name| [ t("promotion_rule_types.#{name.demodulize.underscore}.name"), name] } ) %>
+  <%= form_tag admin_promotion_promotion_rules_path(@promotion), :remote => true,
+                                                                 :id => 'new_product_rule_form' do %>
+    <% options = options_for_select( Rails.application.config.spree.promotions.rules.map(&:name).map {|name| [ t("promotion_rule_types.#{name.demodulize.underscore}.name"), name] } ) %>
     <p>
-      <label for="promotion_rule_type"><%= t('add_rule_of_type') %></label>
-      <%= select_tag("promotion_rule[type]", options) %>
-      <input type="submit" value="<%= t('add') %>" />
+      <%= label_tag :promotion_rule_type, t(:add_rule_of_type) %>
+      <%= select_tag('promotion_rule[type]', options) %>
+      <%= submit_tag t(:add) %>
     </p>
   <% end %>
 

data/app/views/admin/promotions/actions/_create_adjustment.html.erb

@@ -1,10 +1,10 @@
 <div class="calculator-fields">
 
   <p class="field">
-    <%= action_form.label :calculator_type, t("calculator") %>
+    <%= action_form.label :calculator_type, t(:calculator) %>
     <%= action_form.collection_select :calculator_type, @calculators, :to_s, :description, {}, {:class => 'type-select'} %>
     <% if promotion_action.calculator.respond_to?(:preferences) %>
-      &nbsp; <span class="warning"><%= t('calculator_settings_warning')%></span>
+      &nbsp; <span class="warning"><%= t(:calculator_settings_warning)%></span>
     <% end %>
   </p>
 

data/app/views/admin/promotions/actions/_create_line_items.html.erb

@@ -1,51 +1,41 @@
 <table class="index">
   <tr>
-    <th>Product</th>
-    <th>Variant</th>
-    <th>Quantity</th>
+    <th><%= t(:product) %></th>
+    <th><%= t(:qty) %></th>
     <th>&nbsp;</th>
   </tr>
-  <% for item in promotion_action.promotion_action_line_items %>
+  <% promotion_action.promotion_action_line_items.each do |item| %>
     <tr>
       <td>
-        <%= item.variant.product.name %>
-      </td>
-      <td>
-        <%= item.variant.options_text.presence || t("master") %>
+        <%= item.variant.product.name %> <%= item.variant.options_text %>
       </td>
       <td>
         <%= item.quantity %>
       </td>
       <td>
-        <img src='/admin/images/icons/cross.png' />
+        <%= image_tag 'admin/icons/cross.png' %>
       </td>
     </tr>
   <% end %>
 </table>
 
-
-
 <%= action_form.hidden_field :line_items_string %>
 
-
 <div class="add-line-item">
   <fieldset>
-    <legend><%= t('add_product') %></legend>
-    <div style="float:left;width:50%;margin-right:5%;">
-      <%= label_tag :add_product_name, t("name_or_sku") %>
+    <legend><%= t(:add_product) %></legend>
+    <div style="float:left; width:50%; margin-right:5%;">
+      <%= label_tag :add_product_name, t(:name_or_sku) %>
       <%= text_field_tag :add_product_name, nil, :class => 'fullwidth' %>
+      <%= hidden_field_tag :add_line_item_variant_id %>
     </div>
-    <div style="float:left;width:10%;margin-right:5%;">
-      <%= label_tag :add_line_item_variant_id, t("variant") %><br />
-      <select name="add_line_item_variant_id" class="fullwidth"></select>
-    </div>
-    <div style="float:left;width:10%;margin-right:5%;">
-      <%= label_tag :add_quantity, t("qty") %>
+    <div style="float:left; width:10%; margin-right:5%;">
+      <%= label_tag :add_quantity, t(:qty) %>
       <%= text_field_tag :add_quantity, 1 %>
     </div>
-    <div style="float:left;width:j0%">
+    <div style="float:left; width:j0%">
       &nbsp;<br />
-      <button class="add small"> <%= t("add") %></button>
+      <button class="add small"> <%= t(:add) %></button>
     </div>
 
   </fieldset>

data/app/views/admin/promotions/edit.html.erb

@@ -1,8 +1,8 @@
-<h1><%= t("editing_promotion") %></h1>
+<h1><%= t(:editing_promotion) %></h1>
 
-<%= form_for(@promotion, :url => object_url, :html => { :method => :put }) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <%= render "admin/shared/edit_resource_links" %>
+<%= form_for @promotion, :url => object_url, :html => { :method => :put } do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render 'admin/shared/edit_resource_links' %>
 <% end %>
 
 <%= render 'rules' %>

data/app/views/admin/promotions/index.html.erb

@@ -1,27 +1,27 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li>
-      <%= button_link_to t("new_promotion"), new_object_url, :icon => 'add'  %>
+      <%= button_link_to t(:new_promotion), new_object_url, :icon => 'add'  %>
     </li>
   </ul>
-  <br class='clear' />
+  <br class="clear" />
 </div>
 
-<h1><%= t("promotions") %></h1>
+<h1><%= t(:promotions) %></h1>
 
 <table class="index">
   <thead>
     <tr>
-      <th><%= t("name") %></th>
-      <th><%= t("code") %></th>
-      <th><%= t("description") %></th>
-      <th><%= t("usage_limit") %></th>
-      <th><%= t("expiration") %></th>
-      <th width="150"><%= t("action") %></th>
+      <th><%= t(:name) %></th>
+      <th><%= t(:code) %></th>
+      <th><%= t(:description) %></th>
+      <th><%= t(:usage_limit) %></th>
+      <th><%= t(:expiration) %></th>
+      <th style="width:150px;"><%= t(:action) %></th>
     </tr>
   </thead>
   <tbody>
-    <% for promotion in @promotions %>
+    <% @promotions.each do |promotion| %>
       <tr id="<%= dom_id promotion %>">
         <td><%= promotion.name %></td>
         <td><%= promotion.code %></td>

data/app/views/admin/promotions/new.html.erb

@@ -1,6 +1,6 @@
-<h1><%= t("new_promotion") %></h1>
+<h1><%= t(:new_promotion) %></h1>
 
-<%= form_for(:promotion, :url => collection_url) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <%= render :partial => "admin/shared/new_resource_links" %>
+<%= form_for :promotion, :url => collection_url do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render :partial => 'admin/shared/new_resource_links' %>
 <% end %>

data/app/views/admin/promotions/rules/_item_total.html.erb

@@ -1,6 +1,6 @@
 <p class="field">
   <label for="<%= "#{param_prefix}_preferred_amount" %>">
-    Item total must be
+    <%= t('promotion_rule_types.item_total.description') %>
     <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(Promotion::Rules::ItemTotal::OPERATORS.map{|o| [t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator) %>
     <%= text_field_tag "#{param_prefix}[preferred_amount]", promotion_rule.preferred_amount, :size => 10 %>
   </label>

data/app/views/admin/promotions/rules/_landing_page.html.erb

@@ -1,6 +1,6 @@
 <p class="field">
   <label for="<%= "#{param_prefix}_preferred_path" %>">
-    User must have visited the path:
+    <%= t('promotion_rule_types.landing_page.description') %>:
     <%= t('landing_page_rule.must_have_visited_path') %>
     <%= text_field_tag "#{param_prefix}[preferred_path]", promotion_rule.preferred_path, :size => 10 %>
   </label>

data/app/views/admin/promotions/rules/_product.html.erb

@@ -1,9 +1,9 @@
 <p class="field products_rule_products_source_field">
   <label><%= radio_button_tag "#{param_prefix}[products_source]", :manual, promotion_rule.product_group.nil? %> <%= t "product_rule.product_source.manual" %></label> &nbsp;
-  <label><%= radio_button_tag "#{param_prefix}[products_source]", :group, promotion_rule.product_group.present? %> <%= t "product_rule.product_source.group" %></label>
+  <label><%= radio_button_tag "#{param_prefix}[products_source]", :group, promotion_rule.product_group.present? %> <%= t('product_rule.product_source.group') %></label>
 </p>
 <p class="field products_rule_product_group">
-  <label><%= t('product_group') %><br />
+  <label><%= t(:product_group) %><br />
     <%= select_tag "#{param_prefix}[product_group_id]", options_from_collection_for_select(ProductGroup.all, :id, :name, promotion_rule.product_group_id) %></label>
 </p>
 <p class="field products_rule_products">
@@ -13,6 +13,6 @@
 </p>
 <p>
   <label>
-    <%= t("product_rule.label", :select => select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Promotion::Rules::Product::MATCH_POLICIES.map{|s| [t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy))).html_safe %>
+    <%= t('product_rule.label', :select => select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Promotion::Rules::Product::MATCH_POLICIES.map{|s| [t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy))).html_safe %>
   </label>
 </p>

data/app/views/admin/promotions/rules/_user_logged_in.html.erb

@@ -1,3 +1,3 @@
 <%# the spree promo code requires a partial exist.  That's why there's not much here %>
-<p class="field"><label>User must be logged in</label></p>
+<p class="field"><%= label_tag nil, t('promotion_rule_types.user_logged_in.description') %></p>
 

data/app/views/products/_promotions.html.erb

@@ -1,15 +1,15 @@
 <% promotions = @product.possible_promotions %>
 <% if promotions.any? %>
 <div id="promotions">
-  <h3><%= t 'promotions' %></h3>
+  <h3><%= t(:promotions) %></h3>
 
-  <% for promotion in promotions %>
+  <% promotions.each do |promotion| %>
   <div>
     <h4><%= promotion.name %></h4>
     <p><%= promotion.description %></p>
     <% if promotion.products.any? %>
     <ul>
-      <% for product in promotion.products %>
+      <% promotion.products.each do |product| %>
         <li><%= link_to product.name, product_path(product) %></li>
       <% end %>
     </ul>

data/config/locales/en.yml

@@ -3,12 +3,12 @@ en:
   activemodel:
     attributes:
       promotion:
-        name: "Name"
-        description: "Description"
-        code: "Code"
-        usage_limit: "Usage limit"
-        starts_at: "Starts at"
-        expires_at: "Expires at"
+        name: Name
+        description: Description
+        code: Code
+        usage_limit: Usage limit
+        starts_at: Starts at
+        expires_at: Expires at
   add_action_of_type: Add action of type
   add_rule_of_type: Add rule of type
   advertise: Advertise

data/lib/spree/promo/environment.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Promo
+    class Environment
+      include EnvironmentExtension
+
+      attr_accessor :rules, :actions
+    end
+  end
+end

data/lib/spree_promo.rb

@@ -19,38 +19,40 @@ module SpreePromo
           {:user => current_user, :order => current_order, :visited_paths => session[:visited_paths]}
         end
       end
+    end
+
+    config.autoload_paths += %W(#{config.root}/lib)
+    config.to_prepare &method(:activate).to_proc
+
+    initializer "spree.promo.environment", :after => "spree.environment" do |app|
+      app.config.spree.add_class('promotions')
+      app.config.spree.promotions = Spree::Promo::Environment.new
+    end
 
-      if Activator.table_exists?
-        # register promotion rules and actions
-        [Promotion::Rules::ItemTotal,
+    initializer "spree.promo.register.promotion.calculators" do |app|
+      app.config.spree.calculators.add_class('promotion_actions_create_adjustments')
+      app.config.spree.calculators.promotion_actions_create_adjustments = [
+        Calculator::FlatPercentItemTotal,
+        Calculator::FlatRate,
+        Calculator::FlexiRate,
+        Calculator::PerItem,
+        Calculator::FreeShipping
+      ]
+    end
+
+    initializer "spree.promo.register.promotions.rules" do |app|
+      app.config.spree.promotions.rules = [Promotion::Rules::ItemTotal,
          Promotion::Rules::Product,
          Promotion::Rules::User,
          Promotion::Rules::FirstOrder,
          Promotion::Rules::LandingPage,
-         Promotion::Rules::UserLoggedIn,
-         Promotion::Actions::CreateAdjustment,
-         Promotion::Actions::CreateLineItems
-        ].each &:register
-
-        # register default promotion calculators
-        [
-          Calculator::FlatPercentItemTotal,
-          Calculator::FlatRate,
-          Calculator::FlexiRate,
-          Calculator::PerItem,
-          Calculator::FreeShipping
-        ].each{|c_model|
-          begin
-            Promotion::Actions::CreateAdjustment.register_calculator(c_model) if c_model.table_exists?
-          rescue Exception => e
-            $stderr.puts "Error registering promotion calculator #{c_model}"
-          end
-        }
-      end
+         Promotion::Rules::UserLoggedIn]
+    end
 
+    initializer "spree.promo.register.promotions.actions" do |app|
+      app.config.spree.promotions.actions = [Promotion::Actions::CreateAdjustment,
+        Promotion::Actions::CreateLineItems]
     end
 
-    config.autoload_paths += %W(#{config.root}/lib)
-    config.to_prepare &method(:activate).to_proc
   end
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_promo
 version: !ruby/object:Gem::Version 
-  hash: 15425137
-  prerelease: 7
+  hash: 263
+  prerelease: 
   segments: 
   - 0
   - 70
   - 0
-  - rc
-  - 2
-  version: 0.70.0.rc2
+  version: 0.70.0
 platform: ruby
 authors: 
 - David North
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-30 00:00:00 Z
+date: 2011-10-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -27,14 +25,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15425137
+        hash: 263
         segments: 
         - 0
         - 70
         - 0
-        - rc
-        - 2
-        version: 0.70.0.rc2
+        version: 0.70.0
   version_requirements: *id001
   name: spree_core
 - !ruby/object:Gem::Dependency 
@@ -45,14 +41,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15425137
+        hash: 263
         segments: 
         - 0
         - 70
         - 0
-        - rc
-        - 2
-        version: 0.70.0.rc2
+        version: 0.70.0
   version_requirements: *id002
   name: spree_auth
 description: Required dependency for Spree
@@ -123,6 +117,7 @@ files:
 - config/cucumber.yml
 - config/locales/en.yml
 - config/routes.rb
+- lib/spree/promo/environment.rb
 - lib/spree_promo.rb
 - lib/tasks/promotions.rake
 - lib/tasks/promotions_extension_tasks.rake
@@ -158,14 +153,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: 
 - none
 rubyforge_project: spree_promo