active_scaffold 3.4.17 → 3.4.18

data/app/assets/stylesheets/active_scaffold.scss

@@ -4,7 +4,7 @@
 
  ActiveScaffold is freely distributable under the terms of an MIT-style license.
 
- For details, see the ActiveScaffold web site: http://www.activescaffold.com/
+ For details, see the ActiveScaffold web site: https://github.com/activescaffold/active_scaffold
 */
 
 @import 'active_scaffold_layout';

data/app/assets/stylesheets/active_scaffold_colors.scss

@@ -4,7 +4,7 @@
 
  ActiveScaffold is freely distributable under the terms of an MIT-style license.
 
- For details, see the ActiveScaffold web site: http://www.activescaffold.com/
+ For details, see the ActiveScaffold web site: https://github.com/activescaffold/active_scaffold
 
 */
 

data/app/assets/stylesheets/blue-theme.css

@@ -4,7 +4,7 @@
 
  ActiveScaffold is freely distributable under the terms of an MIT-style license.
 
- For details, see the ActiveScaffold web site: http://www.activescaffold.com/
+ For details, see the ActiveScaffold web site: https://github.com/activescaffold/active_scaffold
 
 */
 

data/app/views/active_scaffold_overrides/_form_association.html.erb

@@ -1,6 +1,6 @@
 <%
 ActiveSupport::Deprecation.warn "Relying on @record to render form_asssociation partial with no parent_record local variable is deprecated", caller(1) unless local_assigns[:parent_record]
-parent_record ||= @record # save @record, some partial can change @record TODO remove when changing @record is removed
+parent_record ||= @record # TODO: remove when changing @record is removed, save @record, some partial can change @record
 associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a
 #associated = associated.sort_by {|r| r.new_record? ? 99999999999 : r.id} unless column.association.options.has_key?(:order)
 if column.show_blank_record?(associated)
@@ -15,12 +15,12 @@ subform_div_id = "#{sub_form_id(:association => column.name, :id => parent_recor
   <%= link_to_visibility_toggle(subform_div_id, {:default_visible => !column.collapsed}) -%>
 </h5>
 <div id ="<%= subform_div_id %>" <%= 'style="display: none;"'.html_safe if column.collapsed -%>>
-<%# HACK to be able to delete all associated records %>
+<%# HACK: to be able to delete all associated records %>
   <%= hidden_field_tag "#{active_scaffold_input_options(column, scope, :object => parent_record)[:name]}[0]", '' if column.plural_association? %>
   <%= render :partial => subform_partial_for_column(column), :locals => {:column => column, :parent_record => parent_record, :associated => associated, :show_blank_record => show_blank_record, :scope => scope} %>
   <%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated, :scope => scope} -%>
 </div>
 <%
-  @record = parent_record # restore @record, some partials can change it TODO remove when changing @record is removed
+  @record = parent_record # TODO: remove when changing @record is removed, restore @record, some partials can change it
   @disable_required_for_new = disable_required_for_new
 -%>

data/app/views/active_scaffold_overrides/_form_association_record.html.erb

@@ -1,8 +1,8 @@
 <%
   record_column = column
   ActiveSupport::Deprecation.warn "Relying on @record to render form_asssociation_record partial with no :object is deprecated", caller(1) unless local_assigns[:form_association_record]
-  record = form_association_record ||= @record # TODO remove me, backwards compatibility, no :collection neither object in render
-  @record = record # TODO remove me, backward compatibility, helpers using @record
+  record = form_association_record ||= @record # TODO: remove me, backwards compatibility, no :collection neither object in render
+  @record = record # TODO: remove me, backward compatibility, helpers using @record
   readonly = (record.readonly? or not record.authorized_for?(:crud_type => :update))
   crud_type = record.new_record? ? :create : (readonly ? :read : :update)
   show_actions = false
@@ -81,7 +81,7 @@
 <% columns_groups.each do |column| %>
 <%= content_tag row_tag, :class => 'associated-record' do %>
   <%= content_tag column_tag, :colspan => (columns_length if column_tag == :td) do %>
-  <% column.each :for => @record.class, :crud_type => :read, :flatten => true do |col| %>
+  <% column.each :for => record.class, :crud_type => :read, :flatten => true do |col| %>
     <%= active_scaffold_render_subform_column(col, scope, crud_type, readonly, true, record) %>
   <% end %>
   <% end %>

data/app/views/active_scaffold_overrides/_show_columns.html.erb

@@ -8,7 +8,7 @@
     <% css_class = "#{column.name}-view"
      css_class.concat(" #{column.css_class}") unless column.css_class.nil? %>
     <dd class="<%= css_class.strip %>">
-    <%= show_column_value(@record, column) -%> &nbsp;
+    <%= show_column_value(@record, column) -%>
 <% end -%>
   </dd>
 <% end -%>

data/lib/active_scaffold.rb

@@ -12,13 +12,13 @@ module ActiveScaffold
   autoload :Tableless, 'active_scaffold/tableless'
   autoload :Version, 'active_scaffold/version'
 
-  def self.autoload_subdir(dir, mod=self, root = File.dirname(__FILE__))
-    Dir["#{root}/active_scaffold/#{dir}/*.rb"].each { |file|
-      basename = File.basename(file, ".rb")
-      mod.module_eval {
+  def self.autoload_subdir(dir, mod = self, root = File.dirname(__FILE__))
+    Dir["#{root}/active_scaffold/#{dir}/*.rb"].each do |file|
+      basename = File.basename(file, '.rb')
+      mod.module_eval do
         autoload basename.camelcase.to_sym, "active_scaffold/#{dir}/#{basename}"
-      }
-    }
+      end
+    end
   end
 
   module Actions
@@ -48,17 +48,18 @@ module ActiveScaffold
   self.stylesheets = []
   mattr_accessor :javascripts
   self.javascripts = []
-  
+
   def self.js_framework=(framework)
     @@js_framework = framework
   end
-  
+
   def self.js_framework
-    @@js_framework ||= if defined? Jquery
-      :jquery
-    elsif defined? PrototypeRails
-      :prototype
-    end
+    @@js_framework ||=
+      if defined? Jquery
+        :jquery
+      elsif defined? PrototypeRails
+        :prototype
+      end
   end
 
   def self.js_config=(config)
@@ -82,14 +83,13 @@ module ActiveScaffold
   end
 
   def self.root
-    File.dirname(__FILE__) + "/.."
+    File.dirname(__FILE__) + '/..'
   end
 
   def self.set_defaults(&block)
-    ActiveScaffold::Config::Core.configure &block
+    ActiveScaffold::Config::Core.configure(&block)
   end
 end
 require 'active_scaffold/engine'
 # TODO: clean up extensions. some could be organized for autoloading, and others could be removed entirely.
 Dir["#{File.dirname __FILE__}/active_scaffold/extensions/*.rb"].each { |file| require file }
-

data/lib/active_scaffold/actions/common_search.rb

@@ -14,19 +14,21 @@ module ActiveScaffold::Actions
       def show_search
         respond_to_action(search_partial || :search)
       end
-      
+
       protected
+
       def do_search
       end
-      
+
       def search_partial
-        @_search_partial ||= if params[:kind].present? && active_scaffold_config.actions.include?(params[:kind])
-          params.delete(:kind)
-        else
-          active_scaffold_config.list.auto_search_partial
-        end
+        @_search_partial ||=
+          if params[:kind].present? && active_scaffold_config.actions.include?(params[:kind])
+            params.delete(:kind)
+          else
+            active_scaffold_config.list.auto_search_partial
+          end
       end
-      
+
       def store_search_params_into_session
         if active_scaffold_config.store_user_settings
           active_scaffold_session_storage['search'] = params.delete :search if params[:search]
@@ -38,17 +40,17 @@ module ActiveScaffold::Actions
       def search_params
         @search_params || active_scaffold_session_storage['search']
       end
-      
+
       # The default security delegates to ActiveRecordPermissions.
       # You may override the method to customize.
       def search_authorized?
         authorized_for?(:crud_type => :read)
       end
-      
+
       def search_authorized_filter
         action = active_scaffold_config.send(search_partial)
         link = action.link || action.class.link
-        raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)
+        raise ActiveScaffold::ActionNotAllowed unless send(link.security_method)
       end
     end
   end

data/lib/active_scaffold/actions/core.rb

@@ -29,8 +29,9 @@ module ActiveScaffold::Actions
         respond_to { |format| format.js }
       end
     end
-    
+
     protected
+
     def loading_embedded?
       @loading_embedded ||= params.delete(:embedded)
     end
@@ -49,65 +50,67 @@ module ActiveScaffold::Actions
     end
 
     def render_field_for_update_columns
-      @column = active_scaffold_config.columns[params.delete(:column)]
-      unless @column.nil?
-        @source_id = params.delete(:source_id)
-        @columns = @column.update_columns || []
-        @scope = params.delete(:scope)
-        @main_columns = active_scaffold_config.send(@scope ? :subform : (params[:id] ? :update : :create)).columns
-        @columns << @column.name if @column.options[:refresh_link] && @columns.exclude?(@column.name)
-        
+      return if (@column = active_scaffold_config.columns[params.delete(:column)]).nil?
+      @source_id = params.delete(:source_id)
+      @columns = @column.update_columns || []
+      @scope = params.delete(:scope)
+      action = :subform if @scope
+      action ||= params[:id] ? :update : :create
+      @main_columns = active_scaffold_config.send(action).columns
+      @columns << @column.name if @column.options[:refresh_link] && @columns.exclude?(@column.name)
+
+      @record =
         if @column.send_form_on_update_column
-          if @scope
-            hash = @scope.gsub('[','').split(']').inject(params[:record]) do |hash, index|
-              hash[index]
-            end
-            id = hash[:id]
-          else
-            hash = params[:record]
-            id = params[:id]
-          end
-
-          # check permissions and support overriding to_param
-          record = find_if_allowed(id, :read) if id
-          # call update_record_from_params with new_model
-          # in other case some associations can be saved
-          @record = new_model
-          copy_attributes(record, @record) if record
-          apply_constraints_to_record(@record) unless @scope
-          @record = update_record_from_params(@record, @main_columns, hash || {}, true)
+          updated_record_with_form(@main_columns, params[:record], @scope)
         else
-          @record = params[:id] ? find_if_allowed(params[:id], :read) : new_model
-          if @record.new_record?
-            apply_constraints_to_record(@record) unless @scope
-          else
-            @record = @record.dup
-          end
-          value = column_value_from_param_value(@record, @column, params.delete(:value))
-          @record.send "#{@column.name}=", value
-          @record.id = params[:id]
+          updated_record_with_column(@column, params.delete(:value), @scope)
         end
-        set_parent(@record) if params[:parent_controller] && @scope
+      set_parent(@record) if params[:parent_controller] && @scope
+      after_render_field(@record, @column)
+    end
 
-        after_render_field(@record, @column)
+    def updated_record_with_form(columns, attributes, scope)
+      if attributes && scope
+        attributes = scope.gsub('[', '').split(']').inject(attributes) { |h, idx| h[idx] }
+        id = attributes[:id]
+      else
+        id = params[:id]
       end
