active_scaffold 3.1.20 → 3.2.0

data/lib/active_scaffold/bridges/shared/date_bridge.rb~

@@ -1,209 +0,0 @@
-module ActiveScaffold
-  module Bridges
-    module Shared
-      module DateBridge
-        module SearchColumnHelpers
-          def active_scaffold_search_date_bridge(column, options)
-            current_search = {'from' => nil, 'to' => nil, 'opt' => 'BETWEEN',
-                              'number' => 1, 'unit' => 'DAYS', 'range' => nil}
-            current_search.merge!(options[:value]) unless options[:value].nil?
-            tags = []
-            tags << active_scaffold_search_date_bridge_comparator_tag(column, options, current_search)
-            tags << active_scaffold_search_date_bridge_trend_tag(column, options, current_search)
-            tags << active_scaffold_search_date_bridge_numeric_tag(column, options, current_search)
-            tags << active_scaffold_search_date_bridge_range_tag(column, options, current_search)
-            tags.join("&nbsp;").html_safe
-          end
-          
-          def active_scaffold_search_date_bridge_comparator_options(column)
-            select_options = ActiveScaffold::Finder::DateComparators.collect {|comp| [as_(comp.downcase.to_sym), comp]}
-            select_options + ActiveScaffold::Finder::NumericComparators.collect {|comp| [as_(comp.downcase.to_sym), comp]}
-          end
-          
-          def active_scaffold_search_date_bridge_comparator_tag(column, options, current_search)
-            select_tag("#{options[:name]}[opt]", options_for_select(active_scaffold_search_date_bridge_comparator_options(column),current_search['opt']), :id => "#{options[:id]}_opt", :class => "as_search_range_option as_search_date_time_option")
-          end
-          
-          def active_scaffold_search_date_bridge_numeric_tag(column, options, current_search)
-            numeric_controls = "" << 
-            active_scaffold_search_date_bridge_calendar_control(column, options, current_search, 'from') <<
-            content_tag(:span, (" - " + active_scaffold_search_date_bridge_calendar_control(column, options, current_search, 'to')).html_safe,
-              :id => "#{options[:id]}_between", :class => "as_search_range_between", :style => "display:#{current_search['opt'] == 'BETWEEN' ? '' : 'none'}")  
-            content_tag("span", numeric_controls.html_safe, :id => "#{options[:id]}_numeric", :style => "display:#{ActiveScaffold::Finder::NumericComparators.include?(current_search['opt']) ? '' : 'none'}")
-          end
-  
-          def active_scaffold_search_date_bridge_trend_tag(column, options, current_search)
-            active_scaffold_date_bridge_trend_tag(column, options, 
-                                                 {:name_prefix => 'search',
-                                                  :number_value => current_search['number'],
-                                                  :unit_value => current_search["unit"],
-                                                  :show => (current_search['opt'] == 'PAST' || current_search['opt'] == 'FUTURE')})
-          end
-
-          def active_scaffold_date_bridge_trend_tag(column, options, trend_options)
-            trend_controls = text_field_tag("#{trend_options[:name_prefix]}[#{column.name}][number]", trend_options[:number_value], :class => 'text-input', :size => 10, :autocomplete => 'off') << " " <<
-            select_tag("#{trend_options[:name_prefix]}[#{column.name}][unit]",
-             options_for_select(active_scaffold_search_date_bridge_trend_units(column), trend_options[:unit_value]),
-             :class => 'text-input')
-            content_tag("span", trend_controls.html_safe, :id => "#{options[:id]}_trend", :style => "display:#{trend_options[:show] ? '' : 'none'}")
-          end
-
-          def active_scaffold_search_date_bridge_trend_units(column)
-             options = ActiveScaffold::Finder::DateUnits.collect{|unit| [as_(unit.downcase.to_sym), unit]}
-             options = ActiveScaffold::Finder::TimeUnits.collect{|unit| [as_(unit.downcase.to_sym), unit]} + options if column_datetime?(column)
-             options
-          end
-          
-          def active_scaffold_search_date_bridge_range_tag(column, options, current_search)
-            range_controls = select_tag("search[#{column.name}][range]", 
-              options_for_select( ActiveScaffold::Finder::DateRanges.collect{|range| [as_(range.downcase.to_sym), range]}, current_search["range"]), 
-             :class => 'text-input')
-            content_tag("span", range_controls.html_safe, :id => "#{options[:id]}_range", :style => "display:#{(current_search['opt'] == 'RANGE') ? '' : 'none'}")
-          end
-          
-          def column_datetime?(column)
-            (!column.column.nil? && [:datetime, :time].include?(column.column.type))
-          end
-        end
-
-        module HumanConditionHelpers
-          def active_scaffold_human_condition_date_bridge(column, value)
-            case value[:opt]
-            when 'RANGE'
-              range_type, range = value[:range].downcase.split('_')
-              format = active_scaffold_human_condition_date_bridge_range_format(range_type, range)
-              from, to = controller.class.date_bridge_from_to(column, value)
-              "#{column.active_record_class.human_attribute_name(column.name)} = #{as_(value[:range].downcase).downcase} (#{I18n.l(from, :format => format)})"
-            when 'PAST', 'FUTURE'
-              from, to = controller.class.date_bridge_from_to(column, value)
-              "#{column.active_record_class.human_attribute_name(column.name)} #{as_('BETWEEN'.downcase).downcase} #{I18n.l(from)} - #{I18n.l(to)}"
-            else
-              from, to = controller.class.date_bridge_from_to(column, value)
-              "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt].downcase).downcase} #{I18n.l(from)} #{value[:opt] == 'BETWEEN' ? '- ' + I18n.l(to) : ''}"
-            end
-          end
-
-          def active_scaffold_human_condition_date_bridge_range_format(range_type, range)
-            case range
-            when 'week'
-              first_day_of_week = I18n.translate 'active_scaffold.date_picker_options.firstDay'
-              if first_day_of_week == 1
-                '%W %Y'
-              else
-                '%U %Y'
-              end
-            when 'month'
-              '%b %Y'
-            when 'year'
-              '%Y'
-            else
-              I18n.translate 'date.formats.default'
-            end
-          end
-        end
-        
-        module Finder
-          module ClassMethods
-            def condition_for_date_bridge_type(column, value, like_pattern)
-              operator = ActiveScaffold::Finder::NumericComparators.include?(value[:opt]) && value[:opt] != 'BETWEEN' ? value[:opt] : nil
-              from_value, to_value = date_bridge_from_to(column, value)
-              
-              if column.search_sql.is_a? Proc
-                column.search_sql.call(from_value, to_value, operator)
-              else
-                unless operator.nil?
-                  ["#{column.search_sql} #{value[:opt]} ?", from_value.to_s(:db)] unless from_value.nil?
-                else
-                  ["#{column.search_sql} BETWEEN ? AND ?", from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? && to_value.nil?  
-                end
-              end
-            end
-            
-            def date_bridge_from_to(column, value)
-              conversion = column.column.type == :date ? :to_date : :to_time
-              case value[:opt]
-              when 'RANGE'
-                date_bridge_from_to_for_range(column, value).collect(&conversion)
-              when 'PAST', 'FUTURE'
-                date_bridge_from_to_for_trend(column, value).collect(&conversion)
-              else
-                ['from', 'to'].collect { |field| condition_value_for_datetime(value[field], conversion)}
-              end
-            end
-
-            def date_bridge_now
-              Time.zone.now
-            end
-            
-            def date_bridge_from_to_for_trend(column, value)
-              case value['opt']
-              when "PAST"
-                trend_number = [value['number'].to_i,  1].max
-                now = date_bridge_now
-                if date_bridge_column_date?(column)
-                  from = now.beginning_of_day.ago((trend_number).send(value['unit'].downcase.singularize.to_sym))
-                  to = now.end_of_day
-                else
-                  from = now.ago((trend_number).send(value['unit'].downcase.singularize.to_sym))
-                  to = now
-                end
-                return from, to
-              when "FUTURE"
-                trend_number = [value['number'].to_i,  1].max
-                now = date_bridge_now
-                if date_bridge_column_date?(column)
-                  from = now.beginning_of_day
-                  to = now.end_of_day.in((trend_number).send(value['unit'].downcase.singularize.to_sym))
-                else
-                  from = now
-                  to = now.in((trend_number).send(value['unit'].downcase.singularize.to_sym))
-                end
-                return from, to
-              end
-            end
-            
-            def date_bridge_from_to_for_range(column, value)
-              case value[:range]
-              when 'TODAY'
-                return date_bridge_now.beginning_of_day, date_bridge_now.end_of_day
-              when 'YESTERDAY'
-                return date_bridge_now.ago(1.day).beginning_of_day, date_bridge_now.ago(1.day).end_of_day
-              when 'TOMORROW'
-                return date_bridge_now.in(1.day).beginning_of_day, date_bridge_now.in(1.day).end_of_day
-              else
-                range_type, range = value[:range].downcase.split('_')
-                raise ArgumentError unless ['week', 'month', 'year'].include?(range)
-                case range_type
-                when 'this'
-                  return date_bridge_now.send("beginning_of_#{range}".to_sym), date_bridge_now.send("end_of_#{range}")
-                when 'prev'
-                  return date_bridge_now.ago(1.send(range.to_sym)).send("beginning_of_#{range}".to_sym), date_bridge_now.ago(1.send(range.to_sym)).send("end_of_#{range}".to_sym)
-                when 'next'
-                  return date_bridge_now.in(1.send(range.to_sym)).send("beginning_of_#{range}".to_sym), date_bridge_now.in(1.send(range.to_sym)).send("end_of_#{range}".to_sym)
-                else
-                  return nil, nil    
-                end
-              end
-            end
-
-            def date_bridge_column_date?(column)
-              if [:date_picker, :datetime_picker].include? column.form_ui
-                column.form_ui == :date_picker
-              else
-                (!column.column.nil? && [:date].include?(column.column.type))
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-ActiveScaffold::Finder.const_set('DateComparators', ["PAST", "FUTURE", "RANGE"])
-ActiveScaffold::Finder.const_set('DateUnits', ["DAYS", "WEEKS", "MONTHS", "YEARS"])
-ActiveScaffold::Finder.const_set('TimeUnits', ["SECONDS", "MINUTES", "HOURS"])
-ActiveScaffold::Finder.const_set('DateRanges', ["TODAY", "YESTERDAY", "TOMORROW",
-                                                "THIS_WEEK", "PREV_WEEK", "NEXT_WEEK",
-                                                "THIS_MONTH", "PREV_MONTH", "NEXT_MONTH",
-                                                "THIS_YEAR", "PREV_YEAR", "NEXT_YEAR"])

data/lib/active_scaffold/config/base.rb~

@@ -1,72 +0,0 @@
-module ActiveScaffold::Config
-  class Base
-    include ActiveScaffold::Configurable
-    extend ActiveScaffold::Configurable
-
-    def initialize(core_config)
-      @core = core_config
-    end
-
-    def self.inherited(subclass)
-      class << subclass
-        # the crud type of the action. possible values are :create, :read, :update, :delete, and nil.
-        # this is not a setting for the developer. it's self-description for the actions.
-        def crud_type; @crud_type; end
-
-        protected
-
-        def crud_type=(val)
-          raise ArgumentError, "unknown CRUD type #{val}" unless [:create, :read, :update, :delete].include?(val.to_sym)
-          @crud_type = val.to_sym
-        end
-      end
-    end
-
-    # delegate
-    def crud_type; self.class.crud_type end
-
-    def label(model = nil)
-      model ||= @core.label(:count => 1)
-      @label.nil? ? model : as_(@label, :model => model)
-    end
-    
-    # the user property gets set to the instantiation of the local UserSettings class during the automatic instantiation of this class.
-    attr_accessor :user
-
-    # define a default action_group for this action
-    # e.g. 'members.crud'
-    class_attribute :action_group
-
-    # action_group this action should belong to
-    attr_accessor :action_group
-
-    class UserSettings
-      def initialize(conf, storage, params)
-        # the session hash relevant to this action
-        @session = storage
-        debugger
-        # all the request params
-        @params = params
-        # the configuration object for this action
-        @conf = conf
-      end
-    end
-    
-    def formats
-      @formats ||= []
-    end
-    
-    def formats=(val)
-      @formats=val
-    end
-    
-    private
-    
-    def columns=(val)
-      @columns = ActiveScaffold::DataStructures::ActionColumns.new(*val)
-      @columns.action = self
-      @columns.set_columns(@core.columns) if @columns.respond_to?(:set_columns)
-      @columns
-    end
-  end
-end

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

@@ -1,195 +0,0 @@
-module ActiveScaffold::Config
-  class List < Base
-    self.crud_type = :read
-
-    def initialize(core_config)
-      super
-      # inherit from global scope
-      # 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)
-
-      # inherit from global scope
-      @empty_field_text = self.class.empty_field_text
-      @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
-    # --------------------------
-    # how many records to show per page
-    cattr_accessor :per_page
-    @@per_page = 15
-
-    # how many page links around current page to show
-    cattr_accessor :page_links_window
-    @@page_links_window = 2
-
-    # what string to use when a field is empty
-    cattr_accessor :empty_field_text
-    @@empty_field_text = '-'
-
-    # what string to use to join records from plural associations
-    cattr_accessor :association_join_text
-    @@association_join_text = ', '
-
-    # What kind of pagination to use:
-    # * true: The usual pagination
-    # * :infinite: Treat the source as having an infinite number of pages (i.e. don't count the records; useful for large tables where counting is slow and we don't really care anyway)
-    # * false: Disable pagination
-    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
-    # ----------------------------
-
-    # provides access to the list of columns specifically meant for the Table to use
-    def columns
-      self.columns = @core.columns._inheritable unless @columns # lazy evaluation
-      @columns
-    end
-    
-    public :columns=
-
-    # how many rows to show at once
-    attr_accessor :per_page
-
-    # how many page links around current page to show
-    attr_accessor :page_links_window
-
-    # What kind of pagination to use:
-    # * true: The usual pagination
-    # * :infinite: Treat the source as having an infinite number of pages (i.e. don't count the records; useful for large tables where counting is slow and we don't really care anyway)
-    # * false: Disable pagination
-    attr_accessor :pagination
-
-    # what string to use when a field is empty
-    attr_accessor :empty_field_text
-
-    # what string to use to join records from plural associations
-    attr_accessor :association_join_text
-
-    # 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
-      sorting.clear
-      val.each { |clause| sorting.add *Array(clause).first }
-    end
-    def sorting
-      @sorting ||= ActiveScaffold::DataStructures::Sorting.new(@core.columns)
-    end
-    
-    # overwrite the includes used for the count sql query
-    attr_accessor :count_includes
-
-    # the label for this List action. used for the header.
-    attr_writer :label
-    def label
-      @label ? as_(@label, :count => 2) : @core.label(:count => 2)
-    end
-
-    attr_writer :no_entries_message
-    def no_entries_message
-      @no_entries_message ? @no_entries_message : :no_entries
-    end
-
-    attr_writer :filtered_message
-    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
-
-    # if list view is nested hide nested_column
-    attr_writer :hide_nested_column
-    def hide_nested_column
-      @hide_nested_column.nil? ? true : @hide_nested_column
-    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
-        @session[:label] ? @session[:label] : @conf.label
-      end
-
-      def per_page
-        @session['per_page'] = @params['limit'].to_i if @params.has_key? 'limit'
-        @session['per_page'] || @conf.per_page
-      end
-
-      def page
-        @session['page'] = @params['page'] if @params.has_key? 'page'
-        @session['page'] || 1
-      end
-
-      def page=(value = nil)
-        @session['page'] = value
-      end
-
-      attr_reader :nested_default_sorting
-
-      def nested_default_sorting=(options)
-        @nested_default_sorting ||= @conf.sorting.clone
-        @nested_default_sorting.set_nested_sorting(options[:table_name], options[:default_sorting])
-      end
-
-      def default_sorting
-        nested_default_sorting.nil? ? @conf.sorting : nested_default_sorting
-      end
-
-      def sorting
-        # we want to store as little as possible in the session, but we want to return a Sorting data structure. so we recreate it each page load based on session data.
-        debugger
-        @session['sort'] = [@params['sort'], @params['sort_direction']] if @params['sort'] and @params['sort_direction']
-        @session['sort'] = nil if @params['sort_direction'] == 'reset'
-
-        if @session['sort']
-          sorting = @conf.sorting.clone
-          sorting.set(*@session['sort'])
-          return sorting
-        else
-          return default_sorting
-        end
-      end
-      
-      def count_includes
-        @conf.count_includes
-      end
-    end
-  end
-end