kaminari 0.17.0 → 1.0.0

data/gemfiles/active_record_edge.gemfile

@@ -1,12 +1,18 @@
 source 'https://rubygems.org'
 
-git 'git://github.com/rails/rails.git' do
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+github 'rails/rails' 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', github: 'rack/rack'
+gem 'arel', github: 'rails/arel'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"
@@ -25,6 +31,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/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Kaminari
-  VERSION = '0.17.0'
+  VERSION = '1.0.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/misc/bug_report_template.rb

@@ -0,0 +1,57 @@
+begin
+  require "bundler/inline"
+rescue LoadError => e
+  $stderr.puts "Bundler version 1.10 or later is required. Please update your Bundler"
+  raise e
+end
+
+gemfile(true) do
+  source "https://rubygems.org"
+  # Activate the gem you are reporting the issue against.
+  gem "railties", "5.0.1"
+  gem "activerecord", "5.0.1"
+  gem "sqlite3"
+  gem "kaminari-core", "1.0.0"
+  gem "kaminari-activerecord", "1.0.0"
+end
+
+require "active_record"
+require "minitest/autorun"
+require "logger"
+
+require "kaminari/core"
+require "kaminari/activerecord"
+
+# Ensure backward compatibility with Minitest 4
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
+
+# This connection will do for database-independent bug reports.
+ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
+ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+ActiveRecord::Schema.define do
+  create_table :posts, force: true do |t|
+  end
+
+  create_table :comments, force: true do |t|
+    t.integer :post_id
+  end
+end
+
+class Post < ActiveRecord::Base
+  has_many :comments
+end
+
+class Comment < ActiveRecord::Base
+  belongs_to :post
+end
+
+class BugTest < Minitest::Test
+  def test_pagination_stuff
+    post = Post.create!
+    post.comments << Comment.create!
+
+    assert_equal 1, Post.page(1).total_count
+    assert_equal 1, post.reload.comments.page(1).total_count
+  end
+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
 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: 2017-01-10 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 1.0.0
 - !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
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !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
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !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,58 @@ 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
+- misc/bug_report_template.rb
 homepage: https://github.com/amatsuda/kaminari
 licenses:
 - MIT
@@ -290,43 +183,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 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: []

data/.rspec

@@ -1,2 +0,0 @@
---color
---format=d