kaminari-mongoid 0.1.2 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f9fcf5388c2b1acb0a2f1c83f5a64e9cc524453
-  data.tar.gz: a8a5b33ea8798ec9d9ffd17eb65ca2b86a7f91b1
+  metadata.gz: 31cd50f7166e06faa660db8a83466759e1ef1854
+  data.tar.gz: e91dfdc44c788993c5c64ae0c44d5a8aea403542
 SHA512:
-  metadata.gz: 90abc7adfe4514b010941787c0d86add43168704ddd50a8f7eaa3aaeebdc059966ceaf2ec40bebc62f646aea7e6665d4c1ad560c386388f1db6deae5c216fcfb
-  data.tar.gz: 1f639e7601dad7b83f1616b4f3fbe3985498f1ae82c86a21ec2d593e76ae3c925b23ec93f667719888a342b3f7c31a7fb34aa00d1305d3637dda197d61e864dc
+  metadata.gz: 5b001e517679de215eebf994258e3c8c6fc34b54f589c976a9ca4b2f7faa180d74491dd1364b94b4fdaf72c2211af298dc241a9e0796cb04b18593eb90ec616e
+  data.tar.gz: 84f3bde0938fa9ab383e041a103c011e6f475c24fc5ea1683f903fcfe82a3d4c7789bb356134d4cd86c2aff78f6f02b6c494d5b4785b15f867f0b3ed03707243

data/.travis.yml

@@ -1,36 +1,38 @@
 language: ruby
 
-before_install: gem install bundler -v 1.11.2
+before_install: gem update bundler
 
 rvm:
   - 2.0.0
   - 2.1.10
-  - 2.2.4
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
   - ruby-head
-  - jruby
-  - jruby-head
+  - jruby-9.1.5.0
   - rbx-2
 
 gemfile:
-  - gemfiles/mongoid_30.gemfile
-  - gemfiles/mongoid_31.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 spec"
+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
-    - rvm: jruby-head
+    - rvm: jruby-9.1.5.0
     - rvm: rbx-2
   fast_finish: true

data/Gemfile

@@ -1,8 +1,7 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in kaminari-mongoid.gemspec
 gemspec
 
-gem 'database_cleaner', git: 'git@github.com:DatabaseCleaner/database_cleaner.git'
-
-gem 'kaminari', github: 'amatsuda/kaminari'
+gem 'kaminari-core', github: 'amatsuda/kaminari'

data/README.md

@@ -21,7 +21,7 @@ And bundle.
 
 ## Usage
 
-See [Kaminari README](https://github.com/amatsuda/kaminari/blob/master/README.rdoc).
+See [Kaminari README](https://github.com/amatsuda/kaminari/blob/master/README.md).
 
 
 ## Contributing

data/Rakefile

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
 require "bundler/gem_tasks"
-require 'rspec/core'
-require 'rspec/core/rake_task'
+require 'rake/testtask'
 
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = [FileList['spec/**/*_spec.rb'], FileList["#{File.join(Gem.loaded_specs['kaminari'].gem_dir, 'spec')}/**/*_spec.rb"]].flatten
+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.verbose = true
 end
 
-task default: :spec
+task default: :test

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "kaminari/mongoid"

data/gemfiles/mongoid_40.gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
 #FIXME bundle GH branch for now
-gem 'kaminari', github: 'amatsuda/kaminari', branch: 'extract_adapters'
+gem 'kaminari-core', github: 'amatsuda/kaminari'
+gem 'kaminari-actionview', github: 'amatsuda/kaminari'
 
 gem 'railties', '~> 4.0'
 gem 'mongoid', '~> 4.0.0'
-gem 'rspec-rails', '~> 2.14.1'
 
 if RUBY_VERSION > '1.9.3'
   gem 'mime-types'

data/gemfiles/mongoid_50.gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
 #FIXME bundle GH branch for now
-gem 'kaminari', github: 'amatsuda/kaminari', branch: 'extract_adapters'
+gem 'kaminari-core', github: 'amatsuda/kaminari'
+gem 'kaminari-actionview', github: 'amatsuda/kaminari'
 
 gem 'railties', '~> 4.0'
 gem 'mongoid', '~> 5.0.0'
-gem 'rspec-rails', '~> 2.14.1'
 
 if RUBY_VERSION > '1.9.3'
   gem 'mime-types'

data/gemfiles/mongoid_51.gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
 #FIXME bundle GH branch for now
-gem 'kaminari', github: 'amatsuda/kaminari', branch: 'extract_adapters'
+gem 'kaminari-core', github: 'amatsuda/kaminari'
+gem 'kaminari-actionview', github: 'amatsuda/kaminari'
 
 gem 'railties', '~> 4.0'
 gem 'mongoid', '~> 5.1.0'
-gem 'rspec-rails', '~> 2.14.1'
 
 if RUBY_VERSION > '1.9.3'
   gem 'mime-types'

data/gemfiles/mongoid_60.gemfile

@@ -0,0 +1,31 @@
+source 'https://rubygems.org'
+
+#FIXME bundle GH branch for now
+gem 'kaminari-core', github: 'amatsuda/kaminari'
+gem 'kaminari-actionview', github: 'amatsuda/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
+
+group :development, :test do
+  gem 'database_cleaner', '~> 1.5.1'
+end
+
+platforms :mri do
+  gem 'test-unit' if RUBY_VERSION > '2.1.0'
+end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec :path => '../'

data/kaminari-mongoid.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'kaminari/mongoid/version'
@@ -10,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["ronnie@dio.jp"]
 
   spec.summary       = 'Kaminari Mongoid adapter'
-  spec.description   = 'Kaminari Mongoid adapter'
+  spec.description   = 'kaminari-mongoid lets your Mongoid models be paginatable'
   spec.homepage      = 'https://github.com/kaminari/kaminari-mongoid'
   spec.license       = "MIT"
 
@@ -19,12 +20,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'kaminari'
+  spec.add_dependency 'kaminari-core', Kaminari::Mongoid::VERSION
+  spec.add_dependency 'mongoid'
+
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'mongoid'
   spec.add_development_dependency 'rails'
-  spec.add_development_dependency 'rspec-rails', '~> 2.14.1'
+  spec.add_development_dependency 'test-unit-rails'
   spec.add_development_dependency 'capybara'
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'rr'

data/lib/kaminari/mongoid.rb

@@ -1,4 +1,5 @@
-require 'kaminari'
+# frozen_string_literal: true
+require 'kaminari/core'
 require 'mongoid'
 require 'kaminari/mongoid/mongoid_extension'
 ::Mongoid::Document.send :include, Kaminari::Mongoid::MongoidExtension::Document

data/lib/kaminari/mongoid/mongoid_criteria_methods.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Kaminari
   module Mongoid
     module MongoidCriteriaMethods
@@ -6,8 +7,8 @@ module Kaminari
         super
       end
 
-      def entry_name
-        model_name.human.downcase
+      def entry_name(options = {})
+        model_name.human(options.reverse_merge(default: model_name.human.pluralize(options[:count])))
       end
 
       def limit_value #:nodoc:
@@ -21,12 +22,10 @@ module Kaminari
       def total_count #:nodoc:
         @total_count ||= if embedded?
           unpage.size
+        elsif options[:max_scan] && options[:max_scan] < size
+          options[:max_scan]
         else
-          if options[:max_scan] && options[:max_scan] < size
-            options[:max_scan]
-          else
-            size
-          end
+          size
         end
       end
 

data/lib/kaminari/mongoid/mongoid_extension.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'kaminari/mongoid/mongoid_criteria_methods'
 
 module Kaminari

data/lib/kaminari/mongoid/version.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Kaminari
   module Mongoid
-    VERSION = "0.1.2"
+    VERSION = '1.0.0.rc1'
   end
 end

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: kaminari-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc1
+- !ruby/object:Gem::Dependency
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: test-unit-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Kaminari Mongoid adapter
+description: kaminari-mongoid lets your Mongoid models be paginatable
 email:
 - ronnie@dio.jp
 executables: []
@@ -158,7 +158,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - ".travis.yml"
 - Gemfile
 - MIT-LICENSE
@@ -166,11 +165,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/mongoid_30.gemfile
-- gemfiles/mongoid_31.gemfile
 - gemfiles/mongoid_40.gemfile
 - gemfiles/mongoid_50.gemfile
 - gemfiles/mongoid_51.gemfile
+- gemfiles/mongoid_60.gemfile
 - kaminari-mongoid.gemspec
 - lib/kaminari/mongoid.rb
 - lib/kaminari/mongoid/mongoid_criteria_methods.rb
@@ -191,12 +189,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Kaminari Mongoid adapter

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/gemfiles/mongoid_30.gemfile

@@ -1,30 +0,0 @@
-source 'https://rubygems.org'
-
-#FIXME bundle GH branch for now
-gem 'kaminari', github: 'amatsuda/kaminari', branch: 'extract_adapters'
-
-gem 'railties', '>= 3.2.3'
-gem 'mongoid', '~> 3.0.0'
-gem 'rspec-rails', '~> 2.14.1'
-gem 'origin'
-gem 'moped'
-gem 'activesupport', '~> 3.2.18'
-
-if RUBY_VERSION > '1.9.3'
-  gem 'mime-types'
-else
-  gem 'mime-types', '2.99'
-end
-
-platforms :mri do
-  gem 'test-unit' if RUBY_VERSION > "2.1.0"
-end
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'racc'
-  gem 'rubysl-test-unit', github: 'rubysl/rubysl-test-unit', branch: '2.0'
-  gem 'rubinius-developer_tools'
-end
-
-gemspec :path => '../'

data/gemfiles/mongoid_31.gemfile

@@ -1,29 +0,0 @@
-source 'https://rubygems.org'
-
-#FIXME bundle GH branch for now
-gem 'kaminari', github: 'amatsuda/kaminari', branch: 'extract_adapters'
-
-gem 'railties', '~> 3.2'
-gem 'mongoid', '~> 3.1.0'
-gem 'rspec-rails', '~> 2.14.1'
-gem 'origin'
-gem 'moped'
-
-if RUBY_VERSION > '1.9.3'
-  gem 'mime-types'
-else
-  gem 'mime-types', '2.99'
-end
-
-platforms :mri do
-  gem 'test-unit' if RUBY_VERSION > "2.1.0"
-end
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'racc'
-  gem 'rubysl-test-unit', github: 'rubysl/rubysl-test-unit', branch: '2.0'
-  gem 'rubinius-developer_tools'
-end
-
-gemspec :path => '../'