simple_paginator 0.0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f2849b7d941f9af41dde4fd22ae539ac1d505d5
-  data.tar.gz: e2f4c9261b998d51238de7df7a4ec0db0479f2e9
+  metadata.gz: 16438bedf85b6b691f53f25b47e0afd4fcf38c73
+  data.tar.gz: 69a2c23b02fb29566bb83bcf0782ea7289dc0902
 SHA512:
-  metadata.gz: c8d1ba19069ac6568ca32daa524b940e5dc290c45c6e41115b6b688ca41c510780665d581a84f3cdf943d3a92e12454fdcfb411ca9f4f1b0b9ff96232c4c0322
-  data.tar.gz: 1ca4e949eea9baf78583c1f3f2825658521a29c04ed49868696a0bfd89e52a151c4ee939c5d8e9f86d6f02a367f06ba5c38a9fd5d6a351d3640c303c85c2604c
+  metadata.gz: d3e14abc254343d5774775d4c80f731bdc1d53a65ecf825c7f49bb661b824f0617cc6103bae6fb4b96e7ce5b59cf14ef1daad1eb4dd8ddc9491be1f46676c8b0
+  data.tar.gz: a6edc6b289fb3a1fa7f6182038d7efc41ba6da9291a0ced9af5218d1885b8de665a06c036ffc9f6bced919ef89cd2b9ffeb4712f46b397fd5e2529eb24d45a08

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor/bundle

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
+  - 2.1.1
   - 2.0.0
   - 1.9.3
-  - rbx-19mode

data/README.md

@@ -39,7 +39,8 @@ You will get 26 (per_page + 1) records when you can get next page.
 
 ```
 Post.paged(1) #=> returns 26 records at most.
-Post.paged(11) #=> returns 0 records if page is more than max_page.
+Post.paged #=> same as above.
+Post.paged(11) #=> returns 0 records if page (argument) > max_page.
 ```
 
 You can use `per_page`, `max_page` to change default behavior.
