spree_core 1.1.0 → 1.1.1

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

@@ -121,7 +121,7 @@ $.fn.product_autocomplete = function(){
   return this.each(function() {
     $(this).autocomplete({
       source: function(request, response) {
-        $.get("/admin/products.json?q=" + $('#add_product_name').val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
+        $.get(ajax_root_prefix() + "admin/products.json?q=" + $('#add_product_name').val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
           result = prep_product_autocomplete_data(data)
           response(result);
         });

data/app/assets/javascripts/admin/checkouts/edit.js

@@ -46,7 +46,7 @@ $(document).ready(function(){
       minChars: 5,
       delay: 1500,
       source: function(request, response) {
-        $.get("/admin/users.json?q=" + $("#customer_search").val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
+        $.get(ajax_root_prefix() + "admin/users.json?q=" + $("#customer_search").val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
           result = prep_user_autocomplete_data(data)
           response(result);
         });

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

@@ -7,3 +7,6 @@
 //= require jquery.jstree/jquery.jstree
 //= require jquery.alerts/jquery.alerts
 //= require_tree .
+function ajax_root_prefix(){
+  return $('body').data('ajax-root-path');
+}

data/app/controllers/spree/products_controller.rb

@@ -1,6 +1,7 @@
 module Spree
   class ProductsController < BaseController
     HTTP_REFERER_REGEXP = /^https?:\/\/[^\/]+\/t\/([a-z0-9\-\/]+)$/
+    before_filter :load_product, :only => :show
     rescue_from ActiveRecord::RecordNotFound, :with => :render_404
     helper 'spree/taxons'
 
@@ -13,7 +14,6 @@ module Spree
     end
 
     def show
-      @product = Product.active.find_by_permalink!(params[:id])
       return unless @product
 
       @variants = Variant.active.includes([:option_values, :images]).where(:product_id => @product.id)
@@ -32,5 +32,9 @@ module Spree
       def accurate_title
         @product ? @product.name : super
       end
+
+      def load_product
+        @product = Product.active.find_by_permalink!(params[:id])
+      end
   end
 end

data/app/helpers/spree/base_helper.rb

@@ -63,24 +63,6 @@ module Spree
       list
     end
 
-    Spree::Image.attachment_definitions[:attachment][:styles].each do |style, v|
-      # Defines these methods by default:
-      # def mini_image
-      # def small_image
-      # def product_image
-      # def large_image
-      define_method "#{style}_image" do |product, *options|
-        options = options.first || {}
-        if product.images.empty?
-          image_tag "noimage/#{style}.png", options
-        else
-          image = product.images.first
-          options.reverse_merge! :alt => image.alt.blank? ? product.name : image.alt
-          image_tag image.attachment.url(style), options
-        end
-      end
-    end
-
     def meta_data_tags
       object = instance_variable_get('@'+controller_name.singularize)
       meta = { :keywords => Spree::Config[:default_meta_keywords], :description => Spree::Config[:default_meta_description] }
@@ -141,9 +123,9 @@ module Spree
 
     def available_countries
       countries = Zone.find_by_name(Spree::Config[:checkout_zone]).try(:country_list) || Country.all
-      countries.collect do |c| 
+      countries.collect do |c|
         c.name = I18n.t(c.iso, :scope => 'countries', :default => c.name)
-        c 
+        c
       end.sort{ |a,b| a.name <=> b.name }
     end
 
@@ -180,5 +162,38 @@ module Spree
     rescue
        Gem.available?(name)
     end
+
+    def method_missing(method_name, *args, &block)
+      if image_style = image_style_from_method_name(method_name)
+        define_image_method(image_style)
+        self.send(method_name, *args)
+      else
+        super
+      end
+    end
+
+    private
+
+    # Returns style of image or nil
+    def image_style_from_method_name(method_name)
+      if style = method_name.to_s.sub(/_image$/, '')
+        possible_styles = Spree::Image.attachment_definitions[:attachment][:styles]
+        style if style.in? possible_styles.with_indifferent_access
+      end
+    end
+
+    def define_image_method(style)
+      self.class.send :define_method, "#{style}_image" do |product, *options|
+        options = options.first || {}
+        if product.images.empty?
+          image_tag "noimage/#{style}.png", options
+        else
+          image = product.images.first
+          options.reverse_merge! :alt => image.alt.blank? ? product.name : image.alt
+          image_tag image.attachment.url(style), options
+        end
+      end
+    end
+
   end
 end

data/app/models/spree/adjustment.rb

@@ -33,7 +33,7 @@ module Spree
 
     scope :tax, lambda { where(:originator_type => 'Spree::TaxRate', :adjustable_type => 'Spree::Order') }
     scope :price, lambda { where(:adjustable_type => 'Spree::LineItem') }
-    scope :shipping, lambda { where(:label => I18n.t(:shipping)) }
+    scope :shipping, lambda { where(:originator_type => 'Spree::ShippingMethod') }
     scope :optional, where(:mandatory => false)
     scope :eligible, where(:eligible => true)
     scope :charge, where("amount >= 0")

data/app/models/spree/calculator/per_item.rb

@@ -11,8 +11,14 @@ module Spree
     def compute(object=nil)
       return 0 if object.nil?
       self.preferred_amount * object.line_items.reduce(0) do |sum, value|
-        sum + value.quantity
+        value_to_add = (target_products().include?(value.product) ? value.quantity : 0)
+        sum + value_to_add
       end
     end
+
+    def target_products
+      #TODO: product groups?
+      self.calculable.promotion.rules.map(&:products).flatten
+    end
   end
 end

data/app/models/spree/gateway.rb

@@ -9,8 +9,6 @@ module Spree
     
     attr_accessible :preferred_server, :preferred_test_mode
 
-    attr_accessible :preferred_server, :preferred_test_mode
-
     def payment_source_class
       Creditcard
     end

data/app/models/spree/image.rb

@@ -3,7 +3,7 @@ module Spree
     validates_attachment_presence :attachment
     validate :no_attachment_errors
 
-    attr_accessible :alt, :attachment, :position, :viewable_id
+    attr_accessible :alt, :attachment, :position, :viewable_type, :viewable_id
 
     has_attached_file :attachment,
                       :styles => { :mini => '48x48>', :small => '100x100>', :product => '240x240>', :large => '600x600>' },

data/app/models/spree/inventory_unit.rb

@@ -62,11 +62,6 @@ module Spree
       end
     end
 
-    # find the specified quantity of units with the specified status
-    def self.find_by_status(variant, quantity, status)
-      variant.inventory_units.where(:status => status).limit(quantity)
-    end
-
     private
       def allow_ship?
         Spree::Config[:allow_backorder_shipping] || self.sold?

data/app/models/spree/line_item.rb

@@ -45,7 +45,12 @@ module Spree
     end
 
     def sufficient_stock?
-      Spree::Config[:allow_backorders] ? true : (variant.on_hand >= quantity)
+      return true if Spree::Config[:allow_backorders]
+      if new_record? || !order.completed?
+        variant.on_hand >= quantity
+      else
+        variant.on_hand >= (quantity - self.changed_attributes['quantity'].to_i)
+      end
     end
 
     def insufficient_stock?

data/app/models/spree/order.rb

@@ -374,7 +374,7 @@ module Spree
       InventoryUnit.assign_opening_inventory(self)
       # lock any optional adjustments (coupon promotions, etc.)
       adjustments.optional.each { |adjustment| adjustment.update_attribute('locked', true) }
-      OrderMailer.confirm_email(self).deliver
+      deliver_order_confirmation_email
 
       self.state_changes.create({
         :previous_state => 'cart',
@@ -384,6 +384,15 @@ module Spree
       }, :without_protection => true)
     end
 
+    def deliver_order_confirmation_email
+      begin
+        OrderMailer.confirm_email(self).deliver
+      rescue Exception => e
+        logger.error("#{e.class.name}: #{e.message}")
+        logger.error(e.backtrace * "\n")
+      end
+    end
+
     # Helper methods for checkout steps
 
     def available_shipping_methods(display_on = nil)

data/app/models/spree/payment/processing.rb

@@ -97,6 +97,21 @@ module Spree
       credit!(amount)
     end
 
+    # This needs to be public so that gateway subclasses can use
+    # this to report errors
+    def gateway_error(error)
+      if error.is_a? ActiveMerchant::Billing::Response
+        text = error.params['message'] || error.params['response_reason_text'] || error.message
+      elsif error.is_a? ActiveMerchant::ConnectionError
+        text = I18n.t(:unable_to_connect_to_gateway)
+      else
+        text = error.to_s
+      end
+      logger.error(I18n.t(:gateway_error))
+      logger.error("  #{error.to_yaml}")
+      raise Core::GatewayError.new(text)
+    end
+
     private
 
     def gateway_action(source, action, success_state)
@@ -136,6 +151,8 @@ module Spree
       options.merge!({ :shipping => order.ship_total * 100,
                        :tax      => order.tax_total * 100,
                        :subtotal => order.item_total * 100 })
+      
+      options.merge!({ :currency => payment_method.preferences[:currency_code] }) if payment_method && payment_method.preferences[:currency_code]
 
       options.merge({ :billing_address  => order.bill_address.try(:active_merchant_hash),
                       :shipping_address => order.ship_address.try(:active_merchant_hash) })
@@ -153,19 +170,6 @@ module Spree
       log_entries.create({:details => response.to_yaml}, :without_protection => true)
     end
 
-    def gateway_error(error)
-      if error.is_a? ActiveMerchant::Billing::Response
-        text = error.params['message'] || error.params['response_reason_text'] || error.message
-      elsif error.is_a? ActiveMerchant::ConnectionError
-        text = I18n.t(:unable_to_connect_to_gateway)
-      else
-        text = error.to_s
-      end
-      logger.error(I18n.t(:gateway_error))
-      logger.error("  #{error.to_yaml}")
-      raise Core::GatewayError.new(text)
-    end
-
     # Saftey check to make sure we're not accidentally performing operations on a live gateway.
     # Ex. When testing in staging environment with a copy of production data.
     def check_environment

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

@@ -14,16 +14,12 @@ module Spree
       payment.state != 'void'
     end
 
-    def capture(payment)
-      payment.update_attribute(:state, 'pending') if payment.state == 'checkout'
-      payment.complete
-      true
+    def capture(*args)
+      ActiveMerchant::Billing::Response.new(true, "", {}, {})
     end
 
-    def void(payment)
-      payment.update_attribute(:state, 'pending') if payment.state == 'checkout'
-      payment.void
-      true
+    def void(*args)
+      ActiveMerchant::Billing::Response.new(true, "", {}, {})
     end
 
     def source_required?

data/app/models/spree/product.rb

@@ -29,7 +29,7 @@ module Spree
 
     has_one :master,
       :class_name => 'Spree::Variant',
-      :conditions => ["#{Variant.quoted_table_name}.is_master = ? AND #{Variant.quoted_table_name}.deleted_at IS NULL", true]
+      :conditions => ["#{Variant.quoted_table_name}.is_master = ?", true]
 
     delegate_belongs_to :master, :sku, :price, :weight, :height, :width, :depth, :is_master
     delegate_belongs_to :master, :cost_price if Variant.table_exists? && Variant.column_names.include?('cost_price')
@@ -59,7 +59,9 @@ module Spree
     accepts_nested_attributes_for :variants, :allow_destroy => true
 
     def variant_images
-      Image.find_by_sql("SELECT #{Asset.quoted_table_name}.* FROM #{Asset.quoted_table_name} LEFT JOIN #{Variant.quoted_table_name} ON (#{Variant.quoted_table_name}.id = #{Asset.quoted_table_name}.viewable_id) WHERE (#{Variant.quoted_table_name}.product_id = #{self.id}) ORDER BY #{Asset.quoted_table_name}.position")
+      Image.joins("LEFT JOIN #{Variant.quoted_table_name} ON #{Variant.quoted_table_name}.id = #{Asset.quoted_table_name}.viewable_id").
+      where("#{Variant.quoted_table_name}.product_id = #{self.id}").
+      order("#{Asset.quoted_table_name}.position")
     end
 
     alias_method :images, :variant_images
@@ -72,7 +74,7 @@ module Spree
                     :meta_keywords, :price, :sku, :deleted_at, :prototype_id,
                     :option_values_hash, :on_hand, :weight, :height, :width, :depth,
                     :shipping_category_id, :tax_category_id, :product_properties_attributes,
-                    :variants_attributes
+                    :variants_attributes, :taxon_ids
 
     attr_accessible :cost_price if Variant.table_exists? && Variant.column_names.include?('cost_price')
 

data/app/models/spree/product/scopes.rb

@@ -185,7 +185,7 @@ module Spree
     end
 
     def self.available(available_on = nil)
-      where('available_on <= ?', available_on || Time.now)
+      where("#{Product.quoted_table_name}.available_on <= ?", available_on || Time.now)
     end
 
     #RAILS 3 TODO - this scope doesn't match the original 2.3.x version, needs attention (but it works)

data/app/models/spree/return_authorization.rb

@@ -67,8 +67,10 @@ module Spree
 
       def process_return
         inventory_units.each &:return!
-        credit = Adjustment.create(:source => self, :adjustable => order, :amount => amount.abs * -1, :label => I18n.t(:rma_credit))
-        order.update!
+        credit = Adjustment.new(:amount => amount.abs * -1, :label => I18n.t(:rma_credit))
+        credit.source = self
+        credit.adjustable = order
+        credit.save
       end
 
       def allow_receive?

data/app/models/spree/shipment.rb

@@ -15,7 +15,7 @@ module Spree
     attr_accessor :special_instructions
 
     attr_accessible :order, :state, :shipping_method, :special_instructions,
-                    :shipping_method_id, :tracking
+                    :shipping_method_id, :tracking, :address, :inventory_units
 
     accepts_nested_attributes_for :address
     accepts_nested_attributes_for :inventory_units

data/app/models/spree/shipping_method.rb

@@ -3,11 +3,11 @@ module Spree
     DISPLAY = [:both, :front_end, :back_end]
     belongs_to :zone
     has_many :shipments
-    validates :name, :calculator, :zone, :presence => true
+    validates :name, :zone, :presence => true
     belongs_to :shipping_category
 
-    attr_accessible :name, :zone_id, :display_on, :shipping_category_id, 
-                    :match_none, :match_one, :match_all, :calculator_type
+    attr_accessible :name, :zone_id, :display_on, :shipping_category_id,
+                    :match_none, :match_one, :match_all
 
     calculated_adjustments
 

data/app/models/spree/taxon.rb

@@ -6,9 +6,10 @@ module Spree
     has_and_belongs_to_many :products, :join_table => 'spree_products_taxons'
     before_create :set_permalink
 
-    attr_accessible :name, :parent_id, :position, :icon, :description, :permalink
+    attr_accessible :name, :parent_id, :position, :icon, :description, :permalink, :taxonomy_id
 
     validates :name, :presence => true
+
     has_attached_file :icon,
       :styles => { :mini => '32x32>', :normal => '128x128>' },
       :default_style => :mini,

data/app/models/spree/variant.rb

@@ -112,6 +112,41 @@ module Spree
       deleted_at
     end
 
+    def set_option_value(opt_name, opt_value)
+      # no option values on master
+      return if self.is_master
+
+      option_type = Spree::OptionType.find_or_initialize_by_name(opt_name) do |o|
+        o.presentation = opt_name
+        o.save!
+      end
+
+      current_value = self.option_values.detect { |o| o.option_type.name == opt_name }
+
+      unless current_value.nil?
+        return if current_value.name == opt_value
+        self.option_values.delete(current_value)
+      else
+        # then we have to check to make sure that the product has the option type
+        unless self.product.option_types.include? option_type
+          self.product.option_types << option_type
+          self.product.save
+        end
+      end
+
+      option_value = Spree::OptionValue.find_or_initialize_by_option_type_id_and_name(option_type.id, opt_value) do |o|
+        o.presentation = opt_value
+        o.save!
+      end
+
+      self.option_values << option_value
+      self.save
+    end
+
+    def option_value(opt_name)
+      self.option_values.detect { |o| o.option_type.name == opt_name }.try(:presentation)
+    end
+
     private
       # Ensures a new variant takes the product master price when price is not supplied
       def check_price

data/app/views/spree/admin/shared/_head.html.erb

@@ -4,9 +4,9 @@
 <%= t(controller.controller_name, :default => controller.controller_name.titleize) %></title>
 <%= javascript_tag do %>
   ajax_urls = <%== {
-    :product_search_json       => spree.admin_products_url(:format => 'json'),
-    :product_search_basic_json => spree.admin_products_url(:format => 'json', :json_format => 'basic', :limit => 10),
-    :user_search_basic_json    => spree.admin_users_url(:format => 'json', :json_format => 'basic', :limit => 10)
+    :product_search_json       => spree.admin_products_path(:format => 'json'),
+    :product_search_basic_json => spree.admin_products_path(:format => 'json', :json_format => 'basic', :limit => 10),
+    :user_search_basic_json    => spree.admin_users_path(:format => 'json', :json_format => 'basic', :limit => 10)
   }.to_json %>;
 
   strings = <%==

data/app/views/spree/layouts/admin.html.erb

@@ -4,7 +4,7 @@
 <head data-hook="admin_inside_head">
   <%= render :partial => 'spree/admin/shared/head' %>
 </head>
-<body class='admin'>
+<body class='admin' data-ajax-root-path="<%= spree.root_path %>">
 <!--[if IE 7]>
 <div id='IE7'>
 <![endif]-->

data/db/migrate/20120507232704_increase_scale_of_tax_rate_amount.rb

@@ -0,0 +1,9 @@
+class IncreaseScaleOfTaxRateAmount < ActiveRecord::Migration
+  def up
+    change_column :spree_tax_rates, :amount, :decimal, { :scale => 5, :precision => 8 }
+  end
+
+  def down
+    change_column :spree_tax_rates, :amount, :decimal, { :scale => 4, :precision => 8 }
+  end
+end

data/lib/spree/core/permalinks.rb

@@ -46,25 +46,14 @@ module Spree
       def save_permalink
         permalink_value = self.to_param
         field = self.class.permalink_field
-        order = self.class.permalink_order
-        # Do other links exist with this permalink?
-        other = self.class.first(
-          :conditions => "#{field} LIKE '#{permalink_value}%'",
-          :order => "#{order} LENGTH(#{field}) DESC, #{field} DESC"
-        )
-        if other
-          # Find existence of that permalink or the number of that permalink and add one.
-          if ( permalink_value == other.send(field) || /-(\d+)$/.match(other.send(field)) )
-            if $1
-              number = $1.to_i + 1
-            # Otherwise default to suffixing it with a 1.
-            else
-              number = 1
-            end
-
+          # Do other links exist with this permalink?
+          other = self.class.all(:conditions => "#{field} LIKE '#{permalink_value}%'")
+          unless other.empty?
+            # Find the existing permalink with the highest number, and increment that number.
+            # (If none of the existing permalinks have a number, this will evaluate to 1.)
+            number = other.map { |o| o.send(field)[/-(\d+)$/, 1].to_i }.max + 1
             permalink_value += "-#{number.to_s}"
           end
-        end
         write_attribute(field, permalink_value)
       end
     end

data/lib/spree/core/respond_with.rb

@@ -7,7 +7,7 @@ module ActionController
       if collector = retrieve_collector_from_mimes(&block)
         options = resources.size == 1 ? {} : resources.extract_options!
 
-        if defined_response = collector.response and Spree::BaseController.spree_responders.empty?
+        if defined_response = collector.response and !Spree::BaseController.spree_responders.keys.include?(self.class.to_s.to_sym)
           if action = options.delete(:action)
             render :action => action
           else

data/lib/spree/core/testing_support/factories.rb

@@ -1,6 +1,6 @@
 Spree::Zone.class_eval do
   def self.global
-    find_by_name("GlobalZone") || Factory(:global_zone)
+    find_by_name("GlobalZone") || create(:global_zone)
   end
 end
 
@@ -9,4 +9,3 @@ require 'factory_girl'
 Dir["#{File.dirname(__FILE__)}/factories/**"].each do |f|
   require File.expand_path(f)
 end
-

data/lib/spree/core/testing_support/factories/adjustment_factory.rb

@@ -1,16 +1,16 @@
 FactoryGirl.define do
   factory :adjustment, :class => Spree::Adjustment do
-    adjustable { Factory(:order) }
+    adjustable { FactoryGirl.create(:order) }
     amount '100.0'
     label 'Shipping'
-    source { Factory(:shipment) }
+    source { FactoryGirl.create(:shipment) }
     eligible true
   end
   factory :line_item_adjustment, :class => Spree::Adjustment do
-    adjustable { Factory(:line_item) }
+    adjustable { FactoryGirl.create(:line_item) }
     amount '10.0'
     label 'VAT 5%'
-    source { Factory(:tax_rate) }
+    source { FactoryGirl.create(:tax_rate) }
     eligible true
   end
 end

data/lib/spree/core/testing_support/factories/inventory_unit_factory.rb

@@ -1,9 +1,9 @@
 FactoryGirl.define do
   factory :inventory_unit, :class => Spree::InventoryUnit do
-    variant { Factory(:variant) }
-    order { Factory(:order) }
+    variant { FactoryGirl.create(:variant) }
+    order { FactoryGirl.create(:order) }
     state 'sold'
-    shipment { Factory(:shipment, :state => 'pending') }
-    #return_authorization { Factory(:return_authorization) }
+    shipment { FactoryGirl.create(:shipment, :state => 'pending') }
+    #return_authorization { FactoryGirl.create(:return_authorization) }
   end
 end

data/lib/spree/core/testing_support/factories/order_factory.rb

@@ -10,21 +10,21 @@ FactoryGirl.define do
   end
 
   factory :order_with_totals, :parent => :order do
-    after_create { |order| Factory(:line_item, :order => order) }
+    after_create { |order| FactoryGirl.create(:line_item, :order => order) }
   end
 
   factory :order_with_inventory_unit_shipped, :parent => :order do
     after_create do |order|
-      Factory(:line_item, :order => order)
-      Factory(:inventory_unit, :order => order, :state => 'shipped')
+      FactoryGirl.create(:line_item, :order => order)
+      FactoryGirl.create(:inventory_unit, :order => order, :state => 'shipped')
     end
   end
 
   factory :completed_order_with_totals, :parent => :order_with_totals do
-    bill_address { Factory(:address) }
-    ship_address { Factory(:address) }
+    bill_address { FactoryGirl.create(:address) }
+    ship_address { FactoryGirl.create(:address) }
     after_create do |order|
-      Factory(:inventory_unit, :order => order, :state => 'shipped')
+      FactoryGirl.create(:inventory_unit, :order => order, :state => 'shipped')
     end
     state 'complete'
     completed_at Time.now

data/lib/spree/core/testing_support/factories/payment_factory.rb

@@ -1,9 +1,9 @@
 FactoryGirl.define do
   factory :payment, :class => Spree::Payment do
     amount 45.75
-    payment_method { Factory(:bogus_payment_method) }
-    source { Factory.build(:creditcard) }
-    order { Factory(:order) }
+    payment_method { FactoryGirl.create(:bogus_payment_method) }
+    source { FactoryGirl.build(:creditcard) }
+    order { FactoryGirl.create(:order) }
     state 'pending'
     response_code '12345'
 

data/lib/spree/core/testing_support/factories/product_factory.rb

@@ -17,7 +17,7 @@ FactoryGirl.define do
   end
 
   factory :product_with_option_types, :parent => :product do
-    after_create { |product| Factory(:product_option_type, :product => product) }
+    after_create { |product| FactoryGirl.create(:product_option_type, :product => product) }
   end
 
   factory :custom_product, :class => Spree::Product do

data/lib/spree/core/testing_support/factories/product_option_type_factory.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :product_option_type, :class => Spree::ProductOptionType do
-    product { Factory(:product) }
-    option_type { Factory(:option_type) }
+    product { FactoryGirl.create(:product) }
+    option_type { FactoryGirl.create(:option_type) }
   end
 end

data/lib/spree/core/testing_support/factories/product_property_factory.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :product_property, :class => Spree::ProductProperty do
-    product { Factory(:product) }
-    property { Factory(:property) }
+    product { FactoryGirl.create(:product) }
+    property { FactoryGirl.create(:property) }
   end
 end

data/lib/spree/core/testing_support/factories/prototype_factory.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :prototype, :class => Spree::Prototype do
     name 'Baseball Cap'
-    properties { [Factory(:property)] }
+    properties { [FactoryGirl.create(:property)] }
   end
 end

data/lib/spree/core/testing_support/factories/return_authorization_factory.rb

@@ -2,8 +2,8 @@ FactoryGirl.define do
   factory :return_authorization, :class => Spree::ReturnAuthorization do
     number '100'
     amount 100.00
-    #order { Factory(:order) }
-    order { Factory(:order_with_inventory_unit_shipped) }
+    #order { FactoryGirl.create(:order) }
+    order { FactoryGirl.create(:order_with_inventory_unit_shipped) }
     reason 'no particular reason'
     state 'received'
   end

data/lib/spree/core/testing_support/factories/shipment_factory.rb

@@ -1,11 +1,11 @@
 FactoryGirl.define do
   factory :shipment, :class => Spree::Shipment do
-    order { Factory(:order) }
-    shipping_method { Factory(:shipping_method) }
+    order { FactoryGirl.create(:order) }
+    shipping_method { FactoryGirl.create(:shipping_method) }
     tracking 'U10000'
     number '100'
     cost 100.00
-    address { Factory(:address) }
+    address { FactoryGirl.create(:address) }
     state 'pending'
   end
 end

data/lib/spree/core/testing_support/factories/shipping_method_factory.rb

@@ -2,13 +2,13 @@ FactoryGirl.define do
   factory :shipping_method, :class => Spree::ShippingMethod do
     zone { |a| Spree::Zone.find_by_name('GlobalZone') || a.association(:global_zone) }
     name 'UPS Ground'
-    calculator { Factory.build(:calculator) }
+    calculator { FactoryGirl.build(:calculator) }
   end
 
   factory :free_shipping_method, :class => Spree::ShippingMethod do
     zone { |a| Spree::Zone.find_by_name('GlobalZone') || a.association(:global_zone) }
     name 'UPS Ground'
-    calculator { Factory.build(:no_amount_calculator) }
+    calculator { FactoryGirl.build(:no_amount_calculator) }
   end
 
   factory :shipping_method_with_category, :class => Spree::ShippingMethod do
@@ -18,6 +18,6 @@ FactoryGirl.define do
     match_one nil
     match_all nil
     association(:shipping_category, :factory => :shipping_category)
-    calculator { Factory.build(:calculator) }
+    calculator { FactoryGirl.build(:calculator) }
   end
 end

data/lib/spree/core/testing_support/factories/tax_rate_factory.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :tax_rate, :class => Spree::TaxRate do
-    zone { Factory(:zone) }
+    zone { FactoryGirl.create(:zone) }
     amount 100.00
-    tax_category { Factory(:tax_category) }
+    tax_category { FactoryGirl.create(:tax_category) }
   end
 end

data/lib/spree/core/testing_support/factories/taxon_factory.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :taxon, :class => Spree::Taxon do
     name 'Ruby on Rails'
-    taxonomy { Factory(:taxonomy) }
+    taxonomy { FactoryGirl.create(:taxonomy) }
     parent_id nil
   end
 end

data/lib/spree/core/testing_support/factories/user_factory.rb

@@ -12,6 +12,6 @@ FactoryGirl.define do
   end
 
   factory :admin_user, :parent => :user do
-    roles { [Spree::Role.find_by_name('admin') || Factory(:role, :name => 'admin')]}
+    roles { [Spree::Role.find_by_name('admin') || FactoryGirl.create(:role, :name => 'admin')]}
   end
 end

data/lib/spree/core/testing_support/factories/variant_factory.rb

@@ -11,6 +11,6 @@ FactoryGirl.define do
 
     # associations:
     product { |p| p.association(:product) }
-    option_values { [Factory(:option_value)] }
+    option_values { [FactoryGirl.create(:option_value)] }
   end
 end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.1.0"
+    "1.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70132425348640 !ruby/object:Gem::Requirement
+  requirement: &70318236789620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70132425348640
+  version_requirements: *70318236789620
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &70132425347980 !ruby/object:Gem::Requirement
+  requirement: &70318236802480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70132425347980
+  version_requirements: *70318236802480
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70132425347340 !ruby/object:Gem::Requirement
+  requirement: &70318236799920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70132425347340
+  version_requirements: *70318236799920
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70132425346420 !ruby/object:Gem::Requirement
+  requirement: &70318236798400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *70132425346420
+  version_requirements: *70318236798400
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70132425345560 !ruby/object:Gem::Requirement
+  requirement: &70318236810320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70132425345560
+  version_requirements: *70318236810320
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70132425360140 !ruby/object:Gem::Requirement
+  requirement: &70318236825880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70132425360140
+  version_requirements: *70318236825880
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70132425357460 !ruby/object:Gem::Requirement
+  requirement: &70318236822420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70132425357460
+  version_requirements: *70318236822420
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70132425354260 !ruby/object:Gem::Requirement
+  requirement: &70318236844440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70132425354260
+  version_requirements: *70318236844440
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &70132425384220 !ruby/object:Gem::Requirement
+  requirement: &70318236839880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70132425384220
+  version_requirements: *70318236839880
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70132425382540 !ruby/object:Gem::Requirement
+  requirement: &70318236853080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 1.20.4
   type: :runtime
   prerelease: false
-  version_requirements: *70132425382540
+  version_requirements: *70318236853080
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70132425381100 !ruby/object:Gem::Requirement
+  requirement: &70318236860820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +134,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70132425381100
+  version_requirements: *70318236860820
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70132425392620 !ruby/object:Gem::Requirement
+  requirement: &70318236885120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +145,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70132425392620
+  version_requirements: *70318236885120
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70132425387500 !ruby/object:Gem::Requirement
+  requirement: &70318236881940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,10 +156,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70132425387500
+  version_requirements: *70318236881940
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70132425385100 !ruby/object:Gem::Requirement
+  requirement: &70318236902600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -167,7 +167,7 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70132425385100
+  version_requirements: *70318236902600
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -868,6 +868,7 @@ files:
 - db/migrate/20120203153759_add_deleted_at_to_tax_category.rb
 - db/migrate/20120315064358_migrate_images_from_products_to_variants.rb
 - db/migrate/20120416233427_rename_attachment_size_to_attachment_file_size.rb
+- db/migrate/20120507232704_increase_scale_of_tax_rate_amount.rb
 - db/sample/users.rb
 - db/seeds.rb
 - vendor/assets/images/datepicker/cal.gif
@@ -968,7 +969,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2250496839152331982
+      hash: -3177419443841864347
 requirements:
 - none
 rubyforge_project: spree_core