active_scaffold 3.4.17 → 3.4.18

data/lib/active_scaffold/bridges.rb

@@ -7,21 +7,22 @@ module ActiveScaffold
 
     mattr_accessor :bridges
     mattr_accessor :bridges_run
+    mattr_accessor :bridges_prepared
     self.bridges = {}
 
     def self.register(file)
       match = file.match(/(active_scaffold\/bridges\/(.*))\.rb\Z/)
-      self.bridges[match[2].to_sym] = match[1] if match
+      bridges[match[2].to_sym] = match[1] if match
     end
 
     def self.load(bridge_name)
-      bridge = self.bridges[bridge_name.to_sym]
+      bridge = bridges[bridge_name.to_sym]
       if bridge.is_a? String
         if ActiveScaffold.exclude_bridges.exclude? bridge_name.to_sym
           bridge = bridge.camelize.constantize
-          self.bridges[bridge_name.to_sym] = bridge
+          bridges[bridge_name.to_sym] = bridge
         else
-          self.bridges.delete bridge_name
+          bridges.delete bridge_name
           bridge = nil
         end
       end
@@ -30,32 +31,41 @@ module ActiveScaffold
     class << self
       alias_method :[], :load
     end
-      
+
     def self.run_all
-      return false if self.bridges_run
-      self.bridges.keys.each do |bridge_name|
+      return false if bridges_run
+      bridges.keys.each do |bridge_name|
         bridge = self[bridge_name]
         bridge.run if bridge
       end
       self.bridges_run = true
     end
 
+    def self.prepare_all
+      return false if bridges_prepared
+      bridges.keys.each do |bridge_name|
+        bridge = self[bridge_name]
+        bridge.prepare if bridge.install?
+      end
+      self.bridges_prepared = true
+    end
+
     def self.all_stylesheets
-      self.bridges.keys.collect do |bridge_name|
+      bridges.keys.collect do |bridge_name|
         bridge = self[bridge_name]
-        bridge.stylesheets if bridge and bridge.install?
+        bridge.stylesheets if bridge && bridge.install?
       end.compact.flatten
     end
 
     def self.all_javascripts
-      self.bridges.keys.collect do |bridge_name|
+      bridges.keys.collect do |bridge_name|
         bridge = self[bridge_name]
-        bridge.javascripts if bridge and bridge.install?
+        bridge.javascripts if bridge && bridge.install?
       end.compact.flatten
     end
   end
 end
 
-Dir[File.join(File.dirname(__FILE__), "bridges/*.rb")].each do |bridge|
+Dir[File.join(File.dirname(__FILE__), 'bridges/*.rb')].each do |bridge|
   ActiveScaffold::Bridges.register bridge unless bridge == __FILE__
 end

data/lib/active_scaffold/bridges/ancestry.rb

@@ -1,5 +1,5 @@
 class ActiveScaffold::Bridges::Ancestry < ActiveScaffold::DataStructures::Bridge
   def self.install
-    require File.join(File.dirname(__FILE__), "ancestry/ancestry_bridge.rb")
+    require File.join(File.dirname(__FILE__), 'ancestry/ancestry_bridge.rb')
   end
 end

data/lib/active_scaffold/bridges/ancestry/ancestry_bridge.rb

@@ -2,10 +2,10 @@ ActiveScaffold::Config::Core.class_eval do
   def initialize_with_ancestry(model_id)
     initialize_without_ancestry(model_id)
 
-    return unless self.model.respond_to? :ancestry_column
-    
-    self.columns << :parent_id
-    self.columns[:parent_id].form_ui = :ancestry
+    return unless model.respond_to? :ancestry_column
+
+    columns << :parent_id
+    columns[:parent_id].form_ui = :ancestry
     update.columns.exclude :ancestry
     create.columns.exclude :ancestry, :parent_id
     list.columns.exclude :ancestry, :parent_id
@@ -19,8 +19,8 @@ module ActiveScaffold::Bridges
     module FormColumnHelpers
       def active_scaffold_input_ancestry(column, options)
         record = options[:object]
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in html_options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include :object in html_options with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
 
         select_options = []
         select_control_options = {:selected => record.parent_id}

data/lib/active_scaffold/bridges/bitfields.rb

@@ -1,6 +1,6 @@
 class ActiveScaffold::Bridges::Bitfields < ActiveScaffold::DataStructures::Bridge
   def self.install
-    require File.join(File.dirname(__FILE__), "bitfields/bitfields_bridge")
+    require File.join(File.dirname(__FILE__), 'bitfields/bitfields_bridge')
     ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::Bitfields::BitfieldsBridge
   end
 end

data/lib/active_scaffold/bridges/bitfields/bitfields_bridge.rb

@@ -4,31 +4,30 @@ module ActiveScaffold
       module BitfieldsBridge
         def initialize_with_bitfields(model_id)
           initialize_without_bitfields(model_id)
-          return unless self.model.respond_to?(:bitfields) and self.model.bitfields.present?
+          return unless model.respond_to?(:bitfields) && model.bitfields.present?
 
-          self.model.bitfields.each do |column_name, options|
-            self.columns << options.keys
+          model.bitfields.each do |_, options|
+            columns << options.keys
             options.each do |column, value|
-              self.columns[column].form_ui = :checkbox
-              self.columns[column].weight = 1000 + value.to_s(2).size
+              columns[column].form_ui = :checkbox
+              columns[column].weight = 1000 + value.to_s(2).size
             end
           end
         end
-        
+
         def _load_action_columns_with_bitfields
-          self.model.bitfields.each do |column_name, options|
+          model.bitfields.each do |column_name, options|
             columns = options.keys.sort_by { |column| self.columns[column].weight }
             [:create, :update, :show, :subform].each do |action|
-              if self.actions.include? action
-                self.send(action).columns.exclude column_name
-                self.send(action).columns.add_subgroup(column_name) { |group| group.add *columns }
+              if actions.include? action
+                send(action).columns.exclude column_name
+                send(action).columns.add_subgroup(column_name) { |group| group.add *columns }
               end
             end
-          end if self.model.respond_to?(:bitfields) and self.model.bitfields.present?
-          
+          end if model.respond_to?(:bitfields) && model.bitfields.present?
+
           _load_action_columns_without_bitfields
         end
-          
 
         def self.included(base)
           base.alias_method_chain :initialize, :bitfields

data/lib/active_scaffold/bridges/calendar_date_select.rb

@@ -2,14 +2,14 @@ class ActiveScaffold::Bridges::CalendarDateSelect < ActiveScaffold::DataStructur
   def self.install
     # check to see if the old bridge was installed.  If so, warn them
     # we can detect this by checking to see if the bridge was installed before calling this code
-       
+
     if ActiveScaffold::Config::Core.method_defined?(:initialize_with_calendar_date_select)
-      raise RuntimeError, "We've detected that you have active_scaffold_calendar_date_select_bridge installed.  This plugin has been moved to core.  Please remove active_scaffold_calendar_date_select_bridge to prevent any conflicts"
+      raise "We've detected that you have active_scaffold_calendar_date_select_bridge installed.  This plugin has been moved to core.  Please remove active_scaffold_calendar_date_select_bridge to prevent any conflicts"
     end
-    
-    require File.join(File.dirname(__FILE__), "calendar_date_select/as_cds_bridge.rb")
+
+    require File.join(File.dirname(__FILE__), 'calendar_date_select/as_cds_bridge.rb')
   end
-  
+
   def self.install?
     super && ActiveScaffold.js_framework == :prototype
   end

data/lib/active_scaffold/bridges/calendar_date_select/as_cds_bridge.rb

@@ -1,25 +1,20 @@
 module ActiveScaffold::Config
   class Core < Base
-
     def initialize_with_calendar_date_select(model_id)
       initialize_without_calendar_date_select(model_id)
