Cleanup trailing whitespace

Author: sferik

.rspec

@@ -1 +1 @@
---color
+--color

Rakefile

@@ -1,14 +1,14 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-Dir['lib/tasks/*.rake'].each { |rake| load rake }
-
-require "rubygems"
-require "bundler/setup"
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :test => :spec
-task :default => :spec
-
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+Dir['lib/tasks/*.rake'].each { |rake| load rake }
+
+require "rubygems"
+require "bundler/setup"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :test => :spec
+task :default => :spec
+

app/controllers/rails_admin/application_controller.rb

@@ -22,22 +22,22 @@ def to_model_name(param)
       model_name = to_model_name_with_singularize(param)
       presented_model_name?(model_name)?  model_name : to_model_name_without_singularize(param)
     end
-    
+
     def to_model_name_without_singularize(param)
       parts = param.split("~")
       parts.map(&:camelize).join("::")
     end
-    
+
     def to_model_name_with_singularize(param)
       parts = param.split("~")
       parts[-1] = parts.last.singularize
       parts.map(&:camelize).join("::")
     end
-    
+
     def presented_model_name?(model_name)
       !RailsAdmin::AbstractModel.lookup(model_name).nil?
     end
-    
+
     def get_object
       @object = @abstract_model.get(params[:id])
       not_found unless @object

app/controllers/rails_admin/history_controller.rb

@@ -1,26 +1,26 @@
-module RailsAdmin
-  class HistoryController < RailsAdmin::ApplicationController
-    before_filter :get_model
-    before_filter :get_object, :except => :for_model
-
-    def for_model
-      @authorization_adapter.authorize(:history) if @authorization_adapter
-      @page_type = @abstract_model.pretty_name.downcase
-      @page_name = t("admin.history.page_name", :name => @model_config.label.downcase)
-      @general = true
-      @history = History.history_for_model(@abstract_model, params[:query], params[:sort], params[:sort_reverse], params[:all], params[:page])
-
-      render "show", :layout => request.xhr? ? false : 'rails_admin/application'
-    end
-
-    def for_object
-      @authorization_adapter.authorize(:history) if @authorization_adapter
-      @page_type = @abstract_model.pretty_name.downcase
-      @page_name = t("admin.history.page_name", :name => "#{@model_config.label.downcase} '#{@model_config.with(:object => @object).object_label}'")
-      @general = false
-      @history = History.history_for_object(@abstract_model, @object, params[:query], params[:sort], params[:sort_reverse], params[:all], params[:page])
-
-      render "show", :layout => request.xhr? ? false : 'rails_admin/application'
-    end
-  end
-end
+module RailsAdmin
+  class HistoryController < RailsAdmin::ApplicationController
+    before_filter :get_model
+    before_filter :get_object, :except => :for_model
+
+    def for_model
+      @authorization_adapter.authorize(:history) if @authorization_adapter
+      @page_type = @abstract_model.pretty_name.downcase
+      @page_name = t("admin.history.page_name", :name => @model_config.label.downcase)
+      @general = true
+      @history = History.history_for_model(@abstract_model, params[:query], params[:sort], params[:sort_reverse], params[:all], params[:page])
+
+      render "show", :layout => request.xhr? ? false : 'rails_admin/application'
+    end
+
+    def for_object
+      @authorization_adapter.authorize(:history) if @authorization_adapter
+      @page_type = @abstract_model.pretty_name.downcase
+      @page_name = t("admin.history.page_name", :name => "#{@model_config.label.downcase} '#{@model_config.with(:object => @object).object_label}'")
+      @general = false
+      @history = History.history_for_object(@abstract_model, @object, params[:query], params[:sort], params[:sort_reverse], params[:all], params[:page])
+
+      render "show", :layout => request.xhr? ? false : 'rails_admin/application'
+    end
+  end
+end

app/controllers/rails_admin/main_controller.rb

@@ -16,7 +16,7 @@ def dashboard
 
       @history= History.all
       @abstract_models = RailsAdmin::Config.visible_models.map(&:abstract_model)
-      
+
       @most_recent_changes = {}
       @count = {}
       @max = 0
@@ -230,15 +230,15 @@ def bulk_delete
       @page_type = @abstract_model.pretty_name.downcase
       @objects = list_entries(@model_config, :destroy)
       not_found and return if @objects.empty?
-      
+
       render :action => 'bulk_delete'
     end
 
     def bulk_destroy
       @authorization_adapter.authorize(:bulk_destroy, @abstract_model) if @authorization_adapter
       @objects = list_entries(@model_config, :destroy)
       processed_objects = @abstract_model.destroy(@objects)
-      
+
       destroyed = processed_objects.select(&:destroyed?)
       not_destroyed = processed_objects - destroyed
 
@@ -256,17 +256,17 @@ def bulk_destroy
       end
 
       redirect_to index_path
-    end    
-    
+    end
+
     def list_entries(model_config = @model_config, auth_scope_key = :index, additional_scope = get_association_scope_from_params, pagination = !(params[:associated_collection] || params[:all]))
       scope = @authorization_adapter && @authorization_adapter.query(auth_scope_key, model_config.abstract_model)
       scope = model_config.abstract_model.scoped.merge(scope)
       scope = scope.instance_eval(&additional_scope) if additional_scope
       get_collection(model_config, scope, pagination)
     end
-    
+
     private
-    
+
     def get_sort_hash(model_config)
       abstract_model = model_config.abstract_model
       params[:sort] = params[:sort_reverse] = nil unless model_config.list.with(:view => self, :object => abstract_model.model.new).visible_fields.map {|f| f.name.to_s}.include? params[:sort]
@@ -294,7 +294,7 @@ def get_sort_hash(model_config)
       {:sort => column, :sort_reverse => (params[:sort_reverse] == reversed_sort.to_s)}
     end
 
-    
+
     def get_attributes
       @attributes = params[@abstract_model.to_param.singularize.gsub('~','_')] || {}
       @attributes.each do |key, value|
@@ -306,7 +306,7 @@ def get_attributes
         @attributes[key] = nil if value.blank?
       end
     end
-    
+
     def redirect_to_on_success
       notice = t("admin.flash.successful", :name => @model_config.label, :action => t("admin.actions.#{params[:action]}d"))
       if params[:_add_another]
@@ -329,11 +329,11 @@ def handle_save_error whereto = :new
         format.js   { render whereto, :layout => false, :status => :not_acceptable  }
       end
     end
-    
+
     def check_for_cancel
       redirect_to index_path, :flash => { :warning => t("admin.flash.noaction") } if params[:_continue]
     end
-    
+
     def get_collection(model_config, scope, pagination)
       associations = model_config.list.fields.select {|f| f.type == :belongs_to_association && !f.polymorphic? }.map {|f| f.association[:name] }
       options = {}
@@ -342,10 +342,10 @@ def get_collection(model_config, scope, pagination)
       options = options.merge(get_sort_hash(model_config)) unless params[:associated_collection]
       options = options.merge(model_config.abstract_model.get_conditions_hash(model_config, params[:query], params[:f])) if (params[:query].present? || params[:f].present?)
       options = options.merge(:bulk_ids => params[:bulk_ids]) if params[:bulk_ids]
-      
+
       objects = model_config.abstract_model.all(options, scope)
     end
-    
+
     def get_association_scope_from_params
       return nil unless params[:associated_collection].present?
       source_abstract_model = RailsAdmin::AbstractModel.new(to_model_name(params[:source_abstract_model]))
@@ -355,7 +355,7 @@ def get_association_scope_from_params
       association = source_model_config.send(action).fields.find{|f| f.name == params[:associated_collection].to_sym }.with(:controller => self, :object => source_object)
       association.associated_collection_scope
     end
-    
+
     def associations_hash
       associations = {}
       @abstract_model.associations.each do |association|

app/helpers/rails_admin/form_builder.rb

