spree 0.11.2 → 0.11.3

data/lib/spree/initializer.rb

@@ -42,7 +42,7 @@ module Spree
       end
 
       # Provide the load paths for the Spree installation
-      def default_load_paths
+      def default_autoload_paths
         paths = ["#{SPREE_ROOT}/test/mocks/#{environment}"]
 
         # Add the app's controller directory
@@ -129,7 +129,7 @@ module Spree
 
 
     def initialize_framework_views
-      view_paths = returning [] do |arr|
+      view_paths = [].tap do |arr|
         # Add the singular view path if it's not in the list
         arr << configuration.view_path if !configuration.view_paths.include?(configuration.view_path)
         # Add the default view paths
@@ -158,6 +158,7 @@ module Spree
       extension_loader.add_controller_paths
       super
     end
+    
 
     def initialize_metal
       Rails::Rack::Metal.metal_paths += ["#{SPREE_ROOT}/app/metal"]

data/lib/validation_group.rb

@@ -14,7 +14,7 @@ module ValidationGroup
           def self.validation_groups(all_classes = false)
             return (self.validation_group_classes[self] || {}) unless all_classes
             klasses = ValidationGroup::Util.current_and_ancestors(self).reverse
-            returning Hash.new do |hash|
+            Hash.new.tap do |hash|
               klasses.each do |klass|
                 hash.merge! self.validation_group_classes[klass]
               end
@@ -129,7 +129,7 @@ end
     # Return array consisting of current and its superclasses down to and
     # including base_class.
     def self.current_and_ancestors(current)
-      returning [] do |klasses|
+      [].tap do |klasses|
         klasses << current
         root = current.base_class
         until current == root

data/vendor/extensions/api/Rakefile

@@ -18,7 +18,7 @@ unless defined? SPREE_ROOT
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/testtask'
 
 rspec_base = File.expand_path(SPREE_ROOT + '/vendor/plugins/rspec/lib')

data/vendor/extensions/overview_dashboard/Rakefile

@@ -18,7 +18,7 @@ unless defined? SPREE_ROOT
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/testtask'
 
 rspec_base = File.expand_path(SPREE_ROOT + '/vendor/plugins/rspec/lib')

data/vendor/extensions/payment_gateway/Rakefile

@@ -18,7 +18,7 @@ unless defined? SPREE_ROOT
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/testtask'
 
 rspec_base = File.expand_path(SPREE_ROOT + '/vendor/plugins/rspec/lib')

data/vendor/extensions/payment_gateway/app/models/gateway/authorize_net.rb

@@ -1,8 +1,14 @@
 class Gateway::AuthorizeNet < Gateway
 	preference :login, :string
 	preference :password, :string
-	
+
   def provider_class
     ActiveMerchant::Billing::AuthorizeNetGateway
-  end	
+  end
+
+  def options
+    # add :test key in the options hash, as that is what the ActiveMerchant::Billing::AuthorizeNetGateway expects
+    self.class.default_preferences[:test] = true if self.prefers? :test_mode
+    super
+  end
 end

data/vendor/extensions/payment_gateway/app/models/gateway/authorize_net_cim.rb

@@ -12,6 +12,12 @@ class Gateway::AuthorizeNetCim < Gateway
     self.class
   end
 
+  def options
+    # add :test key in the options hash, as that is what the ActiveMerchant::Billing::AuthorizeNetGateway expects
+    self.class.default_preferences[:test] = true if self.prefers? :test_mode
+    super
+  end
+
   def authorize(amount, creditcard, gateway_options)
     create_transaction(amount, creditcard, :auth_only)
   end

data/vendor/extensions/theme_default/Rakefile

@@ -18,7 +18,7 @@ unless defined? SPREE_ROOT
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/testtask'
 
 rspec_base = File.expand_path(SPREE_ROOT + '/vendor/plugins/rspec/lib')

data/vendor/extensions/theme_default/app/views/admin/adjustments/_form.html.erb

@@ -1,6 +1,3 @@
-<%= hidden_field :adjustment, :adjustment_source_id, :value => @order.id %>
-<%= hidden_field :adjustment, :adjustment_source_type, :value => @order.class %>
-
 <% f.field_container :amount do %>
   <%= f.label :amount, t("amount")%> <span class="required">*</span><br />
   <%= text_field :adjustment, :amount, {:style => "width:80px;"} %>

data/vendor/extensions/theme_default/app/views/admin/adjustments/new.html.erb

@@ -4,6 +4,9 @@
 
 <%=error_messages_for :adjustment %>
 <% form_for @adjustment, :url => collection_url do |f| %>
+  <%= hidden_field :adjustment, :adjustment_source_id, :value => @order.id %>
+  <%= hidden_field :adjustment, :adjustment_source_type, :value => @order.class %>
+
   <%= render :partial => "form", :locals => {:f => f} %>
 
   <p class="form-buttons">

