active_scaffold 3.0.26 → 3.1.3

data/lib/active_scaffold/config/delete.rb

@@ -3,8 +3,7 @@ module ActiveScaffold::Config
     self.crud_type = :delete
 
     def initialize(core_config)
-      @core = core_config
-
+      super
       # start with the ActionLink defined globally
       @link = self.class.link.clone
       @action_group = self.class.action_group.clone if self.class.action_group

data/lib/active_scaffold/config/field_search.rb

@@ -3,8 +3,7 @@ module ActiveScaffold::Config
     self.crud_type = :read
 
     def initialize(core_config)
-      @core = core_config
-
+      super
       @text_search = self.class.text_search
 
       # start with the ActionLink defined globally

data/lib/active_scaffold/config/form.rb

@@ -1,8 +1,7 @@
 module ActiveScaffold::Config
   class Form < Base
     def initialize(core_config)
-      @core = core_config
-
+      super
       # start with the ActionLink defined globally
       @link = self.class.link.clone unless self.class.link.nil?
       @action_group = self.class.action_group.clone if self.class.action_group
@@ -15,7 +14,7 @@ module ActiveScaffold::Config
     # global level configuration
     # --------------------------
     # show value of unauthorized columns instead of skip them
-    class_inheritable_accessor :show_unauthorized_columns
+    class_attribute :show_unauthorized_columns
 
     # instance-level configuration
     # ----------------------------
@@ -28,9 +27,6 @@ module ActiveScaffold::Config
 
     # the label for this Form action. used for the header.
     attr_writer :label
-    def label
-      as_(@label)
-    end
 
     # provides access to the list of columns specifically meant for the Form to use
     def columns

data/lib/active_scaffold/config/list.rb

@@ -3,8 +3,7 @@ module ActiveScaffold::Config
     self.crud_type = :read
 
     def initialize(core_config)
-      @core = core_config
-
+      super
       # inherit from global scope
       # full configuration path is: defaults => global table => local table
       @per_page = self.class.per_page
@@ -19,6 +18,7 @@ module ActiveScaffold::Config
       @association_join_text = self.class.association_join_text
       @pagination = self.class.pagination
       @show_search_reset = true
+      @mark_records = self.class.mark_records
     end
 
     # global level configuration
@@ -46,6 +46,9 @@ module ActiveScaffold::Config
     cattr_accessor :pagination
     @@pagination = true
 
+    # Add a checkbox in front of each record to mark them and use them with a batch action later
+    cattr_accessor :mark_records
+
     # instance-level configuration
     # ----------------------------
 
@@ -78,6 +81,9 @@ module ActiveScaffold::Config
     # show a link to reset the search next to filtered message
     attr_accessor :show_search_reset
 
+    # Add a checkbox in front of each record to mark them and use them with a batch action later
+    attr_accessor :mark_records
+
     # the default sorting. should be an array of hashes of {column_name => direction}, e.g. [{:a => 'desc'}, {:b => 'asc'}]. to just sort on one column, you can simply provide a hash, though, e.g. {:a => 'desc'}.
     def sorting=(val)
       val = [val] if val.is_a? Hash

data/lib/active_scaffold/config/nested.rb

@@ -3,7 +3,8 @@ module ActiveScaffold::Config
     self.crud_type = :read
 
     def initialize(core_config)
-      @core = core_config
+      super
+      @label = :add_existing_model
       self.shallow_delete = self.class.shallow_delete
       @action_group = self.class.action_group.clone if self.class.action_group
     end
@@ -23,7 +24,6 @@ module ActiveScaffold::Config
       unless column.nil? || column.association.nil?
         options.reverse_merge! :security_method => :nested_authorized?, :label => column.association.klass.model_name.human({:count => 2, :default => column.association.klass.name.pluralize}) 
         action_link = @core.link_for_association(column, options)
-        action_link.action ||= :index
         @core.action_links.add_to_group(action_link, action_group) unless action_link.nil?
       else
         
@@ -37,9 +37,5 @@ module ActiveScaffold::Config
 
     # the label for this Nested action. used for the header.
     attr_writer :label
-    def label
-      @label ? as_(@label) : as_(:add_existing_model, :model => @core.label)
-    end
-
   end
 end