+
+      # check permissions and support overriding to_param
+      saved_record = find_if_allowed(id, :read) if id
+      # call update_record_from_params with new_model
+      # in other case some associations can be saved
+      record = new_model
+      copy_attributes(saved_record, record) if saved_record
+      apply_constraints_to_record(record) unless scope
+      update_record_from_params(record, columns, attributes || {}, true)
+    end
+
+    def updated_record_with_column(column, value, scope)
+      record = params[:id] ? find_if_allowed(params[:id], :read).dup : new_model
+      apply_constraints_to_record(record) unless scope || params[:id]
+      value = column_value_from_param_value(record, column, value)
+      record.send "#{column.name}=", value
+      record.id = params[:id]
+      record
     end
 
     def set_parent(record)
       parent_model = params[:parent_controller].singularize.camelize.constantize
       child_association = params[:child_association].presence || @scope.split(']').first.sub(/^\[/, '')
       association = parent_model.reflect_on_association(child_association.to_sym).try(:reverse)
-      if association
-        parent = parent_model.new
-        copy_attributes(parent_model.find(params[:parent_id]), parent) if params[:parent_id]
-        parent.id = params[:parent_id]
-        parent = update_record_from_params(parent, active_scaffold_config_for(parent_model).send(params[:parent_id] ? :update : :create).columns, params[:record], true) if @column.send_form_on_update_column
-        apply_constraints_to_record(parent) unless params[:parent_id]
-        if record.class.reflect_on_association(association).collection?
-          record.send(association) << parent
-        else
-          record.send("#{association}=", parent)
-        end
+      return if association.nil?
+
+      parent = parent_model.new
+      copy_attributes(parent_model.find(params[:parent_id]), parent) if params[:parent_id]
+      parent.id = params[:parent_id]
+      parent = update_record_from_params(parent, active_scaffold_config_for(parent_model).send(params[:parent_id] ? :update : :create).columns, params[:record], true) if @column.send_form_on_update_column
+      apply_constraints_to_record(parent) unless params[:parent_id]
+      if record.class.reflect_on_association(association).collection?
+        record.send(association) << parent
+      else
+        record.send("#{association}=", parent)
       end
     end
 
@@ -124,7 +127,7 @@ module ActiveScaffold::Actions
       dst.attributes = attributes
       dst
     end
-    
+
     # override this method if you want to do something after render_field
     def after_render_field(record, column); end
 
@@ -137,20 +140,21 @@ module ActiveScaffold::Actions
     end
 
     def each_marked_record(&block)
-      active_scaffold_config.model.as_marked.each &block
+      active_scaffold_config.model.as_marked.each(&block)
     end
 
     def marked_records
       active_scaffold_session_storage['marked_records'] ||= {}
     end
-    
+
     def default_formats
       [:html, :js, :json, :xml, :yaml]
     end
+
     # Returns true if the client accepts one of the MIME types passed to it
     # ex: accepts? :html, :xml
     def accepts?(*types)
-      for priority in request.accepts.compact
+      request.accepts.compact.each do |priority|
         if priority == Mime::ALL
           # Because IE always sends */* in the accepts header and we assume
           # that if you really wanted XML or something else you would say so
@@ -185,7 +189,7 @@ module ActiveScaffold::Actions
         @successful
       end
     end
-    
+
     def successful=(val)
       @successful = (val) ? true : false
     end
@@ -194,12 +198,12 @@ module ActiveScaffold::Actions
     def return_to_main
       redirect_to main_path_to_return
     end
-  
-    #Overide this method on your controller to provide model with named scopes
+
+    # Overide this method on your controller to provide model with named scopes
     def beginning_of_chain
       active_scaffold_config.model
     end
-        
+
     # Builds search conditions by search params for column names. This allows urls like "contacts/list?company_id=5".
     def conditions_from_params
       @conditions_from_params ||= begin
@@ -210,12 +214,13 @@ module ActiveScaffold::Actions
           key = key.to_sym
           not_string = [:string, :text].exclude?(column.type)
           next if active_scaffold_constraints[key]
-          next if nested? and nested.param_name == key
-          conditions[key] = if value.is_a?(Array)
-            value.map {|v| v == '' && not_string ? nil : ActiveScaffold::Core.column_type_cast(v, column) }
-          else
-            value == '' && not_string ? nil : ActiveScaffold::Core.column_type_cast(value, column)
-          end
+          next if nested? && nested.param_name == key
+          conditions[key] =
+            if value.is_a?(Array)
+              value.map { |v| v == '' && not_string ? nil : ActiveScaffold::Core.column_type_cast(v, column) }
+            else
+              value == '' && not_string ? nil : ActiveScaffold::Core.column_type_cast(value, column)
+            end
         end
         conditions
       end
@@ -265,14 +270,14 @@ module ActiveScaffold::Actions
     end
 
     def check_input_device
-      if request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"][/(iPhone|iPod|iPad)/i]
+      if request.env['HTTP_USER_AGENT'] && request.env['HTTP_USER_AGENT'][/(iPhone|iPod|iPad)/i]
         session[:input_device_type] = 'TOUCH'
         session[:hover_supported] = false
       else
         session[:input_device_type] = 'MOUSE'
         session[:hover_supported] = true
       end if session[:input_device_type].nil?
-     end
+    end
 
     def touch_device?
       session[:input_device_type] == 'TOUCH'
@@ -299,11 +304,11 @@ module ActiveScaffold::Actions
         if params[:id]
           crud_type_or_security_options ||= {:crud_type => (request.post? || request.put?) ? :update : :delete, :action => action_name}
           get_row(crud_type_or_security_options)
-          unless @record.nil?
-            yield @record
-          else
+          if @record.nil?
             self.successful = false
             flash[:error] = as_(:no_authorization_for_action, :action => action_name)
+          else
+            yield @record
           end
         else
           yield
@@ -326,15 +331,15 @@ module ActiveScaffold::Actions
     end
 
     def action_update_respond_to_xml
-      render :xml => successful? ? "" : response_object.to_xml(:only => list_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(list_columns_names), :methods => virtual_columns(list_columns_names)), :content_type => Mime::XML, :status => response_status
+      render :xml => successful? ? '' : response_object.to_xml(:only => list_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(list_columns_names), :methods => virtual_columns(list_columns_names)), :content_type => Mime::XML, :status => response_status
     end
 
     def action_update_respond_to_json
-      render :text => successful? ? "" : response_object.to_json(:only => list_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(list_columns_names), :methods => virtual_columns(list_columns_names)), :content_type => Mime::JSON, :status => response_status
+      render :text => successful? ? '' : response_object.to_json(:only => list_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(list_columns_names), :methods => virtual_columns(list_columns_names)), :content_type => Mime::JSON, :status => response_status
     end
 
     def action_update_respond_to_yaml
-      render :text => successful? ? "" : Hash.from_xml(response_object.to_xml(:only => list_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(list_columns_names), :methods => virtual_columns(list_columns_names))).to_yaml, :content_type => Mime::YAML, :status => response_status
+      render :text => successful? ? '' : Hash.from_xml(response_object.to_xml(:only => list_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(list_columns_names), :methods => virtual_columns(list_columns_names))).to_yaml, :content_type => Mime::YAML, :status => response_status
     end
 
     def objects_for_etag
@@ -360,14 +365,15 @@ module ActiveScaffold::Actions
     end
 
     def virtual_columns(columns)
-      columns.reject {|col| active_scaffold_config.model.columns_hash[col] || active_scaffold_config.model.reflect_on_association(col)}
+      columns.reject { |col| active_scaffold_config.model.columns_hash[col] || active_scaffold_config.model.reflect_on_association(col) }
     end
 
     def association_columns(columns)
-      columns.select {|col| active_scaffold_config.model.reflect_on_association(col)}
+      columns.select { |col| active_scaffold_config.model.reflect_on_association(col) }
     end
 
     private
+
     def respond_to_action(action)
       return unless !conditional_get_support? || view_stale?
       respond_to do |type|
@@ -382,11 +388,12 @@ module ActiveScaffold::Actions
     end
 
     def action_formats
-      @action_formats ||= if respond_to? "#{action_name}_formats", true
-        send("#{action_name}_formats")
-      else
-        (default_formats + active_scaffold_config.formats).uniq
-      end
+      @action_formats ||=
+        if respond_to? "#{action_name}_formats", true
+          send("#{action_name}_formats")
+        else
+          (default_formats + active_scaffold_config.formats).uniq
+        end
     end
   end
 end