zable 0.0.7 → 0.0.8

data/lib/zable/active_record.rb

@@ -3,7 +3,7 @@ module Zable
   module ActiveRecord
 
     module ClassMethods
-      PAGE_DEFAULTS = { 'num' => 1, 'size' => 200 }
+      PAGE_DEFAULTS = { 'num' => 1 }
 
       def scoped_for_sort(params, scoped_object)
         hash = (params[:sort] || {}).stringify_keys

data/lib/zable/html.rb

@@ -50,8 +50,17 @@ module Zable
       params.join("&".html_safe)
     end
 
-    def search_params(params)
-      params.to_a.collect do |param|
+    def current_sort_params
+      p = []
+      if params[:sort].present?
+        p << param(:sort, "attr", params[:sort][:attr])
+        p << param(:sort, "order", params[:sort][:order]) if params[:sort][:order].present?
+      end
+      p.join("&".html_safe)
+    end
+
+    def search_params
+      @search.to_a.collect do |param|
         param(:search, param.first, param.second)
       end.join("&".html_safe)
     end
@@ -61,8 +70,8 @@ module Zable
     end
 
     def header_cell_href(attr)
-      all_params = [sort_params(attr), search_params(@search), (@_extra_params || {}).to_query.html_safe].reject(&:blank?).join("&".html_safe)
-      current_url << "?".html_safe << all_params
+      params = [sort_params(attr), search_params, @_extra_params.to_query.html_safe].reject(&:blank?).join("&".html_safe)
+      current_url << "?".html_safe << params
     end
 
     def header_cell_link_text(attr)

data/lib/zable/view.rb

@@ -11,7 +11,7 @@ module Zable
       @template = template # this refers to the view context
       raise "Must pass in valid view context" unless @template.kind_of? ActionView::Context
       @search = @template.controller.request.params[:search]
-      @_extra_params = options[:params]
+      @_extra_params = options[:params] || {}
 
       @options = options
       @columns = []
@@ -61,7 +61,7 @@ module Zable
     def pagination_element
       content_tag :div, :class => 'brownFilterResultsBox' do
         page_entries_info(@collection, @options.slice(:entry_name)) <<
-          will_paginate(@collection, :renderer => Zable::WillPaginate::LinkWithParamsRenderer.new(@options[:params] || {}))
+          will_paginate(@collection, :renderer => Zable::WillPaginate::LinkWithParamsRenderer.new(self, @_extra_params))
       end
     end
 

data/lib/zable/will_paginate.rb

@@ -4,10 +4,17 @@ module Zable
   module WillPaginate
     class LinkWithParamsRenderer < ::WillPaginate::ViewHelpers::LinkRenderer
 
-      def initialize(params = {})
+      def initialize(zable_view, params = {})
+        @zable_view = zable_view
         @params = params
       end
 
+      def url(page)
+        page_param = @zable_view.param(:page, :num, page)
+        all_params = [page_param, @zable_view.current_sort_params, @zable_view.search_params, @params.to_query.html_safe].reject(&:blank?).join("&".html_safe)
+        @zable_view.current_url << "?".html_safe << all_params
+      end
+
     protected
 
       def default_url_params

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zable
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: HTML tables