-      
-      calendar_date_select_fields = self.model.columns.collect{|c| c.name.to_sym if [:date, :datetime].include?(c.type) }.compact
+
+      calendar_date_select_fields = model.columns.collect { |c| c.name.to_sym if [:date, :datetime].include?(c.type) }.compact
       # check to see if file column was used on the model
       return if calendar_date_select_fields.empty?
-      
+
       # automatically set the forum_ui to a file column
-      calendar_date_select_fields.each{|field|
-        self.columns[field].form_ui = :calendar_date_select
-      }
+      calendar_date_select_fields.each { |field| columns[field].form_ui = :calendar_date_select }
     end
-    
+
     alias_method_chain :initialize, :calendar_date_select
-    
   end
 end
 
-
 module ActiveScaffold
   module Bridges
     class CalendarDateSelect
@@ -27,10 +22,10 @@ module ActiveScaffold
       module FormColumnHelpers
         def active_scaffold_input_calendar_date_select(column, options)
           options[:class] = "#{options[:class]} text-input".strip
-          calendar_date_select("record", column.name, options.merge(column.options))
-        end      
+          calendar_date_select('record', column.name, options.merge(column.options))
+        end
       end
-      
+
       module SearchColumnHelpers
         def active_scaffold_search_date_bridge_calendar_control(column, options, current_search, name)
           if current_search.is_a? Hash
@@ -38,13 +33,15 @@ module ActiveScaffold
           else
             value = current_search
           end
-          calendar_date_select("record", column.name, 
-            {:name => "#{options[:name]}[#{name}]",
-             :value => (value ? l(value) : nil),
-             :class => 'text-input',
-             :id => "#{options[:id]}_#{name}",
-             :time => column_datetime?(column) ? true : false,
-             :style => (options[:show].nil? || options[:show]) ? nil : "display: none"})
+          calendar_date_select(
+            'record', column.name,
+            :name => "#{options[:name]}[#{name}]",
+            :value => (value ? l(value) : nil),
+            :class => 'text-input',
+            :id => "#{options[:id]}_#{name}",
+            :time => column_datetime?(column) ? true : false,
+            :style => (options[:show].nil? || options[:show]) ? nil : 'display: none'
+          )
         end
       end
     end

data/lib/active_scaffold/bridges/cancan.rb

@@ -1,6 +1,6 @@
 class ActiveScaffold::Bridges::Cancan < ActiveScaffold::DataStructures::Bridge
   def self.install
-    require File.join(File.dirname(__FILE__), "cancan", "cancan_bridge.rb")
+    require File.join(File.dirname(__FILE__), 'cancan', 'cancan_bridge.rb')
 
     ActiveScaffold::Core::ClassMethods.send :include, ActiveScaffold::Bridges::Cancan::ClassMethods
     ActiveScaffold::Actions::Core.send :include, ActiveScaffold::Bridges::Cancan::Actions::Core

data/lib/active_scaffold/bridges/cancan/cancan_bridge.rb

@@ -1,6 +1,6 @@
 # Allow users to easily define aliases for AS actions.
 # Ability#as_action_aliases should be called by the user in his ability class
-# 
+#
 #     class Ability < CanCan::Ability
 #       def initialize(user)
 #         as_action_aliases
@@ -19,7 +19,6 @@ end
 
 module ActiveScaffold::Bridges
   class Cancan
-
     # controller level authorization
     # As already has callbacks to ensure authorization at controller method via "authorization_method"
     # but let's include this too, just in case, no sure how performance is affected tough :TODO benchmark
@@ -70,7 +69,7 @@ module ActiveScaffold::Bridges
         # because the object may change (someone may log in or out). So we give ActiveRecord a proc that ties to the
         # current_ability_method on this ApplicationController.
         def assign_current_ability_to_models
-          ::ActiveRecord::Base.current_ability_proc = proc {send(:current_ability)}
+          ::ActiveRecord::Base.current_ability_proc = proc { send(:current_ability) }
         end
       end
 
@@ -82,6 +81,7 @@ module ActiveScaffold::Bridges
           def current_ability_proc
             Thread.current[:current_ability_proc]
           end