@@ -1,52 +1,52 @@
-ActionView::Base.field_error_proc = Proc.new { |html_tag, instance| "<span class=\"field_with_errors\">#{html_tag}</span>".html_safe }
-
-module RailsAdmin
-  class FormBuilder < ActionView::Helpers::FormBuilder
-    def render action
-      @template.instance_variable_get(:@model_config).send(action).with(:form => self, :object => @object, :view => @template).visible_groups.map do |fieldset|
-        fieldset_for fieldset
-      end.join.html_safe +
-      @template.render(:partial => 'submit_buttons')
-    end
-
-    def fieldset_for fieldset
-      if (fields = fieldset.fields.map{ |f| f.with(:form => self, :object => @object, :view => @template) }.select(&:visible?)).length > 0
-        @template.content_tag :fieldset do
-          @template.content_tag(:legend, fieldset.label.html_safe + (fieldset.help.present? ? @template.content_tag(:small, fieldset.help) : '')) +
-          fields.map{ |field| field_wrapper_for(field) }.join.html_safe
-        end
-      end
-    end
-
-    def field_wrapper_for field
-      @template.content_tag(:div, :class => "clearfix field #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", :id => field.dom_id + '_field') do
-        label(field.method_name, field.label) +
-        input_for(field)
-      end
-    end
-
-    def input_for field
-      @template.content_tag(:div, :class => 'input') do
-        field_for(field) +
-        errors_for(field) +
-        help_for(field)
-      end
-    end
-
-    def errors_for field
-      field.errors.present? ? @template.content_tag(:span, "#{field.label} #{field.errors.first}", :class => 'help-inline') : ''
-    end
-
-    def help_for field
-      field.help.present? ? @template.content_tag(:span, field.help, :class => 'help-block') : ''
-    end
-
-    def field_for field
-      if field.read_only
-        field.pretty_value.to_s.html_safe
-      else
-        field.render.html_safe
-      end
-    end
-  end
-end
+ActionView::Base.field_error_proc = Proc.new { |html_tag, instance| "<span class=\"field_with_errors\">#{html_tag}</span>".html_safe }
+
+module RailsAdmin
+  class FormBuilder < ActionView::Helpers::FormBuilder
+    def render action
+      @template.instance_variable_get(:@model_config).send(action).with(:form => self, :object => @object, :view => @template).visible_groups.map do |fieldset|
+        fieldset_for fieldset
+      end.join.html_safe +
+      @template.render(:partial => 'submit_buttons')
+    end
+
+    def fieldset_for fieldset
+      if (fields = fieldset.fields.map{ |f| f.with(:form => self, :object => @object, :view => @template) }.select(&:visible?)).length > 0
+        @template.content_tag :fieldset do
+          @template.content_tag(:legend, fieldset.label.html_safe + (fieldset.help.present? ? @template.content_tag(:small, fieldset.help) : '')) +
+          fields.map{ |field| field_wrapper_for(field) }.join.html_safe
+        end
+      end
+    end
+
+    def field_wrapper_for field
+      @template.content_tag(:div, :class => "clearfix field #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", :id => field.dom_id + '_field') do
+        label(field.method_name, field.label) +
+        input_for(field)
+      end
+    end
+
+    def input_for field
+      @template.content_tag(:div, :class => 'input') do
+        field_for(field) +
+        errors_for(field) +
+        help_for(field)
+      end
+    end
+
+    def errors_for field
+      field.errors.present? ? @template.content_tag(:span, "#{field.label} #{field.errors.first}", :class => 'help-inline') : ''
+    end
+
+    def help_for field
+      field.help.present? ? @template.content_tag(:span, field.help, :class => 'help-block') : ''
+    end
+
+    def field_for field
+      if field.read_only
+        field.pretty_value.to_s.html_safe
+      else
+        field.render.html_safe
+      end
+    end
+  end
+end

app/helpers/rails_admin/main_helper.rb

@@ -1,31 +1,31 @@
-require 'builder'
-
-module RailsAdmin
-  module MainHelper
-    def get_indicator(percent)
-      return "" if percent < 0          # none
-      return "notice" if percent < 34   # < 1/100 of max
-      return "success" if percent < 67  # < 1/10 of max
-      return "warning" if percent < 84  # < 1/3 of max
-      return "important"                # > 1/3 of max
-    end
-    
-    def get_column_sets(properties)
-      sets = []
-      property_index = 0
-      set_index = 0
-      
-      while (property_index < properties.length)
-        current_set_width = 0
-        begin
-          sets[set_index] ||= []
-          sets[set_index] << properties[property_index]
-          current_set_width += (properties[property_index].column_width || 120)
-          property_index += 1
-        end while (current_set_width < RailsAdmin::Config.total_columns_width) && (property_index < properties.length)
-        set_index += 1
-      end
-      sets
-    end
-  end
-end
+require 'builder'
+
+module RailsAdmin
+  module MainHelper
+    def get_indicator(percent)
+      return "" if percent < 0          # none
+      return "notice" if percent < 34   # < 1/100 of max
+      return "success" if percent < 67  # < 1/10 of max
+      return "warning" if percent < 84  # < 1/3 of max
+      return "important"                # > 1/3 of max
+    end
+
+    def get_column_sets(properties)
+      sets = []
+      property_index = 0
+      set_index = 0
+
+      while (property_index < properties.length)
+        current_set_width = 0
+        begin
+          sets[set_index] ||= []
+          sets[set_index] << properties[property_index]
+          current_set_width += (properties[property_index].column_width || 120)
+          property_index += 1
+        end while (current_set_width < RailsAdmin::Config.total_columns_width) && (property_index < properties.length)
+        set_index += 1
+      end
+      sets
+    end
+  end
+end