@@ -52,6 +53,13 @@ class Post < ActiveRecord::Base
 end
 ```
 
+You are also be able to change them at `.paged` option.
+These parameters will override `per_page`, `max_page` values.
+
+```
+Post.paged(1, per_page: 5, max_page: 10)
+```
+
 ## Contributing
 
 1. Fork it

data/lib/simple_paginator.rb

@@ -1,35 +1,43 @@
 require "simple_paginator/version"
-require 'active_support/concern'
 require 'active_record'
 
 module SimplePaginator
-  extend ActiveSupport::Concern
-
   DEFAULT_PER_PAGE = 25
   DEFAULT_MAX_PAGE = 10
 
-  included do
-    per_page DEFAULT_PER_PAGE
-    max_page DEFAULT_MAX_PAGE
-    scope :paged, ->(page) {
+  def self.included(base)
+    base.extend ClassMethods
+
+    base.class_eval do
+      per_page DEFAULT_PER_PAGE
+      max_page DEFAULT_MAX_PAGE
+    end
+  end
+
+  module ClassMethods
+    def paged(page, options = {})
       num = page_number(page)
-      if num > @max_page
-        none
-      elsif num == @max_page
-        limit(@per_page).offset((num-1)*@per_page)
+      per_page = options[:per_page].presence || @per_page
+      max_page = options[:max_page].presence || @max_page
+
+      if num > max_page
+        scoped = none
+      elsif num == max_page
+        scoped = limit(per_page).offset((num-1)*per_page)
       else
-        limit(@per_page+1).offset((num-1)*@per_page)
+        scoped = limit(per_page+1).offset((num-1)*per_page)
       end
-    }
-  end
+      scoped
+    end
 
-  module ClassMethods
     def page_number(raw_page)
       [raw_page.to_i, 1].max
     end
+
     def per_page(per_page)
       @per_page = per_page
     end
+
     def max_page(max_page)
       @max_page = max_page
     end

data/lib/simple_paginator/version.rb

@@ -1,3 +1,3 @@
 module SimplePaginator
-  VERSION = "0.0.4"
+  VERSION = "1.0.0"
 end

data/simple_paginator.gemspec

@@ -18,10 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'sqlite3'
-  spec.add_dependency 'activesupport'
   spec.add_dependency 'activerecord'
 end

data/spec/simple_paginator_spec.rb

@@ -57,7 +57,7 @@ describe SimplePaginator do
       context 'per_page, max_page are default' do
         context 'page = 1' do
           let(:page) { 1 }
-          it 'send :limit, :offset method' do
+          it 'should send :limit, :offset method' do
             Post.should_receive(:limit).with(26).once { Post }
             Post.should_receive(:offset).with(0).once
             Post.paged(page)
@@ -65,7 +65,7 @@ describe SimplePaginator do
         end
         context 'page = 2' do
           let(:page) { 2 }
-          it 'send :limit, :offset method' do
+          it 'should send :limit, :offset method' do
             Post.should_receive(:limit).with(26).once { Post }
             Post.should_receive(:offset).with(25).once
             Post.paged(page)
@@ -73,7 +73,7 @@ describe SimplePaginator do
         end
         context 'page = 10' do
           let(:page) { 10 }
-          it 'send :limit, :offset method' do
+          it 'should send :limit, :offset method' do
             Post.should_receive(:limit).with(25).once { Post }
             Post.should_receive(:offset).with(25 * (page-1)).once
             Post.paged(page)
@@ -81,7 +81,7 @@ describe SimplePaginator do
         end
         context 'page = 11' do
           let(:page) { 11 }
-          it 'send :none method' do
+          it 'should send :none method' do
             Post.should_receive(:none).once
             Post.paged(page)
           end
@@ -105,7 +105,7 @@ describe SimplePaginator do
 
         context 'page = 1' do
           let(:page) { 1 }
-          it 'send :limit, :offset method' do
+          it 'should send :limit, :offset method' do
             Post.should_receive(:limit).with(4).once { Post }
             Post.should_receive(:offset).with(0).once
             Post.paged(page)
@@ -113,7 +113,7 @@ describe SimplePaginator do
         end
         context 'page = 2' do
           let(:page) { 2 }
-          it 'send :limit, :offset method' do
+          it 'should send :limit, :offset method' do
             Post.should_receive(:limit).with(3).once { Post }
             Post.should_receive(:offset).with(3).once
             Post.paged(page)
@@ -121,12 +121,96 @@ describe SimplePaginator do
         end
         context 'page = 3' do
           let(:page) { 3 }
-          it 'send :limit, :offset method' do
+          it 'should send :none' do
             Post.should_receive(:none).once
             Post.paged(page)
           end
         end
       end
+
+      context 'change per_page by parameter' do
+        let(:per_page) { 5 }
+
+        before do
+          Post.class_eval {
+            per_page 3
+            max_page 2
+          }
+        end
+
+        after do
+          Post.class_eval {
+            per_page SimplePaginator::DEFAULT_PER_PAGE
+            max_page SimplePaginator::DEFAULT_MAX_PAGE
+          }
+        end
+
+        context 'page = 1' do
+          let(:page) { 1 }
+          it 'should send :limit, :offset method' do
+            Post.should_receive(:limit).with(6).once { Post }
+            Post.should_receive(:offset).with(0).once
+            Post.paged(page, per_page: per_page)
+          end
+        end
+        context 'page = 2' do
+          let(:page) { 2 }
+          it 'should send :limit, :offset method' do
+            Post.should_receive(:limit).with(5).once { Post }
+            Post.should_receive(:offset).with(5).once
+            Post.paged(page, per_page: per_page)
+          end
+        end
+        context 'page = 3' do
+          let(:page) { 3 }
+          it 'should send :none method' do
+            Post.should_receive(:none).once
+            Post.paged(page, per_page: per_page)
+          end
+        end
+      end
+
+      context 'change max_page by parameter' do
+        let(:max_page) { 1 }
+
+        before do
+          Post.class_eval {
+            per_page 3
+            max_page 2
+          }
+        end
+
+        after do
+          Post.class_eval {
+            per_page SimplePaginator::DEFAULT_PER_PAGE
+            max_page SimplePaginator::DEFAULT_MAX_PAGE
+          }
+        end
+
+        context 'page = 1' do
+          let(:page) { 1 }
+          it 'should send :limit, :offset method' do
+            Post.should_receive(:limit).with(3).once { Post }
+            Post.should_receive(:offset).with(0).once
+            Post.paged(page, max_page: max_page)
+          end
+        end
+        context 'page = 2' do
+          let(:page) { 2 }
+          it 'should send :none method' do
+            Post.should_receive(:none).once
+            Post.paged(page, max_page: max_page)
+          end
+        end
+        context 'page = 3' do
+          let(:page) { 3 }
+          it 'should send :none method' do
+            Post.should_receive(:none).once
+            Post.paged(page, max_page: max_page)
+          end
+        end
+      end
+
     end
   end
-end
+end

metadata

@@ -1,97 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: simple_paginator
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Satoshi Ebisawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2014-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !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: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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: activesupport
-  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: activerecord
   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'
 description: Useful paginator library for building APIs.
@@ -101,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.ja.md
@@ -124,21 +110,20 @@ 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.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Useful paginator library for building APIs.
 test_files:
 - spec/simple_paginator_spec.rb
 - spec/spec_helper.rb
-has_rdoc: