spree_core 1.3.1 → 1.3.2

data/app/models/spree/shipment.rb

@@ -90,7 +90,7 @@ module Spree
 
     def line_items
       if order.complete? and Spree::Config[:track_inventory_levels]
-        order.line_items.select { |li| inventory_units.map(&:variant_id).include?(li.variant_id) }
+        order.line_items.select { |li| inventory_units.pluck(:variant_id).include?(li.variant_id) }
       else
         order.line_items
       end

data/app/models/spree/variant.rb

@@ -87,7 +87,7 @@ module Spree
     end
 
     def options_text
-      values = self.option_values.sort_by(&:position)
+      values = self.option_values.joins(:option_type).order("#{Spree::OptionType.table_name}.position asc")
 
       values.map! do |ov|
         "#{ov.option_type.presentation}: #{ov.presentation}"

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

@@ -55,7 +55,7 @@
                     <%= radio_button_tag :currency_symbol_position, "before" %>
                     <%= label_tag :currency_symbol_position_before, Spree::Money.new(10, :symbol_position => "before") %>
                   </li>
-                  <li>
+                  <li class="white-space-nowrap">
                     <%= radio_button_tag :currency_symbol_position, "after" %>
                     <%= label_tag :currency_symbol_position_after, Spree::Money.new(10, :symbol_position => "after") %>
                   </li>
@@ -69,7 +69,7 @@
       <div class="form-buttons filter-actions actions" data-hook="buttons">
         <%= button t(:update), 'icon-refresh' %>
         <span class="or"><%= t(:or) %></span>
-        <%= link_to_with_icon 'icon-remove', t(:cancel), admin_general_settings_url, :class => 'button' %>
+        <%= link_to_with_icon 'icon-remove', t(:cancel), edit_admin_general_settings_url, :class => 'button' %>
       </div>
 
     </fieldset>

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

@@ -8,7 +8,7 @@
 
 <div id="images" data-hook></div>
 
-<% unless @product.images.any? %>
+<% unless @product.images.any? || @product.variant_images.any? %>
   <div class="no-objects-found">
     <%= t(:no_images_found) %>.
   </div>
@@ -17,10 +17,8 @@
     <colgroup>
       <col style="width: 5%">
       <col style="width: 10%">
-      <% if @product.has_variants? %>
-        <col style="width: 25%">
-      <% end %>
-      <col style="width: <% if @product.has_variants? %>45%<% else %>70%<% end %>">
+      <col style="width: 25%">
+      <col style="width: 45%">
       <col style="width: 15%">
     </colgroup>
     <thead>
@@ -35,7 +33,7 @@
     </thead>
 
     <tbody>
-      <% @product.images.each do |image| %>
+      <% (@product.images + @product.variant_images).each do |image| %>
         <tr id="<%= spree_dom_id image %>" data-hook="images_row" class="<%= cycle('odd', 'even')%>">
           <td class="no-border">
             <span class="handle"></span>
@@ -43,9 +41,7 @@
           <td>
             <%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %>
           </td>
-          <% if @product.has_variants? %>
-            <td><%= t(:all) %></td>
-          <% end %>
+          <td><%= options_text_for(image) %></td>
           <td><%= image.alt %></td>
           <td class="actions">
             <%= link_to_with_icon 'icon-edit', t(:edit), edit_admin_product_image_url(@product, image), :no_text => true, :data => {:action => 'edit'} %>
@@ -53,29 +49,6 @@
           </td>
         </tr>
       <% end %>
-
-      <% @product.variants.each do |variant| %>
-        <% variant.images.each do |image| %>
-          <tr id="<%= spree_dom_id image %>" data-hook="images_row" class="<%= cycle('odd', 'even')%>">
-            <td class="no-border">
-              <span class="handle"></span>
-            </td>
-            <td>
-              <%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %>
-            </td>
-            <% if @product.has_variants? %>
-              <td><%= variant.options_text %></td>
-            <% end %>
-            <td>
-              <%= image.alt %>
-            </td>
-            <td class="actions">
-              <%= link_to_with_icon 'icon-edit', t(:edit), edit_admin_product_image_url(@product, image), :no_text => true, :data => {:action => 'edit'} %>
-              <%= link_to_delete image, {:url => admin_product_image_url(@product, image), :no_text => true }%>
-            </td>
-          </tr>
-        <% end %>
-      <% end %>
     </tbody>
   </table>
