cursor_pagination 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0975daf496d378c472103614276ccbcb01b30c9c
-  data.tar.gz: 054a13ee7d3149d8b0174b1ff776219c1be0443c
+  metadata.gz: 160e8afd510f2789a414f3b860ae6d59c5c626c4
+  data.tar.gz: b49030bc3ec98ec9091fcfcabe9184d31d68aec7
 SHA512:
-  metadata.gz: ce77e48e37546b7c6192ab9f5e5a4b25f10b4dbfe1f78d87d9e24a9b9608cc96d02475b4f3adc1924c607197d1c443c88e169bf5da12ac0ce0d14d17b6d3cfee
-  data.tar.gz: 9e6024bf149e93ef1762e56964145172a892cb4ece9ea8c349bd3cead53330be9b3cc30dcf98927209c883c5159aab4a4f468496072c451d5f8ba5fbba084af0
+  metadata.gz: 97ce4b2fb4ecdfb51bb9c097fcbcdc6db5b6bd5e4f62619d2046349a9e803aa3a9586d9bf4ac0bd14ae438a7ba8b0ad41d4b6c5dab60f9ad50fac47b63014531
+  data.tar.gz: db5fe954866b988670f3bfdb2a075e6fe656f674edd652315f7c4fb25768f17079d4e189690a4ba9e23f90a3189e308aff5ab67fc91fb800d1a950056dc31561

data/cursor_pagination.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/Kukunin/cursor_pagination"
   spec.license       = "MIT"
 
-  spec.add_dependency "activerecord", ['>= 3.0.0']
+  spec.add_dependency "activerecord", ['>= 3.1']
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "sqlite3-ruby"
-  spec.add_development_dependency "database_cleaner", ['< 1.1.1']
+  spec.add_development_dependency "database_cleaner", ['< 1.1.0']
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/lib/cursor_pagination/active_record_model_extension.rb

@@ -17,17 +17,18 @@ module CursorPagination
         @cursor_options
       end
 
-      scope :cursor, Proc.new { |cursor, options|
-        options = { column: :id, reverse: false }.merge(options || {})
+      def self.cursor(cursor, options = {})
+        options.reverse_merge! column: :id, reverse: false
+        scoped_method = ActiveRecord::VERSION::STRING < '4.0' ? :scoped : :all
         @current_cursor = cursor
-        @origin_scope = self.all
+        @origin_scope = self.send scoped_method
         @cursor_options = options
 
         scope = @origin_scope
         scope = scope.where("#{options[:column]} #{options[:reverse] ? '<' : '>'} ?", cursor) if cursor
-        scope.limit(25)
-      } do
-        include CursorPagination::PageScopeMethods
+        scope = scope.limit(25)
+
+        scope.extending(CursorPagination::PageScopeMethods)
       end
     end
   end

data/lib/cursor_pagination/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cursor_pagination
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sergey Kukunin
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - <
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - <
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement