wice_grid 3.2.1 → 3.3.0

data/.gitignore

@@ -0,0 +1,18 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+.rbenv-version
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/CHANGELOG

@@ -1,11 +1,38 @@
-3.2.0pre2
+3.2.2
+
+improvement of the javascript calendar control: if the FROM field is set to a value after TO, TO is set to the value of FROM.
+Vice versa: if the TO field is set to a value before FROM, FROM is set to the value of TO
+
+Wice::Defaults::DATEPICKER_YEAR_RANGE added to the config to define the default year range in Datepicker (https://github.com/leikind/wice_grid/issues/61)
+
+support for Ruby 2.0
+
+<caption> supported
+
+2 js errors fixed in the Saved Queries UI ( https://github.com/leikind/wice_grid/issues/89
+
+helpers filter_and_order_state_as_hash(grid) and filter_state_as_hash(grid)
+
+the with_paginated_resultset callback receives an ActiveRelation object, not a lambda
+
+3.2.1
+
+action_column can now also take a block. If the block returns a falsy value, no checkbox will be rendered.
+
+A fix: the css class submitted to column is also added to the <th> tags of the column.
+
+Filter related code has been refactored: condition generators are unified together with view column processors into one module. Writing your own filters has been simplified.
+
+The default filter for numeric columns has been replaced by a simple one field filter which checks the values for equality, not the inclusion in a range.
+New column parameter :filter_type allows to load custom alternative filters.
+The old numeric range filter can still be used by specifying filter_type: :range. See lib/columns/column_processor_index.rb for the list of available filters.
+
+3.2.0
 
 Fixes:
 https://github.com/leikind/wice_grid/issues/83
 https://github.com/leikind/wice_grid/issues/82
 
-3.2.0pre1
-
 action_column can now also take a block. If the block returns a falsy value, no checkbox will be rendered
 
 A fix: the css class submitted to column is also added to <th> tags of the column
@@ -17,12 +44,9 @@ New column parameter :filter_type allows to load custom alternative filters. The
 See lib/columns/column_processor_index.rb</tt> for the list of available filters.
 
 
-3.2.0pre1
-
-
 3.0.4
 
-bugxixes
+bugfixes
 
 3.0.3
 

data/Gemfile

@@ -0,0 +1 @@
+gemspec

data/README.rdoc

@@ -1,14 +1,13 @@
 = WiceGrid
 
-Version:: 3.2.1
+Version:: 3.3.0
 Author::  Yuri Leikind
 Sources:: https://github.com/leikind/wice_grid/
-Examples online:: http://grid.leikind.org
+Examples online:: http://wicegrid.herokuapp.com
 News:: http://leikind.org/pages/wicegrid/
 Email::   "Yuri Leikind" <yuri.leikind at gmail dot com>
 
-
-FOR RAILS 3.0.X AND 3.1.X USE VERSION 3.0.4.
+FOR RAILS 3 USE VERSION 3.x
 FOR RAILS 2 USE VERSION 0.6 (https://github.com/leikind/wice_grid/tree/master).
 
 
@@ -49,7 +48,7 @@ WiceGrid is known to work with MySQL and Postgres.
 === Examples
 
 This tutorial is accompanied by a sample application with WiceGrid examples which you
-can browse online ( http://grid.leikind.org ),
+can browse online ( http://wicegrid.herokuapp.com ),
 or just view the code ( https://github.com/leikind/wice_grid_testbed ).
 
 
@@ -75,7 +74,7 @@ Beginning from version 3.2 only jQuery is supported.
 
 Add the following to your Gemfile:
 
-  gem "wice_grid", '3.2.0.pre1'
+  gem "wice_grid", '3.2.1'
 
 and run the <tt>bundle</tt> command.
 
@@ -91,8 +90,10 @@ Require WiceGrid javascript in your js index file:
 
   //= require wice_grid
 
-Make sure that jQuery is required, and if the application uses Date and DateTime filters, jQuery Datepicker has
-to be required as well. Here is an example of application.js with everything WiceGrid needs:
+Make sure that jQuery is loaded.
+If the application uses Date and DateTime filters, you have to install jQuery Datepicker by yourself.
+
+Here is an example of application.js with everything WiceGrid needs:
 
   //= require jquery
   //= require jquery_ujs
@@ -101,7 +102,9 @@ to be required as well. Here is an example of application.js with everything Wic
   //= require jquery.ui.datepicker
   //= require_tree .
 
-
+WiceGrid provides some very basic styles, not specifying exactly how the table should look like,
+but if the application uses Twitter Bootstrap, the markup generated by WiceGrid will have correct classes and will fit nicely.
+Generally it is advised to modify WiceGrid css to match the application style.
 
 
 === Basics
@@ -887,6 +890,11 @@ jQuery +datepicker+ uses a different format flavor, therefore there is an additi
 for presenting initial date values in filters, so make sure that +DATE_FORMAT_JQUERY+ and +DATE_FORMAT+
 result in an identical date representation.
 
+Constant +DATEPICKER_YEAR_RANGE+ defined the range of years in the Datepicker year dropdown. Alternatively,
+you can always change this range dynamically with the following javascript:
+
+  $( ".hasDatepicker" ).datepicker( "option", "yearRange", "2000:2042" );
+
 
 === Show All Records
 
@@ -1164,14 +1172,14 @@ There are two callbacks:
 * <tt>:with_resultset</tt> - used to process all records browsable through all pages with the current filters
 
 While the <tt>:with_paginated_resultset</tt> callback just receives the list of records, <tt>:with_resultset</tt>
-receives a lambda object which, when called, returns the list of all records:
+receives an ActiveRelation object which can be used to obtain the list of all records:
 
 
   def index
     @tasks_grid = initialize_grid(Task)
 
-    @tasks_grid.with_resultset do |wrapper|
-      all_records = wrapper.call
+    @tasks_grid.with_resultset do |active_relation|
+      all_records = active_relation.find(:first)
       ...
     end
   end

data/Rakefile

@@ -1,16 +1,9 @@
-require 'rake'
-require 'rake/testtask'
-require 'rdoc/task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-desc 'Default: run unit tests.'
-task :default => :test
+RSpec::Core::RakeTask.new
 
-desc 'Test the wice_grid plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
+task :default => :rdoc
 
 desc 'Generate documentation for the wice_grid plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
@@ -23,22 +16,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('CHANGELOG')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-begin
-  require 'git'
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "wice_grid"
-    gem.summary = %Q{Rails Grid Plugin}
-    gem.description = %Q{A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters }
-    gem.email = "yuri.leikind@gmail.com"
-    gem.homepage = "http://github.com/leikind/wice_grid"
-    gem.authors = ["Yuri Leikind"]
-    gem.add_dependency "kaminari", ">= 0.13.0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-

data/lib/generators/wice_grid/templates/wice_grid.css.scss

@@ -3,12 +3,10 @@
   height: 16px;
 }
 
-.wg-detached-filter{
+.wg-detached-filter, .wice-grid{
+
   a.date-label {text-decoration: none;}
   a.date-label:hover {text-decoration: line-through;}
-}
-
-.wice-grid{
 
   .clickable{
     cursor: pointer;
@@ -16,14 +14,49 @@
     margin-right: 2px;
   }
 
-
-  a.date-label {text-decoration: none;}
-  a.date-label:hover {text-decoration: line-through;}
-
   .ui-datepicker-trigger, .wg-detached-filter .ui-datepicker-trigger{
     cursor: pointer;
   }
 
+  .custom-dropdown-container {
+    position: relative;
+    padding-right: 18px;
+
+
+    .collapse-multi-select-icon, .expand-multi-select-icon{
+      width: 12px;
+      height: 12px;
+      position:absolute;
+      top:0;
+      right:0;
+    }
+
+    .collapse-multi-select-icon{
+      background: transparent url(/assets/icons/grid/collapse.gif) no-repeat;
+    }
+
+    .expand-multi-select-icon{
+      background: transparent url(/assets/icons/grid/expand.gif) no-repeat;
+    }
+
+  }
+
+  .text-filter-container {
+    position: relative; padding-right: 13px;
+    .negation-checkbox {
+      position:absolute;
+      top:0;
+      right:0;
+    }
+  }
+
+
+}
+
+
+.wice-grid{
+
+
   .desc,  .asc{
     padding-right: 18px;
     text-decoration:none;
@@ -71,38 +104,6 @@
     float:left;
   }
 
-  .custom-dropdown-container {
-    position: relative;
-    padding-right: 18px;
-
-
-    .collapse-multi-select-icon, .expand-multi-select-icon{
-      width: 12px;
-      height: 12px;
-      position:absolute;
-      top:0;
-      right:0;
-    }
-
-    .collapse-multi-select-icon{
-      background: transparent url(/assets/icons/grid/collapse.gif) no-repeat;
-    }
-
-    .expand-multi-select-icon{
-      background: transparent url(/assets/icons/grid/expand.gif) no-repeat;
-    }
-
-  }
-
-  .text-filter-container {
-    position: relative; padding-right: 13px;
-    .negation-checkbox {
-      position:absolute;
-      top:0;
-      right:0;
-    }
-  }
-
 
   /* in case of twitter bootstrap :) */
   thead th select{

data/lib/generators/wice_grid/templates/wice_grid.yml

@@ -500,3 +500,51 @@ zh:
     query_saved_message: 查询已储存
     select_all: 全选
     deselect_all: 全清
+
+ja:
+  date:
+    order:
+      - :年
+      - :月
+      - :日
+  wice_grid:
+    show_filter_tooltip: フィルタ表示
+    hide_filter_tooltip: フィルタ非表示
+    csv_export_tooltip: CSVエクスポート
+    filter_tooltip: フィルタ
+    reset_filter_tooltip: リセット
+    boolean_filter_true_label: "yes"
+    boolean_filter_false_label: "no"
+    previous_label: «
+    next_label: »
+    # Title of the icon clicking on which will show the calendar to set the FROM date.
+    date_selector_tooltip_from: From
+    # Title of the icon clicking on which will show the calendar to set the TO date.
+    date_selector_tooltip_to: To
+    # The title of the checkox to turn on negation
+    negation_checkbox_title: 除外する
+    # link to switch to show all records
+    show_all_records_label: すべて表示
+    # tooltip for the link to switch to show all records
+    show_all_records_tooltip: 前レコード表示
+    # Warning message shown when the user wants to switch to all-records mode
+    all_queries_warning: 全てのレコードを表示しますか？
+    # link to paginated view
+    switch_back_to_paginated_mode_label: 戻る
+    # tooltip for the link to paginated view
+    switch_back_to_paginated_mode_tooltip: 戻る
+    # Title of the date string.
+    date_string_tooltip: 削除
+    saved_query_panel_title: クエリ保存
+    save_query_button_label: フィルタ保存
+    saved_query_deletion_confirmation: 本当によろしいですか？
+    saved_query_deletion_link_title: クエリ削除
+    saved_query_link_title: クエリのロード
+    validates_uniqueness_error: 同じ名前がすでに存在します
+    validates_presence_error: クエリ名を記入して下さい
+    query_deleted_message: クエリの削除が完了しました
+    query_saved_message: クエリを保存しました
+    select_all: 全てを選択
+    deselect_all: 選択を解除
+    expand: 開く
+    collapse: 閉じる

data/lib/generators/wice_grid/templates/wice_grid_config.rb

@@ -120,6 +120,11 @@ if defined?(Wice::Defaults)
     end
   }
 
+  # The range of years to display in jQuery Datepicker.
+  # It can always be changed dynamically with the following javascript:
+  #  $( ".hasDatepicker" ).datepicker( "option", "yearRange", "2000:2042" );
+  Wice::Defaults::DATEPICKER_YEAR_RANGE = (from = Date.current.year - 10).to_s + ':' + (from + 15).to_s
+
 
   # With Calendar helpers enabled the parameter sent is the string displayed. This lambda will be given a date string in the
   # format defined by +DATETIME+ and must generate a Date object.

data/lib/{columns.rb → wice/columns.rb}

@@ -49,7 +49,7 @@ module Wice #:nodoc:
 
       def require_columns
         Wice::Columns::COLUMN_PROCESSOR_INDEX.values.uniq do |column_source_file|
-          require "columns/#{column_source_file}.rb"
+          require "wice/columns/#{column_source_file}.rb"
         end
       end
 

data/lib/{columns → wice/columns}/column_datetime.rb

@@ -49,11 +49,28 @@ module Wice
 
       def render_calendar_filter_internal(params) #:nodoc:
 
-        html1 = date_calendar_jquery(
-          params[:fr], NlMessage['date_selector_tooltip_from'], :prefix => @name1, :fire_event => auto_reload, :grid_name => self.grid.name)
-
-        html2 = date_calendar_jquery(
-          params[:to], NlMessage['date_selector_tooltip_to'],   :prefix => @name2, :fire_event => auto_reload, :grid_name => self.grid.name)
+        calendar_data_from = prepare_data_for_calendar(
+          :initial_date => params[:fr],
+          :title        => NlMessage['date_selector_tooltip_from'],
+          :name         => @name1,
+          :fire_event   => auto_reload,
+          :grid_name    => self.grid.name
+        )
+
+        calendar_data_to = prepare_data_for_calendar(
+          :initial_date => params[:to],
+          :title        => NlMessage['date_selector_tooltip_to'],
+          :name         => @name2,
+          :fire_event   => auto_reload,
+          :grid_name    => self.grid.name
+        )
+
+        calendar_data_from.the_other_datepicker_id_to   = calendar_data_to.dom_id
+        calendar_data_to.the_other_datepicker_id_from   = calendar_data_from.dom_id
+
+        html1 = date_calendar_jquery calendar_data_from
+
+        html2 = date_calendar_jquery calendar_data_to
 
         %!<div class="date-filter">#{html1}<br/>#{html2}</div>!
       end

data/lib/{grid_renderer.rb → wice/grid_renderer.rb}

@@ -14,6 +14,7 @@ module Wice
     attr_reader :blank_slate_handler
     attr_reader :last_row_handler
     attr_reader :grid
+    attr_reader :kaption
 
     @@order_parameter_name = "order"
     @@order_direction_parameter_name = "order_direction"
@@ -115,6 +116,12 @@ module Wice
       end
     end
 
+    # Takes one argument and adds the  <caption></caption> tag to the table with the argument value as
+    # the contents of <caption>.
+    def caption kaption
+      @kaption = kaption
+    end
+
     # Adds a column with checkboxes for each record. Useful for actions with multiple records, for example, deleting
     # selected records. Please note that +action_column+ only creates the checkboxes and the 'Select All' and
     # 'Deselect All' buttons, and the form itelf as well as processing the parameters should be taken care of

data/lib/wice/helpers/js_calendar_helpers.rb

@@ -0,0 +1,81 @@
+module Wice #:nodoc:
+  module JsCalendarHelpers #:nodoc:
+
+    class CalendarData
+      attr_accessor :name,
+                    :date_string,
+                    :dom_id,
+                    :datepicker_placeholder_id,
+                    :date_span_id,
+                    :close_calendar_event_name,
+                    :title,
+                    :fire_event,
+                    :the_other_datepicker_id_to,
+                    :the_other_datepicker_id_from
+    end
+
+    def date_calendar_jquery(calendar_data)  #:nodoc:
+
+      hidden_field_tag_options = {
+        :id                 => calendar_data.dom_id,
+        'data-locale'       => I18n.locale,
+        'data-date-format'  => Wice::ConfigurationProvider.value_for(:DATE_FORMAT_JQUERY),
+        'data-button-image' => Wice::ConfigurationProvider.value_for(:CALENDAR_ICON),
+        'data-button-text'  => calendar_data.title
+      }
+
+      if calendar_data.fire_event
+        hidden_field_tag_options['data-close-calendar-event-name'] = calendar_data.close_calendar_event_name
+      end
+
+      if Rails.env == 'development'
+        hidden_field_tag_options['class'] = 'check-for-datepicker'
+      end
+
+      if calendar_data.the_other_datepicker_id_to
+        hidden_field_tag_options['data-the-other-datepicker-id-to'] = calendar_data.the_other_datepicker_id_to
+      end
+
+      if calendar_data.the_other_datepicker_id_from
+        hidden_field_tag_options['data-the-other-datepicker-id-from'] = calendar_data.the_other_datepicker_id_from
+      end
+
+
+      if year_range = ConfigurationProvider.value_for(:DATEPICKER_YEAR_RANGE)
+        hidden_field_tag_options['data-date-year-range'] = year_range
+      end
+
+
+      date_picker = hidden_field_tag(calendar_data.name, calendar_data.date_string, hidden_field_tag_options) + ' ' +
+
+        link_to(calendar_data.date_string,
+          '#',
+          :id => calendar_data.date_span_id,
+          :class => 'date-label',
+          :title => ::Wice::NlMessage['date_string_tooltip'],
+          'data-dom-id' => calendar_data.dom_id
+        )
+
+      "<span id=\"#{calendar_data.datepicker_placeholder_id}\">#{date_picker}</span>"
+    end
+
+    def prepare_data_for_calendar(options)  #:nodoc:
+
+      date_format = Wice::ConfigurationProvider.value_for(:DATE_FORMAT)
+
+      CalendarData.new.tap do |calendar_data|
+
+        calendar_data.name                      = options[:name]
+        calendar_data.date_string               = options[:initial_date].nil? ? '' : options[:initial_date].strftime(date_format)
+        calendar_data.dom_id                    = options[:name].gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '').gsub(/\./, '_').gsub(/_+/, '_')
+        calendar_data.datepicker_placeholder_id = calendar_data.dom_id + '_date_placeholder'
+        calendar_data.date_span_id              = calendar_data.dom_id + '_date_view'
+        calendar_data.close_calendar_event_name =  "wg:calendarChanged_#{options[:grid_name]}"
+        calendar_data.title                     = options[:title]
+        calendar_data.fire_event                = options[:fire_event]
+
+      end
+    end
+
+  end
+end

data/lib/{helpers → wice/helpers}/wice_grid_misc_view_helpers.rb

@@ -15,11 +15,34 @@ module Wice
       grid.get_state_as_parameter_value_pairs(true).collect{|param_name, value|
         hidden_field_tag(param_name, value, :id => "hidden-#{param_name.gsub(/[\[\]]/, '-')}")
       }.join("\n").html_safe
+    end
 
+    # This method dumps all HTTP parameters related to filtering of a certain grid in the form of a hash.
+    # This might be required if you want to keep the state of a grid while reloading the page using Rails routing helpers.
+    # Attention: this does not return parameters for ordering the grid, use +filter_and_order_state_as_hash+ if you
+    # need it.
+    #
+    # The only parameter is a grid object returned by +initialize_grid+ in the controller.
+    def filter_state_as_hash(grid)
+      {grid.name => {'f' => grid.status[:f]}}
+    end
+
+    # This method dumps all HTTP parameters related to filtering and ordering of a certain grid in the form of a hash.
+    # This might be required if you want to keep the state of a grid while reloading the page using Rails routing helpers.
+    #
+    # The only parameter is a grid object returned by +initialize_grid+ in the controller.
+    def filter_and_order_state_as_hash(grid)
+      {
+        grid.name => {
+          'f'               => grid.status[:f],
+          'order'           => grid.status[:order],
+          'order_direction' => grid.status[:order_direction]
+        }
+      }
     end
 
     def dump_state(grid)  #:nodoc:
-      debug(grid.get_state_as_parameter_value_pairs)
+      debug(grid.get_state_as_parameter_value_pairs())
     end
 
 

data/lib/{helpers → wice/helpers}/wice_grid_view_helpers.rb

@@ -195,6 +195,7 @@ module Wice
       grid.output_buffer << %!<div class="wice-grid-container" id="#{grid.name}"><div id="#{grid.name}_title">!
       grid.output_buffer << content_tag(:h3, grid.saved_query.name) if grid.saved_query
       grid.output_buffer << "</div><table #{tag_options(table_html_attrs, true)}>"
+      grid.output_buffer << "<caption>#{rendering.kaption}</caption>" if rendering.kaption
       grid.output_buffer << "<thead>"
 
       no_filters_at_all = (options[:show_filters] == :no || rendering.no_filter_needed?) ? true: false
@@ -583,6 +584,7 @@ module Wice
       paginate(grid.resultset,
         :theme         => 'wice_grid',
         :param_name    => "#{grid.name}[page]",
+        :params        => extra_request_parameters,
         :inner_window  => 4,
         :outer_window  => 2
       ) +

data/lib/{wice_grid_misc.rb → wice/wice_grid_misc.rb}

@@ -88,7 +88,10 @@ module Wice
         if Wice::Defaults.const_defined?(key)
           Wice::Defaults.const_get(key)
         else
-          raise WiceGridException.new("Could not find constant #{key} in the configuration file! Please run the generator command to update the configuration file:\n   rails g  wice_grid:wice_grid_assets_jquery\nor   rails g wice_grid:wice_grid_assets_prototype\ndepending on your JS framework")
+          raise WiceGridMissingConfigurationConstantException.new("Could not find constant #{key} in the configuration file!" +
+              " It is possible that the version of WiceGrid you are using is newer than the installed configuration file in config/initializers. " +
+              "Constant Wice::Defaults::#{key} is missing  and you need to add it manually to wice_grid_config.rb or run the generator task=:\n" +
+              "   rails g wice_grid:install")
         end
       end
 
@@ -109,4 +112,8 @@ module Wice
   class WiceGridException < Exception #:nodoc:
     include ExceptionsMixin
   end
+  class WiceGridMissingConfigurationConstantException < Exception #:nodoc:
+    include ExceptionsMixin
+  end
+
 end

data/lib/{wice_grid_spreadsheet.rb → wice/wice_grid_spreadsheet.rb}

@@ -6,7 +6,7 @@ module Wice
 
     attr_reader :tempfile
     # CSV in 1.9.1 is a version of FasterCSV
-    if RUBY_VERSION =~ /1\.9\./
+    if RUBY_VERSION =~ /^1\.9\./ || RUBY_VERSION =~ /^2\./
 
       def initialize(name, field_separator)  #:nodoc:
         @tempfile = Tempfile.new(name)

data/lib/wice_grid.rb

@@ -1,21 +1,21 @@
 # encoding: UTF-8
 
-require 'wice_grid_misc.rb'
-require 'wice_grid_core_ext.rb'
-require 'grid_renderer.rb'
-require 'table_column_matrix.rb'
-require 'active_record_column_wrapper.rb'
-require 'helpers/wice_grid_view_helpers.rb'
-require 'helpers/wice_grid_misc_view_helpers.rb'
-require 'helpers/wice_grid_serialized_queries_view_helpers.rb'
-require 'helpers/wice_grid_view_helpers.rb'
-require 'helpers/js_calendar_helpers.rb'
-require 'grid_output_buffer.rb'
-require 'wice_grid_controller.rb'
-require 'wice_grid_spreadsheet.rb'
-require 'wice_grid_serialized_queries_controller.rb'
-require 'columns/column_processor_index.rb'
-require 'columns.rb'
+require 'wice/wice_grid_misc.rb'
+require 'wice/wice_grid_core_ext.rb'
+require 'wice/grid_renderer.rb'
+require 'wice/table_column_matrix.rb'
+require 'wice/active_record_column_wrapper.rb'
+require 'wice/helpers/wice_grid_view_helpers.rb'
+require 'wice/helpers/wice_grid_misc_view_helpers.rb'
+require 'wice/helpers/wice_grid_serialized_queries_view_helpers.rb'
+require 'wice/helpers/wice_grid_view_helpers.rb'
+require 'wice/helpers/js_calendar_helpers.rb'
+require 'wice/grid_output_buffer.rb'
+require 'wice/wice_grid_controller.rb'
+require 'wice/wice_grid_spreadsheet.rb'
+require 'wice/wice_grid_serialized_queries_controller.rb'
+require 'wice/columns/column_processor_index.rb'
+require 'wice/columns.rb'
 require 'kaminari.rb'
 
 
@@ -46,10 +46,10 @@ module Wice
         end
 
         Columns.load_column_processors
-        require 'wice_grid_serialized_query.rb'
+        require 'wice/wice_grid_serialized_query.rb'
 
         # It is here only until this pull request is pulled: https://github.com/amatsuda/kaminari/pull/267
-        require 'kaminari_monkey_patching.rb'
+        require 'wice/kaminari_monkey_patching.rb'
       end
     end
   end
@@ -473,7 +473,7 @@ module Wice
 
     def invoke_resultset_callbacks #:nodoc:
       invoke_resultset_callback(@options[:with_paginated_resultset], @resultset)
-      invoke_resultset_callback(@options[:with_resultset], lambda{self.send(:resultset_without_paging_with_user_filters)})
+      invoke_resultset_callback(@options[:with_resultset], self.active_relation_for_resultset_without_paging_with_user_filters)
     end
 
 
@@ -546,19 +546,27 @@ module Wice
     #   end
     # end
 
-
     def resultset_without_paging_with_user_filters  #:nodoc:
+      @klass.unscoped do
+        active_relation_for_resultset_without_paging_with_user_filters.find(:all)
+      end
+    end
+
+    def active_relation_for_resultset_without_paging_with_user_filters  #:nodoc:
       form_ar_options
+      relation = nil
       @klass.unscoped do
-        @relation.find(:all, :joins   => @ar_options[:joins],
-                          :include    => @ar_options[:include],
-                          :group      => @ar_options[:group],
-                          :conditions => @ar_options[:conditions],
-                          :order      => @ar_options[:order])
+        relation = @relation.
+          where(@ar_options[:conditions]).
+          joins(@ar_options[:joins]).
+          includes(@ar_options[:include]).
+          order(@ar_options[:order])
       end
+      relation
     end
 
 
+
     def load_query(query_id) #:nodoc:
       @query_store_model ||= Wice::get_query_store_model
       query = @query_store_model.find_by_id_and_grid_name(query_id, self.name)

data/release_notes/RELEASE_NOTES_3.3.0.rdoc

@@ -0,0 +1,21 @@
+the with_paginated_resultset callback receives an ActiveRelation object, not a lambda
+
+Wice::Defaults::DATEPICKER_YEAR_RANGE added to the config to define the default year range in Datepicker (https://github.com/leikind/wice_grid/issues/61)
+
+improvement of the javascript calendar control: if the FROM field is set to a value after TO, TO is set to the value of FROM. Vice versa: if the TO field is set to a value before FROM, FROM is set to the value of TO
+
+New view helpers filter_and_order_state_as_hash(grid) and filter_state_as_hash(grid)
+
+<caption> supported
+
+support for Ruby 2.0
+
+2 errors fixed in the Saved Queries UI ( https://github.com/leikind/wice_grid/issues/89 )
+
+bug fixed: extra_request_parameters not propagating to the pagination panel
+
+README: made it clear that Datepicker has to be installed separately
+
+README: made it clear that css is basis and that Twitter Bootstrap is supported
+
+

data/vendor/assets/javascripts/wice_grid_init.js.coffee

@@ -42,6 +42,22 @@ initWiceGrid = ->
   setupExternalSubmitReset()
   setupExternalCsvExport()
 
+  # for all grids on oage because it does not matter which grid it is
+  setupMultiSelectToggle $('.wg-detached-filter')
+
+
+
+moveDateBoundIfInvalidPeriod = (dataFieldNameWithTheOtherDatepicker, datepickerHiddenField, selectedDate, dateFormat, predicate) ->
+  if (datepickerId = datepickerHiddenField.data(dataFieldNameWithTheOtherDatepicker)) &&
+    (theOtherDatepicker = $(_datepickerId = "#" + datepickerId)) &&
+    (theOtherDate = theOtherDatepicker.datepicker('getDate')) &&
+
+    predicate(theOtherDate, selectedDate)
+      theOtherDatepicker.datepicker("setDate", selectedDate)
+      theOtherDatepicker.next().next().html  $.datepicker.formatDate(dateFormat, selectedDate)
+
+
+
 # datepicker logic
 setupDatepicker = ->
   # check if datepicker is loaded
@@ -72,20 +88,45 @@ setupDatepicker = ->
       false
     that = this
 
+    dateFormat = datepickerHiddenField.data('date-format')
+
+    yearRange = datepickerHiddenField.data('date-year-range')
+
     # datepicker constructor
     datepickerHiddenField.datepicker
       firstDay:        1
       showOn:          "button"
-      dateFormat:      datepickerHiddenField.data('date-format')
+      dateFormat:      dateFormat
       buttonImage:     datepickerHiddenField.data('button-image')
       buttonImageOnly: true
       buttonText:      datepickerHiddenField.data('button-text')
       changeMonth:     true
       changeYear:      true
+      yearRange:       yearRange
+
       onSelect: (dateText, inst) ->
+
+        selectedDate = $(this).datepicker("getDate")
+
+        moveDateBoundIfInvalidPeriod(
+          'the-other-datepicker-id-to',
+          datepickerHiddenField,
+          selectedDate,
+          dateFormat,
+          (theOther, selected)-> theOther < selected
+        )
+
+        moveDateBoundIfInvalidPeriod(
+          'the-other-datepicker-id-from',
+          datepickerHiddenField,
+          selectedDate,
+          dateFormat,
+          (theOther, selected)-> theOther > selected
+        )
+
         $(that).html(dateText)
         if eventToTriggerOnChange
-          datepickerHiddenField.trigger(eventToTriggerOnChange)
+         datepickerHiddenField.trigger(eventToTriggerOnChange)
 
 
 

data/vendor/assets/javascripts/wice_grid_saved_queries_init.js.coffee

@@ -88,13 +88,13 @@ onChangeToQueryList = (data, gridName, queryName, inputField) ->
   queryListId  = "##{gridName}_query_list"
   inputField.val('') if queryName
   if errorMessages = data['error_messages']
-    $(notificationMessagesDomId).text(errorExplanation)
+    $(notificationMessagesDomId).text(errorMessages)
   else
     if notificationMessages = data['notification_messages']
       $(notificationMessagesDomId).text(notificationMessages)
     $(gridTitleId).html("<h3>#{queryName}</h3>") if queryName
     $(queryListId).replaceWith(data['query_list'])
-    $(queryListId).effect('highlight')
+    $(queryListId).effect('highlight') if jQuery.ui
 
     $(".wice-grid-delete-query", $(queryListId)).click (event) ->
       deleteQuery(this, event)

data/wice_grid.gemspec

@@ -1,101 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
-  s.name = "wice_grid"
-  s.version = "3.2.1"
+  s.name          = 'wice_grid'
+  s.version       = '3.3.0'
+  s.homepage      = 'https://github.com/leikind/wice_grid'
+  s.date          = '2013-08-04'
+  s.summary       = 'A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters.'
+  s.description   = 'One of the goals of this plugin was to allow the programmer to define the contents of the cell by himself, '  +
+                    'just like one does when rendering a collection via a simple table (and this is what differentiates WiceGrid ' +
+                    'from various scaffolding solutions), but automate implementation of filters, ordering, paginations, CSV '     +
+                    'export, and so on. Ruby blocks provide an elegant means for this.'
+  s.authors       = ['Yuri Leikind']
+  s.email         = 'yuri.leikind@gmail.com'
+  s.files         = `git ls-files`.split($/)
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Yuri Leikind"]
-  s.date = "2013-01-29"
-  s.description = "A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters "
-  s.email = "yuri.leikind@gmail.com"
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    "CHANGELOG",
-    "MIT-LICENSE",
-    "README.rdoc",
-    "RELEASE_NOTES_3.2.pre1.rdoc",
-    "RELEASE_NOTES_3.2.pre2.rdoc",
-    "Rakefile",
-    "SAVED_QUERIES_HOWTO.rdoc",
-    "VERSION",
-    "app/views/kaminari/wice_grid/_gap.html.erb",
-    "app/views/kaminari/wice_grid/_next_page.html.erb",
-    "app/views/kaminari/wice_grid/_page.html.erb",
-    "app/views/kaminari/wice_grid/_paginator.html.erb",
-    "app/views/kaminari/wice_grid/_prev_page.html.erb",
-    "lib/active_record_column_wrapper.rb",
-    "lib/columns.rb",
-    "lib/columns/column_action.rb",
-    "lib/columns/column_boolean.rb",
-    "lib/columns/column_custom_dropdown.rb",
-    "lib/columns/column_date.rb",
-    "lib/columns/column_datetime.rb",
-    "lib/columns/column_float.rb",
-    "lib/columns/column_integer.rb",
-    "lib/columns/column_processor_index.rb",
-    "lib/columns/column_range.rb",
-    "lib/columns/column_string.rb",
-    "lib/generators/wice_grid/add_migration_for_serialized_queries_generator.rb",
-    "lib/generators/wice_grid/install_generator.rb",
-    "lib/generators/wice_grid/templates/create_wice_grid_serialized_queries.rb",
-    "lib/generators/wice_grid/templates/wice_grid.css.scss",
-    "lib/generators/wice_grid/templates/wice_grid.yml",
-    "lib/generators/wice_grid/templates/wice_grid_config.rb",
-    "lib/grid_output_buffer.rb",
-    "lib/grid_renderer.rb",
-    "lib/helpers/js_calendar_helpers.rb",
-    "lib/helpers/wice_grid_misc_view_helpers.rb",
-    "lib/helpers/wice_grid_serialized_queries_view_helpers.rb",
-    "lib/helpers/wice_grid_view_helpers.rb",
-    "lib/kaminari_monkey_patching.rb",
-    "lib/table_column_matrix.rb",
-    "lib/wice_grid.rb",
-    "lib/wice_grid_controller.rb",
-    "lib/wice_grid_core_ext.rb",
-    "lib/wice_grid_misc.rb",
-    "lib/wice_grid_serialized_queries_controller.rb",
-    "lib/wice_grid_serialized_query.rb",
-    "lib/wice_grid_spreadsheet.rb",
-    "test/readme.txt",
-    "vendor/assets/images/icons/grid/arrow_down.gif",
-    "vendor/assets/images/icons/grid/arrow_up.gif",
-    "vendor/assets/images/icons/grid/calendar_view_month.png",
-    "vendor/assets/images/icons/grid/collapse.gif",
-    "vendor/assets/images/icons/grid/delete.png",
-    "vendor/assets/images/icons/grid/expand.gif",
-    "vendor/assets/images/icons/grid/page_white_excel.png",
-    "vendor/assets/images/icons/grid/page_white_find.png",
-    "vendor/assets/images/icons/grid/table.png",
-    "vendor/assets/images/icons/grid/table_refresh.png",
-    "vendor/assets/images/icons/grid/tick_all.png",
-    "vendor/assets/images/icons/grid/untick_all.png",
-    "vendor/assets/javascripts/wice_grid.js",
-    "vendor/assets/javascripts/wice_grid_init.js.coffee",
-    "vendor/assets/javascripts/wice_grid_processor.js.coffee",
-    "vendor/assets/javascripts/wice_grid_saved_queries_init.js.coffee",
-    "wice_grid.gemspec"
-  ]
-  s.homepage = "http://github.com/leikind/wice_grid"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Rails Grid Plugin"
+  kaminary         = 'kaminari'
+  kaminary_version = '>= 0.13.0'
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<kaminari>, [">= 0.13.0"])
+      s.add_runtime_dependency(kaminary, [kaminary_version])
     else
-      s.add_dependency(%q<kaminari>, [">= 0.13.0"])
+      s.add_dependency(kaminari, [kaminary_version])
     end
   else
-    s.add_dependency(%q<kaminari>, [">= 0.13.0"])
+    s.add_dependency(kaminari, [kaminary_version])
   end
-end
 
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wice_grid
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -27,60 +27,64 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.13.0
-description: ! 'A Rails grid plugin to create grids with sorting, pagination, and
-  (automatically generated) filters '
+description: One of the goals of this plugin was to allow the programmer to define
+  the contents of the cell by himself, just like one does when rendering a collection
+  via a simple table (and this is what differentiates WiceGrid from various scaffolding
+  solutions), but automate implementation of filters, ordering, paginations, CSV export,
+  and so on. Ruby blocks provide an elegant means for this.
 email: yuri.leikind@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
+extra_rdoc_files: []
 files:
+- .gitignore
 - CHANGELOG
+- Gemfile
 - MIT-LICENSE
 - README.rdoc
-- RELEASE_NOTES_3.2.pre1.rdoc
-- RELEASE_NOTES_3.2.pre2.rdoc
 - Rakefile
 - SAVED_QUERIES_HOWTO.rdoc
-- VERSION
 - app/views/kaminari/wice_grid/_gap.html.erb
 - app/views/kaminari/wice_grid/_next_page.html.erb
 - app/views/kaminari/wice_grid/_page.html.erb
 - app/views/kaminari/wice_grid/_paginator.html.erb
 - app/views/kaminari/wice_grid/_prev_page.html.erb
-- lib/active_record_column_wrapper.rb
-- lib/columns.rb
-- lib/columns/column_action.rb
-- lib/columns/column_boolean.rb
-- lib/columns/column_custom_dropdown.rb
-- lib/columns/column_date.rb
-- lib/columns/column_datetime.rb
-- lib/columns/column_float.rb
-- lib/columns/column_integer.rb
-- lib/columns/column_processor_index.rb
-- lib/columns/column_range.rb
-- lib/columns/column_string.rb
 - lib/generators/wice_grid/add_migration_for_serialized_queries_generator.rb
 - lib/generators/wice_grid/install_generator.rb
 - lib/generators/wice_grid/templates/create_wice_grid_serialized_queries.rb
 - lib/generators/wice_grid/templates/wice_grid.css.scss
 - lib/generators/wice_grid/templates/wice_grid.yml
 - lib/generators/wice_grid/templates/wice_grid_config.rb
-- lib/grid_output_buffer.rb
-- lib/grid_renderer.rb
-- lib/helpers/js_calendar_helpers.rb
-- lib/helpers/wice_grid_misc_view_helpers.rb
-- lib/helpers/wice_grid_serialized_queries_view_helpers.rb
-- lib/helpers/wice_grid_view_helpers.rb
-- lib/kaminari_monkey_patching.rb
-- lib/table_column_matrix.rb
+- lib/wice/active_record_column_wrapper.rb
+- lib/wice/columns.rb
+- lib/wice/columns/column_action.rb
+- lib/wice/columns/column_boolean.rb
+- lib/wice/columns/column_custom_dropdown.rb
+- lib/wice/columns/column_date.rb
+- lib/wice/columns/column_datetime.rb
+- lib/wice/columns/column_float.rb
+- lib/wice/columns/column_integer.rb
+- lib/wice/columns/column_processor_index.rb
+- lib/wice/columns/column_range.rb
+- lib/wice/columns/column_string.rb
+- lib/wice/grid_output_buffer.rb
+- lib/wice/grid_renderer.rb
+- lib/wice/helpers/js_calendar_helpers.rb
+- lib/wice/helpers/wice_grid_misc_view_helpers.rb
+- lib/wice/helpers/wice_grid_serialized_queries_view_helpers.rb
+- lib/wice/helpers/wice_grid_view_helpers.rb
+- lib/wice/kaminari_monkey_patching.rb
+- lib/wice/table_column_matrix.rb
+- lib/wice/wice_grid_controller.rb
+- lib/wice/wice_grid_core_ext.rb
+- lib/wice/wice_grid_misc.rb
+- lib/wice/wice_grid_serialized_queries_controller.rb
+- lib/wice/wice_grid_serialized_query.rb
+- lib/wice/wice_grid_spreadsheet.rb
 - lib/wice_grid.rb
-- lib/wice_grid_controller.rb
-- lib/wice_grid_core_ext.rb
-- lib/wice_grid_misc.rb
-- lib/wice_grid_serialized_queries_controller.rb
-- lib/wice_grid_serialized_query.rb
-- lib/wice_grid_spreadsheet.rb
+- release_notes/RELEASE_NOTES_3.2.pre1.rdoc
+- release_notes/RELEASE_NOTES_3.2.pre2.rdoc
+- release_notes/RELEASE_NOTES_3.3.0.rdoc
 - test/readme.txt
 - vendor/assets/images/icons/grid/arrow_down.gif
 - vendor/assets/images/icons/grid/arrow_up.gif
@@ -99,7 +103,7 @@ files:
 - vendor/assets/javascripts/wice_grid_processor.js.coffee
 - vendor/assets/javascripts/wice_grid_saved_queries_init.js.coffee
 - wice_grid.gemspec
-homepage: http://github.com/leikind/wice_grid
+homepage: https://github.com/leikind/wice_grid
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -122,5 +126,6 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Rails Grid Plugin
+summary: A Rails grid plugin to create grids with sorting, pagination, and (automatically
+  generated) filters.
 test_files: []

data/VERSION

@@ -1 +0,0 @@
-3.2.1

data/lib/helpers/js_calendar_helpers.rb

@@ -1,54 +0,0 @@
-module Wice #:nodoc:
-  module JsCalendarHelpers #:nodoc:
-
-    def date_calendar_jquery(initial_date, title, opts = {})  #:nodoc:
-      date_format = Wice::ConfigurationProvider.value_for(:DATE_FORMAT)
-
-      name, date_string, dom_id, datepicker_placeholder_id, date_span_id, close_calendar_event_name  =
-        prepare_data_for_calendar(opts, date_format, initial_date)
-
-      hidden_field_tag_options = {
-        :id => dom_id,
-        'data-locale' => I18n.locale,
-        'data-date-format' => Wice::ConfigurationProvider.value_for(:DATE_FORMAT_JQUERY),
-        'data-button-image' => Wice::ConfigurationProvider.value_for(:CALENDAR_ICON),
-        'data-button-text' => title,
-      }
-
-      if opts[:fire_event]
-        hidden_field_tag_options['data-close-calendar-event-name'] = close_calendar_event_name
-      end
-
-      if Rails.env == 'development'
-        hidden_field_tag_options['class'] = 'check-for-datepicker'
-      end
-
-      date_picker = hidden_field_tag(name, date_string, hidden_field_tag_options) + ' ' +
-
-        link_to(date_string,
-          '#',
-          :id => date_span_id,
-          :class => 'date-label',
-          :title => ::Wice::NlMessage['date_string_tooltip'],
-          'data-dom-id' => dom_id
-        )
-
-      "<span id=\"#{datepicker_placeholder_id}\">#{date_picker}</span>"
-    end
-
-    protected
-
-    def prepare_data_for_calendar(opts, date_format, initial_date)  #:nodoc:
-      options = {:prefix => 'date'}
-      options.merge!(opts)
-      name = options[:prefix]
-      date_string = initial_date.nil? ? '' : initial_date.strftime(date_format)
-      dom_id = name.gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '').gsub(/\./, '_').gsub(/_+/, '_')
-      datepicker_placeholder_id = dom_id + '_date_placeholder'
-      date_span_id = dom_id + '_date_view'
-      close_calendar_event_name =  "wg:calendarChanged_#{options[:grid_name]}"
-      return name, date_string, dom_id, datepicker_placeholder_id, date_span_id, close_calendar_event_name
-    end
-
-  end
-end