Skip to content

Commit

Permalink
monkey patching kaminari :(
Browse files Browse the repository at this point in the history
  • Loading branch information
leikind committed Aug 4, 2012
1 parent d2920fe commit 9e53c43
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 67 deletions.
8 changes: 6 additions & 2 deletions RELEASE_NOTES_3.2.pre2.rdoc
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
1. The detached filter API has changed. No more magical invocation of the +grid+ helper two times. First, +define_grid+ is used in the same
way as +grid+, then +grid_filter+, and then <tt>render_grid(@grid)</tt> to actually output the grid table .
1. +will_paginate+ is replaced by +kaminari+.
2. The detached filter API has changed. No more magical invocation of the +grid+ helper two times.
First, +define_grid+ is used in the same way as +grid+, then +grid_filter+,
and then <tt>render_grid(@grid)</tt> to actually output the grid table .
3. No more polluting core Ruby classes like Hash and Array with methods. All such methods
are now private to the plugin.
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ begin
gem.email = "yuri.leikind@gmail.com"
gem.homepage = "http://github.com/lekind/wice_grid"
gem.authors = ["Yuri Leikind"]
gem.add_development_dependency "kaminari", ">= 0.13.0"
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
Expand Down
13 changes: 13 additions & 0 deletions lib/kaminari_monkey_patching.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# encoding: UTF-8
# It is here only until this pull request is pulled: https://github.com/amatsuda/kaminari/pull/267
module Kaminari
module Helpers
class Tag
def page_url_for(page)
current_page_params_as_query_string = @param_name.to_s + '=' + (page <= 1 ? nil : page).to_s
current_page_params_as_hash = Rack::Utils.parse_nested_query(current_page_params_as_query_string)
@template.url_for Wice::WgHash.rec_merge(@params, current_page_params_as_hash).symbolize_keys
end
end
end
end
7 changes: 4 additions & 3 deletions lib/wice_grid.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
require 'wice_grid_serialized_queries_controller.rb'
require 'view_columns/column_processor_index.rb'
require 'view_columns.rb'

require 'kaminari.rb'


ActionController::Base.send(:helper_method, :wice_grid_custom_filter_params)
Expand Down Expand Up @@ -48,10 +48,11 @@ class WiceGridEngine < ::Rails::Engine
Wice::GridRenderer.send(:include, ::WillPaginate::ViewHelpers)
ViewColumn.load_column_processors
require 'wice_grid_serialized_query.rb'
end

# It is here only until this pull request is pulled: https://github.com/amatsuda/kaminari/pull/267
require 'kaminari_monkey_patching.rb'
end
end

end

class WiceGrid
Expand Down
64 changes: 3 additions & 61 deletions wice_grid.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,74 +5,16 @@

Gem::Specification.new do |s|
s.name = "wice_grid"
s.version = "3.2.0.pre1"
s.version = "3.2.0.pre2"

s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
s.authors = ["Yuri Leikind"]
s.date = "2012-07-22"
s.date = "2012-08-04"
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",
"Rakefile",
"SAVED_QUERIES_HOWTO.rdoc",
"VERSION",
"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/table_column_matrix.rb",
"lib/view_columns.rb",
"lib/view_columns/action_view_column.rb",
"lib/view_columns/column_processor_index.rb",
"lib/view_columns/view_column_boolean.rb",
"lib/view_columns/view_column_custom_dropdown.rb",
"lib/view_columns/view_column_date.rb",
"lib/view_columns/view_column_datetime.rb",
"lib/view_columns/view_column_float.rb",
"lib/view_columns/view_column_integer.rb",
"lib/view_columns/view_column_string.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",
"lib/will_paginate_paginator.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/lekind/wice_grid"
s.require_paths = ["lib"]
s.rubygems_version = "1.8.23"
Expand All @@ -82,7 +24,7 @@ Gem::Specification.new do |s|
s.specification_version = 3

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_development_dependency(%q<kaminari>, [">= 0.13.0"])
s.add_runtime_dependency(%q<kaminari>, [">= 0.13.0"])
else
s.add_dependency(%q<kaminari>, [">= 0.13.0"])
end
Expand Down

0 comments on commit 9e53c43

Please sign in to comment.