groonga-client-rails 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0eba8046f328d94ef1f96a7d754ca8b735abb8c
-  data.tar.gz: 861d91c93f83ff419a71c7f6ea0e994dce45d206
+  metadata.gz: ae1aeecc659c4cf220e1053948f4a01135195918
+  data.tar.gz: f38dc25d82bca1d26369dd69e9b2610c9f6ac3e3
 SHA512:
-  metadata.gz: 2c90d0147eb0aa2f1467d8bbbfb341fef0c56a95f1c3e858a9dad73cbd134dd6f2351bf0a878ab353fcd559fe0a33bdf24864e17954659b36e4b17152b481189
-  data.tar.gz: 64523981496bc3ded1caa5e2c4143a9c641ae80e960e5a45129cd214ac7e8918094825a546e1d6bae3d48dbef30a8a137cdea077a7dd9220dd8d664dbf820798
+  metadata.gz: 85b3c15830736f9430ab18f9dd4d776ff69619c82e9000ba8e6297504e32c0e427cea6b3a92ce21c8108d200815c298f3ad38bb4e69f29207a59232288434916
+  data.tar.gz: 6840a0971efe941f3da05a46f724d86f28f39bec24d1968b87a167d8d6b69cb03e401083230e9bcc3c96d14356be186062e7a1157040af5348f293c92189a37b

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # NEWS
 
+## 0.9.3 - 2016-06-07
+
+### Improvements
+
+  * Added native Kaminari support.
+
 ## 0.9.2 - 2016-03-28
 
 ### Fixes

data/lib/groonga/client/rails/version.rb

@@ -17,7 +17,7 @@
 module Groonga
   class Client
     module Rails
-      VERSION = "0.9.2"
+      VERSION = "0.9.3"
     end
   end
 end

data/lib/groonga/client/searcher/select/request.rb

@@ -34,7 +34,7 @@ module Groonga
           end
 
           def result_set
-            @result_set ||= ResultSet.new(response)
+            @result_set ||= create_result_set
           end
 
           def match_columns(value)
@@ -74,15 +74,32 @@ module Groonga
           def paginate(page, per_page: 10)
             page ||= 1
             page = page.to_i
-            return self if page < 0
-
-            offset(per_page * page).limit(per_page)
+            if page <= 0
+              offset = 0
+            else
+              offset = per_page * (page - 1)
+            end
+            offset(offset).limit(per_page)
           end
 
           private
           def create_request(parameters)
             self.class.new(parameters)
           end
+
+          def create_result_set
+            result_set = ResultSet.new(response)
+            if paginated? and defined?(Kaminari)
+              result_set.extend(Kaminari::ConfigurationMethods::ClassMethods)
+              result_set.extend(Kaminari::PageScopeMethods)
+            end
+            result_set
+          end
+
+          def paginated?
+            parameters = to_parameters
+            parameters.key?(:offset) and parameters.key?(:limit)
+          end
         end
 
         # @private

data/test/apps/rails4-mongoid/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../../
   specs:
-    groonga-client-rails (0.9.0)
+    groonga-client-rails (0.9.3)
       groonga-client (>= 0.2.4)
       rails
 
@@ -68,13 +68,13 @@ GEM
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     gqtp (1.0.6)
-    groonga-client (0.2.4)
+    groonga-client (0.2.5)
       gqtp (>= 1.0.4)
       groonga-command (>= 1.2.0)
       hashie
     groonga-command (1.2.0)
       json
-    hashie (3.4.3)
+    hashie (3.4.4)
     i18n (0.7.0)
     jbuilder (2.4.1)
       activesupport (>= 3.0.0, < 5.1)
@@ -187,4 +187,4 @@ DEPENDENCIES
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5