kaminari-sinatra 0.1.0 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fec598fd8d63563a8d139f51b64d024171bf243
-  data.tar.gz: ceffc543cafab67c63245e42f69a85052f0fef18
+  metadata.gz: c4738ac5cda28114105594798e24bdbb1a2f9364
+  data.tar.gz: 033d48a1a250aa4c3d10debddfc368559aae99c7
 SHA512:
-  metadata.gz: 8e5bac3c9adea62733242d1583b580000a917bf4ca234d3713c8c05c0c6898bc7c8343efe543e77a32bf8d4079f5da0ae354a8eeca70392d95ea92a202c6753c
-  data.tar.gz: 8e736d8e881b76304b78cf5add500006aca08d7b956f8c84d34e3ab45fef853c75f9c4892fdd7bd61405b48309a657f03ff2961b91c421a812bb8b27970a0b4e
+  metadata.gz: 22be9d021ac330d3f57c8784967191b7b6569ee0f27a6063f5eef6e8c5d318ffa25ce852777fb1269bc4113918bf09697169cb6204a71f4adeaeb6db201daeb4
+  data.tar.gz: 1114d56624cd11896e721384c60233f7a3d3b7a3f311a12c506632fc1a171f506da7e12b5e297a48691a5ad64732e6ec44f91c6bfbd70be4951e66964f123252

data/.travis.yml

@@ -1,12 +1,10 @@
 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
@@ -17,7 +15,7 @@ gemfile:
 
 sudo: false
 
-script: 'bundle exec rake spec'
+script: 'bundle exec rake test'
 
 cache: bundler
 

data/Gemfile

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in kaminari-sinatra.gemspec
 gemspec
 
-gem 'kaminari'
+#FIXME bundle GH master for now
+gem 'kaminari-core', github: 'amatsuda/kaminari'
+gem 'kaminari-activerecord', github: 'amatsuda/kaminari'
+
+#FIXME need to bundle AV for now, because the helper still depends on ActionView
+gem 'actionview', require: 'action_view'

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'], "#{File.join(Gem.loaded_specs['kaminari'].gem_dir, '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
+task default: :test

data/bin/console

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

data/gemfiles/sinatra_14.gemfile

@@ -1,11 +1,13 @@
 source 'https://rubygems.org'
 
-#FIXME bundle GH branch for now
-gem 'kaminari', github: 'amatsuda/kaminari', branch: 'extract_adapters'
+#FIXME bundle GH master for now
+gem 'kaminari-core', github: 'amatsuda/kaminari'
+gem 'kaminari-activerecord', github: 'amatsuda/kaminari'
 
-gem 'activerecord', '>= 4.0.0', :require => 'active_record'
+gem 'activerecord', '>= 5.0.0', :require => 'active_record'
+#FIXME need to bundle AV for now, because the helper still depends on ActionView
+gem 'actionview', '>= 5.0.0', :require => 'action_view'
 gem 'sinatra', '~> 1.4.0'
-gem 'rspec', '~> 2.14.1'
 gem 'padrino-helpers', '~> 0.12.0'
 gem 'rack-test', '>= 0'
 gem 'sinatra-contrib', '~> 1.4.0'

data/kaminari-sinatra.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/sinatra/version'
@@ -10,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["ronnie@dio.jp"]
 
   spec.summary       = 'Kaminari Sinatra adapter'
-  spec.description   = 'Kaminari Sinatra adapter'
+  spec.description   = 'kaminari-sinatra privides pagination helpers for your Sinatra templates'
   spec.homepage      = 'https://github.com/kaminari/kaminari-sinatra'
   spec.license       = "MIT"
 
@@ -21,15 +22,15 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'rspec', '< 2.9'
+  spec.add_development_dependency 'test-unit-activesupport'
+  spec.add_development_dependency 'test-unit-rr'
   spec.add_development_dependency 'capybara'
-  spec.add_development_dependency 'rr'
   spec.add_development_dependency 'sinatra-contrib'
   spec.add_development_dependency 'activerecord'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'database_cleaner'
-  spec.add_dependency 'kaminari'
+  spec.add_dependency 'kaminari-core', Kaminari::Sinatra::VERSION
   spec.add_dependency 'sinatra'
   spec.add_dependency 'actionview'
   spec.add_dependency 'padrino-helpers'

data/lib/kaminari/helpers/sinatra_helpers.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 require 'active_support/core_ext/object'
 require 'active_support/core_ext/string'
-require 'action_dispatch/http/mime_type'
-
-begin
-
 require 'padrino-helpers'
+require 'kaminari/helpers/helper_methods'
+require 'action_view'
+require 'action_view/base'
+
 module Kaminari::Helpers
   module SinatraHelpers
     class << self
@@ -21,156 +22,84 @@ module Kaminari::Helpers
       alias included registered
     end
 
-    class ActionViewTemplateProxy
-      include Padrino::Helpers::OutputHelpers
-      include Padrino::Helpers::TagHelpers
-      include Padrino::Helpers::AssetTagHelpers
-      include Padrino::Helpers::FormatHelpers
-      include Padrino::Helpers::TranslationHelpers
-
-      def initialize(opts={})
-        @current_path = opts[:current_path]
-        @param_name = (opts[:param_name] || :page).to_sym
-        @current_params = opts[:current_params]
+    # kaminari-sinatra uses Action View for rendering the Paginator
+    # because the default template uses Rails 3-ish `<%=` + block syntax that can't be rendered
+    # with pure ERB.
+    class ActionViewTemplateProxy < ActionView::Base
+      def initialize(current_path: nil, param_name: nil, current_params: nil)
+        super()
+
+        @current_path = current_path
+        @param_name = param_name || Kaminari.config.page_method_name
+        @current_params = current_params || {}
         @current_params.delete(@param_name)
-      end
 
-      def render(*args)
-        base = ActionView::Base.new.tap do |a|
-          a.view_paths << SinatraHelpers.view_paths
-          a.view_paths << File.join(Gem.loaded_specs['kaminari'].gem_dir, 'app/views')
-        end
-        base.render(*args)
+        view_paths << SinatraHelpers.view_paths
+        view_paths << File.join(Gem.loaded_specs['kaminari-core'].gem_dir, 'app/views')
       end
 
       def url_for(params)
+        return params if String === params
+
         extra_params = {}
-        if (page = params[@param_name]) && (Kaminari.config.params_on_first_page || page != 1)
+        if (page = params[@param_name]) && (Kaminari.config.params_on_first_page || (page.to_i != 1))
           extra_params[@param_name] = page
         end
         query = @current_params.merge(extra_params)
         @current_path + (query.empty? ? '' : "?#{query.to_query}")
       end
 
-      def link_to_unless(condition, name, options = {}, html_options = {}, &block)
-        options = url_for(options) if options.is_a? Hash
-        if condition
-          if block_given?
-            block.arity <= 1 ? capture(name, &block) : capture(name, options, html_options, &block)
-          else
-            name
-          end
-        else
-          link_to(name, options, html_options)
-        end
-      end
-
       def params
         @current_params
       end
     end
 
-    module HelperMethods
-      # A helper that renders the pagination links - for Sinatra.
-      #
-      #   <%= paginate @articles %>
-      #
-      # ==== Options
-      # * <tt>:window</tt> - The "inner window" size (4 by default).
-      # * <tt>:outer_window</tt> - The "outer window" size (0 by default).
-      # * <tt>:left</tt> - The "left outer window" size (0 by default).
-      # * <tt>:right</tt> - The "right outer window" size (0 by default).
-      # * <tt>:params</tt> - url_for parameters for the links (:id, :locale, etc.)
-      # * <tt>:param_name</tt> - parameter name for page number in the links (:page by default)
-      # * <tt>:remote</tt> - Ajax? (false by default)
-      # * <tt>:ANY_OTHER_VALUES</tt> - Any other hash key & values would be directly passed into each tag as :locals value.
-      def paginate(scope, options = {}, &block)
+    # Some helper methods that are used in Kaminari::Helpers::HelperMethods.
+    # Plus, monkey-patch for `paginate` to pass in an ActionViewTemplateProxy instance.
+    module SinatraHelperMethods
+      def url_for(params)
         current_path = env['PATH_INFO'] rescue nil
-        current_params = Rack::Utils.parse_query(env['QUERY_STRING']).symbolize_keys rescue {}
-        paginator = Kaminari::Helpers::Paginator.new(
-          ActionViewTemplateProxy.new(:current_params => current_params, :current_path => current_path, :param_name => options[:param_name] || Kaminari.config.param_name),
-          options.reverse_merge(:current_page => scope.current_page, :total_pages => scope.total_pages, :per_page => scope.limit_value, :param_name => Kaminari.config.param_name, :remote => false)
-        )
-        paginator.to_s
-      end
+        current_params = Rack::Utils.parse_query(env['QUERY_STRING']) rescue {}
 
-      # A simple "Twitter like" pagination link that creates a link to the previous page.
-      # Works on Sinatra.
-      #
-      # ==== Examples
-      # Basic usage:
-      #
-      #   <%= link_to_previous_page @items, 'Previous Page' %>
-      #
-      # Ajax:
-      #
-      #   <%= link_to_previous_page @items, 'Previous Page', :remote => true %>
-      #
-      # By default, it renders nothing if there are no more results on the previous page.
-      # You can customize this output by passing a parameter <tt>:placeholder</tt>.
-      #
-      #   <%= link_to_previous_page @users, 'Previous Page', :placeholder => %{<span>At the Beginning</span>} %>
-      #
-      def link_to_previous_page(scope, name, options = {})
-        params = options.delete(:params) || (Rack::Utils.parse_query(env['QUERY_STRING']).symbolize_keys rescue {})
-        param_name = options.delete(:param_name) || Kaminari.config.param_name
-        placeholder = options.delete(:placeholder)
-
-        if scope.first_page?
-          placeholder.to_s.html_safe
-        else
-          query = params.merge(param_name => scope.prev_page)
-          link_to name, env['PATH_INFO'] + (query.empty? ? '' : "?#{query.to_query}"), options.reverse_merge(:rel => 'previous')
-        end
+        extra_params = params.dup
+        extra_params.delete :only_path
+
+        query = current_params.merge(extra_params)
+        res = current_path + (query.empty? ? '' : "?#{query.to_query}")
+        res
       end
 
-      # A simple "Twitter like" pagination link that creates a link to the next page.
-      # Works on Sinatra.
-      #
-      # ==== Examples
-      # Basic usage:
-      #
-      #   <%= link_to_next_page @items, 'Next Page' %>
-      #
-      # Ajax:
-      #
-      #   <%= link_to_next_page @items, 'Next Page', :remote => true %>
-      #
-      # By default, it renders nothing if there are no more results on the next page.
-      # You can customize this output by passing a parameter <tt>:placeholder</tt>.
-      #
-      #   <%= link_to_next_page @items, 'Next Page', :placeholder => %{<span>No More Pages</span>} %>
-      #
-      def link_to_next_page(scope, name, options = {})
-        params = options.delete(:params) || (Rack::Utils.parse_query(env['QUERY_STRING']).symbolize_keys rescue {})
-        param_name = options.delete(:param_name) || Kaminari.config.param_name
-        placeholder = options.delete(:placeholder)
-
-        if scope.last_page? || scope.out_of_range?
-          placeholder.to_s.html_safe
+      def link_to_if(condition, name, options = {}, html_options = {}, &block)
+        options = url_for(options) if options.is_a? Hash
+        if condition
+          link_to(name, options, html_options)
+        elsif block_given?
+          capture_html(&block).html_safe
         else
-          query = params.merge(param_name => scope.next_page)
-          link_to name, env['PATH_INFO'] + (query.empty? ? '' : "?#{query.to_query}"), options.reverse_merge(:rel => 'next')
+          name
         end
       end
-    end
-  end
-end
 
-if defined? I18n
-  I18n.load_path += Dir.glob(File.join(Gem.loaded_specs['kaminari'].gem_dir, 'config/locales/*.yml'))
-end
+      def link_to_unless(condition, name, options = {}, html_options = {}, &block)
+        link_to_if !condition, name, options, html_options, &block
+      end
 
-rescue LoadError
+      # Overriding `paginate` to pass in an Action View renderer.
+      # If you're sure your custom template is compatible with Padrino renderer, you might not need it.
+      # In that case, please add `template: self` option when calling this method.
+      def paginate(scope, options = {})
+        current_path = env['PATH_INFO'] rescue nil
+        current_params = Rack::Utils.parse_query(env['QUERY_STRING']).symbolize_keys rescue {}
 
-$stderr.puts "[!]You should install `padrino-helpers' gem if you want to use kaminari's pagination helpers with Sinatra."
-$stderr.puts "[!]Kaminari::Helpers::SinatraHelper does nothing now..."
+        template = ActionViewTemplateProxy.new current_params: current_params, current_path: current_path, param_name: options[:param_name] || Kaminari.config.param_name
 
-module Kaminari::Helpers
-  module SinatraHelper
-    def self.registered(*)
+        super scope, {template: template}.merge(options)
+      end
     end
+    Kaminari::Helpers::HelperMethods.prepend SinatraHelperMethods
   end
 end
 
+if defined? I18n
+  I18n.load_path += Dir.glob(File.join(Gem.loaded_specs['kaminari-core'].gem_dir, 'config/locales/*.yml'))
 end

data/lib/kaminari/sinatra.rb

@@ -1,5 +1,4 @@
+# frozen_string_literal: true
 require 'sinatra/base'
-require 'kaminari'
+require 'kaminari/core'
 require 'kaminari/helpers/sinatra_helpers'
-
-Kaminari::Hooks.init

data/lib/kaminari/sinatra/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-sinatra
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: test-unit-activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rr
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: kaminari-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +206,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Kaminari Sinatra adapter
+description: kaminari-sinatra privides pagination helpers for your Sinatra templates
 email:
 - ronnie@dio.jp
 executables: []
@@ -241,12 +241,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 Sinatra adapter