active_scaffold 3.0.26 → 3.1.3

data/lib/active_scaffold/actions/list.rb~

@@ -17,6 +17,8 @@ module ActiveScaffold::Actions
 
     def list
       do_list
+      do_new if active_scaffold_config.list.always_show_create
+      @record ||= new_model if active_scaffold_config.list.always_show_search
       @nested_auto_open = active_scaffold_config.list.nested_auto_open
       respond_to_action(:list)
     end
@@ -173,9 +175,7 @@ module ActiveScaffold::Actions
     end
     alias_method :index_formats, :list_formats
 
-    def row_formats
-      ([:html] + active_scaffold_config.formats + active_scaffold_config.list.formats).uniq
-    end
+    alias_method :row_formats, :list_formats
 
     def action_update_formats
       (default_formats + active_scaffold_config.formats).uniq

data/lib/active_scaffold/actions/mark.rb

@@ -2,8 +2,8 @@ module ActiveScaffold::Actions
   module Mark
 
     def self.included(base)
-      base.before_filter :mark_authorized?, :only => [:mark_all]
-      base.prepend_before_filter :assign_marked_records_to_model
+      base.before_filter :mark_authorized?, :only => :mark
+      #base.prepend_before_filter :assign_marked_records_to_model
       base.helper_method :marked_records
     end
 
@@ -11,7 +11,7 @@ module ActiveScaffold::Actions
       if mark_all? || mark_all_scope_forced?
         do_mark_all
       else
-        do_demark_all
+        do_unmark
       end
       respond_to_action(:mark_all)
     end
@@ -33,9 +33,9 @@ module ActiveScaffold::Actions
     def assign_marked_records_to_model
       active_scaffold_config.model.marked_records = marked_records
     end
-    
-    def marked_records
-      active_scaffold_session_storage[:marked_records] ||= Set.new
+
+    def mark?
+      params[:value] == 'true'
     end
     
     def mark_all?
@@ -65,11 +65,11 @@ module ActiveScaffold::Actions
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
     def mark_authorized?
-      authorized_for?(:action => :read)
+      authorized_for?(:crud_type => :read)
     end
 
     def mark_all_formats
       (default_formats + active_scaffold_config.formats).uniq
     end
   end
-end
+end

data/lib/active_scaffold/actions/nested.rb

@@ -82,12 +82,8 @@ module ActiveScaffold::Actions
     end
     
     def beginning_of_chain
-      if nested? && nested.association && !nested.association.belongs_to?
-        if nested.association.collection?
-          nested.parent_scope.send(nested.association.name)
-        elsif nested.child_association.belongs_to?
-          active_scaffold_config.model.where(nested.child_association.foreign_key => nested.parent_scope)
-        end
+      if nested? && nested.association && nested.association.collection?
+        nested.parent_scope.send(nested.association.name)
       elsif nested? && nested.scope
         nested.parent_scope.send(nested.scope)
       else
@@ -127,9 +123,6 @@ module ActiveScaffold::Actions::Nested
 
     def self.included(base)
       super
-      base.verify :method => :post,
-                  :only => :add_existing,
-                  :redirect_to => { :action => :index }
     end
 
     def new_existing

data/lib/active_scaffold/actions/nested.rb~

@@ -82,13 +82,8 @@ module ActiveScaffold::Actions
     end
     
     def beginning_of_chain
-      if nested? && nested.association && !nested.association.belongs_to?
-        debugger
-        if nested.association.collection?
-          nested.parent_scope.send(nested.association.name)
-        elsif nested.child_association.belongs_to?
-          active_scaffold_config.model.where(nested.child_association.foreign_key => nested.parent_scope)
-        end
+      if nested? && nested.association && nested.association.collection?
+        nested.parent_scope.send(nested.association.name)
       elsif nested? && nested.scope
         nested.parent_scope.send(nested.scope)
       else
@@ -128,6 +123,9 @@ module ActiveScaffold::Actions::Nested
 
     def self.included(base)
       super
+      base.verify :method => :post,
+                  :only => :add_existing,
+                  :redirect_to => { :action => :index }
     end
 
     def new_existing

data/lib/active_scaffold/actions/search.rb

@@ -24,7 +24,8 @@ module ActiveScaffold::Actions
       unless query.empty?
         columns = active_scaffold_config.search.columns
         text_search = active_scaffold_config.search.text_search
-        search_conditions = self.class.create_conditions_for_columns(query.split(' '), columns, text_search)
+        query = query.split(active_scaffold_config.search.split_terms) if active_scaffold_config.search.split_terms
+        search_conditions = self.class.create_conditions_for_columns(query, columns, text_search)
         self.active_scaffold_conditions = merge_conditions(self.active_scaffold_conditions, search_conditions)
         @filtered = !search_conditions.blank?
 

data/lib/active_scaffold/actions/subform.rb

@@ -13,11 +13,7 @@ module ActiveScaffold::Actions
 
       # 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 ||= if @column.singular_association?
-        @parent_record.send("build_#{@column.name}".to_sym)
-      else
-        @parent_record.send(@column.name).build
-      end
+      @record ||= build_associated(@column, @parent_record)
 
       @scope = "[#{@column.name}]"
       @scope += (@record.new_record?) ? "[#{(Time.now.to_f*1000).to_i.to_s}]" : "[#{@record.id}]" if @column.plural_association?

data/lib/active_scaffold/actions/update.rb

@@ -2,9 +2,6 @@ module ActiveScaffold::Actions
   module Update
     def self.included(base)
       base.before_filter :update_authorized_filter, :only => [:edit, :update]
-      base.verify :method => [:post, :put],
-                  :only => :update,
-                  :redirect_to => { :action => :index }
       base.helper_method :update_refresh_list?
     end
 
@@ -35,7 +32,7 @@ module ActiveScaffold::Actions
     def edit_respond_to_js
       render(:partial => 'update_form')
     end
-    def update_respond_to_html  
+    def update_respond_to_html
       if params[:iframe]=='true' # was this an iframe post ?
         responds_to_parent do
           render :action => 'on_update.js', :layout => false

data/lib/active_scaffold/actions/update.rb~

@@ -18,7 +18,7 @@ module ActiveScaffold::Actions
     # for inline (inlist) editing
     def update_column
       do_update_column
-      @column_span_id = params[:editor_id] || params[:editorId]
+      render :action => 'update_column', :locals => {:column_span_id => params[:editor_id] || params[:editorId]}
     end
 
     protected
@@ -32,7 +32,8 @@ module ActiveScaffold::Actions
     def edit_respond_to_js
       render(:partial => 'update_form')
     end
-    def update_respond_to_html
+    def update_respond_to_html  
+      debugger
       if params[:iframe]=='true' # was this an iframe post ?
         responds_to_parent do
           render :action => 'on_update.js', :layout => false
@@ -47,6 +48,7 @@ module ActiveScaffold::Actions
       end
     end
     def update_respond_to_js
+      debugger
       if successful? && update_refresh_list? && !render_parent?
         do_search if respond_to? :do_search
         do_list
@@ -92,11 +94,9 @@ module ActiveScaffold::Actions
           end
         end
       rescue ActiveRecord::RecordInvalid
-        self.successful = false
-        flash[:error] = $!.message
       rescue ActiveRecord::StaleObjectError
         @record.errors.add(:base, as_(:version_inconsistency))
-        self.successful = false
+        self.successful=false
       rescue ActiveRecord::RecordNotSaved
         @record.errors.add(:base, as_(:record_not_saved)) if @record.errors.empty?
         self.successful = false

data/lib/active_scaffold/attribute_params.rb

@@ -39,7 +39,6 @@ module ActiveScaffold
       crud_type = parent_record.new_record? ? :create : :update
       return parent_record unless parent_record.authorized_for?(:crud_type => crud_type)
 
-      attributes = {} unless attributes.is_a?(Hash)
       multi_parameter_attributes = {}
       attributes.each do |k, v|
         next unless k.include? '('
@@ -62,22 +61,17 @@ module ActiveScaffold
           # 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
-        # params even though they're in the columns list. the result is that associations were being
-        # emptied out way too often.
-        elsif column.form_ui and column.plural_association?
+        elsif column.plural_association?
           parent_record.send("#{column.name}=", [])
         end
       end
 
       if parent_record.new_record?
         parent_record.class.reflect_on_all_associations.each do |a|
-          next unless [:has_one, :has_many].include?(a.macro) and not a.options[:through]
+          next unless [:has_one, :has_many].include?(a.macro) and not (a.options[:through] || a.options[:finder_sql])
           next unless association_proxy = parent_record.send(a.name)
 
-          raise ActiveScaffold::ReverseAssociationRequired, "Association #{a.name}: In order to support :has_one and :has_many where the parent record is new and the child record(s) validate the presence of the parent, ActiveScaffold requires the reverse association (the belongs_to)." unless a.reverse
+          raise ActiveScaffold::ReverseAssociationRequired, "Association #{a.name} in class #{parent_record.class.name}: In order to support :has_one and :has_many where the parent record is new and the child record(s) validate the presence of the parent, ActiveScaffold requires the reverse association (the belongs_to)." unless a.reverse
 
           association_proxy = [association_proxy] if a.macro == :has_one
           association_proxy.each { |record| record.send("#{a.reverse}=", parent_record) }
