simple_paginate 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3f02be42940105af3c23326397216cc21911eda
-  data.tar.gz: b8a83039ae197bc065e00aeaccb4ca3f7b13b5e2
+  metadata.gz: 641d201b635a1f7c3c5d7852cbf7097258f27b64
+  data.tar.gz: 5e1424ce40c44aed23116bccaaf84f90637311ad
 SHA512:
-  metadata.gz: bb3c1ff76a0df73a11196d9161921d7beb31e4f523b9c2859f8964b76d8caebe3c72f705d9411e7ea44076106ddde06d042b48ca80fdc65637712e4d1f6a22ec
-  data.tar.gz: 2e0f7f19eac500362d8550ea8ad60426c72808c24acab568cca8350bd88f9bffc3c58d26389f3c90fe4233fdff8098c7daa5d88df818b93028aa5e98a5d52c1a
+  metadata.gz: 773f0db9bde2113d311dc872398acb30204f82f94944168a37258030402c4265adb27d34d18d7a715c0d8a35be4e7772cfc95117537fceab040bf425fe1e0ad0
+  data.tar.gz: 4ac034264d2c61e18a88f9b47a9c871949b7b729faef9a0c9ac21dd830aae467093f42a4052587012f34833a5672d92b4c9491bf882ea2a0396954bbde7402b4

data/.gitignore

@@ -37,3 +37,4 @@ build/
 
 doc
 log
+spec/fake_app/log/development.log

data/.travis.yml

@@ -1,12 +1,10 @@
 language: ruby
 
 rvm:
-  - 2.1.5
-  - 2.2.1
+  - 2.3.3
 
 gemfile:
   gemfiles/active_record_42.gemfile
-
-script: 'bundle exec rake spec'
+  gemfiles/active_record_50.gemfile
 
 cache: bundler

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Next Release
 
-## 1.0.0 (2017-07-15)
+## 0.2.0 (2017-12-16)
+
+* Support rails 5.1
+
+## 0.1.0 (2017-07-15)
 
 * First release

data/README.md

@@ -1,6 +1,8 @@
 # simple_paginate
 
 [![Build Status](https://travis-ci.org/xinminlabs/simple_paginate.png)](https://travis-ci.org/xinminlabs/simple_paginate)
+[ ![AwesomeCode Status for
+xinminlabs/simple_paginate](https://awesomecode.io/projects/d214f111-80a5-49c6-b8e5-af5220b5f838/status)](https://awesomecode.io/projects/31)
 
 Simple pagination solution for previous and next page navigation.
 

data/Rakefile

@@ -10,12 +10,13 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task default: "spec:all"
+task test: "spec:all"
 
 namespace :spec do
   mappers = %w(
     active_record_42
     active_record_50
+    active_record_51
   )
 
   mappers.each do |gemfile|

data/gemfiles/active_record_42.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'railties', '~> 4.2.0'
 gem 'activerecord', '~> 4.2.0', :require => 'active_record'
-gem 'rspec-rails', '~> 3.2.1'
+gem 'rspec-rails', '~> 3.6.0'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"

data/gemfiles/active_record_51.gemfile

@@ -0,0 +1,24 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 5.1.0'
+gem 'activerecord', '~> 5.1.0', :require => 'active_record'
+gem 'rspec-rails', '~> 3.6.0'
+
+platforms :ruby do
+  if RUBY_VERSION > "2.1.0"
+    gem 'sqlite3'
+  else
+    gem 'sqlite3', '1.3.8'
+  end
+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/lib/simple_paginate/helpers/tags.rb

@@ -7,14 +7,18 @@ module SimplePaginate
       def initialize(template, options = {})
         @template, @options = template, options
         @views_prefix = @options.delete(:views_prefix)
-        @params = template.params.except(*PARAM_KEY_BLACKLIST).merge(@options.delete(:params) || {})
+        @params = template.params
+        @params = @params.to_unsafe_h if @params.respond_to?(:to_unsafe_h)
+        @params = @params.with_indifferent_access
+        @params.except!(*PARAM_KEY_BLACKLIST)
+        @params.merge!(@options.delete(:params) || {})
       end
 
       def to_s(locals = {})
         @template.render partial: partial_path, locals: @options.merge(locals), formats: [:html]
       end
 
-      def page_url_for(page) 
+      def page_url_for(page)
         @template.url_for params_for(page).merge(only_path: true)
       end
 
@@ -22,7 +26,7 @@ module SimplePaginate
 
       def params_for(page)
         page_params = Rack::Utils.parse_nested_query("#{PARAM_NAME}=#{page}")
-        page_params = @params.with_indifferent_access.deep_merge(page_params)
+        page_params = @params.deep_merge(page_params)
 
         if page <= 1
           PARAM_NAME.to_s.scan(/\w+/)[0..-2].inject(page_params){|h, k| h[k] }[$&] = nil
@@ -55,7 +59,7 @@ module SimplePaginate
 
     class Page < Tag
       include Link
-      
+
       def page
         @options[:page]
       end

data/lib/simple_paginate/models/active_record_extension.rb

@@ -12,14 +12,6 @@ module SimplePaginate
     end
 
     included do
-      class << self
-        def inherited_with_simple_paginate(kls)
-          inherited_without_simple_paginate kls
-          kls.send(:include, SimplePaginate::ActiveRecordModelExtension)
-        end
-        alias_method_chain :inherited, :simple_paginate
-      end
-
       self.descendants.each do |kls|
         kls.send(:include, SimplePaginate::ActiveRecordModelExtension)
       end

data/lib/simple_paginate/version.rb

@@ -1,3 +1,3 @@
 module SimplePaginate
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/simple_paginate.gemspec

@@ -20,9 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', ['>= 3.0.0']
   spec.add_dependency 'actionpack', ['>= 3.0.0']
+  spec.add_dependency 'activerecord', ['>= 3.0.0']
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.2"
+  spec.add_development_dependency "rspec", "~> 3.6.0"
   spec.add_development_dependency 'database_cleaner', ['~> 1.4.0']
+  spec.add_development_dependency 'rails', '>= 3.0.0'
 end

data/spec/fake_app/active_record/config.rb

@@ -1,3 +1,2 @@
 # database
-ActiveRecord::Base.configurations = {'test' => {adapter: 'sqlite3', database: ':memory:'}}
-ActiveRecord::Base.establish_connection :test
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')

data/spec/fake_app/active_record/models.rb

@@ -3,7 +3,7 @@ class User < ActiveRecord::Base
 end
 
 #migrations
-class CreateAllTables < ActiveRecord::Migration
+class CreateAllTables < ActiveRecord::Migration[4.2]
   def self.up
     create_table(:users) {|t| t.string :name; t.integer :age}
   end

data/spec/fake_app/rails_app.rb

@@ -1,7 +1,7 @@
 require 'action_controller/railtie'
 require 'action_view/railtie'
 
-require 'fake_app/active_record/config' 
+require 'fake_app/active_record/config'
 # config
 app = Class.new(Rails::Application)
 app.config.secret_key_base = '9489b3eee4eccf317ed77407553e8adc97baca7c74dc7ee33cd93e4c8b69477eea66eaedeb18af0be2679887c7c69c0a28c0fded0a71ea472a8c4laalal19cb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_paginate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yong Gu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-15 00:00:00.000000000 Z
+date: 2017-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Simple pagination solution for previous and next page navigation.
 email:
 - zerogy921@gmail.com
@@ -122,6 +150,7 @@ files:
 - gemfiles/.bundle/config
 - gemfiles/active_record_42.gemfile
 - gemfiles/active_record_50.gemfile
+- gemfiles/active_record_51.gemfile
 - lib/generators/simple_paginate/config_generator.rb
 - lib/generators/simple_paginate/templates/simple_paginate_config.rb
 - lib/generators/simple_paginate/views_generator.rb
@@ -138,7 +167,6 @@ files:
 - simple_paginate.gemspec
 - spec/fake_app/active_record/config.rb
 - spec/fake_app/active_record/models.rb
-- spec/fake_app/log/development.log
 - spec/fake_app/rails_app.rb
 - spec/simple_paginate/config_spec.rb
 - spec/simple_paginate/helpers/action_view_extension_spec.rb
@@ -166,14 +194,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Simple pagination solution for previous and next page navigation.
 test_files:
 - spec/fake_app/active_record/config.rb
 - spec/fake_app/active_record/models.rb
-- spec/fake_app/log/development.log
 - spec/fake_app/rails_app.rb
 - spec/simple_paginate/config_spec.rb
 - spec/simple_paginate/helpers/action_view_extension_spec.rb