kaminari 0.12.3 → 0.12.4

data/CHANGELOG

@@ -1,3 +1,12 @@
+== 0.12.4
+
+* Support for config.param_name as lambda #102 [ajrkerr]
+
+* Stop duplicating order_values #65 [zettabyte]
+
+* Preserve select value (e.g. "distinct") when counting #77, #104 [tbeauvais,
+beatlevic]
+
 == 0.12.3
 
 * Haml 3.1 Support #96 [FlyboyArt, sonic921]

data/lib/kaminari/config.rb

@@ -23,6 +23,10 @@ module Kaminari
     config_accessor :left
     config_accessor :right
     config_accessor :param_name
+
+    def param_name
+      config.param_name.respond_to?(:call) ? config.param_name.call() : config.param_name 
+    end
   end
 
   # this is ugly. why can't we pass the default value to config_accessor...?

data/lib/kaminari/helpers/paginator.rb

@@ -1,9 +1,13 @@
 require File.join(File.dirname(__FILE__), 'tags')
+require 'action_view/context'
 
 module Kaminari
   module Helpers
     # The main container tag
     class Paginator < Tag
+      # so that this instance can actually "render"
+      include ::ActionView::Context
+
       def initialize(template, options) #:nodoc:
         @window_options = {}.tap do |h|
           h[:window] = options.delete(:window) || options.delete(:inner_window) || Kaminari.config.window
@@ -16,7 +20,7 @@ module Kaminari
         @template, @options = template, options
         @theme = @options[:theme] ? "#{@options[:theme]}/" : ''
         @options[:current_page] = PageProxy.new @window_options.merge(@options), @options[:current_page], nil
-        # so that this instance can actually "render". Black magic?
+        # initialize the output_buffer for Context
         @output_buffer = ActionView::OutputBuffer.new
       end
 

data/lib/kaminari/models/active_record_extension.rb

@@ -5,6 +5,8 @@ module Kaminari
     extend ActiveSupport::Concern
     included do
       def self.inherited(kls) #:nodoc:
+        super
+
         kls.class_eval do
           include Kaminari::ConfigurationMethods
 
@@ -17,8 +19,6 @@ module Kaminari
             include Kaminari::PageScopeMethods
           end
         end
-
-        super
       end
     end
   end

data/lib/kaminari/version.rb

@@ -1,3 +1,3 @@
 module Kaminari
-  VERSION = '0.12.3'
+  VERSION = '0.12.4'
 end

data/spec/config/config_spec.rb

@@ -45,5 +45,17 @@ describe Kaminari::Configuration do
     context 'by default' do
       its(:param_name) { should == :page }
     end
+
+    context 'configured via config block' do
+      before do
+        Kaminari.configure {|c| c.param_name = lambda { :test } }
+      end
+
+      its(:param_name) { should == :test }
+
+      after do
+        Kaminari.configure {|c| c.param_name = :page }
+      end
+    end
   end
 end

data/spec/helpers/action_view_extension_spec.rb

@@ -18,4 +18,3 @@ describe 'Kaminari::ActionViewExtension' do
     end
   end
 end
-

data/spec/models/active_record_relation_methods_spec.rb

@@ -23,6 +23,6 @@ describe Kaminari::ActiveRecordRelationMethods do
         # Only @author and @author2 have books titled with the title00x partern
         User.includes(:books_authored).where("books.title LIKE 'title00%'").page(1).total_count.should == 2
       end
-    end    
+    end
   end
 end

data/spec/models/mongo_mapper_spec.rb

@@ -33,7 +33,7 @@ describe Kaminari::MongoMapperExtension do
       its(:num_pages) { should == 12 }
       it { should skip 25 }
     end
-    
+
     context 'page "foobar"' do
       subject { Developer.page 'foobar' }
       it { should be_a Plucky::Query }
@@ -42,31 +42,30 @@ describe Kaminari::MongoMapperExtension do
       its(:num_pages) { should == 12 }
       it { should skip 0 }
     end
-    
+
     context 'with criteria before' do
       it "should have the proper criteria source" do
         Developer.where(:salary => 1).page(2).criteria.source.should == {:salary => 1}
       end
-      
+
       subject { Developer.where(:salary => 1).page 2 }
       its(:current_page) { should == 2 }
       its(:limit_value) { should == 25 }
       its(:num_pages) { should == 12 }
       it { should skip 25 }
     end
-    
+
     context 'with criteria after' do
       it "should have the proper criteria source" do
         Developer.where(:salary => 1).page(2).criteria.source.should == {:salary => 1}
       end
-      
+
       subject { Developer.page(2).where(:salary => 1) }
       its(:current_page) { should == 2 }
       its(:limit_value) { should == 25 }
       its(:num_pages) { should == 12 }
       it { should skip 25 }
     end
-
   end
 
   describe '#per' do
@@ -77,4 +76,4 @@ describe Kaminari::MongoMapperExtension do
     its(:num_pages) { should == 30 }
     it { should skip 10 }
   end
-end
+end

data/spec/models/scopes_spec.rb

@@ -40,6 +40,11 @@ describe Kaminari::ActiveRecordExtension do
       subject { User.page 5 }
       it_should_behave_like 'blank page'
     end
+
+    describe 'ensure #order_values is preserved' do
+      subject { User.order('id').page 1 }
+      its(:order_values) { should == ['id'] }
+    end
   end
 
   describe '#per' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaminari
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 39
   prerelease: 
   segments: 
   - 0
   - 12
-  - 3
-  version: 0.12.3
+  - 4
+  version: 0.12.4
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 Z
+date: 2011-05-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails