kaminari-mongoid 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6d87b2e3af14ed6f038068d2b21d83264c4f0d91
-  data.tar.gz: 5b57372e8544caee7c4ed32e45f0347a569eb451
+SHA256:
+  metadata.gz: 39c49d86e68f35086ca61ed72ef6bb427c5e36b0c1f86dbc7569413cc6b35668
+  data.tar.gz: 4696911080d0791c0c0aaaf68eaf538b515817c0ae2cb202ceda5c793ff1abdb
 SHA512:
-  metadata.gz: 40f93c2aa8d0a933655591b8694c3ecc410c8a8a263e428d5ae5a6dfc6b05fe6ff4998de1b86eab49f3cc63b89a99772b156fb4f29bcf50c1ca92fa764d50bbd
-  data.tar.gz: 12dc2644487eaf7ffe35f46d02ecc24f1abc42d88451cdeb4ee7576c6a3747b9e1c7cc01d898d7660350d6c1f8572b2db8a1790fa0173b9806ed1fa14cb2d4e9
+  metadata.gz: 49062bc8dfb5bee854aa1dd8ab7cc1204153a94cb2c9e8ef88d5e92e11de9f452b498eaad7ba53eaec48db479d22710482d32c222df086a970c95bbde5ab97ba
+  data.tar.gz: 1ff9bdedbfd926ca597f7a7640425cd80aa91295b8a20ad08f7fcebe0b24b5fcd5815836de6b5cc557eefef6c2c334b1ad48ee6670dd1909879843977efe712a

data/.github/workflows/main.yml

@@ -0,0 +1,68 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: true
+
+      # see https://docs.mongodb.com/mongoid/current/tutorials/mongoid-installation/ for supported versions
+      matrix:
+        ruby_version: ['3.0', '2.7', '2.6', '2.5']
+        gemfile:
+          - gemfiles/mongoid_73.gemfile
+          - gemfiles/mongoid_72.gemfile
+          - gemfiles/mongoid_71.gemfile
+          - gemfiles/mongoid_70.gemfile
+          - gemfiles/mongoid_64.gemfile
+
+        exclude:
+          - ruby_version: '3.0'
+            gemfile: gemfiles/mongoid_70.gemfile
+          - ruby_version: '3.0'
+            gemfile: gemfiles/mongoid_64.gemfile
+          - ruby_version: '2.7'
+            gemfile: gemfiles/mongoid_64.gemfile
+
+        include:
+          - ruby_version: '2.5'
+            gemfile: gemfiles/mongoid_63.gemfile
+          - ruby_version: '2.5'
+            gemfile: gemfiles/mongoid_62.gemfile
+          - ruby_version: '2.4'
+            gemfile: gemfiles/mongoid_61.gemfile
+          - ruby_version: '2.3'
+            gemfile: gemfiles/mongoid_60.gemfile
+          - ruby_version: '2.3'
+            gemfile: gemfiles/mongoid_54.gemfile
+            bundler_version: '1'
+          - ruby_version: '2.2'
+            gemfile: gemfiles/mongoid_52.gemfile
+          - ruby_version: '2.2'
+            gemfile: gemfiles/mongoid_51.gemfile
+          - ruby_version: '2.1'
+            gemfile: gemfiles/mongoid_50.gemfile
+          - ruby_version: '2.1'
+            gemfile: gemfiles/mongoid_40.gemfile
+
+
+    runs-on: ubuntu-18.04
+
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true
+          bundler: ${{ matrix.bundler_version || 'latest' }}
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+
+      - uses: supercharge/mongodb-github-action@1.7.0
+
+      - run: bundle exec rake
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+## 1.0.2
+
+* `max_pages` support
+
+## 1.0.0
+
+* Extracted from kaminari gem
+
+* Droped mongoid 3.0 and 3.1 support

data/Gemfile

@@ -4,4 +4,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in kaminari-mongoid.gemspec
 gemspec
 
-gem 'kaminari-core', github: 'kaminari/kaminari'
+unless ENV['CI']
+  gem 'kaminari-core', path: 'kaminari/kaminari'
+  gem 'kaminari-actionview', github: 'kaminari/kaminari'
+end

data/README.md

@@ -1,4 +1,4 @@
-# Kaminari::Mongoid
+# Kaminari::Mongoid [![Build Status](https://travis-ci.org/kaminari/kaminari-mongoid.svg?branch=master)](https://travis-ci.org/kaminari/kaminari-mongoid)
 
 Kaminari Mongoid adapter.
 

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/testtask'
 Rake::TestTask.new do |t|
   t.libs << 'test'
   t.pattern = "{test,#{File.join(Gem.loaded_specs['kaminari-core'].gem_dir, 'test')}}/**/*_test.rb"
-  t.warning = true
+  t.warning = false
   t.verbose = true
 end
 

data/gemfiles/mongoid_40.gemfile

@@ -11,19 +11,8 @@ gem 'kaminari-actionview', github: 'kaminari/kaminari'
 gem 'railties', '~> 4.0'
 gem 'mongoid', '~> 4.0.0'
 