data/lib/active_scaffold/config/search.rb

@@ -3,10 +3,10 @@ module ActiveScaffold::Config
     self.crud_type = :read
 
     def initialize(core_config)
-      @core = core_config
-
+      super
       @text_search = self.class.text_search
       @live = self.class.live?
+      @split_terms = self.class.split_terms
 
       # start with the ActionLink defined globally
       @link = self.class.link.clone
@@ -57,6 +57,10 @@ module ActiveScaffold::Config
     # Default is :full
     attr_accessor :text_search
 
+    @@split_terms = " "
+    cattr_accessor :split_terms
+    attr_accessor :split_terms
+
     # the ActionLink for this action
     attr_accessor :link
 

data/lib/active_scaffold/config/show.rb

@@ -3,7 +3,7 @@ module ActiveScaffold::Config
     self.crud_type = :read
 
     def initialize(core_config)
-      @core = core_config
+      super
       # start with the ActionLink defined globally
       @link = self.class.link.clone
       @action_group = self.class.action_group.clone if self.class.action_group
@@ -20,9 +20,6 @@ module ActiveScaffold::Config
     attr_accessor :link
     # the label for this action. used for the header.
     attr_writer :label
-    def label
-      @label ? as_(@label) : as_(:show_model, :model => @core.label(:count => 1))
-    end
 
     # provides access to the list of columns specifically meant for this action to use
     def columns

data/lib/active_scaffold/config/subform.rb

@@ -1,7 +1,7 @@
 module ActiveScaffold::Config
   class Subform < Base
     def initialize(core_config)
-      @core = core_config
+      super
       @layout = self.class.layout # default layout
     end
 

data/lib/active_scaffold/config/update.rb

@@ -1,7 +1,7 @@
 module ActiveScaffold::Config
   class Update < ActiveScaffold::Config::Form
     self.crud_type = :update
-    def initialize(*args)
+    def initialize(core_config)
       super
       self.nested_links = self.class.nested_links
       self.refresh_list = self.class.refresh_list
@@ -25,11 +25,6 @@ module ActiveScaffold::Config
     # instance-level configuration
     # ----------------------------
 
-    # the label= method already exists in the Form base class
-    def label
-      @label ? as_(@label) : as_(:update_model, :model => @core.label(:count => 1))
-    end
-
     attr_accessor :nested_links
     cattr_accessor :nested_links
     @@nested_links = false

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -12,6 +12,9 @@ module ActiveScaffold::DataStructures
     def label
       as_(@label) if @label
     end
+    def css_class
+      @label.to_s.underscore
+    end
 
     # Whether this column set is collapsed by default in contexts where collapsing is supported
     attr_accessor :collapsed

data/lib/active_scaffold/data_structures/action_link.rb

@@ -3,15 +3,15 @@ module ActiveScaffold::DataStructures
     # provides a quick way to set any property of the object from a hash
     def initialize(action, options = {})
       # set defaults
-      self.action = action
+      self.action = action.to_s
       self.label = action
       self.confirm = false
       self.type = :collection
       self.inline = true
       self.method = :get
-      self.crud_type = :delete if [:destroy].include?(action.try(:to_sym))
-      self.crud_type = :create if [:create, :new].include?(action.try(:to_sym))
-      self.crud_type = :update if [:edit, :update].include?(action.try(:to_sym))
+      self.crud_type = :delete if [:destroy].include?(action.to_sym)
+      self.crud_type = :create if [:create, :new].include?(action.to_sym)
+      self.crud_type = :update if [:edit, :update].include?(action.to_sym)
       self.crud_type ||= :read
       self.parameters = {}
       self.html_options = {}
@@ -60,21 +60,25 @@ module ActiveScaffold::DataStructures
     attr_accessor :image
 
     # if the action requires confirmation
-    attr_writer :confirm
+    def confirm=(value)
+      @dhtml_confirm = nil if value
+      @confirm = value
+    end
     def confirm(label = '')
       @confirm.is_a?(String) ? @confirm : as_(@confirm, :label => label)
     end
     def confirm?
-      @confirm ? true : false
+      !!@confirm
     end
     
     # if the action uses a DHTML based (i.e. 2-phase) confirmation