+
           def current_ability_proc=(value)
             Thread.current[:current_ability_proc] = value
           end
@@ -93,11 +93,12 @@ module ActiveScaffold::Bridges
         end
 
         # Instance-level access to the current ability
-        def current_ability; self.class.current_ability end
+        def current_ability
+          self.class.current_ability
+        end
       end
     end
 
-
     # plug into AS#authorized_for calls
     module ActiveRecord
       extend ActiveSupport::Concern
@@ -119,7 +120,7 @@ module ActiveScaffold::Bridges
         # to allow access cancan must allow both :crud_type and :action
         # if cancan says "no", it delegates to default AS behavior
         def authorized_for_with_cancan?(options = {})
-          raise InvalidArgument if options[:crud_type].blank? and options[:action].blank?
+          raise InvalidArgument if options[:crud_type].blank? && options[:action].blank?
           if current_ability.present?
             crud_type_result = options[:crud_type].nil? ? true : current_ability.can?(options[:crud_type], self)
             action_result = options[:action].nil? ? true : current_ability.can?(options[:action].to_sym, self)
@@ -127,11 +128,9 @@ module ActiveScaffold::Bridges
             crud_type_result, action_result = false, false
           end
           default_result = authorized_for_without_cancan?(options)
-          result = (crud_type_result && action_result) || default_result
-          return result
+          (crud_type_result && action_result) || default_result
         end
       end
     end
-
   end
 end

data/lib/active_scaffold/bridges/carrierwave.rb

@@ -1,9 +1,9 @@
 class ActiveScaffold::Bridges::Carrierwave < ActiveScaffold::DataStructures::Bridge
   def self.install
-    require File.join(File.dirname(__FILE__), "carrierwave/form_ui")
-    require File.join(File.dirname(__FILE__), "carrierwave/list_ui")
-    require File.join(File.dirname(__FILE__), "carrierwave/carrierwave_bridge_helpers")
-    require File.join(File.dirname(__FILE__), "carrierwave/carrierwave_bridge")
+    require File.join(File.dirname(__FILE__), 'carrierwave/form_ui')
+    require File.join(File.dirname(__FILE__), 'carrierwave/list_ui')
+    require File.join(File.dirname(__FILE__), 'carrierwave/carrierwave_bridge_helpers')
+    require File.join(File.dirname(__FILE__), 'carrierwave/carrierwave_bridge')
     ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::Carrierwave::CarrierwaveBridge
   end
   def self.install?

data/lib/active_scaffold/bridges/carrierwave/carrierwave_bridge.rb

@@ -4,12 +4,12 @@ module ActiveScaffold
       module CarrierwaveBridge
         def initialize_with_carrierwave(model_id)
           initialize_without_carrierwave(model_id)
-          return unless self.model.respond_to?(:uploaders) && self.model.uploaders.present?
+          return unless model.respond_to?(:uploaders) && model.uploaders.present?
 
-          self.update.multipart = true
-          self.create.multipart = true
+          update.multipart = true
+          create.multipart = true
 
-          self.model.uploaders.keys.each do |field|
+          model.uploaders.keys.each do |field|
             configure_carrierwave_field(field.to_sym)
           end
         end
@@ -19,11 +19,12 @@ module ActiveScaffold
         end
 
         private
+
         def configure_carrierwave_field(field)
-          self.columns << field
-          self.columns[field].form_ui ||= :carrierwave # :TODO thumbnail
-          self.columns[field].params.add "#{field}_cache"
-          self.columns[field].params.add "remove_#{field}"
+          columns << field
+          columns[field].form_ui ||= :carrierwave # :TODO thumbnail
+          columns[field].params.add "#{field}_cache"
+          columns[field].params.add "remove_#{field}"
         end
       end
     end

data/lib/active_scaffold/bridges/carrierwave/form_ui.rb

