active_scaffold 3.0.4 → 3.0.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+= 3.0.5
+
+- switch from explicit requires to autoloading
+- get nested action links up and running
+
 = 3.0.4
 
 - Fix a typo that made 3.0.3 unusable.

data/active_scaffold.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "active_scaffold"
-  s.version     = "3.0.4"
+  s.version     = "3.0.5"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Many, see README"]
   s.email       = ["activescaffold@googlegroups.com"]

data/frontends/default/stylesheets/stylesheet.css

@@ -264,7 +264,8 @@ text-align: right;
 padding: 0 2px;
 }
 
-.active-scaffold tr.record td.actions a {
+.active-scaffold tr.record td.actions a,
+.active-scaffold tr.record td.actions span {
 font: bold 11px verdana, sans-serif;
 letter-spacing: -1px;
 padding: 2px;
@@ -273,6 +274,43 @@ line-height: 16px;
 white-space: nowrap;
 }
 
+.active-scaffold tr.record td.actions td.action_list {
+  position:relative;
+  text-align: left;
+  color: #0066CC;
+}
+
+.active-scaffold tr.record td.actions .action_list ul {
+border:medium none;
+list-style-type:none;
+margin:0;
+padding:0;
+position:absolute;
+line-height:200%;
+display: none;
+width:100%;
+}
+
+.active-scaffold tr.record td.actions .action_list ul li {
+background:none repeat scroll 0 0 #FFF;
+border-bottom:1px solid #AFD0F5;
+border-left:1px solid #AFD0F5;
+border-right:1px solid #AFD0F5;
+color:#000000;
+display:block;
+padding-bottom:5px;
+position:relative;
+width:160px;
+z-index: 2;
+}
+
+.active-scaffold tr.record td.actions td.action_list:hover ul {
+display:block;
+}
+
+
+
+
 /* Table :: Inline Adapter
    ============================= */
 
@@ -625,7 +663,6 @@ letter-spacing: 0;
 
 .active-scaffold li.form-element {
 clear: both;
-padding-top: 2px;
 }
 
 .active-scaffold label {
@@ -653,6 +690,7 @@ margin: 0;
 
 
 .active-scaffold .description {
+display: inline-block;
 color: #999;
 font-size: 10px;
 margin-left: 5px;

data/lib/active_scaffold.rb

@@ -1,3 +1,7 @@
+unless Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 0
+  raise "This version of ActiveScaffold requires Rails 3.0 or higher.  Please use an earlier version."
+end
+
 require 'render_component' rescue nil
 require 'verification'
 
@@ -5,18 +9,43 @@ require 'active_record_permissions'
 require 'dhtml_confirm'
 require 'paginator'
 require 'responds_to_parent'
-require 'active_scaffold/attribute_params'
-require 'active_scaffold/configurable'
-require 'active_scaffold/constraints'
-require 'active_scaffold/finder'
-require 'active_scaffold/marked_model'
-require 'active_scaffold/config/base'
-require 'active_scaffold/data_structures/column'
-require 'active_scaffold/data_structures/actions'
-require 'active_scaffold/data_structures/action_links'
-require 'active_scaffold/config/form'
 
 module ActiveScaffold
+  autoload :AttributeParams, 'active_scaffold/attribute_params'
+  autoload :Configurable, 'active_scaffold/configurable'
+  autoload :Constraints, 'active_scaffold/constraints'
+  autoload :Finder, 'active_scaffold/finder'
+  autoload :MarkedModel, 'active_scaffold/marked_model'
+
+  def self.active_scaffold_autoload_subdir(dir, mod=self)
+    Dir["#{File.dirname(__FILE__)}/active_scaffold/#{dir}/*.rb"].each { |file|
+      basename = File.basename(file, ".rb")
+      mod.module_eval {
+        autoload basename.camelcase.to_sym, "active_scaffold/#{dir}/#{basename}"
+      }
+    }
+  end
+
+  module Actions
+    ActiveScaffold.active_scaffold_autoload_subdir('actions', self)
+  end
+
+  module Bridges
+    autoload :Bridge, 'active_scaffold/bridges/bridge'
+  end
+
+  module Config
+    ActiveScaffold.active_scaffold_autoload_subdir('config', self)
+  end
+
+  module DataStructures
+    ActiveScaffold.active_scaffold_autoload_subdir('data_structures', self)
+  end
+
+  module Helpers
+    ActiveScaffold.active_scaffold_autoload_subdir('helpers', self)
+  end
+
   class ControllerNotFound < RuntimeError; end
   class DependencyFailure < RuntimeError; end
   class MalformedConstraint < RuntimeError; end
@@ -71,6 +100,58 @@ module ActiveScaffold
     @@js_framework ||= :prototype
   end
 
+  ##
+  ## Copy over asset files (javascript/css/images) from directory to public/
+  ##
+  def self.install_assets_from(directory)
+    copy_files("/public", "/public", directory)
+
+    available_frontends = Dir[File.join(directory, 'frontends', '*')].map { |d| File.basename d }
+    [:stylesheets, :javascripts, :images].each do |asset_type|
+      path = "/public/#{asset_type}/active_scaffold"
+      copy_files(path, path, directory)
+
+      File.open(File.join(Rails.root, path, 'DO_NOT_EDIT'), 'w') do |f|
+        f.puts "Any changes made to files in sub-folders will be lost."
+        f.puts "See http://activescaffold.com/tutorials/faq#custom-css."
+      end
+
+      available_frontends.each do |frontend|
+        if asset_type == :javascripts
+          file_mask = '*.js'
+          source = "/frontends/#{frontend}/#{asset_type}/#{ActiveScaffold.js_framework}"
+        else
+          file_mask = '*.*'
+          source = "/frontends/#{frontend}/#{asset_type}"
+        end
+        destination = "/public/#{asset_type}/active_scaffold/#{frontend}"
+        copy_files(source, destination, directory, file_mask)
+      end
+    end
+  end
+
+  def self.root
+    File.dirname(__FILE__) + "/.."
+  end
+
+  def self.delete_stale_assets
+    available_frontends = Dir[File.join(root, 'frontends', '*')].map { |d| File.basename d }
+    [:stylesheets, :javascripts, :images].each do |asset_type|
+      available_frontends.each do |frontend|
+        destination = File.join(Rails.root, "/public/#{asset_type}/active_scaffold/#{frontend}")
+        FileUtils.rm Dir.glob("#{destination}/*")
+      end
+    end
+  end
+
+  private
+  def self.copy_files(source_path, destination_path, directory, file_mask = '*.*')
+    source, destination = File.join(directory, source_path), File.join(Rails.root, destination_path)
+    FileUtils.mkdir_p(destination) unless File.exist?(destination)
+
+    FileUtils.cp_r(Dir.glob("#{source}/#{file_mask}"), destination)
+  end
+
   module ClassMethods
     def active_scaffold(model_id = nil, &block)
       # initialize bridges here
@@ -228,8 +309,10 @@ module ActiveScaffold
     end
 
     # Tries to find a controller for the given ActiveRecord model.
-    # Searches in the namespace of the current controller for singular and plural versions of the conventional "#{model}Controller" syntax.
-    # You may override this method to customize the search routine.
+    # Searches in the namespace of the current controller for singular
+    # and plural versions of the conventional "#{model}Controller"
+    # syntax.  You may override this method to customize the search
+    # routine.
     def active_scaffold_controller_for(klass)
       controller_namespace = self.to_s.split('::')[0...-1].join('::') + '::'
       error_message = []
@@ -260,22 +343,29 @@ module ActiveScaffold
   end
 end
 
-##
-## Initialize the environment
-##
-unless Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 0
-  raise "This version of ActiveScaffold requires Rails 3.0 or higher.  Please use an earlier version."
-end
+# TODO: clean up extensions. some could be organized for autoloading, and others could be removed entirely.
+Dir["#{File.dirname __FILE__}/extensions/*.rb"].each { |file| require file }
+
+ActionController::Base.send(:include, ActiveScaffold)
+ActionController::Base.send(:include, RespondsToParent)
+ActionController::Base.send(:include, ActiveScaffold::Helpers::ControllerHelpers)
+ActionView::Base.send(:include, ActiveScaffold::Helpers::ViewHelpers)
+
+ActionController::Base.class_eval {include ActiveRecordPermissions::ModelUserAccess::Controller}
+ActiveRecord::Base.class_eval     {include ActiveRecordPermissions::ModelUserAccess::Model}
+ActiveRecord::Base.class_eval     {include ActiveRecordPermissions::Permissions}
 
-require File.dirname(__FILE__) + '/../environment'
+I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'active_scaffold', 'locale', '*.{rb,yml}')]
+#ActiveScaffold.js_framework = :jquery
 
 ##
 ## Run the install assets script, too, just to make sure
 ## But at least rescue the action in production
 ##
-Rails::Application.initializer("active_scaffold_install_assets") do
+Rails::Application.initializer("active_scaffold.install_assets") do
   begin
-    require File.dirname(__FILE__) + '/../install_assets'
+    ActiveScaffold.delete_stale_assets
+    ActiveScaffold.install_assets_from(ActiveScaffold.root)
   rescue
     raise $! unless Rails.env == 'production'
   end

data/lib/active_scaffold/actions/nested.rb

@@ -1,5 +1,9 @@
 module ActiveScaffold::Actions
-  # The Nested module basically handles automatically linking controllers together. It does this by creating column links with the right parameters, and by providing any supporting systems (like a /:controller/nested action for returning associated scaffolds).
+  # The Nested module basically handles automatically linking
+  # controllers together. It does this by creating column links with
+  # the right parameters, and by providing any supporting systems
+  # (like a /:controller/nested action for returning associated
+  # scaffolds).
   module Nested
 
     def self.included(base)

data/lib/active_scaffold/actions/subform.rb

@@ -4,7 +4,10 @@ module ActiveScaffold::Actions
       @parent_record = params[:id].nil? ? active_scaffold_config.model.new : find_if_allowed(params[:id], :update)
       @column = active_scaffold_config.columns[params[:association]]
 
-      # NOTE: we don't check whether the user is allowed to update this record, because if not, we'll still let them associate the record. we'll just refuse to do more than associate, is all.
+      # NOTE: we don't check whether the user is allowed to update
+      # this record, because if not, we'll still let them associate
+      # the record. we'll just refuse to do more than associate, is
+      # all.
       @record = @column.association.klass.find(params[:associated_id]) if params[:associated_id]
       @record ||= @column.association.klass.new
 

data/lib/active_scaffold/attribute_params.rb

@@ -56,11 +56,11 @@ module ActiveScaffold
         if multi_parameter_attributes.has_key? column.name
           parent_record.send(:assign_multiparameter_attributes, multi_parameter_attributes[column.name])
         elsif attributes.has_key? column.name
-          value = column_value_from_param_value(parent_record, column, attributes[column.name]) 
+          value = column_value_from_param_value(parent_record, column, attributes[column.name])
 
           # we avoid assigning a value that already exists because otherwise has_one associations will break (AR bug in has_one_association.rb#replace)
           parent_record.send("#{column.name}=", value) unless parent_record.send(column.name) == value
-          
+
         # plural associations may not actually appear in the params if all of the options have been unselected or cleared away.
         # the "form_ui" check is necessary, becuase without it we have problems
         # with subforms. the UI cuts out deep associations, which means they're not present in the
@@ -85,7 +85,7 @@ module ActiveScaffold
 
       parent_record
     end
-    
+
     def manage_nested_record_from_params(parent_record, column, attributes)
       record = find_or_create_for_params(attributes, column, parent_record)
       if record
@@ -95,7 +95,7 @@ module ActiveScaffold
       end
       record
     end
-    
+
     def column_value_from_param_value(parent_record, column, value)
       # convert the value, possibly by instantiating associated objects
       if value.is_a?(Hash)

data/lib/active_scaffold/bridges/bridge.rb

@@ -37,11 +37,8 @@ module ActiveScaffold
       end
 
       def self.run_all
-        return false if self.bridges_run
-        ActiveScaffold::Bridges::Bridge.bridges.each{|bridge|
-          bridge.run
-        }
-        self.bridges_run=true
+        self.bridges.each(&:run) unless self.bridges_run
+        self.bridges_run = true
       end
     end
   end

data/lib/active_scaffold/config/list.rb

@@ -9,7 +9,7 @@ module ActiveScaffold::Config
       # full configuration path is: defaults => global table => local table
       @per_page = self.class.per_page
       @page_links_window = self.class.page_links_window
-      
+
       # originates here
       @sorting = ActiveScaffold::DataStructures::Sorting.new(@core.columns)
       @sorting.set_default_sorting(@core.model)
@@ -49,7 +49,7 @@ module ActiveScaffold::Config
       self.columns = @core.columns._inheritable unless @columns # lazy evaluation
       @columns
     end
-    
+
     public :columns=
 
     # how many rows to show at once
@@ -79,7 +79,7 @@ module ActiveScaffold::Config
     def sorting
       @sorting ||= ActiveScaffold::DataStructures::Sorting.new(@core.columns)
     end
-    
+
     # overwrite the includes used for the count sql query
     attr_accessor :count_includes
 
@@ -98,29 +98,29 @@ module ActiveScaffold::Config
     def filtered_message
       @filtered_message ? @filtered_message : :filtered
     end
-    
+
     attr_writer :always_show_search
     def always_show_search
       @always_show_search && !search_partial.blank?
     end
-    
+
     def search_partial
       return "search" if @core.actions.include?(:search)
       return "field_search" if @core.actions.include?(:field_search)
     end
-    
+
     # always show create
     attr_writer :always_show_create
     def always_show_create
       @always_show_create && @core.actions.include?(:create)
     end
-    
+
     # might be set to open nested_link automatically in view
     # conf.nested.add_link(:players)
     # conf.list.nested_auto_open = {:players => 2}
     # will open nested players view if there are 2 or less records in parent
     attr_accessor :nested_auto_open
-    
+
     class UserSettings < UserSettings
       # This label has alread been localized.
       def label
@@ -165,7 +165,7 @@ module ActiveScaffold::Config
           return default_sorting
         end
       end
-      
+
       def count_includes
         @conf.count_includes
       end

data/lib/active_scaffold/config/update.rb

@@ -33,6 +33,6 @@ module ActiveScaffold::Config
     def hide_nested_column
       @hide_nested_column.nil? ? true : @hide_nested_column
     end
- 
+
   end
 end

data/lib/active_scaffold/data_structures/action_links.rb

@@ -73,12 +73,13 @@ module ActiveScaffold::DataStructures
     end
 
     def traverse(controller, options = {}, &block)
-      @set.each do |link|
+      traverse_method = options.delete(:reverse).nil? ? :each : :reverse_each
+      @set.send(traverse_method) do |link|
         if link.is_a?(ActiveScaffold::DataStructures::ActionLinks)
           # add top node only if there is anything in the list
           #yield({:kind => :node, :level => 1, :last => false, :link => link})
           yield(link, nil, {:node => :start_traversing})
-          link.traverse(options, &block)
+          link.traverse(controller,options, &block)
           yield(link, nil, {:node => :finished_traversing})
           #yield({:kind => :completed_group, :level => 1, :last => false, :link => link})
         elsif controller.nil? || !skip_action_link(controller, link, options[:record])
@@ -89,7 +90,7 @@ module ActiveScaffold::DataStructures
     end
 
     def collect
-      @set.collect
+      @set
     end
 
     def empty?

data/lib/active_scaffold/finder.rb

@@ -98,7 +98,7 @@ module ActiveScaffold
           nil
         end
       end
-      
+
       def condition_value_for_datetime(value, conversion = :to_time)
         if value.is_a? Hash
           Time.zone.local(*[:year, :month, :day, :hour, :minute, :second].collect {|part| value[field][part].to_i}) rescue nil
@@ -132,7 +132,7 @@ module ActiveScaffold
           value
         end
       end
-            
+
       def condition_for_datetime(column, value, like_pattern = nil)
         conversion = column.column.type == :date ? :to_date : :to_time
         from_value = condition_value_for_datetime(value[:from], conversion)
@@ -156,7 +156,7 @@ module ActiveScaffold
           ["#{column.search_sql} = ?", value]
         end
       end
-      
+
       def condition_for_null_type(column, value, like_pattern = nil)
         case value.to_sym
         when :null
@@ -196,8 +196,8 @@ module ActiveScaffold
       :null,
       :not_null
     ]