-<% end %>
+<% end %>

data/app/views/spree/admin/orders/_form.html.erb

@@ -38,7 +38,7 @@
         <tbody id="order-charges" data-hook="admin_order_form_adjustments" class="no-border-top">
           <% @order.adjustments.eligible.each do |adjustment| %>
             <tr>
-              <td colspan="3"><strong><%= adjustment.label %></strong></td>
+              <td colspan="3"><strong><%= adjustment.label %>:</strong></td>
               <td class="total align-center"><span><%= adjustment.display_amount %></span></td>
               <td class="actions"></td>
             </tr>

data/app/views/spree/admin/payment_methods/_form.html.erb

@@ -21,6 +21,10 @@
         <%= label_tag nil, t(:environment) %>
         <%= collection_select(:payment_method, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'gtwy-env', :class => 'select2 fullwidth'}) %>        
       </div>
+      <div data-hook="display" class="field">
+        <%= label_tag nil, t(:display) %>
+        <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'}) %>
+      </div>
       <div data-hook="active" class="field">
         <%= label_tag nil, t(:active) %>
         <ul>

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

@@ -24,6 +24,7 @@
       <th><%= t(:name) %></th>
       <th><%= t(:provider) %></th>
       <th><%= t(:environment) %></th>
+      <th><%= t(:display) %></th>
       <th><%= t(:active) %></th>
       <th data-hook="admin_payment_methods_index_header_actions" class="actions"></th>
     </tr>  
@@ -34,6 +35,7 @@
         <td class="align-center"><%= method.name %></td>
         <td><%= method.type %></td>
         <td class="align-center"><%= method.environment.to_s.titleize %></td>
+        <td class="align-center"><%= method.display_on.blank? ? t(:both) : t(method.display_on) %></td>
         <td class="align-center"><%= method.active ? t(:yes) : t(:no) %></td>
         <td data-hook="admin_payment_methods_index_row_actions" class="actions">
           <%= link_to_edit method, :no_text => true %>
@@ -42,4 +44,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

data/app/views/spree/admin/product_properties/_product_property_fields.html.erb

@@ -1,4 +1,8 @@
-<tr class="product_property fields"  data-hook="product_property">
+<tr class="product_property fields" id="spree_<%= dom_id(f.object) %>" data-hook="product_property">
+  <td class="no-border">
+    <span class="handle"></span>
+    <%= f.hidden_field :id %>
+  </td>
   <td class='property_name'>
     <%= f.text_field :property_name, :class => 'autocomplete' %>
   </td>

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

@@ -24,10 +24,10 @@
     <div id="prototypes" data-hook></div>
     <%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
     
-    <table class="index">
+    <table class="index sortable" data-hook data-sortable-link="<%= update_positions_admin_product_product_properties_url %>">
       <thead>
         <tr data-hook="product_properties_header">
-          <th><%= t(:property) %></th>
+          <th colspan="2"><%= t(:property) %></th>
           <th><%= t(:value) %></th>
           <th class="actions"></th>
         </tr>

data/app/views/spree/admin/products/_form.html.erb

@@ -47,12 +47,7 @@
     <%= f.field_container :available_on do %>
       <%= f.label :available_on, t(:available_on) %>
       <%= f.error_message_on :available_on %>
-      <% if @product.available_on? %>
-        <% available_on = l(@product.available_on, :format => t('spree.date_picker.format')) %>
-      <% else %>
-        <% available_on = nil %>
-      <% end %>
-      <%= f.text_field :available_on, :value => available_on, :class => 'datepicker' %>
+      <%= f.text_field :available_on, :value => datepicker_field_value(@product.available_on), :class => 'datepicker' %>
     <% end %>
 
     <% unless @product.has_variants? %>

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

@@ -1,5 +1,8 @@
 <% content_for :page_actions do %>
