kaminari-mandatory_ordering 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08f862a65011bcd30349ee2d7cf90df4c1805d2e
-  data.tar.gz: 70c3466b658d90215de5a5537e1d1af12382642b
+  metadata.gz: a8f508477e6af13a5d570312043deb83cfefb931
+  data.tar.gz: ada5e44036c2f4ea27eeff4f8378b7db21be8d7e
 SHA512:
-  metadata.gz: cd18bc69cc6844f7c56452ec180a2e04d453312e58ad1179eea67dae42193c1705879d743f47d44ba0b33972db4d9475266c955d311113be9ce8a2bdaaaa4da4
-  data.tar.gz: 24be08e162d660a28a264967011a6d1a7ba3184a0a72d26a52457cc4970c534da633633d9c9d42ec54217ccb3d9f6b288b6acac67759ceafe3a5ca3954d67ef9
+  metadata.gz: 5ae2cfdb4e336a4c5e8e91277ab0755d3a7838683d10755f873b373d1bb293fd70bb076a4a73baf0ff1ad903b792f478a30fec5207739139d8f094a8790bbea2
+  data.tar.gz: 536b20359a2fa1239ce99b84b1e28be603246a570885d4ee39f4817d70cfc69483d73b6955c7bcaa0bb748033a6e983b333fbb01285d69eff2fe38848484e467

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 /.vscode/
+/gemfiles/*.lock

data/.rubocop.yml

@@ -1,5 +1,8 @@
 AllCops:
-  TargetRubyVersion: 2.0
+  TargetRubyVersion: 2.2
+  Exclude:
+    - spec/**/*
+    - gemfiles/**/*
 
 Metrics/LineLength:
   Max: 145

data/.travis.yml

@@ -1,5 +1,24 @@
 sudo: false
+
 language: ruby
+
 rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.12.5
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+
+gemfile:
+  - gemfiles/active_record_50.gemfile
+  - gemfiles/active_record_42.gemfile
+  - gemfiles/active_record_edge.gemfile
+
+script:
+  - bundle exec rake spec
+  - bundle exec rubocop --display-cop-names
+
+cache: bundler
+
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/active_record_edge.gemfile
+  fast_finish: true

data/README.md

@@ -1,4 +1,4 @@
-# Kaminari::MandatoryOrdering
+# Kaminari::MandatoryOrdering [![Build Status](https://travis-ci.org/tmikoss/kaminari-mandatory_ordering.svg?branch=master)](https://travis-ci.org/tmikoss/kaminari-mandatory_ordering)
 
 Makes sure ActiveRecord collections paged over by `kaminari` are ordered.
 
@@ -24,13 +24,11 @@ Or install it yourself as:
 
 Look for `Kaminari::MandatoryOrdering::Error` exceptions, add order clauses to queries causing them.
 
-Disable (for example, in production environment) by setting `disable_mandatory_ordering = true` value in `kaminari` configuration block.
+Can be enabled / disabled by setting `mandatory_ordering` option in `kaminari` configuration (defaults to `true`).
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests and `rubocop` to check code style. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 ## Contributing
 

data/gemfiles/active_record_42.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 4.2.0'
+gem 'activerecord', '~> 4.2.0', require: 'active_record'
+
+gemspec path: '../'

data/gemfiles/active_record_50.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 5.0.0'
+gem 'activerecord', '~> 5.0.0', require: 'active_record'
+
+gemspec path: '../'

data/gemfiles/active_record_edge.gemfile

@@ -0,0 +1,13 @@
+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
+
+github 'rails/rails' do
+  gem 'railties'
+  gem 'activerecord', require: 'active_record'
+end
+
+gemspec path: '../'

data/kaminari-mandatory_ordering.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'kaminari/mandatory_ordering/version'
@@ -18,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'kaminari', '>= 1.0'
-  spec.add_dependency 'activerecord', '>= 4.0'
-  spec.add_dependency 'activesupport', '>= 4.0'
+  spec.add_dependency 'activerecord', '>= 4.2'
+  spec.add_dependency 'activesupport', '>= 4.2'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '~> 0.43.0'
   spec.add_development_dependency 'sqlite3', '>= 1.3'
 end

data/lib/kaminari/mandatory_ordering.rb

@@ -1,8 +1,7 @@
-require 'kaminari'
-require 'active_support/lazy_load_hooks'
 require 'kaminari/mandatory_ordering/version'
 require 'kaminari/mandatory_ordering/error'
 require 'kaminari/mandatory_ordering/active_record_extension'
+require 'kaminari/mandatory_ordering/configuration'
 
 module Kaminari
   module MandatoryOrdering

data/lib/kaminari/mandatory_ordering/active_record_model_extension.rb

@@ -4,7 +4,7 @@ module Kaminari
       extend ActiveSupport::Concern
 
       def self.prepended(klass)
-        return if Kaminari.config.disable_mandatory_ordering
+        return unless Kaminari.config.mandatory_ordering
 
         original = klass.method(Kaminari.config.page_method_name)
 
@@ -12,6 +12,7 @@ module Kaminari
           if all.values.fetch(:order, []).none?
             raise Kaminari::MandatoryOrdering::Error
           else
+            # TODO: Find out why calling `super` fails to find the previously defined method.
             original.call(number)
           end
         end

data/lib/kaminari/mandatory_ordering/configuration.rb

@@ -0,0 +1,3 @@
+Kaminari.config.instance_eval do
+  self.mandatory_ordering = true
+end

data/lib/kaminari/mandatory_ordering/version.rb

@@ -1,5 +1,5 @@
 module Kaminari
   module MandatoryOrdering
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-mandatory_ordering
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Toms Mikoss
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.43.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.43.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -138,10 +138,14 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/active_record_42.gemfile
+- gemfiles/active_record_50.gemfile
+- gemfiles/active_record_edge.gemfile
 - kaminari-mandatory_ordering.gemspec
 - lib/kaminari/mandatory_ordering.rb
 - lib/kaminari/mandatory_ordering/active_record_extension.rb
 - lib/kaminari/mandatory_ordering/active_record_model_extension.rb
+- lib/kaminari/mandatory_ordering/configuration.rb
 - lib/kaminari/mandatory_ordering/error.rb
 - lib/kaminari/mandatory_ordering/version.rb
 homepage: https://github.com/tmikoss/kaminari-mandatory_ordering
@@ -163,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Makes sure ActiveRecord collections paged over by kaminari are ordered