active_scaffold 3.1.20 → 3.2.0

data/lib/active_scaffold/attribute_params.rb~

@@ -1,203 +0,0 @@
-module ActiveScaffold
-  # Provides support for param hashes assumed to be model attributes.
-  # Support is primarily needed for creating/editing associated records using a nested hash structure.
-  #
-  # Paradigm Params Hash (should write unit tests on this):
-  #   params[:record] = {
-  #     # a simple record attribute
-  #     'name' => 'John',
-  #     # a plural association hash
-  #     'roles' => {
-  #       # associate with an existing role
-  #       '5' => {'id' => 5}
-  #       # associate with an existing role and edit it
-  #       '6' => {'id' => 6, 'name' => 'designer'}
-  #       # create and associate a new role
-  #       '124521' => {'name' => 'marketer'}
-  #     }
-  #     # a singular association hash
-  #     'location' => {'id' => 12, 'city' => 'New York'}
-  #   }
-  #
-  # Simpler association structures are also supported, like:
-  #   params[:record] = {
-  #     # a simple record attribute
-  #     'name' => 'John',
-  #     # a plural association ... all ids refer to existing records
-  #     'roles' => ['5', '6'],
-  #     # a singular association ... all ids refer to existing records
-  #     'location' => '12'
-  # }
-  module AttributeParams
-    protected
-    # Takes attributes (as from params[:record]) and applies them to the parent_record. Also looks for
-    # association attributes and attempts to instantiate them as associated objects.
-    #
-    # This is a secure way to apply params to a record, because it's based on a loop over the columns
-    # set. The columns set will not yield unauthorized columns, and it will not yield unregistered columns.
-    def update_record_from_params(parent_record, columns, attributes)
-      crud_type = parent_record.new_record? ? :create : :update
-      return parent_record unless parent_record.authorized_for?(:crud_type => crud_type)
-
-      multi_parameter_attributes = {}
-      attributes.each do |k, v|
-        next unless k.include? '('
-        column_name = k.split('(').first.to_sym
-        multi_parameter_attributes[column_name] ||= []
-        multi_parameter_attributes[column_name] << [k, v]
-      end
-
-      columns.each :for => parent_record, :crud_type => crud_type, :flatten => true do |column|
-        # Set any passthrough parameters that may be associated with this column (ie, file column "keep" and "temp" attributes)
-        unless column.params.empty?
-          column.params.each{|p| parent_record.send("#{p}=", attributes[p]) if attributes.has_key? p}
-        end
-
-        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]) 
-
-          # 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
-          
-        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] || a.options[:finder_sql])
-          next unless association_proxy = parent_record.send(a.name)
-
-          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) }
-        end
-      end
-
-      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
-        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
-      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)
-        column_value_from_param_hash_value(parent_record, column, value)
-      else
-        column_value_from_param_simple_value(parent_record, column, value)
-      end
-    end
-
-    def column_value_from_param_simple_value(parent_record, column, value)
-      if column.singular_association?
-        # it's a single id
-        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.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),
-        # and 'null => false' columns should just convert back to an empty string.
-        # ... but we can at least check the ConnectionAdapter::Column object to see if nulls are allowed
-        value = nil if value.is_a? String and value.empty? and !column.column.nil? and column.column.null
-        value
-      end
-    end
-
-    def column_plural_assocation_value_from_value(column, value)
-      # it's an array of ids
-      if value and not value.empty?
-        ids = value.select {|id| id.respond_to?(:empty?) ? !id.empty? : true}
-        ids.empty? ? [] : column.association.klass.find(ids)
-      end
-    end
-
-    def column_value_from_param_hash_value(parent_record, column, value)
-      # this is just for backwards compatibility. we should clean this up in 2.0.
-      if column.form_ui == :select
-        ids = if column.singular_association?
-          value[:id]
-        else
-          value.values.collect {|hash| hash[:id]}
-        end
-        (ids and not ids.empty?) ? column.association.klass.find(ids) : nil
-
-      elsif column.singular_association?
-        manage_nested_record_from_params(parent_record, column, value)
-      elsif column.plural_association?
-        value.collect {|key_value_pair| manage_nested_record_from_params(parent_record, column, key_value_pair[1])}.compact
-      else
-        value
-      end
-    end
-
-   # 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
-      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? pk
-        # modifying the current object of a singular association
-        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 == pk_val}
-          current.detect {|o| o.id.to_s == pk_val}
-        # attaching an existing but not-current object
-        else
-          klass.find(pk_val)
-        end
-      else
-        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)
-      ignore_column_types = [:boolean]
-      hash.all? do |key,value|
-        # convert any possible multi-parameter attributes like 'created_at(5i)' to simply 'created_at'
-        parts = key.to_s.split('(')
-        #old style date form management... ignore them too
-        ignore_column_types = [:boolean, :datetime, :date, :time] if parts.length > 1
-        column_name = parts.first
-        column = klass.columns_hash[column_name]
-
-        # booleans and datetimes will always have a value. so we ignore them when checking whether the hash is empty.
-        # this could be a bad idea. but the current situation (excess record entry) seems worse.
-        next true if column and ignore_column_types.include?(column.type)
-
-        # defaults are pre-filled on the form. we can't use them to determine if the user intends a new row.
-        next true if column and value == column.default.to_s
-
-        if value.is_a?(Hash)
-          attributes_hash_is_empty?(value, klass)
-        elsif value.is_a?(Array)
-          value.any? {|id| id.respond_to?(:empty?) ? !id.empty? : true}
-        else
-          value.respond_to?(:empty?) ? value.empty? : false
-        end
-      end
-    end
-  end
-end

