kaminari 0.17.0 → 1.0.0.beta2

data/Rakefile

@@ -1,42 +1,32 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
-require 'bundler'
-Bundler::GemHelper.install_tasks
+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']
+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:all"
+task default: "test:all"
 
-namespace :spec do
+namespace :test do
   mappers = %w(
     active_record_edge
+    active_record_50
     active_record_42
     active_record_41
-    active_record_40
-    active_record_32
-    active_record_31
-    active_record_30
-    data_mapper_12
-    mongoid_50
-    mongoid_40
-    mongoid_31
-    mongoid_30
-    mongoid_24
-    mongo_mapper
-    sinatra_13
-    sinatra_14
   )
 
   mappers.each do |gemfile|
     desc "Run Tests against #{gemfile}"
     task gemfile do
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
-      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake -t spec"
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake -t test"
     end
   end
 
@@ -44,11 +34,19 @@ namespace :spec do
   task :all do
     mappers.each do |gemfile|
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
-      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake spec"
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake test"
     end
   end
 end
 
+task :install_tasks_for_sub_gems do
+  Bundler::GemHelper.install_tasks dir: File.join(__dir__, 'kaminari-core'), name: 'kaminari-core'
+  Bundler::GemHelper.install_tasks dir: File.join(__dir__, 'kaminari-actionview'), name: 'kaminari-actionview'
+  Bundler::GemHelper.install_tasks dir: File.join(__dir__, 'kaminari-activerecord'), name: 'kaminari-activerecord'
+end
+
+Rake::Task[:build].enhance [:install_tasks_for_sub_gems]
+
 begin
   require 'rdoc/task'
 
@@ -57,7 +55,6 @@ begin
 
     rdoc.rdoc_dir = 'rdoc'
     rdoc.title = "kaminari #{Kaminari::VERSION}"
-    rdoc.rdoc_files.include('README*')
     rdoc.rdoc_files.include('lib/**/*.rb')
   end
 rescue LoadError

data/gemfiles/active_record_41.gemfile

@@ -1,9 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'railties', '~> 4.1.0'
-gem 'activerecord', '~> 4.1.0', :require => 'active_record'
-gem 'rspec-rails', '~> 2.14.1'
-gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
+gem 'activerecord', '~> 4.1.0', require: 'active_record'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"
@@ -22,4 +20,4 @@ platforms :rbx do
   gem 'rubinius-developer_tools'
 end
 
-gemspec :path => '../'
+gemspec path: '../'

data/gemfiles/active_record_42.gemfile

@@ -1,9 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'railties', '~> 4.2.0'
-gem 'activerecord', '~> 4.2.0', :require => 'active_record'
-gem 'rspec-rails', '~> 2.14.1'
-gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
+gem 'activerecord', '~> 4.2.0', require: 'active_record'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"
@@ -22,4 +20,4 @@ platforms :rbx do
   gem 'rubinius-developer_tools'
 end
 
-gemspec :path => '../'
+gemspec path: '../'

data/gemfiles/active_record_50.gemfile

@@ -0,0 +1,20 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 5.0.0'
+gem 'activerecord', '~> 5.0.0', require: 'active_record'
+gem 'actionview', '~> 5.0.0', require: 'action_view'
+
+platforms :ruby do
+  gem 'sqlite3'
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec path: '../'

data/gemfiles/active_record_edge.gemfile

@@ -2,11 +2,12 @@ source 'https://rubygems.org'
 
 git 'git://github.com/rails/rails.git' do
   gem 'railties'
-  gem 'activerecord', :require => 'active_record'
-  gem 'actionview', :require => 'action_view'
+  gem 'activerecord', require: 'active_record'
+  gem 'actionview', require: 'action_view'
 end
 
-gem 'arel', :github => 'rails/arel'
+gem 'rack', git: 'git://github.com/rack/rack.git'
+gem 'arel', github: 'rails/arel'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"
@@ -25,6 +26,4 @@ platforms :rbx do
   gem 'rubinius-developer_tools'
 end
 
-gem 'rspec-rails', '2.99.0'
-
-gemspec :path => '../'
+gemspec path: '../'

