grape-kaminari 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fb24c245069275a376233ac2b1ab9ea14bacf83
-  data.tar.gz: 1f74c3dd9df09d1bc3f015e23dd2f2289239eed2
+  metadata.gz: 0650a3fcc5272f2eed79e0e91bfa6eb5fb587163
+  data.tar.gz: cfdfdff5ef9331723eb5c44aa9664d992649ec6d
 SHA512:
-  metadata.gz: 3f2fbb8ce000c0938fe14adc08e7c646bae1be1f2341fba2eff44e21e59133766db1152ceb873ea482d62ea17992a0eb8c7bdd381935b1c952999e778520fb6d
-  data.tar.gz: 8d87799ba47f32584ed935f7f1f8db84ed71fbb8d4b92c937c8370570ab0aa577309268957eeb23fe3baa9b894211001f2ee74a77b7c8a54c5d9c44b1f133280
+  metadata.gz: 4080a0270909df209d36acea7842c54e0b65fe78c463695e9ea42911b0b8ced4ccda6effa7509e387251978e5f7983176a42b8d0628fffcdc4311d08ba661fcf
+  data.tar.gz: 0b8b07ff42c2b53a93b1804602571fe8b8d331e2294402867e2882c7723060540380611db1e115cf65d80c0b59f70eb4d326ca89cf6f4ae3c67eb39972b1487b

data/lib/grape-kaminari.rb

@@ -1 +1,11 @@
+module Grape
+  module Kaminari
+    class << self
+      def post_0_9_0_grape?
+        Gem::Version.new(Grape::VERSION) > Gem::Version.new('0.9.0')
+      end
+    end
+  end
+end
+
 require "grape/kaminari"

data/lib/grape/kaminari/max_value_validator.rb

@@ -1,6 +1,12 @@
 module Grape
   module Kaminari
-    class MaxValueValidator < Grape::Validations::SingleOptionValidator
+    base = if post_0_9_0_grape?
+             Grape::Validations::Base
+           else
+             Grape::Validations::SingleOptionValidator
+           end
+
+    class MaxValueValidator < base
       def validate_param!(attr_name, params)
         return unless params[attr_name]
 

data/lib/grape/kaminari/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Kaminari
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/spec/kaminari_spec.rb

@@ -23,7 +23,11 @@ describe Grape::Kaminari do
 
     it 'adds to declared parameters' do
       subject.paginate
-      expect(subject.settings[:declared_params]).to eq([:page, :per_page, :offset])
+      if Grape::Kaminari.post_0_9_0_grape?
+        expect(subject.inheritable_setting.route[:declared_params]).to eq([:page, :per_page, :offset])
+      else
+        expect(subject.settings[:declared_params]).to eq([:page, :per_page, :offset])
+      end
     end
 
     describe 'descriptions, validation, and defaults' do
@@ -122,7 +126,11 @@ describe Grape::Kaminari do
 
     it 'excludes :offset from declared params' do
       subject.paginate offset: false
-      expect(subject.settings[:declared_params]).not_to include(:offset)
+      if Grape::Kaminari.post_0_9_0_grape?
+        expect(subject.inheritable_setting.route[:declared_params]).not_to include(:offset)
+      else
+        expect(subject.settings[:declared_params]).not_to include(:offset)
+      end
     end
 
   end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: grape-kaminari
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Tymon Tobolski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
 description: kaminari paginator integration for grape API framework
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -110,17 +110,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: kaminari integration for grape