data/lib/active_scaffold/bridges/date_picker/helper.rb~

@@ -1,180 +0,0 @@
-module ActiveScaffold::Bridges
-  class DatePicker
-    module Helper
-      DATE_FORMAT_CONVERSION = {
-        /%a/ => 'D',
-        /%A/ => 'DD',
-        /%b/ => 'M',
-        /%B/ => 'MM',
-        /%d/ => 'dd',
-        /%e/ => 'd',
-        /%j/ => 'oo',
-        /%m/ => 'mm',
-        /%y/ => 'y',
-        /%Y/ => 'yy',
-        /%H/ => 'hh', # options ampm => false
-        /%I/ => 'hh', # options ampm => true
-        /%M/ => 'mm',
-        /%p/ => 'tt',
-        /%S/ => 'ss',
-        /%[cUWwxXZz]/ => ''
-      }
-      
-      def self.date_options_for_locales
-        I18n.available_locales.collect do |locale|
-          locale_date_options = date_options(locale)
-          if locale_date_options
-            "$.datepicker.regional['#{locale}'] = #{locale_date_options.to_json};"
-          else
-            nil
-          end
-        end.compact.join('')
-      end
-      
-      def self.date_options(locale)
-        begin
-          date_picker_options = { :closeText => as_(:close),
-            :prevText => as_(:previous),
-            :nextText => as_(:next),
-            :currentText => as_(:today),
-            :monthNames => I18n.translate!('date.month_names', :locale => locale)[1..-1],
-            :monthNamesShort => I18n.translate!('date.abbr_month_names', :locale => locale)[1..-1],
-            :dayNames => I18n.translate!('date.day_names', :locale => locale),
-            :dayNamesShort => I18n.translate!('date.abbr_day_names', :locale => locale),
-            :dayNamesMin => I18n.translate!('date.abbr_day_names', :locale => locale),
-            :changeYear => true,
-            :changeMonth => true,
-          }
-
-          as_date_picker_options = I18n.translate! :date_picker_options, :scope => :active_scaffold, :locale => locale, :default => ''
-          date_picker_options.merge!(as_date_picker_options) if as_date_picker_options.is_a? Hash
-          Rails.logger.warn "ActiveScaffold: Missing date picker localization for your locale: #{locale}" if as_date_picker_options.blank?
-
-          js_format = self.to_datepicker_format(I18n.translate!('date.formats.default', :locale => locale, :default => ''))
-          date_picker_options[:dateFormat] = js_format unless js_format.blank?
-          date_picker_options
-        rescue
-          raise if locale == I18n.locale
-        end
-      end
-
-      def self.datetime_options_for_locales
-        I18n.available_locales.collect do |locale|
-          locale_datetime_options = datetime_options(locale)
-          if locale_datetime_options
-            "$.timepicker.regional['#{locale}'] = #{locale_datetime_options.to_json};"
-          else
-            nil
-          end
-        end.compact.join('')
-      end
-      
-      def self.datetime_options(locale)
-        begin
-          rails_time_format = I18n.translate! 'time.formats.picker', :locale => locale
-          datetime_picker_options = {:ampm => false,
-            :hourText => I18n.translate!('datetime.prompts.hour', :locale => locale),
-            :minuteText => I18n.translate!('datetime.prompts.minute', :locale => locale),
-            :secondText => I18n.translate!('datetime.prompts.second', :locale => locale)
-          }
-
-          as_datetime_picker_options = I18n.translate! :datetime_picker_options, :scope => :active_scaffold, :locale => locale, :default => ''
-          datetime_picker_options.merge!(as_datetime_picker_options) if as_datetime_picker_options.is_a? Hash
-          Rails.logger.warn "ActiveScaffold: Missing datetime picker localization for your locale: #{locale}" if as_datetime_picker_options.blank?
-
-          date_format, time_format = self.split_datetime_format(self.to_datepicker_format(rails_time_format))
-          datetime_picker_options[:dateFormat] = date_format unless date_format.nil?
-          unless time_format.nil?
-            datetime_picker_options[:timeFormat] = time_format
-            datetime_picker_options[:ampm] = true if rails_time_format.include?('%I')
-          end
-          datetime_picker_options
-        rescue
-          raise if locale == I18n.locale
-        end
-      end
-      
-      def self.to_datepicker_format(rails_format)
-        return nil if rails_format.nil?
-        if rails_format =~ /%[cUWwxXZz]/
-          Rails.logger.warn("AS DatePicker::Helper: rails date format #{rails_format} includes options which can't be converted to jquery datepicker format. Options %c, %U, %W, %w, %x %X, %z, %Z are not supported by datepicker and will be removed")
-          nil
-        end
-        js_format = rails_format.dup
-        DATE_FORMAT_CONVERSION.each do |key, value|
-          js_format.gsub!(key, value)
-        end
-        js_format
-      end
-      
-      def self.split_datetime_format(datetime_format)
-        date_format = datetime_format
-        time_format = nil
-        time_start_indicators = %w{hh mm tt ss}
-        unless datetime_format.nil?
-          start_indicator = time_start_indicators.detect {|indicator| datetime_format.include?(indicator)}
-          unless start_indicator.nil?
-            pos_time_format = datetime_format.index(start_indicator)
-            date_format = datetime_format.to(pos_time_format - 1)
-            time_format = datetime_format.from(pos_time_format)
-          end
-        end
-        return date_format, time_format
-      end
-      
-      module DatepickerColumnHelpers
-        def datepicker_split_datetime_format(datetime_format)
-          ActiveScaffold::Bridges::DatePicker::Helper.split_datetime_format(datetime_format)
-        end
-        
-        def to_datepicker_format(rails_format)
-          ActiveScaffold::Bridges::DatePicker::Helper.to_datepicker_format(rails_format)
-        end
-        
-        def datepicker_format_options(column, format, options)
-          if column.form_ui == :date_picker
-            js_format = to_datepicker_format(I18n.translate!("date.formats.#{format}"))
-            options['date:dateFormat'] = js_format unless js_format.nil?
-          else
-            rails_time_format = I18n.translate!("time.formats.#{format}")
-            date_format, time_format = datepicker_split_datetime_format(self.to_datepicker_format(rails_time_format))
-            options['date:dateFormat'] = date_format unless date_format.nil?
-            unless time_format.nil?
-              options['time:timeFormat'] = time_format
-              options['time:ampm'] = true if rails_time_format.include?('%I')
-            end
-          end unless format == :default
-        end
-      end
-      
-      module SearchColumnHelpers
-        def active_scaffold_search_date_bridge_calendar_control(column, options, current_search, name)
-          if current_search.is_a? Hash
-            value = controller.class.condition_value_for_datetime(current_search[name], column.form_ui == :date_picker ? :to_date : :to_time)
-          else
-            value = current_search
-          end
-          options = column.options.merge(options).except!(:include_blank, :discard_time, :discard_date, :value)
-          options = active_scaffold_input_text_options(options.merge(column.options))
-          options[:class] << " #{column.search_ui.to_s}"
-          options[:style] = "display:#{(options[:show].nil? || options[:show]) ? '' : 'none'}"
-          format = options.delete(:format) || :default
-          datepicker_format_options(column, format, options)
-          text_field_tag("#{options[:name]}[#{name}]", value ? l(value, :format => format) : nil, options.merge(:id => "#{options[:id]}_#{name}", :name => "#{options[:name]}[#{name}]"))
-        end
-      end
-      
-      module FormColumnHelpers
-        def active_scaffold_input_date_picker(column, options)
-          options = active_scaffold_input_text_options(options.merge(column.options))
-          options[:class] << " #{column.form_ui.to_s}"
-          value = controller.class.condition_value_for_datetime(@record.send(column.name), column.form_ui == :date_picker ? :to_date : :to_time)
-          format = options.delete(:format) || :default
-          datepicker_format_options(column, format, options)
-          options[:value] = (value ? l(value, :format => format) : nil)
-          text_field(:record, column.name, options)
-        end
-      end
-    end
-  end
-end