data/vendor/extensions/theme_default/app/views/admin/general_settings/edit.html.erb

@@ -28,6 +28,14 @@
     </label>
   </p>
 
+  <p>
+    <label>
+      <input name="preferences[check_for_spree_alerts]" type="hidden" value="0" />
+      <%= check_box_tag('preferences[check_for_spree_alerts]', "1", Spree::Config[:check_for_spree_alerts]) %>
+      <%= t('spree_alert_checking') %>
+    </label>
+ </p>
+
   <p class="form-buttons">
     <%= button t('update') %> 
     <%= t("or") %> <%= link_to t("cancel"), admin_general_settings_url %>

data/vendor/extensions/theme_default/app/views/admin/general_settings/show.html.erb

@@ -21,6 +21,11 @@
 	  <%= (Spree::Config[:allow_ssl_in_development_and_test] ? t("ssl_will_be_used_in_development_and_test_modes") : t("ssl_will_not_be_used_in_development_and_test_modes")) %>
 	</td>	
   </tr>
+  <tr>
+    <td colspan="2">
+      <%= (Spree::Config[:check_for_spree_alerts] ? t("spree_alert_checking") : t("spree_alert_not_checking")) %>
+    </td>
+  </tr>
 </table>
 
 <p><%= link_to_with_icon 'edit', t("edit"), edit_admin_general_settings_path %></p>

data/vendor/extensions/theme_default/app/views/admin/shared/_alert.html.erb

@@ -0,0 +1,11 @@
+<div class="alert <%= alert.severity.downcase %>">
+  <%= alert.message %> <%= link_to alert.url_name, alert.url if alert.url %>
+  <%= link_to_remote 'X',{ :url => { :controller=>"admin/general_settings",
+                                     :action=>"dismiss_alert",
+                                     :alert_id => alert.id,
+                                     :method => :post } },
+                           :class  => "dismiss" %>
+</div>
+
+
+

data/vendor/extensions/theme_default/app/views/layouts/admin.html.erb

@@ -42,7 +42,6 @@
 
   <div class="<%= 'with-sidebar ' unless @content_for_sidebar.blank? %> clear tile_bg" id="content">
 
-
     <% if flash[:error] %>
     <div class="flash error"><%= flash[:error] %></div>
     <% end %>
@@ -50,6 +49,7 @@
     <div class="flash notice"><%= self.notice %></div>
     <% end %>
 
+    <%= render :partial => 'admin/shared/alert', :collection => session[:alerts] %>
 
     <%= yield %>
 

data/vendor/extensions/theme_default/public/stylesheets/admin/admin.css

@@ -573,4 +573,33 @@ table#product_scopes tr td table tr td {
 #new_product_group_form p {
   text-align: right;
   margin: 0;
-}
+}
+
+.alert {
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+  font-size: 1.3em;
+  margin-bottom: 1em;
+  padding: 0.8em;
+}
+.alert a.dismiss {
+  float:right;
+  font-size: 0.8em;
+}
+.alert.release {
+  background: #ccddff url(../images/shadow_top.png) 0px -50px repeat-x;
+  color: #556699;
+  border: 1px solid #99aacc;
+}
+.alert.security {
+  background: #f4b4b4 url(../images/shadow_top.png) 0px -50px repeat-x;
+  color: #000000;
+  border: 1px solid #e75b5b;
+}
+.alert.news {
+  background: #ccffd4 url(../images/shadow_top.png) 0px -50px repeat-x;
+  color: #000000;
+  border: 1px solid #66ff7e;
+}
+

data/vendor/plugins/acts_as_tree/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test

data/vendor/plugins/attribute_fu/Rakefile

@@ -1,7 +1,7 @@
 require 'rake'
 require "load_multi_rails_rake_tasks" 
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test

data/vendor/plugins/auto_complete/Rakefile

@@ -1,6 +1,6 @@
 require 'rake' 
 require 'rake/testtask' 
-require 'rake/rdoctask' 
+require 'rdoc/task' 
  
 desc 'Default: run unit tests.' 
 task :default => :test 

data/vendor/plugins/awesome_nested_set/Rakefile

@@ -5,7 +5,7 @@ rescue LoadError
   exit 1
 end
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rcov/rcovtask'
 require "load_multi_rails_rake_tasks" 
 

data/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb

@@ -60,9 +60,9 @@ module CollectiveIdea #:nodoc:
             extend Columns
             extend ClassMethods
             
-            belongs_to :parent, :class_name => self.base_class.class_name,
+            belongs_to :parent, :class_name => self.base_class.model_name,
               :foreign_key => parent_column_name
-            has_many :children, :class_name => self.base_class.class_name,
+            has_many :children, :class_name => self.base_class.model_name,
               :foreign_key => parent_column_name, :order => quoted_left_column_name
 
             attr_accessor :skip_before_destroy
@@ -149,7 +149,7 @@ module CollectiveIdea #:nodoc:
         def each_root_valid?(roots_to_validate)
           left = right = 0
           roots_to_validate.all? do |root|
-            returning(root.left > left && root.right > right) do
+            (root.left > left && root.right > right).tap do
               left = root.left
               right = root.right
             end

data/vendor/plugins/delegate_belongs_to/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'spec/rake/spectask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run specs.'
 task :default => :spec

data/vendor/plugins/enumerable_constants/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test

data/vendor/plugins/find_by_param/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test

data/vendor/plugins/in_place_editing/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test

data/vendor/plugins/jrails_auto_complete/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test

data/vendor/plugins/mail_queue/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test

data/vendor/plugins/open_id_authentication/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test

data/vendor/plugins/resource_controller/lib/resource_controller/action_options.rb

@@ -28,7 +28,7 @@ module ResourceController
     end
     
     def dup
-      returning self.class.new do |duplicate|
+      self.class.new.tap do |duplicate|
         duplicate.instance_variable_set(:@collector, wants.dup)
         duplicate.instance_variable_set(:@before, before.dup)       unless before.nil?
         duplicate.instance_variable_set(:@after, after.dup)         unless after.nil?

data/vendor/plugins/resource_controller/lib/resource_controller/failable_action_options.rb

@@ -15,7 +15,7 @@ module ResourceController
     delegate :flash, :flash_now, :after, :response, :wants, :to => :success
     
     def dup
-      returning self.class.new do |duplicate|
+      self.class.new.tap do |duplicate|
         duplicate.instance_variable_set(:@success, success.dup)
         duplicate.instance_variable_set(:@fails,   fails.dup)
         duplicate.instance_variable_set(:@before,  before.dup) unless before.nil?

data/vendor/plugins/resource_controller/test/app/controllers/accounts_controller.rb

@@ -0,0 +1,6 @@
+class AccountsController < ResourceController::Singleton
+  protected
+    def object
+      Account.find(:first)
+    end
+end

data/vendor/plugins/resource_controller/test/app/controllers/application.rb

@@ -0,0 +1,7 @@
+# Filters added to this controller apply to all controllers in the application.
+# Likewise, all the methods added will be available for all controllers.
+
+class ApplicationController < ActionController::Base
+  # Pick a unique cookie name to distinguish our session data from others'
+  session :session_key => '_myapp_session'
+end

data/vendor/plugins/resource_controller/test/app/controllers/cms/options_controller.rb

@@ -0,0 +1,3 @@
+class Cms::OptionsController < ResourceController::Base
+  belongs_to :product
+end

data/vendor/plugins/resource_controller/test/app/controllers/cms/personnel_controller.rb

@@ -0,0 +1,2 @@
+class Cms::PersonnelController < ResourceController::Base
+end

data/vendor/plugins/resource_controller/test/app/controllers/cms/photos_controller.rb

@@ -0,0 +1,6 @@
+class Cms::PhotosController < ResourceController::Base
+  actions :all, :except => :update
+  
+  belongs_to :personnel
+  create.flash { "#{@photo.title} was created!" }  
+end

data/vendor/plugins/resource_controller/test/app/controllers/cms/products_controller.rb

@@ -0,0 +1,3 @@
+class Cms::ProductsController < ResourceController::Base
+  create.flash 'something'
+end

data/vendor/plugins/resource_controller/test/app/controllers/comments_controller.rb

@@ -0,0 +1,3 @@
+class CommentsController < ResourceController::Base
+  belongs_to :post
+end

data/vendor/plugins/resource_controller/test/app/controllers/images_controller.rb

@@ -0,0 +1,4 @@
+class ImagesController < ResourceController::Singleton
+  belongs_to :user
+  actions :create
+end

data/vendor/plugins/resource_controller/test/app/controllers/options_controller.rb

@@ -0,0 +1,8 @@
+class OptionsController < ResourceController::Base
+  belongs_to :account
+  
+  protected
+    def parent_object
+      Account.find(:first)
+    end
+end

data/vendor/plugins/resource_controller/test/app/controllers/people_controller.rb

@@ -0,0 +1,9 @@
+class PeopleController < ResourceController::Base
+  create.before :name_person
+  model_name    :account
+  
+  private
+    def name_person
+      @person.name = "Bob Loblaw"
+    end
+end

data/vendor/plugins/resource_controller/test/app/controllers/photos_controller.rb

@@ -0,0 +1,11 @@
+class PhotosController < ResourceController::Base
+  actions :all, :except => :update
+  
+  belongs_to :user
+  create.flash { "#{@photo.title} was created!" }
+  
+  private
+    def parent_model
+      Account
+    end
+end