@@ -3,8 +3,8 @@ module ActiveScaffold
     module FormColumnHelpers
       def active_scaffold_input_carrierwave(column, options)
         record = options[:object]
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in html_options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include :object in html_options with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
         options = active_scaffold_input_text_options(options.merge(column.options))
 
         carrierwave = record.send("#{column.name}")
@@ -23,22 +23,23 @@ module ActiveScaffold
 
           case ActiveScaffold.js_framework
           when :jquery
-            js_remove_file_code = "jQuery(this).prev('input#remove_#{options[:id]}').val('true'); jQuery(this).parent().hide().next().show(); return false;";
-            js_dont_remove_file_code = "jQuery(this).parents('div.carrierwave_controls').find('input#remove_#{options[:id]}').val('false'); return false;";
+            js_remove_file_code = "jQuery(this).prev('input#remove_#{options[:id]}').val('true'); jQuery(this).parent().hide().next().show(); return false;"
+            js_dont_remove_file_code = "jQuery(this).parents('div.carrierwave_controls').find('input#remove_#{options[:id]}').val('false'); return false;"
           when :prototype
-            js_remove_file_code = "$(this).previous('input#remove_#{options[:id]}').value='true'; $(this).up().hide().next().show(); return false;";
-            js_dont_remove_file_code = "$(this).up('div.carrierwave_controls').down('input#remove_#{options[:id]}').value='false'; return false;";
+            js_remove_file_code = "$(this).previous('input#remove_#{options[:id]}').value='true'; $(this).up().hide().next().show(); return false;"
+            js_dont_remove_file_code = "$(this).up('div.carrierwave_controls').down('input#remove_#{options[:id]}').value='false'; return false;"
           end
 
           input = file_field(:record, column.name, options.merge(:onchange => js_dont_remove_file_code))
-          content_tag( :div,
+          content_tag(
+            :div,
             content_tag(:div, (
-                get_column_value(record, column) + " | " +
+                get_column_value(record, column) + ' | ' +
                   hidden_field(:record, "#{column.name}_cache", cache_field_options) +
                   hidden_field(:record, "remove_#{column.name}", remove_field_options) +
-                  content_tag(:a, as_(:remove_file), {:href => '#', :onclick => js_remove_file_code})
+                  content_tag(:a, as_(:remove_file), :href => '#', :onclick => js_remove_file_code)
               ).html_safe
-            ) + content_tag(:div, input, :style => "display: none"),
+            ) + content_tag(:div, input, :style => 'display: none'),
             :class => 'carrierwave_controls'
           )
         else

data/lib/active_scaffold/bridges/carrierwave/list_ui.rb

@@ -3,13 +3,14 @@ module ActiveScaffold
     module ListColumnHelpers
       def active_scaffold_column_carrierwave(record, column)
         carrierwave = record.send("#{column.name}")
-        return nil unless !carrierwave.file.blank?
+        return nil if carrierwave.file.blank?
         thumbnail_style = ActiveScaffold::Bridges::Carrierwave::CarrierwaveBridgeHelpers.thumbnail_style
-        content = if carrierwave.versions.keys.include?(thumbnail_style)
-          image_tag(carrierwave.url(thumbnail_style), :border => 0).html_safe
-        else
-          record.send(record.send(:_mounter, column.name).send(:serialization_column))
-        end
+        content =
+          if carrierwave.versions.keys.include?(thumbnail_style)
+            image_tag(carrierwave.url(thumbnail_style), :border => 0).html_safe
+          else
+            record.send(record.send(:_mounter, column.name).send(:serialization_column))
+          end
         link_to(content, carrierwave.url, :target => '_blank')
       end
     end

data/lib/active_scaffold/bridges/chosen.rb

@@ -1,6 +1,6 @@
 class ActiveScaffold::Bridges::Chosen < ActiveScaffold::DataStructures::Bridge
   def self.install
-    require File.join(File.dirname(__FILE__), "chosen/helpers.rb")
+    require File.join(File.dirname(__FILE__), 'chosen/helpers.rb')
   end
   def self.install?
     super && [:jquery, :prototype].include?(ActiveScaffold.js_framework)