@@ -112,7 +106,7 @@ module ActiveScaffold
         column.association.klass.find(value) if value and not value.empty?
       elsif column.plural_association?
         column_plural_assocation_value_from_value(column, value)
-      elsif column.column && column.number? && [:i18n_number, :currency].include?(column.options[:format])
+      elsif column.number? && [:i18n_number, :currency].include?(column.options[:format])
         self.class.i18n_number_to_native_format(value)
       else
         # convert empty strings into nil. this works better with 'null => true' columns (and validations),
@@ -150,36 +144,31 @@ module ActiveScaffold
       end
     end
 
-    # Attempts to create or find an instance of klass (which must be an ActiveRecord object) from the
+   # Attempts to create or find an instance of klass (which must be an ActiveRecord object) from the
     # request parameters given. If params[:id] exists it will attempt to find an existing object
     # otherwise it will build a new one.
     def find_or_create_for_params(params, parent_column, parent_record)
       current = parent_record.send(parent_column.name)
       klass = parent_column.association.klass
-      return nil if parent_column.show_blank_record and attributes_hash_is_empty?(params, klass)
+      pk = klass.primary_key.to_sym
+      return nil if parent_column.show_blank_record?(current) and attributes_hash_is_empty?(params, klass)
 
-      if params.has_key? :id
+      if params.has_key? pk
         # modifying the current object of a singular association
-        if current and current.is_a? ActiveRecord::Base and current.id.to_s == params[:id]
-          return current
+        pk_val = params[pk] 
+        if current and current.is_a? ActiveRecord::Base and current.id.to_s == pk_val
+          current
         # modifying one of the current objects in a plural association
-        elsif current and current.respond_to?(:any?) and current.any? {|o| o.id.to_s == params[:id]}
-          return current.detect {|o| o.id.to_s == params[:id]}
+        elsif current and current.respond_to?(:any?) and current.any? {|o| o.id.to_s == pk_val}
+          current.detect {|o| o.id.to_s == pk_val}
         # attaching an existing but not-current object
         else
-          return klass.find(params[:id])
+          klass.find(pk_val)
         end
       else
-        if klass.authorized_for?(:crud_type => :create)
-          if parent_column.singular_association?
-            return parent_record.send("build_#{parent_column.name}")
-          else
-            return parent_record.send(parent_column.name).build
-          end
-        end
+        build_associated(parent_column, parent_record) if klass.authorized_for?(:crud_type => :create)
       end
     end
-
     # Determines whether the given attributes hash is "empty".
     # This isn't a literal emptiness - it's an attempt to discern whether the user intended it to be empty or not.
     def attributes_hash_is_empty?(hash, klass)

data/lib/active_scaffold/attribute_params.rb~

@@ -85,8 +85,6 @@ module ActiveScaffold
       record = find_or_create_for_params(attributes, column, parent_record)
       if record
         record_columns = active_scaffold_config_for(column.association.klass).subform.columns
-        record_columns.constraint_columns = [column.association.reverse]
-        debugger
         update_record_from_params(record, record_columns, attributes)
         record.unsaved = true
       end
@@ -103,6 +101,7 @@ module ActiveScaffold
     end
 
     def column_value_from_param_simple_value(parent_record, column, value)
+      debugger if column.name == :working_days
       if column.singular_association?
         # it's a single id
         column.association.klass.find(value) if value and not value.empty?

data/lib/active_scaffold/bridges.rb

@@ -0,0 +1,61 @@
+module ActiveScaffold
+  module Bridges
+    ActiveScaffold.autoload_subdir('bridges', self)
+    module Shared
+      autoload :DateBridge, 'active_scaffold/bridges/shared/date_bridge'
+    end
+
+    mattr_accessor :bridges
+    mattr_accessor :bridges_run
+    self.bridges = {}
+
+    def self.register(file)
+      match = file.match(/(active_scaffold\/bridges\/(.*))\.rb\Z/)
+      self.bridges[match[2].to_sym] = match[1] if match
+    end
+
+    def self.load(bridge_name)
+      bridge = self.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
+        else
+          self.bridges.delete bridge_name
+          bridge = nil
+        end
+      end
+      bridge
+    end
+    class << self
+      alias_method :[], :load
+    end
+      
+    def self.run_all
+      return false if self.bridges_run
+      self.bridges.keys.each do |bridge_name|
+        bridge = self[bridge_name]
+        bridge.run if bridge
+      end
+      self.bridges_run = true
+    end
+
+    def self.all_stylesheets
+      self.bridges.keys.collect do |bridge_name|
+        bridge = self[bridge_name]
+        bridge.stylesheets if bridge and bridge.install?
+      end.compact.flatten
+    end
+
+    def self.all_javascripts
+      self.bridges.keys.collect do |bridge_name|
+        bridge = self[bridge_name]
+        bridge.javascripts if bridge and bridge.install?
+      end.compact.flatten
+    end
+  end
+end
+
+(Dir[File.join(File.dirname(__FILE__), "bridges/*.rb")] - [__FILE__]).each{|bridge_require|
+  ActiveScaffold::Bridges.register bridge_require
+} 

data/lib/active_scaffold/bridges/ancestry.rb

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

data/lib/active_scaffold/bridges/ancestry/{lib/ancestry_bridge.rb → ancestry_bridge.rb}

@@ -14,8 +14,8 @@ ActiveScaffold::Config::Core.class_eval do
   alias_method_chain :initialize, :ancestry
 end
 
-module ActiveScaffold
-  module AncestryBridge
+module ActiveScaffold::Bridges
+  class Ancestry
     module FormColumnHelpers
       def active_scaffold_input_ancestry(column, options)
         select_options = []
@@ -35,5 +35,5 @@ module ActiveScaffold
 end
 
 ActionView::Base.class_eval do
-  include ActiveScaffold::AncestryBridge::FormColumnHelpers
+  include ActiveScaffold::Bridges::Ancestry::FormColumnHelpers
 end

data/lib/active_scaffold/bridges/{calendar_date_select/bridge.rb → calendar_date_select.rb}

@@ -1,5 +1,5 @@
-ActiveScaffold::Bridges.bridge "CalendarDateSelect" do
-  install do
+class ActiveScaffold::Bridges::CalendarDateSelect < ActiveScaffold::DataStructures::Bridge
+  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
        
@@ -7,10 +7,18 @@ ActiveScaffold::Bridges.bridge "CalendarDateSelect" do
       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"
     end
     
-    require File.join(File.dirname(__FILE__), "lib/as_cds_bridge.rb")
+    require File.join(File.dirname(__FILE__), "calendar_date_select/as_cds_bridge.rb")
   end
   
-  install? do
-    Object.const_defined?(name) && ActiveScaffold.js_framework == :prototype
+  def self.install?
+    super && ActiveScaffold.js_framework == :prototype
+  end
+
+  def self.stylesheets
+    calendar_date_select_stylesheets
+  end
+
+  def self.javascripts
+    calendar_date_select_javascripts
   end
 end

data/lib/active_scaffold/bridges/calendar_date_select/{lib/as_cds_bridge.rb → as_cds_bridge.rb}

@@ -22,7 +22,7 @@ end
 
 module ActiveScaffold
   module Bridges
-    module CalendarDateSelectBridge
+    class CalendarDateSelect
       # Helpers that assist with the rendering of a Form Column
       module FormColumnHelpers
         def active_scaffold_input_calendar_date_select(column, options)
@@ -47,34 +47,18 @@ module ActiveScaffold
              :style => "display:#{(options[:show].nil? || options[:show]) ? '' : 'none'}"})
         end
       end
-  
-      module ViewHelpers
-        def self.included(base)
-          base.alias_method_chain :active_scaffold_stylesheets, :calendar_date_select
-          base.alias_method_chain :active_scaffold_javascripts, :calendar_date_select
-        end
-        # Provides stylesheets to include with +stylesheet_link_tag+
-        def active_scaffold_stylesheets_with_calendar_date_select(frontend = :default)
-          active_scaffold_stylesheets_without_calendar_date_select + [calendar_date_select_stylesheets]
-        end
-  
-        # Provides stylesheets to include with +stylesheet_link_tag+
-        def active_scaffold_javascripts_with_calendar_date_select(frontend = :default)
-          active_scaffold_javascripts_without_calendar_date_select + [calendar_date_select_javascripts]
-        end
-      end
     end
   end
 end
 
 ActionView::Base.class_eval do
-  include ActiveScaffold::Bridges::CalendarDateSelectBridge::FormColumnHelpers
+  include ActiveScaffold::Bridges::CalendarDateSelect::FormColumnHelpers
   include ActiveScaffold::Bridges::Shared::DateBridge::SearchColumnHelpers
   alias_method :active_scaffold_search_calendar_date_select, :active_scaffold_search_date_bridge
   include ActiveScaffold::Bridges::Shared::DateBridge::HumanConditionHelpers
   alias_method :active_scaffold_human_condition_calendar_date_select, :active_scaffold_human_condition_date_bridge
-  include ActiveScaffold::Bridges::CalendarDateSelectBridge::SearchColumnHelpers
-  include ActiveScaffold::Bridges::CalendarDateSelectBridge::ViewHelpers
+  include ActiveScaffold::Bridges::CalendarDateSelect::SearchColumnHelpers
+  include ActiveScaffold::Bridges::CalendarDateSelect::ViewHelpers
 end
 
 ActiveScaffold::Finder::ClassMethods.module_eval do