data/kaminari.gemspec

@@ -1,35 +1,29 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 $:.push File.expand_path("../lib", __FILE__)
 require "kaminari/version"
 
 Gem::Specification.new do |s|
   s.name        = 'kaminari'
   s.version     = Kaminari::VERSION
-  s.platform    = Gem::Platform::RUBY
   s.authors     = ['Akira Matsuda', 'Yuki Nishijima', 'Zachary Scott', 'Hiroshi Shibata']
   s.email       = ['ronnie@dio.jp']
   s.homepage    = 'https://github.com/amatsuda/kaminari'
-  s.summary     = 'A pagination engine plugin for Rails 3+ and other modern frameworks'
-  s.description = 'Kaminari is a Scope & Engine based, clean, powerful, agnostic, customizable and sophisticated paginator for Rails 3+'
+  s.summary     = 'A pagination engine plugin for Rails 4+ and other modern frameworks'
+  s.description = 'Kaminari is a Scope & Engine based, clean, powerful, agnostic, customizable and sophisticated paginator for Rails 4+'
+  s.license       = "MIT"
 
-  s.rubyforge_project = 'kaminari'
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.extra_rdoc_files = ['README.rdoc']
+  s.files         = `git ls-files | egrep -v 'kaminari-(core|actionview|activerecord)' | grep -v '^test'`.split("\n")
   s.require_paths = ['lib']
 
-  s.licenses = ['MIT']
-
-  s.add_dependency 'activesupport', '>= 3.0.0'
-  s.add_dependency 'actionpack', '>= 3.0.0'
+  s.add_dependency 'activesupport', '>= 4.1.0'
+  s.add_dependency 'kaminari-core', Kaminari::VERSION
+  s.add_dependency 'kaminari-actionview', Kaminari::VERSION
+  s.add_dependency 'kaminari-activerecord', Kaminari::VERSION
 
+  s.add_development_dependency 'test-unit-rails'
   s.add_development_dependency 'bundler', '>= 1.0.0'
   s.add_development_dependency 'rake', '>= 0'
-  s.add_development_dependency 'tzinfo', '>= 0'
-  s.add_development_dependency 'rspec', '>= 0'
-  s.add_development_dependency 'rr', (RUBY_VERSION < '2' ? '< 1.2' : '>= 0')
+  s.add_development_dependency 'rr', '>= 0'
   s.add_development_dependency 'capybara', '>= 1.0'
-  s.add_development_dependency 'database_cleaner', '~> 1.2.0'
-  s.add_development_dependency 'rdoc', '>= 0'
 end

data/lib/kaminari.rb

@@ -1,39 +1,4 @@
-module Kaminari
-end
-
-# load Rails/Railtie
-begin
-  require 'rails'
-rescue LoadError
-  #do nothing
-end
-
-$stderr.puts <<-EOC if !defined?(Rails) && !defined?(Sinatra) && !defined?(Grape)
-warning: no framework detected.
-
-Your Gemfile might not be configured properly.
----- e.g. ----
-Rails:
-    gem 'kaminari'
-
-Sinatra/Padrino:
-    gem 'kaminari', :require => 'kaminari/sinatra'
-
-Grape:
-    gem 'kaminari', :require => 'kaminari/grape'
-
-EOC
-
-# load Kaminari components
-require 'kaminari/config'
-require 'kaminari/helpers/action_view_extension'
-require 'kaminari/helpers/paginator'
-require 'kaminari/models/page_scope_methods'
-require 'kaminari/models/configuration_methods'
-require 'kaminari/hooks'
-
-# if not using Railtie, call `Kaminari::Hooks.init` directly
-if defined? Rails
-  require 'kaminari/railtie'
-  require 'kaminari/engine'
-end
+# frozen_string_literal: true
+require 'kaminari/core'
+require 'kaminari/actionview'
+require 'kaminari/activerecord'