-  <li><%= button_link_to t(:back_to_products_list), admin_products_url, :icon => 'icon-arrow-left' %></li>
+  <li><%= button_link_to t(:back_to_products_list), session[:return_to] || admin_products_url, :icon => 'icon-arrow-left' %></li>
+  <li id="new_product_link">
+    <%= button_link_to t(:new_product), new_object_url, { :remote => true, :icon => 'icon-plus', :id => 'admin_new_product' } %>
+  </li>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/product_sub_menu' %>

data/app/views/spree/admin/prototypes/_form.html.erb

@@ -11,7 +11,7 @@
     <div id='properties' data-hook>
       <%= f.field_container :property_ids do %>
         <%= f.label :property_ids, t(:properties) %><br>
-        <%= f.select :property_ids, Spree::Property.sorted.map { |p| [p.presentation, p.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
+        <%= f.select :property_ids, Spree::Property.all.map { |p| [p.presentation, p.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
       <% end %>
     </div>
   </div>

data/app/views/spree/admin/prototypes/select.js.erb

@@ -1,4 +1,4 @@
-<% @prototype_properties.each do |prop| %>
+<% @prototype_properties.sort_by{ |prop| -prop[:id] }.each do |prop| %>
   $("a.add_fields").click();
-  $(".product_property.fields:last input:first").val("<%= prop.name %>");
+  $(".product_property.fields:first input:first").val("<%= prop.name %>");
 <% end %>

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

@@ -13,7 +13,7 @@
   <i class="icon-arrow-right"></i> <%= t(:return_authorizations) %>
 <% end %>
 
-<% if @order.inventory_units.any? &:shipped? %>
+<% if @order.inventory_units.any?(&:shipped?) || @order.return_authorizations.any? %>
   <table class="index">
     <thead data-hook="rma_header">
       <tr>

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

@@ -2,4 +2,4 @@
 <%= tab :orders, :payments, :creditcard_payments, :shipments, :credit_cards, :return_authorizations, :icon => 'icon-shopping-cart' %>
 <%= tab :products , :option_types, :properties, :prototypes, :variants, :product_properties, :taxons, :icon => 'icon-th-large' %>
 <%= tab :reports, :icon => 'icon-file'  %>
-<%= tab :configurations, :general_settings, :mail_methods, :tax_categories, :zones, :states, :payment_methods, :inventory_settings, :taxonomies, :shipping_methods, :trackers, :label => 'configuration', :icon => 'icon-wrench', :url => edit_admin_general_settings_path %>
+<%= tab :configurations, :general_settings, :mail_methods, :tax_categories, :zones, :states, :payment_methods, :inventory_settings, :taxonomies, :shipping_methods, :trackers, :label => 'configuration', :icon => 'icon-wrench', :url => spree.edit_admin_general_settings_path %>

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

@@ -13,7 +13,7 @@
     :destroy             => I18n.t(:destroy),
     :edit                => I18n.t(:edit),
     :loading             => I18n.t(:loading),
-    :month_names         => I18n.t(:month_names, :scope => :date).delete_if(&:blank?),
+    :month_names         => I18n.t(:month_names, :scope => :date).reject(&:blank?),
     :more                => I18n.t(:more),
     :name                => I18n.t(:name),
     :next                => I18n.t(:next),

data/app/views/spree/admin/shipments/_form.html.erb

@@ -17,7 +17,7 @@
               <%= check_box_tag "inventory_units[#{inventory_unit.id}]",
                                 :true,
                                 (inventory_unit.shipment == @shipment),
-                                { :disabled => %w(shipped backordered returned).include?(inventory_unit.state),
+                                { :disabled => %w(shipped backordered).include?(inventory_unit.state),
                                   :class => 'inventory_unit'} %>
             </td>
             <td style="vertical-align:top; width:120px;"><%= inventory_unit.variant.sku %></td>

data/app/views/spree/admin/shipping_methods/_form.html.erb

@@ -1,4 +1,4 @@
-<div data-hook="admin_shipping_method_form_fields">
+<div data-hook="admin_shipping_method_form_fields" class="alpha twelve columns">
   <div class="alpha four columns">
     <%= f.field_container :name do %>
       <%= f.label :name, t(:name) %><br />
@@ -34,14 +34,14 @@
     <% end %>
 
     <div class="field">
-      <%= label_tag t(:match_rule) %> 
+      <%= label_tag t(:match_rule) %>
       <ul>
         <li><%= f.check_box :match_none %> <%= f.label :match_none, t('match_choices.none') %></li>
         <li><%= f.check_box :match_one %>  <%= f.label :match_one, t('match_choices.one') %></li>
         <li><%= f.check_box :match_all %>  <%= f.label :match_all, t('match_choices.all') %></li>
       </ul>
     </div>
-    
+
   </fieldset>
 </div>
 

data/app/views/spree/admin/taxonomies/get_children.json.erb

@@ -1,7 +1,7 @@
 [<% @taxons.each_with_index do |t,i| %>
   { "attr" :
     { "id" : "<%= t.id %>" },
-    "data" : "<%= escape_javascript(raw(t.name)) %>"
+    "data" : "<%= raw(t.name.gsub('"','\"')) %>"
     <% unless t.children.empty? %>
       ,"state" : "closed"
     <% end %>

data/app/views/spree/admin/variants/_autocomplete.js.erb

@@ -20,7 +20,7 @@
       {{#if variant.option_values}}
         <ul class='variant-options'>
           {{#each variant.option_values}}
-            <li><strong>{{option_value.option_type.presentation}}:</strong> {{option_value.presentation}}</li>
+            <li><strong>{{this.option_type.presentation}}:</strong> {{this.presentation}}</li>
           {{/each}}
         </ul>
       {{/if}}

data/app/views/spree/shared/_order_details.html.erb

@@ -78,7 +78,7 @@
         </td>
         <td data-hook="order_item_description">
           <h4><%= item.variant.product.name %></h4>
-          <%= truncate(item.variant.product.description, :length => 100, :omission => "...") %>
+          <%= truncate(raw(item.variant.product.description), :length => 100, :omission => "...") %>
           <%= "(" + item.variant.options_text + ")" unless item.variant.option_values.empty? %>
         </td>
         <td data-hook="order_item_price" class="price"><span><%= item.variant.display_amount %></span></td>

data/config/routes.rb

@@ -53,7 +53,11 @@ Spree::Core::Engine.routes.draw do
         get :search
       end
 
-      resources :product_properties
+      resources :product_properties do
+        collection do
+          post :update_positions
+        end
+      end
       resources :images do
         collection do
           post :update_positions

data/db/migrate/20121031162139_split_prices_from_variants.rb

@@ -9,7 +9,7 @@ class SplitPricesFromVariants < ActiveRecord::Migration
     Spree::Variant.all.each do |variant|
       Spree::Price.create!(
         :variant_id => variant.id,
-        :amount => variant.price,
+        :amount => variant[:price],
         :currency => Spree::Config[:currency]
       )
     end

data/db/migrate/20130114053446_add_display_on_to_spree_payment_methods.rb

@@ -0,0 +1,9 @@
+class AddDisplayOnToSpreePaymentMethods < ActiveRecord::Migration
+  def self.up
+    add_column :spree_payment_methods, :display_on, :string
+  end
+
+  def self.down
+    remove_column :spree_payment_methods, :display_on
+  end
+end

data/db/migrate/20130120201805_add_position_to_product_properties.spree.rb

@@ -0,0 +1,6 @@
+class AddPositionToProductProperties < ActiveRecord::Migration
+  def change
+    add_column :spree_product_properties, :position, :integer, :default => 0
+  end
+end
+

data/db/migrate/20130203232234_add_identifier_to_spree_payments.rb

@@ -0,0 +1,5 @@
+class AddIdentifierToSpreePayments < ActiveRecord::Migration
+  def change
+    add_column :spree_payments, :identifier, :string
+  end
+end

data/lib/generators/spree/install/install_generator.rb

@@ -53,14 +53,17 @@ module Spree
       return unless File.exists? 'public/robots.txt'
       append_file "public/robots.txt", <<-ROBOTS
 User-agent: *
-Disallow: /checkouts
+Disallow: /checkout
+Disallow: /cart
 Disallow: /orders
 Disallow: /countries
 Disallow: /line_items
 Disallow: /password_resets
 Disallow: /states
 Disallow: /user_sessions
+Disallow: /user_registrations
 Disallow: /users
+Disallow: /account
       ROBOTS
     end
 

data/lib/spree/core/controller_helpers/common.rb

@@ -38,7 +38,7 @@ module Spree
           title_string = @title.present? ? @title : accurate_title
           if title_string.present?
             if Spree::Config[:always_put_site_name_in_title]
-              [default_title, title_string].join(' - ')
+              [title_string, default_title].join(' - ')
             else
               title_string
             end
@@ -76,8 +76,8 @@ module Spree
         def set_user_language
           locale = session[:locale]
           locale ||= Rails.application.config.i18n.default_locale
-          locale ||= I18n.default_locale unless I18n.available_locales.include?(locale.try(:to_sym))
-          I18n.locale = locale.to_sym
+          locale ||= I18n.default_locale unless I18n.available_locales.map(&:to_s).include?(locale)
+          I18n.locale = locale
         end
 
         # Returns which layout to render.

data/lib/spree/core/controller_helpers.rb

@@ -0,0 +1,13 @@
+module Spree
+  module Core
+    module ControllerHelpers
+      def self.included(base)
+        base.class_eval do
+          include Spree::Core::ControllerHelpers::Common
+          include Spree::Core::ControllerHelpers::Auth
+          include Spree::Core::ControllerHelpers::Order
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/engine.rb

@@ -1,3 +1,5 @@
+require 'rabl'
+
 module Spree
   module Core
     class Engine < ::Rails::Engine
@@ -14,12 +16,13 @@ module Spree
 
       config.to_prepare &method(:activate).to_proc
 
-      Rabl.configure do |config|
-        config.include_json_root = false
-        config.include_child_root = false
-      end
 
       config.after_initialize do
+        Rabl.configure do |config|
+          config.include_json_root = false
+          config.include_child_root = false
+        end
+
         ActiveSupport::Notifications.subscribe(/^spree\./) do |*args|
           event_name, start_time, end_time, id, payload = args
           Activator.active.event_name_starts_with(event_name).each do |activator|

data/lib/spree/core/permalinks.rb

@@ -42,7 +42,7 @@ module Spree
       def save_permalink(permalink_value=self.to_param)
         field = self.class.permalink_field
           # Do other links exist with this permalink?
-          other = self.class.where("#{field} LIKE ?", "#{permalink_value}%")
+          other = self.class.where("#{self.class.table_name}.#{field} LIKE ?", "#{permalink_value}%")
           if other.any?
             # 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.)

data/lib/spree/core/ssl_requirement.rb

@@ -1,5 +1,5 @@
 # ++
-# Copyright (c) 2007-2012, Spree Commerce, Inc. and other contributors
+# Copyright (c) 2007-2013, Spree Commerce, Inc. and other contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

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

@@ -1,8 +1,11 @@
 module AuthorizationHelpers
   module Controller
     def stub_authorization!
+      let(:ability_user) { stub_model(Spree::LegacyUser) }
+
       before do
-        controller.should_receive(:authorize!).twice.and_return(true)
+        controller.stub(:try_spree_current_user => ability_user)
+        controller.should_receive(:authorize!).and_return(true)
       end
     end
   end
@@ -27,4 +30,4 @@ end
 RSpec.configure do |config|
   config.extend AuthorizationHelpers::Controller, :type => :controller
   config.extend AuthorizationHelpers::Request, :type => :request
-end
+end

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

@@ -0,0 +1,17 @@
+# Fake ability for testing administration
+class BarAbility
+  include CanCan::Ability
+
+  def initialize(user)
+    user ||= Spree::User.new
+    if user.has_spree_role? 'bar'
+      # allow dispatch to :index and :show orders on the admin
+      can :index, Spree::Order
+      can :show, Spree::Order
+      can :admin, Spree::Order
+      # allow dispatch to :index, :show, :create and :update shipments on the admin
+      can :manage, Spree::Shipment
+      can :admin, Spree::Shipment
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :simple_product, :class => Spree::Product do
+  factory :base_product, :class => Spree::Product do
     sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" }
     description { Faker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
     price 19.99
@@ -7,13 +7,15 @@ FactoryGirl.define do
     sku 'ABC'
     available_on 1.year.ago
     deleted_at nil
+  end
+
+  factory :simple_product, :parent => :base_product do
     on_hand 5
   end
 
   factory :product, :parent => :simple_product do
     tax_category { |r| Spree::TaxCategory.first || r.association(:tax_category) }
     shipping_category { |r| Spree::ShippingCategory.first || r.association(:shipping_category) }
-    on_hand 5
   end
 
   factory :product_with_option_types, :parent => :product do

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

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :variant, :class => Spree::Variant do
+  factory :base_variant, :class => Spree::Variant do
     price 19.99
     cost_price 17.00
     sku    { Faker::Lorem.sentence }
@@ -7,10 +7,16 @@ FactoryGirl.define do
     height { BigDecimal.new("#{rand(200)}.#{rand(99)}") }
     width  { BigDecimal.new("#{rand(200)}.#{rand(99)}") }
     depth  { BigDecimal.new("#{rand(200)}.#{rand(99)}") }
-    on_hand 5
 
     # associations:
-    product { |p| p.association(:product) }
+    product { |p| p.association(:base_product) }
     option_values { [FactoryGirl.create(:option_value)] }
   end
+
+  factory :variant, :parent => :base_variant do
+    on_hand 5
+    
+    # associations:
+    product { |p| p.association(:product) }
+  end
 end

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

@@ -2,17 +2,23 @@ module Spree
   module Core
     module TestingSupport
       module Preferences
-        # Resets all preferences to default values, you can
-        # pass a block to override the defaults with a block
+        def reset_spree_preferences(&config_block)
+          Spree::Preferences::Store.instance.persistence = false
+          Spree::Preferences::Store.instance.clear_cache
+
+          configure_spree_preferences &config_block if block_given?
+        end
+
+        # The preference cache is cleared before each test, so the
+        # default values will be used. You can define preferences
+        # for your spec with:
         #
-        # reset_spree_preferences do |config|
+        # configure_spree_preferences do |config|
         #   config.site_name = "my fancy pants store"
         # end
         #
-        def reset_spree_preferences
-          Spree::Preferences::Store.instance.persistence = false
+        def configure_spree_preferences
           config = Rails.application.config.spree.preferences
-          config.reset
           yield(config) if block_given?
         end
 

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.3.1"
+    "1.3.2"
   end
 end

data/lib/spree/core.rb

@@ -1,5 +1,5 @@
 #++
-# Copyright (c) 2007-2012, Spree Commerce, Inc. and other contributors
+# Copyright (c) 2007-2013, Spree Commerce, Inc. and other contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/spree/scopes/dynamic.rb

@@ -11,7 +11,7 @@ module Spree
         scopes = []
 
         # Price based scopes
-        all_prices = products.map(&:price).sort
+        all_prices = products.pluck(:price).sort
 
         ranges = [Math.log(products.length).floor, scope_limit].max
 

data/lib/tasks/core.rake

@@ -3,13 +3,13 @@ require 'spree/core/custom_fixtures'
 
 namespace :db do
   desc %q{Loads a specified fixture file:
-For .yml/.csv use rake db:load_file[spree/filename.yml,/absolute/path/to/parent/]
+For .yml      use rake db:load_file[spree/filename.yml,/absolute/path/to/parent/]
 For .rb       use rake db:load_file[/absolute/path/to/sample/filename.rb]}
 
   task :load_file , [:file, :dir] => :environment do |t, args|
     file = Pathname.new(args.file)
 
-    if %w{.csv .yml}.include? file.extname
+    if %w{.yml}.include? file.extname
       puts "loading fixture #{Pathname.new(args.dir).join(file)}"
       Spree::Core::Fixtures.create_fixtures(args.dir, file.to_s.sub(file.extname, ""))
     elsif file.exist?
@@ -25,7 +25,7 @@ For .rb       use rake db:load_file[/absolute/path/to/sample/filename.rb]}
 
     fixtures = ActiveSupport::OrderedHash.new
     ruby_files = ActiveSupport::OrderedHash.new
-    Dir.glob(File.join(dir , '**/*.{yml,csv,rb}')).each do |fixture_file|
+    Dir.glob(File.join(dir , '**/*.{yml,rb}')).each do |fixture_file|
       ext = File.extname fixture_file
       if ext == ".rb"
         ruby_files[File.basename(fixture_file, '.*')] = fixture_file