spree_core 1.0.0.rc4 → 1.0.0

data/app/assets/stylesheets/store/screen.css.scss

@@ -585,6 +585,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
     text-align: center;
     border: 1px solid $c_border;
     margin-top: 23px;
+    margin-left: 0;
 
     h3 {
       text-transform: uppercase;
@@ -816,13 +817,31 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
 ================================================== */
 
   /* Smaller than standard 960 (devices and browsers) */
-  @media only screen and (max-width: 959px) {}
+  @media only screen and (max-width: 959px) {
+
+  }
 
   /* Tablet Portrait size to standard 960 (devices and browsers) */
-  @media only screen and (min-width: 768px) and (max-width: 959px) {}
+  @media only screen and (min-width: 768px) and (max-width: 959px) {
+    .container {
+      padding-left: 10px;
+      width: 758px;
+    }
+    footer#footer {
+      width: 748px;
+    }
+    p[data-hook="use_billing"] {
+      margin-top: -15px;
+    }
+  }
 
   /* All Mobile Sizes (devices and browser) */
-  @media only screen and (max-width: 767px) {
+  @media only screen and (max-width: 767px) {        
+
+    html {
+      -webkit-text-size-adjust: none;
+    }
+
     nav#taxonomies {
       text-align: center;
 
@@ -861,7 +880,11 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
 
   /* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
   @media only screen and (min-width: 480px) and (max-width: 767px) {
-    
+
+    footer#footer {
+      width: auto !important;
+    }
+
     input, select {
       vertical-align: baseline !important;
     }

data/app/models/spree/calculator/{price_bucket.rb → price_sack.rb}

@@ -1,11 +1,11 @@
 module Spree
-  class Calculator::PriceBucket < Calculator
+  class Calculator::PriceSack < Calculator
     preference :minimal_amount, :decimal, :default => 0
     preference :normal_amount, :decimal, :default => 0
     preference :discount_amount, :decimal, :default => 0
 
     def self.description
-      I18n.t(:price_bucket)
+      I18n.t(:price_sack)
     end
 
     # as object we always get line items, as calculable we have Coupon, ShippingMethod

data/app/models/spree/order.rb

@@ -56,7 +56,7 @@ module Spree
       self.update_hooks.add(hook)
     end
 
-    # For compatiblity with Calculator::PriceBucket
+    # For compatiblity with Calculator::PriceSack
     def amount
       line_items.map(&:amount).sum
     end
@@ -128,6 +128,10 @@ module Spree
         end
       end
 
+      before_transition :to => ['delivery'] do |order|
+        order.shipments.each { |s| s.destroy unless s.shipping_method.available_to_order?(order) }
+      end
+
       after_transition :to => 'complete', :do => :finalize!
       after_transition :to => 'delivery', :do => :create_tax_charge!
       after_transition :to => 'payment',  :do => :create_shipment!

data/app/models/spree/payment.rb

@@ -72,9 +72,15 @@ module Spree
     end
 
     def process!
-      if !processing? and source and source.respond_to?(:process!)
-        started_processing!
-        source.process!(self) # source is responsible for updating the payment state when it's done processing
+      if payment_method && payment_method.source_required?
+        if source
+          if !processing? && source.respond_to?(:process!)
+            started_processing!
+            source.process!(self) # source is responsible for updating the payment state when it's done processing
+          end
+        else
+          raise Core::GatewayError.new(I18n.t(:payment_processing_failed))
+        end
       end
     end
 

data/app/models/spree/payment_method/check.rb

@@ -25,5 +25,9 @@ module Spree
       payment.void
       true
     end
+
+    def source_required?
+      false
+    end
   end
 end

data/app/models/spree/payment_method.rb

@@ -49,5 +49,9 @@ module Spree
     def payment_profiles_supported?
       false
     end
+
+    def source_required?
+      true
+    end
   end
 end

data/app/models/spree/preference.rb

@@ -1,31 +1,62 @@
 class Spree::Preference < ActiveRecord::Base
 
   validates :key, :presence => true
+  validates :value, :presence => true
+  validates :value_type, :presence => true
 
-  def value=(value)
-    self[:value] = value
-    self[:value_type] = value.class.name
-  end
+  scope :valid, where(Spree::Preference.arel_table[:key].not_eq(nil)).where(Spree::Preference.arel_table[:value_type].not_eq(nil))
 
+  # The type conversions here should match
+  # the ones in spree::preferences::preferrable#convert_preference_value
   def value
-    return unless self[:value]
+    if self[:value_type].present?
+      case self[:value_type].to_sym
+      when :string
+        self[:value].to_s
+      when :password
+        self[:value].to_s
+      when :decimal
+        BigDecimal.new(self[:value].to_s).round(2, BigDecimal::ROUND_HALF_UP)
+      when :integer
+        self[:value].to_i
+      when :boolean
+        (self[:value].to_s =~ /^t/i) != nil
+      end
+    else
+      self[:value]
+    end
+  end
 
-    case self[:value_type]
+  def raw_value
+    self[:value]
+  end
+
+  # For the rc releases of 1.0, we stored the object class names, this converts
+  # to preferences definition types. This code should eventually be removed.
+  # it is called during the load_preferences of the Preferences::Store
+  def self.convert_old_value_types(preference)
+    return unless [Symbol.to_s, Fixnum.to_s, Bignum.to_s,
+                   Float.to_s, TrueClass.to_s, FalseClass.to_s].include? preference.value_type
+
+    case preference.value_type
     when Symbol.to_s
-      self[:value].to_sym
+      preference.value_type = 'string'
     when Fixnum.to_s
-      self[:value].to_i
+      preference.value_type = 'integer'
     when Bignum.to_s
-      self[:value].to_f.to_i
+      preference.value_type = 'integer'
+      preference.value = preference.value.to_f.to_i
     when Float.to_s
-      self[:value].to_f
+      preference.value_type = 'decimal'
     when TrueClass.to_s
-      true
+      preference.value_type = 'boolean'
+      preference.value = "true"
     when FalseClass.to_s
-      false
-    else
-      self[:value]
+      preference.value_type = 'boolean'
+      preference.value = "false"
     end
+
+    preference.save
   end
 
 end

data/app/models/spree/preferences/preferable.rb

@@ -104,6 +104,31 @@ module Spree::Preferences::Preferable
     @pending_preferences[name]
   end
 
+  def convert_preference_value(value, type)
+    case type
+    when :string
+      value.to_s
+    when :password
+      value.to_s
+    when :decimal
+      BigDecimal.new(value.to_s).round(2, BigDecimal::ROUND_HALF_UP)
+    when :integer
+      value.to_i
+    when :boolean
+      if value.is_a?(FalseClass) ||
+         value.nil? ||
+         value == 0 ||
+         value =~ /^(f|false|0)$/i ||
+         (value.respond_to? :empty? and value.empty?)
+         false
+      else
+         true
+      end
+    else
+      value
+    end
+  end
+
   def preference_store
     Spree::Preferences::Store.instance
   end

data/app/models/spree/preferences/preferable_class_methods.rb

@@ -23,20 +23,9 @@ module Spree::Preferences
       alias_method prefers_getter_method(name), preference_getter_method(name)
 
       define_method preference_setter_method(name) do |value|
-        # Boolean attributes can come back from forms as '0' or '1'
-        # Convert them to their correct values here
-        if type == :boolean && !value.is_a?(TrueClass) && !value.is_a?(FalseClass)
-          value = value.downcase if value.respond_to? :downcase
-          case value
-          when 0, '0', 'false', 'f', "", []
-            value = false
-          else
-            value = true
-          end
-        end
-
+        value = convert_preference_value(value, type)
         if preference_cache_key(name)
-          preference_store.set preference_cache_key(name), value
+          preference_store.set preference_cache_key(name), value, type
         else
           add_pending_preference(name, value)
         end

data/app/models/spree/preferences/store.rb

@@ -17,16 +17,16 @@ module Spree::Preferences
       load_preferences
     end
 
-    def set(key, value)
+    def set(key, value, type)
       @cache.write(key, value)
-      persist(key, value)
+      persist(key, value, type)
     end
 
     def exist?(key)
       @cache.exist? key
     end
 
-    def get(key, default_key=nil)
+    def get(key)
       @cache.read(key)
     end
 
@@ -37,11 +37,12 @@ module Spree::Preferences
 
     private
 
-    def persist(cache_key, value)
+    def persist(cache_key, value, type)
       return unless should_persist?
 
       preference = Spree::Preference.find_or_initialize_by_key(cache_key)
       preference.value = value
+      preference.value_type = type
       preference.save
     end
 
@@ -55,8 +56,9 @@ module Spree::Preferences
     def load_preferences
       return unless should_persist?
 
-      Spree::Preference.all.each do |p|
-         @cache.write(p.key, p.value)
+      Spree::Preference.valid.each do |p|
+        Spree::Preference.convert_old_value_types(p) # see comment
+        @cache.write(p.key, p.value)
       end
     end
 

data/app/models/spree/product.rb

@@ -78,8 +78,7 @@ module Spree
     end
 
     def to_param
-      return permalink if permalink.present?
-      name.to_url
+      permalink.present? ? permalink : (permalink_was || name.to_s.to_url)
     end
 
     # returns true if the product has any variants (the master variant is not a member of the variants array)
@@ -185,6 +184,12 @@ module Spree
       self.where([where_str, values.map { |value| "%#{value}%" } * fields.size].flatten)
     end
 
+    def empty_option_values?
+      options.empty? || options.any? do |opt|
+        opt.option_type.option_values.empty?
+      end
+    end
+
     private
       def recalculate_count_on_hand
         product_count_on_hand = has_variants? ?

data/app/models/spree/product_group.rb

@@ -28,7 +28,7 @@
 #
 module Spree
   class ProductGroup < ActiveRecord::Base
-    validates :name, :presence => true # TODO ensure that this field is defined as not_null
+    validates :name, :permalink, :presence => true
     validates_associated :product_scopes
 
     after_save :update_memberships
@@ -153,13 +153,10 @@ module Spree
       result
     end
 
-    # generates ProductGroup url
-    def permalink
-      name.to_s.to_url
+    def to_param
+      permalink.present? ? permalink : (permalink_was || name.to_s.to_url)
     end
 
-    alias_method :to_url, :permalink
-
     def update_memberships
       # wipe everything directly to avoid expensive in-rails sorting
       ActiveRecord::Base.connection.execute "DELETE FROM spree_product_groups_products WHERE product_group_id = #{self.id}"
@@ -178,9 +175,6 @@ module Spree
       "<Spree::ProductGroup" + (id && "[#{id}]").to_s + ":'#{to_url}'>"
     end
 
-    def to_param
-      self.permalink
-    end
 
     def order_scope
       if scope = product_scopes.detect {|s| s.is_ordering?}

data/app/views/spree/admin/product_groups/edit.html.erb

@@ -4,7 +4,7 @@
 
 <fieldset id="product_group_forms_container" data-hook>
 
-  <%= form_for [:admin, @product_group], :html => { :id => 'product-group-form', :method => :put, :remote => true } do |f| %>
+  <%= form_for [:admin, @product_group], :html => { :id => 'product-group-form', :method => :put } do |f| %>
 
       <%= f.field_container :name do %>
         <%= f.label :name, t(:name) %><br />
@@ -12,6 +12,12 @@
         <%= f.error_message_on :name %>
       <% end %>
 
+      <%= f.field_container :permalink do %>
+        <%= f.label :permalink, t(:permalink) %><br />
+        <%= f.text_field :permalink %>
+        <%= f.error_message_on :permalink %>
+      <% end %>
+
       <%= f.field_container :order_scope do %>
         <%= f.label :order_scope, t(:sort_ordering) %><br />
         <%= f.select(:order_scope, Spree::Product.simple_scopes.collect{|p| [ t(:name, :scope =>[:product_scopes, :scopes, p]), p.to_s ] }) %>

data/app/views/spree/admin/product_scopes/create.js.erb

@@ -1,3 +1,6 @@
 $('#product_scopes').append('<%= escape_javascript( render('spree/admin/product_groups/product_scope', :product_scope => @product_scope) ) %>');
 $('#<%= dom_id @product_scope %>').hide();
 $('#<%= dom_id @product_scope %>').fadeIn();
+if(!$('.token-input-list').is('*')){
+  $('.tokeninput.products').productPicker();
+}

data/app/views/spree/admin/variants/index.html.erb

@@ -36,11 +36,13 @@
   <% end %>
 </table>
 
-<% if @product.options.empty? %>
+<% if @product.empty_option_values? %>
 
   <p class='first_add_option_types' data-hook="first_add_option_types">
     <%= t(:to_add_variants_you_must_first_define) %>
     <%= link_to t(:option_types), selected_admin_product_option_types_url(@product) %>
+    <%= t(:and) %>
+    <%= link_to t(:option_values), admin_option_types_url %>
   </p>
 
 <% else %>

data/config/initializers/check_for_orphaned_preferences.rb

@@ -0,0 +1,6 @@
+begin
+  ActiveRecord::Base.connection.execute("select owner_id, owner_type, name, value from spree_preferences where `key` is null").each do |pref|
+    warn "[WARNING] Orphaned preference `#{pref[2]}` with value `#{pref[3]}` for #{pref[1]} with id of: #{pref[0]}, you should reset the preference value manually."
+  end
+rescue
+end

data/config/locales/en.yml

@@ -252,6 +252,7 @@ en:
   alternative_phone: Alternative Phone
   amount: Amount
   analytics_trackers: Analytics Trackers
+  and: and
   apply: "Apply"
   are_you_sure: "Are you sure?"
   are_you_sure_category: "Are you sure you want to delete this category?"
@@ -672,7 +673,7 @@ en:
   preview: Preview
   previous: Previous
   price: Price
-  price_bucket: Price Bucket
+  price_sack: Price Sack
   price_range: Price Range
   problem_authorizing_card: "Problem authorizing credit card"
   problem_capturing_card: "Problem capturing credit card"

data/db/migrate/20120119024710_new_preferences.rb

@@ -1,15 +1,14 @@
-class NewPreferences < ActiveRecord::Migration
+require 'spree/core/preference_rescue'
 
-  class OldPrefs < ActiveRecord::Base
-    set_table_name "spree_preferences"
-    belongs_to  :owner, :polymorphic => true
-  end
+class NewPreferences < ActiveRecord::Migration
 
   def up
     add_column :spree_preferences, :key, :string
     add_column :spree_preferences, :value_type, :string
     add_index :spree_preferences, :key, :unique => true
 
+    remove_index :spree_preferences, :name => 'ix_prefs_on_owner_attr_pref'
+
     # remove old constraints for migration
     change_column :spree_preferences, :name, :string, :null => true
     change_column :spree_preferences, :owner_id, :integer, :null => true
@@ -17,32 +16,23 @@ class NewPreferences < ActiveRecord::Migration
     change_column :spree_preferences, :group_id, :integer, :null => true
     change_column :spree_preferences, :group_type, :string, :null => true
 
-    OldPrefs.all.each do |old_pref|
-      begin
-        begin
-          owner = old_pref.owner
-        rescue => e1
-          # case:
-          # AppConfiguration is no longer an sti derivative of Configuration
-          owner_class = old_pref.owner_type.constantize
-          owner = OldPrefs.connection.select_value("SELECT #{owner_class.inheritance_column} FROM #{owner_class.table_name} WHERE id = #{old_pref.owner_id}").constantize.new
-        end
-
-        unless old_pref.owner_type.nil?
-        end
-
-        unless old_pref.owner_type == "Spree::Activator" || old_pref.owner_type == "Spree::PromotionRule"
-          say "Migrating preference #{old_pref.name}"
-          owner.set_preference old_pref.name, old_pref.value
-        end
-      rescue => e
-        say "Skipping setting preference #{old_pref.owner_type}::#{old_pref.name}"
-      end
+    cfgs = execute("select id, type from spree_configurations").to_a
+    execute("select id, owner_id, name from spree_preferences where owner_type = 'Spree::Configuration'").each do |pref|
+      configuration = cfgs.detect { |c| c[0].to_s == pref[1].to_s }
+
+      value_type = configuration[1].constantize.new.send "preferred_#{pref[2]}_type" rescue 'string'
+
+      execute "UPDATE spree_preferences set `key` = '#{configuration[1].underscore}/#{pref[2]}', `value_type` = '#{value_type}' where id = #{pref[0]}" rescue nil
+    end
+
+    # remove orphaned calculator preferences
+    Spree::Preference.where(:owner_type => 'Spree::Calculator').each do |preference|
+      preference.destroy unless Spree::Calculator.exists? preference.owner_id
     end
 
-    # Remove old promotion prefs
-    Spree::Preference.where(:key => nil).delete_all
+    Spree::PreferenceRescue.try
 
+    Spree::Preference.where(:value_type => nil).update_all(:value_type => 'string')
   end
 
   def down
@@ -55,4 +45,4 @@ class NewPreferences < ActiveRecord::Migration
     add_column :spree_preferences, :group_id, :integer
     add_column :spree_preferences, :group_type, :string
   end
-end
+end

data/lib/spree/core/engine.rb

@@ -51,7 +51,7 @@ module Spree
             Spree::Calculator::FlatRate,
             Spree::Calculator::FlexiRate,
             Spree::Calculator::PerItem,
-            Spree::Calculator::PriceBucket]
+            Spree::Calculator::PriceSack]
 
          app.config.spree.calculators.tax_rates = [
             Spree::Calculator::DefaultTax]

data/lib/spree/core/preference_rescue.rb

@@ -0,0 +1,21 @@
+module Spree
+  class OldPrefs < ActiveRecord::Base
+    set_table_name "spree_preferences"
+    belongs_to  :owner, :polymorphic => true
+    attr_accessor :owner_klass
+  end
+
+  class PreferenceRescue
+    def self.try
+      OldPrefs.where(:key => nil).each do |old_pref|
+        next unless owner = (old_pref.owner rescue nil)
+        unless old_pref.owner_type == "Spree::Activator" || old_pref.owner_type == "Spree::Configuration"
+          old_pref.key = [owner.class.name, old_pref.name, owner.id].join('::').underscore
+          old_pref.value_type = owner.preference_type(old_pref.name)
+          puts "Migrating Preference: #{old_pref.key}"
+          old_pref.save
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/user_banners.rb

@@ -5,7 +5,7 @@ module Spree
   module Core
     module UserBanners
       def self.included(base)
-        base.preference :dismissed_banners, :text, :default => ''
+        base.preference :dismissed_banners, :string, :default => ''
       end
 
       def dismissed_banner_ids

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.0.0.rc4"
+    "1.0.0"
   end
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Sean Schofield
 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: acts_as_list
-  requirement: &70315830659780 !ruby/object:Gem::Requirement
+  requirement: &70236783733120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70315830659780
+  version_requirements: *70236783733120
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &70315830658700 !ruby/object:Gem::Requirement
+  requirement: &70236783732040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70315830658700
+  version_requirements: *70236783732040
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70315830657660 !ruby/object:Gem::Requirement
+  requirement: &70236783765860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 1.0.19
   type: :runtime
   prerelease: false
-  version_requirements: *70315830657660
+  version_requirements: *70236783765860
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70315830655400 !ruby/object:Gem::Requirement
+  requirement: &70236783764200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -57,10 +57,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70315830655400
+  version_requirements: *70236783764200
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70315830654520 !ruby/object:Gem::Requirement
+  requirement: &70236783763600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -68,10 +68,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70315830654520
+  version_requirements: *70236783763600
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70315830670300 !ruby/object:Gem::Requirement
+  requirement: &70236783762880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70315830670300
+  version_requirements: *70236783762880
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70315830669540 !ruby/object:Gem::Requirement
+  requirement: &70236783762380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -90,10 +90,10 @@ dependencies:
         version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70315830669540
+  version_requirements: *70236783762380
 - !ruby/object:Gem::Dependency
   name: meta_search
-  requirement: &70315830668920 !ruby/object:Gem::Requirement
+  requirement: &70236783761800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -101,10 +101,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70315830668920
+  version_requirements: *70236783761800
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70315830668060 !ruby/object:Gem::Requirement
+  requirement: &70236783761200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -112,10 +112,10 @@ dependencies:
         version: 1.20.1
   type: :runtime
   prerelease: false
-  version_requirements: *70315830668060
+  version_requirements: *70236783761200
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70315830667420 !ruby/object:Gem::Requirement
+  requirement: &70236783760640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -126,10 +126,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70315830667420
+  version_requirements: *70236783760640
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70315830666140 !ruby/object:Gem::Requirement
+  requirement: &70236783759600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -137,10 +137,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70315830666140
+  version_requirements: *70236783759600
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70315830665460 !ruby/object:Gem::Requirement
+  requirement: &70236783758860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -148,10 +148,10 @@ dependencies:
         version: 0.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70315830665460
+  version_requirements: *70236783758860
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70315830664880 !ruby/object:Gem::Requirement
+  requirement: &70236783752940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,7 +159,7 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70315830664880
+  version_requirements: *70236783752940
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -394,7 +394,7 @@ files:
 - app/models/spree/calculator/flat_rate.rb
 - app/models/spree/calculator/flexi_rate.rb
 - app/models/spree/calculator/per_item.rb
-- app/models/spree/calculator/price_bucket.rb
+- app/models/spree/calculator/price_sack.rb
 - app/models/spree/calculator.rb
 - app/models/spree/configuration.rb
 - app/models/spree/country.rb
@@ -509,7 +509,6 @@ files:
 - app/views/spree/admin/product_groups/index.html.erb
 - app/views/spree/admin/product_groups/new.html.erb
 - app/views/spree/admin/product_groups/show.html.erb
-- app/views/spree/admin/product_groups/update.js.erb
 - app/views/spree/admin/product_properties/_product_property_fields.html.erb
 - app/views/spree/admin/product_properties/index.html.erb
 - app/views/spree/admin/product_scopes/create.js.erb
@@ -671,6 +670,7 @@ files:
 - app/views/spree/taxons/_taxon.html.erb
 - app/views/spree/taxons/show.html.erb
 - app/views/spree/test_mailer/test_email.text.erb
+- config/initializers/check_for_orphaned_preferences.rb
 - config/initializers/deprecation_checker.rb
 - config/initializers/form_builder.rb
 - config/initializers/rails_3_1.rb
@@ -714,6 +714,7 @@ files:
 - lib/spree/core/middleware/redirect_legacy_product_url.rb
 - lib/spree/core/middleware/seo_assist.rb
 - lib/spree/core/permalinks.rb
+- lib/spree/core/preference_rescue.rb
 - lib/spree/core/respond_with.rb
 - lib/spree/core/responder.rb
 - lib/spree/core/scopes.rb
@@ -967,9 +968,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: 360601115106515255
 requirements:
 - none
 rubyforge_project: spree_core

data/app/views/spree/admin/product_groups/update.js.erb

@@ -1,12 +0,0 @@
-$('#preview_container').html('<%= escape_javascript( render('spree/admin/product_groups/preview') ) %>');
-<% notice = flash[:notice] %>
-<% flash.delete(:notice) %>
-flash_notice = jQuery('.flash.notice');
-if (flash_notice.length > 0) {
-  flash_notice.html('<%= notice %>');
-} else {
-  $('#content h1').before('<div class="flash notice"><%= notice %></div>');
-}
-
-//set form action in case permalink changes
-$('form#product-group-form').attr('action', '<%= url_for([:admin, @product_group]) %>');