simple_paginate 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52213695afadde9c4e6914a10e89a69e3172fd50
-  data.tar.gz: 843b0371f94a788fd2d66c697e3ea39d0a83bfab
+  metadata.gz: 9ccfd558c3db4487692dce7e3e619020b59bb135
+  data.tar.gz: 4ceef5a49453b3fdf4662f1b2c5c3ae85a8b14ad
 SHA512:
-  metadata.gz: 2d87801708e54fa73201e6216c0aa79b95c661b29d06ff76627a1544a1f65cd30dc77eec7f1147e54e338aa337cf99924bc766ba69450c95e9826971e0405d3c
-  data.tar.gz: 21527728172629e242b9118b61b8cecf08246af18b453eaa151407ccb43ceb81701db74604d64679be04a290070db1cb6d516af239ba0454729453ff64872ae9
+  metadata.gz: 4bb9548797d7d4dbedaf3a6a97247e7a3949b5023f05674d0a9440a972c5cc9a7ac4eaefccd30854558eab988c8308ab147d40beb35add414a363607cdbcd4cd
+  data.tar.gz: ed638195243abb718b5a0ba4000ba22fef39b1a77a7a4a7454f449f7cb832606ecb21b86a2f4dbe039fa358e2c7edf8594476520ce6d63fce0635b04c78afaf0

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+
+rvm:
+  - 2.1.5
+  - 2.2.1
+
+gemfile:
+  gemfiles/active_record_42.gemfile

data/README.md

@@ -1,5 +1,7 @@
 # simple_paginate
 
+[![Build Status](https://travis-ci.org/xinminlabs/simple_paginate.png)](https://travis-ci.org/xinminlabs/simple_paginate)
+
 Simple pagination solution for previous and next page navigation.
 
 ## Why simple_paginate
@@ -39,6 +41,9 @@ it fetches one more record (11 = 10 + 1) to calculate if there is a next page re
 ```
 ## perform a paginate query:
 @users = User.paginate(:page => params[:page])
+
+# or, use page and per scope:
+@users = User.page(params[:page]).per(25)
 ```
 
 ### Helpers 
@@ -75,3 +80,12 @@ SimplePaginate includes a handy template generator, To edit your paginator, run
 ```
 % rails g simple_paginate:views 
 ```
+
+### Contribute
+
+To run the test suite locally:
+
+```
+% bundle install
+% rake spec:active_record_42
+```

data/lib/simple_paginate/models/active_record_extension.rb

@@ -1,26 +1,27 @@
+require 'simple_paginate/models/active_record_model_extension'
+
 module SimplePaginate
   module ActiveRecordExtension
     extend ActiveSupport::Concern
 
-    included do
-      def self.paginate(options = {})
-        options = options.dup
-        page = options.delete(:page) || 1
-        per_page = options.delete(:per_page) || SimplePaginate.config.default_per_page 
-
-        offset(per_page * (page - 1)).limit(per_page + 1).extending do
-          def current_page
-            (offset_value / (limit_value - 1)) + 1
-          end
-
-          def first_page?
-            current_page == 1
-          end
+    module ClassMethods
+      def inherited(kls)
+        super
+        kls.send(:include, SimplePaginate::ActiveRecordModelExtension)
+      end
+    end
 
-          def last_page?
-            length < limit_value
-          end
+    included do
+      class << self
+        def inherited_with_simple_paginate(kls)
+          inherited_without_simple_paginate kls
+          kls.send(:include, SimplePaginate::ActiveRecordModelExtension)
         end
+        alias_method_chain :inherited, :simple_paginate
+      end
+
+      self.descendants.each do |kls|
+        kls.send(:include, SimplePaginate::ActiveRecordModelExtension)
       end
     end
   end

data/lib/simple_paginate/models/active_record_model_extension.rb

@@ -0,0 +1,53 @@
+module SimplePaginate
+  module ActiveRecordModelExtension
+    extend ActiveSupport::Concern
+
+    included do
+      def self.paginate(options = {})
+        options = options.dup
+        page = options.delete(:page) || 1
+        per_page = options.delete(:per_page) || SimplePaginate.config.default_per_page
+
+        offset(per_page * (page - 1)).limit(per_page + 1).extending do
+          def current_page
+            (offset_value / (limit_value - 1)) + 1
+          end
+
+          def first_page?
+            current_page == 1
+          end
+
+          def last_page?
+            loaded? ? @actual_records.length < limit_value : count(:all) < limit_value
+          end
+
+          def per(num)
+            if (n = num.to_i) < 0 || !(/^\d/ =~ num.to_s)
+              self
+            elsif n.zero?
+              limit(n + 1)
+            else
+              limit(n + 1).offset(offset_value / (limit_value - 1) + 1)
+            end
+          end
+
+          private
+
+          def exec_queries
+            @actual_records = super
+            @records = if @actual_records.length > 1 && @actual_records.length == limit_value
+                         @actual_records.first(limit_value - 1)
+                       else
+                         @actual_records
+                       end
+            @records
+          end
+        end
+      end
+
+      def self.page(num = nil)
+        self.paginate(page: num)
+      end
+    end
+  end
+end

data/lib/simple_paginate/version.rb

@@ -1,3 +1,3 @@
 module SimplePaginate
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/simple_paginate/models/active_record_extension_spec.rb

@@ -35,6 +35,41 @@ describe SimplePaginate::ActiveRecordExtension do
 
       it { expect(subject).to be_empty }
     end
+  end  
+  
+  describe '#page' do
+    subject { User.page(page) }
+
+    context 'page 1' do
+      let(:page) { 1 }
+
+      it { expect(subject.first.name).to eq('user001') }
+    end
+
+    context 'page 2' do
+      let(:page) { 2 }
+
+      it { expect(subject.first.name).to eq('user026') }
+    end
+
+    context 'page < 1' do
+      let(:page) { 0 }
+
+      it { expect(subject.first.name).to eq('user001') }
+    end
+
+    context 'page > max page' do
+      let(:page) { 5 }
+
+      it { expect(subject).to be_empty }
+    end
+  end
+
+  describe '#per' do
+    context 'page 1 per 5' do
+      subject { User.page(1).per(5) }
+      it { expect(subject.last.name).to eq('user006') }
+    end
   end
 
   describe '#current_page' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_paginate
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Yong Gu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -102,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - LICENSE.txt
@@ -116,7 +117,7 @@ files:
 - app/views/simple_paginate/_prev_page.html.erb
 - app/views/simple_paginate/_prev_page.html.haml
 - app/views/simple_paginate/_prev_page.html.slim
-- config/locales/simple_paginate.yml
+- config/locales/simple_paginate.en.yml
 - gemfiles/.bundle/config
 - gemfiles/active_record_42.gemfile
 - gemfiles/active_record_42.gemfile.lock
@@ -130,6 +131,7 @@ files:
 - lib/simple_paginate/helpers/paginator.rb
 - lib/simple_paginate/helpers/tags.rb
 - lib/simple_paginate/models/active_record_extension.rb
+- lib/simple_paginate/models/active_record_model_extension.rb
 - lib/simple_paginate/railtie.rb
 - lib/simple_paginate/version.rb
 - simple_paginate.gemspec