data/lib/kaminari/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Kaminari
-  VERSION = '0.17.0'
+  VERSION = '1.0.0.beta2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaminari
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Akira Matsuda
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,58 +19,58 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: kaminari-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 1.0.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 1.0.0.beta2
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: kaminari-actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
+        version: 1.0.0.beta2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.0.beta2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: kaminari-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.0.0.beta2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.beta2
 - !ruby/object:Gem::Dependency
-  name: tzinfo
+  name: test-unit-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -84,21 +84,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rr
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,165 +112,57 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Kaminari is a Scope & Engine based, clean, powerful, agnostic, customizable
-  and sophisticated paginator for Rails 3+
+  and sophisticated paginator for Rails 4+
 email:
 - ronnie@dio.jp
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
+extra_rdoc_files: []
 files:
 - ".document"
-- ".gemtest"
 - ".gitignore"
-- ".rspec"
 - ".travis.yml"
-- CHANGELOG.rdoc
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
-- app/views/kaminari/_first_page.html.erb
-- app/views/kaminari/_first_page.html.haml
-- app/views/kaminari/_first_page.html.slim
-- app/views/kaminari/_gap.html.erb
-- app/views/kaminari/_gap.html.haml
-- app/views/kaminari/_gap.html.slim
-- app/views/kaminari/_last_page.html.erb
-- app/views/kaminari/_last_page.html.haml
-- app/views/kaminari/_last_page.html.slim
-- app/views/kaminari/_next_page.html.erb
-- app/views/kaminari/_next_page.html.haml
-- app/views/kaminari/_next_page.html.slim
-- app/views/kaminari/_page.html.erb
-- app/views/kaminari/_page.html.haml
-- app/views/kaminari/_page.html.slim
-- app/views/kaminari/_paginator.html.erb
-- app/views/kaminari/_paginator.html.haml
-- app/views/kaminari/_paginator.html.slim
-- app/views/kaminari/_prev_page.html.erb
-- app/views/kaminari/_prev_page.html.haml
-- app/views/kaminari/_prev_page.html.slim
-- config/locales/kaminari.yml
-- gemfiles/active_record_30.gemfile
-- gemfiles/active_record_31.gemfile
-- gemfiles/active_record_32.gemfile
-- gemfiles/active_record_40.gemfile
 - gemfiles/active_record_41.gemfile
 - gemfiles/active_record_42.gemfile
+- gemfiles/active_record_50.gemfile
 - gemfiles/active_record_edge.gemfile
-- gemfiles/data_mapper_12.gemfile
-- gemfiles/mongo_mapper.gemfile
-- gemfiles/mongoid_30.gemfile
-- gemfiles/mongoid_31.gemfile
-- gemfiles/mongoid_40.gemfile
-- gemfiles/mongoid_50.gemfile
-- gemfiles/sinatra_13.gemfile
-- gemfiles/sinatra_14.gemfile
 - kaminari.gemspec
-- lib/generators/kaminari/config_generator.rb
-- lib/generators/kaminari/templates/kaminari_config.rb
-- lib/generators/kaminari/views_generator.rb
 - lib/kaminari.rb
-- lib/kaminari/config.rb
-- lib/kaminari/engine.rb
-- lib/kaminari/grape.rb
-- lib/kaminari/helpers/action_view_extension.rb
-- lib/kaminari/helpers/paginator.rb
-- lib/kaminari/helpers/sinatra_helpers.rb
-- lib/kaminari/helpers/tags.rb
-- lib/kaminari/hooks.rb
-- lib/kaminari/models/active_record_extension.rb
-- lib/kaminari/models/active_record_model_extension.rb
-- lib/kaminari/models/active_record_relation_methods.rb
-- lib/kaminari/models/array_extension.rb
-- lib/kaminari/models/configuration_methods.rb
-- lib/kaminari/models/data_mapper_collection_methods.rb
-- lib/kaminari/models/data_mapper_extension.rb
-- lib/kaminari/models/mongo_mapper_extension.rb
-- lib/kaminari/models/mongoid_criteria_methods.rb
-- lib/kaminari/models/mongoid_extension.rb
-- lib/kaminari/models/page_scope_methods.rb
-- lib/kaminari/models/plucky_criteria_methods.rb
-- lib/kaminari/railtie.rb
-- lib/kaminari/sinatra.rb
 - lib/kaminari/version.rb
-- spec/config/config_spec.rb
-- spec/fake_app/active_record/config.rb
-- spec/fake_app/active_record/models.rb
-- spec/fake_app/data_mapper/config.rb
-- spec/fake_app/data_mapper/models.rb
-- spec/fake_app/mongo_mapper/config.rb
-- spec/fake_app/mongo_mapper/models.rb
-- spec/fake_app/mongoid/config.rb
-- spec/fake_app/mongoid/models.rb
-- spec/fake_app/rails_app.rb
-- spec/fake_app/sinatra_app.rb
-- spec/fake_app/views/alternative/kaminari/_first_page.html.erb
-- spec/fake_app/views/alternative/kaminari/_paginator.html.erb
-- spec/fake_app/views/kaminari/bootstrap/_page.html.erb
-- spec/fake_app/views/kaminari/bootstrap/_paginator.html.erb
-- spec/fake_gem.rb
-- spec/generators/views_generator_spec.rb
-- spec/helpers/action_view_extension_spec.rb
-- spec/helpers/helpers_spec.rb
-- spec/helpers/sinatra_helpers_spec.rb
-- spec/helpers/tags_spec.rb
-- spec/models/active_record/active_record_relation_methods_spec.rb
-- spec/models/active_record/inherited_spec.rb
-- spec/models/active_record/scopes_spec.rb
-- spec/models/array_spec.rb
-- spec/models/configuration_methods_spec.rb
-- spec/models/data_mapper/data_mapper_spec.rb
-- spec/models/mongo_mapper/mongo_mapper_spec.rb
-- spec/models/mongoid/mongoid_spec.rb
-- spec/requests/users_spec.rb
-- spec/spec_helper.rb
-- spec/spec_helper_for_sinatra.rb
-- spec/support/database_cleaner.rb
-- spec/support/matchers.rb
 homepage: https://github.com/amatsuda/kaminari
 licenses:
 - MIT
@@ -286,47 +178,13 @@ 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: kaminari
-rubygems_version: 2.6.4
+rubyforge_project: 
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: A pagination engine plugin for Rails 3+ and other modern frameworks
-test_files:
-- spec/config/config_spec.rb
-- spec/fake_app/active_record/config.rb
-- spec/fake_app/active_record/models.rb
-- spec/fake_app/data_mapper/config.rb
-- spec/fake_app/data_mapper/models.rb
-- spec/fake_app/mongo_mapper/config.rb
-- spec/fake_app/mongo_mapper/models.rb
-- spec/fake_app/mongoid/config.rb
-- spec/fake_app/mongoid/models.rb
-- spec/fake_app/rails_app.rb
-- spec/fake_app/sinatra_app.rb
-- spec/fake_app/views/alternative/kaminari/_first_page.html.erb
-- spec/fake_app/views/alternative/kaminari/_paginator.html.erb
-- spec/fake_app/views/kaminari/bootstrap/_page.html.erb
-- spec/fake_app/views/kaminari/bootstrap/_paginator.html.erb
-- spec/fake_gem.rb
-- spec/generators/views_generator_spec.rb
-- spec/helpers/action_view_extension_spec.rb
-- spec/helpers/helpers_spec.rb
-- spec/helpers/sinatra_helpers_spec.rb
-- spec/helpers/tags_spec.rb
-- spec/models/active_record/active_record_relation_methods_spec.rb
-- spec/models/active_record/inherited_spec.rb
-- spec/models/active_record/scopes_spec.rb
-- spec/models/array_spec.rb
-- spec/models/configuration_methods_spec.rb
-- spec/models/data_mapper/data_mapper_spec.rb
-- spec/models/mongo_mapper/mongo_mapper_spec.rb
-- spec/models/mongoid/mongoid_spec.rb
-- spec/requests/users_spec.rb
-- spec/spec_helper.rb
-- spec/spec_helper_for_sinatra.rb
-- spec/support/database_cleaner.rb
-- spec/support/matchers.rb
+summary: A pagination engine plugin for Rails 4+ and other modern frameworks
+test_files: []