data/lib/active_scaffold/bridges/record_select/helpers.rb~

@@ -1,86 +0,0 @@
-class ActiveScaffold::Bridges::RecordSelect
-  module Helpers
-    def self.included(base)
-      base.class_eval do
-        include FormColumnHelpers
-        include SearchColumnHelpers
-      end
-    end
-
-    module FormColumnHelpers
-      # requires RecordSelect plugin to be installed and configured.
-      def active_scaffold_input_record_select(column, options)
-        if column.singular_association?
-          multiple = false
-          multiple = column.options[:html_options][:multiple] if column.options[:html_options] &&  column.options[:html_options][:multiple]
-          active_scaffold_record_select(column, options, @record.send(column.name), multiple)
-        elsif column.plural_association?
-          active_scaffold_record_select(column, options, @record.send(column.name), true)
-        else
-          active_scaffold_record_select_autocomplete(column, options)
-        end
-      end
-
-      def active_scaffold_record_select(column, options, value, multiple)
-        unless column.association
-          raise ArgumentError, "record_select can only work against associations (and #{column.name} is not).  A common mistake is to specify the foreign key field (like :user_id), instead of the association (:user)."
-        end
-        remote_controller = active_scaffold_controller_for(column.association.klass).controller_path
-
-        # if the opposite association is a :belongs_to (in that case association in this class must be has_one or has_many)
-        # then only show records that have not been associated yet
-        if [:has_one, :has_many].include?(column.association.macro)
-          params.merge!({column.association.primary_key_name => ''})
-        end
- 
-        record_select_options = active_scaffold_input_text_options(options).merge(
-          :controller => remote_controller
-        )
-        record_select_options.merge!(column.options)
- 
-        html = if multiple
-          record_multi_select_field(options[:name], value || [], record_select_options)
-        else
-          record_select_field(options[:name], value || column.association.klass.new, record_select_options)
-        end
-        html = self.class.field_error_proc.call(html, self) if @record.errors[column.name].any?
-        html
-      end
-      
-      def active_scaffold_record_select_autocomplete(column, options)
-        remote_controller = active_scaffold_controller_for(column.association.klass).controller_path
-        record_select_options = active_scaffold_input_text_options(options).merge(
-          :controller => remote_controller
-        )
-        html = record_select_autocomplete(options[:name], @record, record_select_options)
-        html = self.class.field_error_proc.call(html, self) if @record.errors[column.name].any?
-        html
-      end
-    end
-
-    module SearchColumnHelpers
-      def active_scaffold_search_record_select(column, options)
-        value = field_search_record_select_value(column)
-        active_scaffold_record_select(column, options, value, column.options[:multiple])
-      end
-      
-      def field_search_record_select_value(column)
-        begin
-          value = field_search_params[column.name]
-          unless value.blank?
-            if column.options[:multiple]
-              column.association.klass.find value.collect!(&:to_i)
-            else
-              column.association.klass.find(value.to_i)
-            end
-          end
-        rescue Exception => e
-          logger.error Time.now.to_s + "Sorry, we are not that smart yet. Attempted to restore search values to search fields but instead got -- #{e.inspect} -- on the ActiveScaffold column = :#{column.name} in #{@controller.class}"
-          raise e
-        end
-      end
-    end
-  end
-end
-
-ActionView::Base.class_eval { include ActiveScaffold::Bridges::RecordSelect::Helpers }