-    
-    
+
+
 
     def self.included(klass)
       klass.extend ClassMethods
@@ -219,7 +219,7 @@ module ActiveScaffold
     def active_scaffold_habtm_joins
       @active_scaffold_habtm_joins ||= []
     end
-    
+
     def all_conditions
       merge_conditions(
         active_scaffold_conditions,                   # from the search modules
@@ -229,7 +229,7 @@ module ActiveScaffold
         active_scaffold_session_storage[:conditions] # embedding conditions (weaker constraints)
       )
     end
-    
+
     # returns a single record (the given id) but only if it's allowed for the specified action.
     # accomplishes this by checking model.#{action}_authorized?
     # TODO: this should reside on the model, not the controller
@@ -255,19 +255,19 @@ module ActiveScaffold
       options[:count_includes] ||= full_includes unless search_conditions.nil?
 
       klass = beginning_of_chain
-      
+
       # create a general-use options array that's compatible with Rails finders
       finder_options = { :order => options[:sorting].try(:clause),
                          :where => search_conditions,
                          :joins => joins_for_finder,
                          :includes => options[:count_includes]}
-                         
+
       finder_options.merge! custom_finder_options
 
       # NOTE: we must use :include in the count query, because some conditions may reference other tables
       count_query = append_to_query(klass, finder_options.reject{|k, v| [:select, :order].include?(k)})
       count = count_query.count unless options[:pagination] == :infinite
-  
+
       # Converts count to an integer if ActiveRecord returned an OrderedHash
       # that happens when finder_options contains a :group key
       count = count.length if count.is_a? ActiveSupport::OrderedHash
@@ -288,11 +288,11 @@ module ActiveScaffold
       end
       pager.page(options[:page])
     end
-    
+
     def append_to_query(query, options)
       options.assert_valid_keys :where, :select, :group, :order, :limit, :offset, :joins, :includes, :lock, :readonly, :from
       options.reject{|k, v| v.blank?}.inject(query) do |query, (k, v)|
-        query.send((k.to_sym), v) 
+        query.send((k.to_sym), v)
       end
     end
 
@@ -306,7 +306,7 @@ module ActiveScaffold
           []
       end + active_scaffold_habtm_joins
     end
-    
+
     def merge_conditions(*conditions)
       segments = []
       conditions.each do |condition|