Merge branch 'official_master' into merge22

Conflicts:

	environment.rb
	frontends/default/views/destroy.rjs
	lib/active_scaffold/data_structures/column.rb
	lib/active_scaffold/helpers/list_column_helpers.rb
	lib/active_scaffold/helpers/view_helpers.rb

Author: pbrant

README

@@ -16,4 +16,12 @@ http://paginator.rubyforge.org/
 Supports RecordSelect by Lance Ivy
 http://code.google.com/p/recordselect/
 
+== Version Information
+
+Please note the following list of Active Scaffold branches and Rails versions. Master will not work with Rails < 2.2
+
+Rails >= 2.2: Active Scaffold master
+Rails 2.1.*: Active Scaffold rails-2.1
+Rails < 2.1: Active Scaffold 1-1-stable (no guarantees)
+
 Released under the MIT license (included)

environment.rb

@@ -1,84 +1,15 @@
-require 'exceptions'
-##
-## Check for dependencies
-##
-
-version = Rails::VERSION::STRING.split(".")
-if version[0] < "1" or (version[0] == "1" and version[1] < "2")
-  message = <<-EOM
-    ************************************************************************
-    Rails 1.2.1 or greater is required. Please remove ActiveScaffold or
-    upgrade Rails. After you upgrade Rails, be sure to run
-
-    > rake rails:update:javascripts
-
-    to get the newest prototype.js.
-    ************************************************************************
-  EOM
-  ActionController::Base::logger.error message
-  puts message
-  raise ActiveScaffold::DependencyFailure
-end
-
-begin
-  Paginator rescue require('paginator')
-end
-
-##
-## Load the library
-##
 require 'active_scaffold'
-require 'configurable'
-require 'finder'
-require 'constraints'
-require 'attribute_params'
-require 'active_record_permissions'
-require 'responds_to_parent'
-require 'composite_keys'
-
-##
-## Autoloading for some directories
-## (this could probably be optimized more -lance)
-##
-def autoload_dir(directory, namespace)
-  Dir.entries(directory).each do |file|
-    next unless file =~ /\.rb$/
-    if file =~ /^[a-z_]+\.rb$/
-      constant = File.basename(file, '.rb').camelcase
-      eval(namespace).autoload constant, File.join(directory, file)
-    else
-      message = "ActiveScaffold: could not autoload #{File.join(directory, file)}"
-      RAILS_DEFAULT_LOGGER.error message
-      puts message
-    end
-  end
-end
-[:config, :actions, :data_structures].each do |namespace|
-  ActiveScaffold.class_eval "module #{namespace.to_s.camelcase}; end"
-  autoload_dir "#{File.dirname __FILE__}/lib/#{namespace}", "ActiveScaffold::#{namespace.to_s.camelcase}"
-end
 
-##
-## Preload other directories
-##
+# TODO: clean up extensions. some could be organized for autoloading, and others could be removed entirely.
 Dir["#{File.dirname __FILE__}/lib/extensions/*.rb"].each { |file| require file }
-Dir["#{File.dirname __FILE__}/lib/helpers/*.rb"].each do |file|
-  require file unless ['view_helpers.rb', 'controller_helpers.rb'].include? File.basename(file)
-end
-require "#{File.dirname __FILE__}/lib/helpers/view_helpers"
-require "#{File.dirname __FILE__}/lib/helpers/controller_helpers"
 
-## 
-## Load the bridge infrastructure
-## 
-require 'bridges/bridge.rb'
-
-
-##
-## Inject includes for ActiveScaffold libraries
-##
 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 'bridges/bridge.rb'