-    attr_writer :dhtml_confirm
-    def dhtml_confirm
-      @dhtml_confirm
+    attr_accessor :dhtml_confirm
+    def dhtml_confirm=(value)
+      @confirm = nil if value
+      @dhtml_confirm = value
     end
     def dhtml_confirm?
-      @dhtml_confirm
+      !!@dhtml_confirm
     end
 
     # what method to call on the controller to see if this action_link should be visible

data/lib/active_scaffold/data_structures/bridge.rb

@@ -0,0 +1,22 @@
+module ActiveScaffold::DataStructures
+  class Bridge
+    def self.install
+      raise(RunTimeError, "install not defined for bridge #{name}")
+    end
+      
+    # by convention and default, use the bridge name as the required constant for installation
+    def self.install?
+      Object.const_defined? name.demodulize
+    end
+      
+    def self.run
+      install if install?
+    end
+
+    def self.stylesheets
+    end
+
+    def self.javascripts
+    end
+  end
+end

data/lib/active_scaffold/data_structures/column.rb

@@ -66,6 +66,13 @@ module ActiveScaffold::DataStructures
     cattr_accessor :send_form_on_update_column
     attr_accessor :send_form_on_update_column
 
+    # column to be updated in a form when this column changes
+    attr_accessor :update_column
+
+    # send all the form instead of only new value when this column change
+    cattr_accessor :send_form_on_update_column
+    attr_accessor :send_form_on_update_column
+
     # sorting on a column can be configured four ways:
     #   sort = true               default, uses intelligent sorting sql default
     #   sort = false              sometimes sorting doesn't make sense
@@ -201,7 +208,7 @@ module ActiveScaffold::DataStructures
     def show_blank_record?(associated)
       if @show_blank_record
         return false unless self.association.klass.authorized_for?(:crud_type => :create)
-        self.plural_association? or (self.singular_association? and associated.empty?)
+        self.plural_association? or (self.singular_association? and associated.blank?)
       end
     end
 
@@ -279,6 +286,7 @@ module ActiveScaffold::DataStructures
       @associated_limit = self.class.associated_limit
       @associated_number = self.class.associated_number
       @show_blank_record = self.class.show_blank_record
+      @send_form_on_update_column = self.class.send_form_on_update_column
       @actions_for_association_links = self.class.actions_for_association_links.clone if @association
       
       self.number = @column.try(:number?)
@@ -290,7 +298,11 @@ module ActiveScaffold::DataStructures
       
       # default all the configurable variables
       self.css_class = ''
-      self.required = active_record_class.validators_on(self.name).map(&:class).include? ActiveModel::Validations::PresenceValidator
+      self.required = active_record_class.validators_on(self.name).any? do |val|
+        ActiveModel::Validations::PresenceValidator === val or (
+          ActiveModel::Validations::InclusionValidator === val and not val.options[:allow_nil] and not val.options[:allow_blank]
+        )
+      end
       self.sort = true
       self.search_sql = true
       
@@ -302,7 +314,7 @@ module ActiveScaffold::DataStructures
     # just the field (not table.field)
     def field_name
       return nil if virtual?
-      column ? @active_record_class.connection.quote_column_name(column.name) : association.primary_key_name
+      column ? @active_record_class.connection.quote_column_name(column.name) : association.foreign_key
     end
 
     def <=>(other_column)
@@ -310,6 +322,26 @@ module ActiveScaffold::DataStructures
       order_weight != 0 ? order_weight : self.name.to_s <=> other_column.name.to_s
     end
 
+    def number_to_native(value)
+      return value if value.blank? || !value.is_a?(String)
+      native = '.' # native ruby separator
+      format = {:separator => '', :delimiter => ''}.merge! I18n.t('number.format', :default => {})
+      specific = case self.options[:format]
+      when :currency
+        I18n.t('number.currency.format', :default => nil)
+      when :size
+        I18n.t('number.human.format', :default => nil)
+      when :percentage
+        I18n.t('number.percentage.format', :default => nil)
+      end
+      format.merge! specific unless specific.nil?
+      unless format[:separator].blank? || !value.include?(format[:separator]) && value.include?(native) && (format[:delimiter] != native || value !~ /\.\d{3}$/)
+        value.gsub(/[^0-9\-#{format[:separator]}]/, '').gsub(format[:separator], native)
+      else
+        value
+      end
+    end
+
     protected
 
     def initialize_sort
@@ -344,7 +376,7 @@ module ActiveScaffold::DataStructures
 
     # the table.field name for this column, if applicable
     def field
-      @field ||= [@active_record_class.connection.quote_column_name(@table), field_name].join('.')
+      @field ||= [@active_record_class.connection.quote_table_name(@table), field_name].join('.')
     end
     
     def estimate_weight

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -98,16 +98,16 @@ module ActiveScaffold::DataStructures
     
     def iterate_model_associations(model)
       @constrained_fields = [] 
-      @constrained_fields << association.primary_key_name.to_sym unless association.belongs_to?
+      @constrained_fields << association.foreign_key.to_sym unless association.belongs_to?
       model.reflect_on_all_associations.each do |current|
-        if !current.belongs_to? && association.primary_key_name == current.association_foreign_key
+        if !current.belongs_to? && association.foreign_key == current.association_foreign_key
           constrained_fields << current.name.to_sym
           @child_association = current if current.klass == @parent_model
         end
-        if association.primary_key_name == current.primary_key_name
+        if association.foreign_key == current.foreign_key
           # show columns for has_many and has_one child associationes
           constrained_fields << current.name.to_sym if current.belongs_to? 
-          @child_association = current if current.klass == @parent_model
+          @child_association = current
         end
       end
     end

data/lib/active_scaffold/data_structures/set.rb

@@ -3,11 +3,6 @@ module ActiveScaffold::DataStructures
     include Enumerable
     include ActiveScaffold::Configurable
 
-    attr_writer :label
-    def label
-      as_(@label)
-    end
-
     def initialize(*args)
       @set = []
       self.add *args
@@ -59,4 +54,4 @@ module ActiveScaffold::DataStructures
     end
 
   end
-end
+end

data/lib/active_scaffold/data_structures/sorting.rb

@@ -9,7 +9,7 @@ module ActiveScaffold::DataStructures
     end
     
     def set_default_sorting(model)
-      model_scope = model.send(:current_scoped_methods)
+      model_scope = model.send(:build_default_scope)
       order_clause = model_scope.arel.order_clauses.join(",") if model_scope
 
       # If an ORDER BY clause is found set default sorting according to it, else
@@ -34,7 +34,7 @@ module ActiveScaffold::DataStructures
       column = get_column(column_name)
       raise ArgumentError, "Could not find column #{column_name}" if column.nil?
       raise ArgumentError, "Sorting direction unknown" unless [:ASC, :DESC].include? direction.to_sym
-      @clauses << [column, direction] if column.sortable?
+      @clauses << [column, direction.untaint] if column.sortable?
       raise ArgumentError, "Can't mix :method- and :sql-based sorting" if mixed_sorting?
     end
 

data/lib/active_scaffold/engine.rb

@@ -0,0 +1,4 @@
+module ActiveScaffold
+  class Engine < ::Rails::Engine
+  end
+end

data/lib/active_scaffold/extensions/action_controller_rendering.rb

@@ -7,8 +7,8 @@ module ActionController #:nodoc:
         # if we need an adapter, then we render the actual stuff to a string and insert it into the adapter template
         opts = args.blank? ? Hash.new : args.first
         render :partial => params[:adapter][1..-1],
-        :locals => {:payload => render_to_string(opts.merge(:layout => false), &block)},
-               :use_full_path => true, :layout => false
+        :locals => {:payload => render_to_string(opts.merge(:layout => false), &block).html_safe},
+               :use_full_path => true, :layout => false, :content_type => :html
         @rendering_adapter = nil # recursion control
       else
         render_without_active_scaffold(*args, &block)

data/lib/active_scaffold/extensions/action_controller_rendering.rb~

@@ -8,7 +8,7 @@ module ActionController #:nodoc:
         opts = args.blank? ? Hash.new : args.first
         render :partial => params[:adapter][1..-1],
         :locals => {:payload => render_to_string(opts.merge(:layout => false), &block).html_safe},
-               :use_full_path => true, :layout => false, :content_type => :html
+               :use_full_path => true, :layout => false
         @rendering_adapter = nil # recursion control
       else
         render_without_active_scaffold(*args, &block)