-if RUBY_VERSION > '1.9.3'
-  gem 'mime-types'
-else
-  gem 'mime-types', '2.99'
-end
+gem 'mime-types'
 
 gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
 
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'racc'
-  gem 'minitest'
-  gem 'rubinius-developer_tools'
-end
-
 gemspec :path => '../'

data/gemfiles/mongoid_50.gemfile

@@ -11,19 +11,8 @@ gem 'kaminari-actionview', github: 'kaminari/kaminari'
 gem 'railties', '~> 4.0'
 gem 'mongoid', '~> 5.0.0'
 
-if RUBY_VERSION > '1.9.3'
-  gem 'mime-types'
-else
-  gem 'mime-types', '2.99'
-end
+gem 'mime-types'
 
 gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
 
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'racc'
-  gem 'minitest'
-  gem 'rubinius-developer_tools'
-end
-
 gemspec :path => '../'

data/gemfiles/mongoid_51.gemfile

@@ -11,19 +11,8 @@ gem 'kaminari-actionview', github: 'kaminari/kaminari'
 gem 'railties', '~> 4.0'
 gem 'mongoid', '~> 5.1.0'
 
-if RUBY_VERSION > '1.9.3'
-  gem 'mime-types'
-else
-  gem 'mime-types', '2.99'
-end
+gem 'mime-types'
 
 gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
 
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'racc'
-  gem 'minitest'
-  gem 'rubinius-developer_tools'
-end
-
 gemspec :path => '../'

data/gemfiles/mongoid_52.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+# bundle GH master to load kaminari-core/test directory which is not included in the packaged gems
+gem 'kaminari-core', github: 'kaminari/kaminari'
+gem 'kaminari-actionview', github: 'kaminari/kaminari'
+
+gem 'railties', '~> 4.0'
+gem 'mongoid', '~> 5.2.0'
+
+gem 'mime-types'
+
+gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
+
+gemspec :path => '../'

data/gemfiles/mongoid_54.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+# bundle GH master to load kaminari-core/test directory which is not included in the packaged gems
+gem 'kaminari-core', github: 'kaminari/kaminari'
+gem 'kaminari-actionview', github: 'kaminari/kaminari'
+
+gem 'railties', '~> 4.0'
+gem 'mongoid', '~> 5.4.0'
+
+gem 'mime-types'
+
+gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
+
+gemspec :path => '../'

data/gemfiles/mongoid_60.gemfile

@@ -11,17 +11,6 @@ gem 'kaminari-actionview', github: 'kaminari/kaminari'
 gem 'railties', '~> 5.0'
 gem 'mongoid', '~> 6.0.0'
 
-if RUBY_VERSION > '1.9.3'
-  gem 'mime-types'
-else
-  gem 'mime-types', '2.99'
-end
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'racc'
-  gem 'minitest'
-  gem 'rubinius-developer_tools'
-end
+gem 'mime-types'
 
 gemspec :path => '../'

data/gemfiles/mongoid_61.gemfile

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+# bundle GH master to load kaminari-core/test directory which is not included in the packaged gems
+gem 'kaminari-core', github: 'kaminari/kaminari'
+gem 'kaminari-actionview', github: 'kaminari/kaminari'
+
+gem 'railties', '~> 5.0'
+gem 'mongoid', '~> 6.1.0'
+
+gem 'mime-types'
+
+gemspec :path => '../'

data/gemfiles/mongoid_62.gemfile

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+# bundle GH master to load kaminari-core/test directory which is not included in the packaged gems
+gem 'kaminari-core', github: 'kaminari/kaminari'
+gem 'kaminari-actionview', github: 'kaminari/kaminari'
+
+gem 'railties', '~> 5.2'
+gem 'mongoid', '~> 6.2.0'
+
+gem 'mime-types'
+
+gemspec :path => '../'

data/gemfiles/mongoid_63.gemfile

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+# bundle GH master to load kaminari-core/test directory which is not included in the packaged gems
+gem 'kaminari-core', github: 'kaminari/kaminari'
+gem 'kaminari-actionview', github: 'kaminari/kaminari'
+
+gem 'railties', '~> 5.2'
+gem 'mongoid', '~> 6.3.0'
+
+gem 'mime-types'
+
+gemspec :path => '../'

data/gemfiles/mongoid_64.gemfile

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+# bundle GH master to load kaminari-core/test directory which is not included in the packaged gems
+gem 'kaminari-core', github: 'kaminari/kaminari'
+gem 'kaminari-actionview', github: 'kaminari/kaminari'
+
+gem 'railties', '~> 5.2'
+gem 'mongoid', '~> 6.4.0'
+
+gem 'mime-types'
+
+gemspec :path => '../'

data/gemfiles/mongoid_70.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+# bundle GH master to load kaminari-core/test directory which is not included in the packaged gems
+gem 'kaminari-core', github: 'kaminari/kaminari'
+gem 'kaminari-actionview', github: 'kaminari/kaminari'
+
+gem 'railties', '~> 6.1'
+gem 'selenium-webdriver'
+gem 'mongoid', '~> 7.0.0'
+
+gem 'mime-types'
+
+gemspec :path => '../'

data/gemfiles/mongoid_71.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+# bundle GH master to load kaminari-core/test directory which is not included in the packaged gems
+gem 'kaminari-core', github: 'kaminari/kaminari'
+gem 'kaminari-actionview', github: 'kaminari/kaminari'
+
+gem 'railties', '~> 6.1'
+gem 'selenium-webdriver'
+gem 'mongoid', '~> 7.1.0'
+
+gem 'mime-types'
+
+gemspec :path => '../'

data/gemfiles/mongoid_72.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+# bundle GH master to load kaminari-core/test directory which is not included in the packaged gems
+gem 'kaminari-core', github: 'kaminari/kaminari'
+gem 'kaminari-actionview', github: 'kaminari/kaminari'
+
+gem 'railties', '~> 6.1'
+gem 'selenium-webdriver'
+gem 'mongoid', '~> 7.2.0'
+
+gem 'mime-types'
+
+gemspec :path => '../'

data/gemfiles/mongoid_73.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+# bundle GH master to load kaminari-core/test directory which is not included in the packaged gems
+gem 'kaminari-core', github: 'kaminari/kaminari'
+gem 'kaminari-actionview', github: 'kaminari/kaminari'
+
+gem 'railties', '~> 6.1'
+gem 'selenium-webdriver'
+gem 'mongoid', '~> 7.3.0'
+
+gem 'mime-types'
+
+gemspec :path => '../'

data/kaminari-mongoid.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'kaminari-core', '~> 1.0'
   spec.add_dependency 'mongoid'
 
-  spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'rails'
   spec.add_development_dependency 'test-unit-rails'

data/lib/kaminari/mongoid/mongoid_criteria_methods.rb

@@ -22,8 +22,10 @@ module Kaminari
       def total_count #:nodoc:
         @total_count ||= if embedded?
           unpage.size
-        elsif options[:max_scan] && options[:max_scan] < size
+        elsif options[:max_scan] && (options[:max_scan] < size)
           options[:max_scan]
+        elsif max_pages && (max_pages * limit_value < size)
+          max_pages * limit_value
         else
           size
         end

data/lib/kaminari/mongoid/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Kaminari
   module Mongoid
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-mongoid
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2021-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari-core
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -143,8 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -154,7 +141,17 @@ files:
 - gemfiles/mongoid_40.gemfile
 - gemfiles/mongoid_50.gemfile
 - gemfiles/mongoid_51.gemfile
+- gemfiles/mongoid_52.gemfile
+- gemfiles/mongoid_54.gemfile
 - gemfiles/mongoid_60.gemfile
+- gemfiles/mongoid_61.gemfile
+- gemfiles/mongoid_62.gemfile
+- gemfiles/mongoid_63.gemfile
+- gemfiles/mongoid_64.gemfile
+- gemfiles/mongoid_70.gemfile
+- gemfiles/mongoid_71.gemfile
+- gemfiles/mongoid_72.gemfile
+- gemfiles/mongoid_73.gemfile
 - kaminari-mongoid.gemspec
 - lib/kaminari/mongoid.rb
 - lib/kaminari/mongoid/mongoid_criteria_methods.rb
@@ -164,7 +161,7 @@ homepage: https://github.com/kaminari/kaminari-mongoid
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -179,9 +176,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.9
-signing_key: 
+rubygems_version: 3.3.0.dev
+signing_key:
 specification_version: 4
 summary: Kaminari Mongoid adapter
 test_files: []

data/.travis.yml

@@ -1,46 +0,0 @@
-language: ruby
-
-before_install: gem update bundler
-
-rvm:
-  - 2.0.0
-  - 2.1.10
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
-  - ruby-head
-  - jruby-9.1.7.0
-  - rbx-2
-
-gemfile:
-  - gemfiles/mongoid_40.gemfile
-  - gemfiles/mongoid_50.gemfile
-  - gemfiles/mongoid_51.gemfile
-  - gemfiles/mongoid_60.gemfile
-
-sudo: false
-
-services: mongodb
-
-script: 'bundle exec rake test'
-
-cache: bundler
-
-matrix:
-  exclude:
-    - rvm: 2.0.0
-      gemfile: gemfiles/mongoid_60.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/mongoid_60.gemfile
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-9.1.7.0
-    - rvm: rbx-2
-    # mongoid < 6 depends on activemodel < 5 that depends on json < 2 that currently doesn't support ruby 2.4
-    - rvm: 2.4.0
-      gemfile: gemfiles/mongoid_40.gemfile
-    - rvm: 2.4.0
-      gemfile: gemfiles/mongoid_50.gemfile
-    - rvm: 2.4.0
-      gemfile: gemfiles/mongoid_51.gemfile
-  fast_finish: true