smart_pagination 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3914632522e00ca6ba04328501f0ee2b3640075e5f741935923263870db9f3c0
-  data.tar.gz: b49c5a85f4e2d0bc2e17631ce742face1b0d8229d6a627723fc30f180a0fed98
+  metadata.gz: 622958f99bacc734c5e67d7371358dc02b814582c9765f7b0dd097aa05f5ef1c
+  data.tar.gz: 71e2679df477bf457a4e368de908d8e841c870063284bc21041fb6e059be7558
 SHA512:
-  metadata.gz: 9674a59d5b985baec207bb8176666a32e0882583d54561d69f38cbeaf81de0693e5303ff21f8341778d0b9c45fba2f2b31937c2f21447f8e42f4e0319a3d6c0c
-  data.tar.gz: a94144d2bf68180725da5c73190bcd68a2ddb05316adab489661cee0371497f66c0427a36deb1bf7ab438683178b462c25a3202eee3986a07b2cc6b7085c1c1a
+  metadata.gz: 0fd88c944be240ff5727bdeb2916f5c2e828c0776d21b533f9c99d2a51369dad2f7bfb0d14646b821ee777051556d0976f495b5baffe6afc2d35659f5a3468f6
+  data.tar.gz: b4084bb59c6114a8135ce408443e80b25f2a51b06a228dcdbee11909ebf770e53818332f1799633b2c66c5905498c32a3ae189679088c17de8b9eb85b64a4d2a

data/README.md

@@ -92,12 +92,8 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/hardpixel/smart-pagination. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/hardpixel/smart-pagination.
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the SmartPagination project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/hardpixel/smart-pagination/blob/master/CODE_OF_CONDUCT.md).

data/lib/smart_pagination/helper.rb

@@ -1,29 +1,23 @@
 module SmartPagination
   module Helper
-    # Render pagination links
-    def smart_pagination_for(collection, options={})
+    def smart_pagination_for(collection, options = {})
       SmartPagination::Renderer.new(self, collection, options).render
     end
 
-    # Alias helper method
     alias :pagination_for :smart_pagination_for
 
-    # Render pager links
-    def smart_pager_for(collection, options={})
+    def smart_pager_for(collection, options = {})
       options = options.merge(pager_mode: true)
       SmartPagination::Renderer.new(self, collection, options).render
     end
 
-    # Alias helper method
     alias :pager_for :smart_pager_for
 
-    # Render pagination info text
-    def smart_pagination_info_for(collection, options={})
+    def smart_pagination_info_for(collection, options = {})
       options = options.merge(info_mode: true)
       SmartPagination::Renderer.new(self, collection, options).render
     end
 
-    # Alias helper method
     alias :pagination_info_for :smart_pagination_info_for
   end
 end

data/lib/smart_pagination/renderer.rb

@@ -1,13 +1,11 @@
 module SmartPagination
   class Renderer
-    # Initialize pagination renderer
-    def initialize(context, collection, options={})
+    def initialize(context, collection, options = {})
       @context    = context
       @collection = collection
       @options    = default_options.merge(options)
     end
 
-    # Render pagination links
     def render
       if auto_hide?
         nil
@@ -22,221 +20,195 @@ module SmartPagination
 
     private
 
-      # Default options
-      def default_options
-        {
-          info_mode:      false,
-          pager_mode:     false,
-          auto_hide:      false,
-          item_class:     '',
-          previous_text:  '«',
-          previous_class: 'previous',
-          next_text:      '»',
-          next_class:     'next',
-          active_class:   'active',
-          disabled_class: 'disabled',
-          wrapper:        'ul',
-          wrapper_class:  'pagination',
-          item_wrapper:   'li',
-          inner_window:    2,
-          outer_window:    0
-        }
-      end
+    def default_options
+      {
+        info_mode:      false,
+        pager_mode:     false,
+        auto_hide:      false,
+        item_class:     '',
+        previous_text:  '«',
+        previous_class: 'previous',
+        next_text:      '»',
+        next_class:     'next',
+        active_class:   'active',
+        disabled_class: 'disabled',
+        wrapper:        'ul',
+        wrapper_class:  'pagination',
+        item_wrapper:   'li',
+        inner_window:    2,
+        outer_window:    0
+      }
+    end
 
-      # Get collection name
-      def collection_name
-        if @collection.is_a? ActiveRecord::Relation
-          @collection.model_name.human(count: total_entries)
-        else
-          total_entries == 1 ? 'Item' : 'Items'
-        end
+    def collection_name
+      if @collection.is_a? ActiveRecord::Relation
+        @collection.model_name.human(count: total_entries)
+      else
+        total_entries == 1 ? 'Item' : 'Items'
       end
+    end
 
-      # Get current_page
-      def current_page
-        @collection.current_page.to_i
-      end
+    def current_page
+      @collection.current_page.to_i
+    end
 
-      # Get total pages
-      def total_pages
-        @total_pages ||= @collection.total_pages.to_i
-      end
+    def total_pages
+      @total_pages ||= @collection.total_pages.to_i
+    end
 
-      # Check if current page
-      def current_page?(page)
-        page.to_i == current_page
-      end
+    def current_page?(page)
+      page.to_i == current_page
+    end
 
-      # Get entries per page
-      def per_page
-        @collection.per_page.to_i
-      end
+    def per_page
+      @collection.per_page.to_i
+    end
 
-      # Get current entries
-      def current_entries
-        entries = current_page * per_page
-        entries < total_entries ? entries : total_entries
-      end
+    def current_entries
+      entries = current_page * per_page
+      entries < total_entries ? entries : total_entries
+    end
 
-      # Get total entries
-      def total_entries
-        @total_entries ||= @collection.total_entries.to_i
-      end
+    def total_entries
+      @total_entries ||= @collection.total_entries.to_i
+    end
 
-      # Check if should hide pagination
-      def auto_hide?
-        @options[:auto_hide].present? and total_pages < 2
-      end
+    def auto_hide?
+      @options[:auto_hide].present? and total_pages < 2
+    end
 
-      # Check if pager mode enabled
-      def pager_mode?
-        @options[:pager_mode].present?
-      end
+    def pager_mode?
+      @options[:pager_mode].present?
+    end
 
-      # Check if info mode enabled
-      def info_mode?
-        @options[:info_mode].present?
-      end
+    def info_mode?
+      @options[:info_mode].present?
+    end
 
-      # Current url parameters
-      def url_params
-        url    = URI.parse(@context.request.url)
-        params = Rack::Utils.parse_nested_query(url.query).symbolize_keys
+    def url_params
+      url    = URI.parse(@context.request.url)
+      params = Rack::Utils.parse_nested_query(url.query).symbolize_keys
 
-        params.except(:page)
-      end
+      params.except(:page)
+    end
 
-      # Get page numbers
-      def page_numbers
-        inner = @options[:inner_window].to_i
-        outer = @options[:outer_window].to_i
-        from  = current_page - inner
-        to    = current_page + inner
-
-        if to > total_pages
-          from -= to - total_pages
-          to    = total_pages
-        end
-
-        if from < 1
-          to   += 1 - from
-          from  = 1
-          to    = total_pages if to > total_pages
-        end
-
-        middle = from..to
-
-        if outer + 3 < middle.first
-          left = (1..(outer + 1)).to_a
-          left << :sep
-        else
-          left = 1...middle.first
-        end
-
-        if total_pages - outer - 2 > middle.last
-          right = ((total_pages - outer)..total_pages).to_a
-          right.unshift :sep
-        else
-          right = (middle.last + 1)..total_pages
-        end
-
-        left.to_a + middle.to_a + right.to_a
-      end
+    def page_numbers
+      inner = @options[:inner_window].to_i
+      outer = @options[:outer_window].to_i
+      from  = current_page - inner
+      to    = current_page + inner
 
-      # Get link params
-      def link_params(page)
-        page = @collection.send(:"#{page}_page") unless page.is_a? Integer
-        { page: page }
+      if to > total_pages
+        from -= to - total_pages
+        to    = total_pages
       end
 
-      # Get link options
-      def link_options(page)
-        if page.is_a? Integer
-          active = @options[:active_class] if current_page? page
-          { class: "#{@options[:item_class]} #{active}".strip }
-        else
-          disabled   = @options[:disabled_class] unless @collection.send(:"#{page}_page?")
-          item_class = @options[:"#{page}_class"]
-
-          { class: "#{@options[:item_class]} #{item_class} #{disabled}".strip }
-        end
+      if from < 1
+        to   += 1 - from
+        from  = 1
+        to    = total_pages if to > total_pages
       end
 
-      # Page link
-      def page_link(page)
-        item_link page, link_params(page), link_options(page)
-      end
+      middle = from..to
 
-      # Previous link
-      def previous_link
-        item_link @options[:previous_text], link_params(:previous), link_options(:previous)
+      if outer + 3 < middle.first
+        left = (1..(outer + 1)).to_a
+        left << :sep
+      else
+        left = 1...middle.first
       end
 
-      # Next link
-      def next_link
-        item_link @options[:next_text], link_params(:next), link_options(:next)
+      if total_pages - outer - 2 > middle.last
+        right = ((total_pages - outer)..total_pages).to_a
+        right.unshift :sep
+      else
+        right = (middle.last + 1)..total_pages
       end
 
-      # Render item link
-      def item_link(text, params={}, html_options={})
-        wrapper  = @options[:item_wrapper]
-        link_opt = html_options if wrapper.blank?
-        item_tag = link_to text, params, link_opt
-        item_tag = tag wrapper, item_tag, html_options if wrapper.present?
+      left.to_a + middle.to_a + right.to_a
+    end
 
-        item_tag
-      end
+    def link_params(page)
+      page = @collection.send(:"#{page}_page") unless page.is_a? Integer
+      { page: page }
+    end
 
-      # Render item separator
-      def item_sep
-        item_link '&hellip;', {}, class: "#{@options[:item_class]} #{@options[:disabled_class]}".strip
-      end
+    def link_options(page)
+      if page.is_a? Integer
+        active = @options[:active_class] if current_page? page
+        { class: "#{@options[:item_class]} #{active}".strip }
+      else
+        disabled   = @options[:disabled_class] unless @collection.send(:"#{page}_page?")
+        item_class = @options[:"#{page}_class"]
 
-      # Render content tag
-      def tag(*args, &block)
-        @context.content_tag(*args, &block)
+        { class: "#{@options[:item_class]} #{item_class} #{disabled}".strip }
       end
+    end
 
-      # Render link tag
-      def link_to(text, params={}, html_options={})
-        prm = params.except(:page) if params[:page] == 1
-        url = @context.url_for url_params.merge(prm || params)
-        opt = html_options.to_h
-        opt = opt.merge(href: url) if params[:page].present?
+    def page_link(page)
+      item_link page, link_params(page), link_options(page)
+    end
 
-        tag :a, "#{text}".html_safe, opt
-      end
+    def previous_link
+      item_link @options[:previous_text], link_params(:previous), link_options(:previous)
+    end
 
-      # Render wrapper
-      def wrapper(links)
-        wrapper  = @options[:wrapper]
-        wrap_opt = { class: @options[:wrapper_class] }
-        wrap_tag = links.html_safe
-        wrap_tag = tag wrapper, wrap_tag, wrap_opt if wrapper.present?
+    def next_link
+      item_link @options[:next_text], link_params(:next), link_options(:next)
+    end
 
-        wrap_tag
-      end
+    def item_link(text, params = {}, html_options = {})
+      wrapper  = @options[:item_wrapper]
+      link_opt = html_options if wrapper.blank?
+      item_tag = link_to text, params, link_opt
+      item_tag = tag wrapper, item_tag, html_options if wrapper.present?
 
-      # Render pagination info
-      def pagination_info
-        current = tag :strong, current_entries, class: 'current'
-        total   = tag :strong, total_entries, class: 'total'
+      item_tag
+    end
 
-        "Displaying #{current} of #{total} #{collection_name}".html_safe
-      end
+    def item_sep
+      item_link '&hellip;', {}, class: "#{@options[:item_class]} #{@options[:disabled_class]}".strip
+    end
 
-      # Render pager
-      def pager
-        items = [previous_link, next_link]
-        wrapper items.map(&:to_s).join
-      end
+    def tag(*args, &block)
+      @context.content_tag(*args, &block)
+    end
 
-      # Render pagination
-      def pagination
-        items = page_numbers.map { |page| page == :sep ? item_sep : page_link(page) }
-        items = [previous_link, *items, next_link]
+    def link_to(text, params = {}, html_options = {})
+      prm = params.except(:page) if params[:page] == 1
+      url = @context.url_for url_params.merge(prm || params)
+      opt = html_options.to_h
+      opt = opt.merge(href: url) if params[:page].present?
 
-        wrapper items.map(&:to_s).join
-      end
+      tag :a, "#{text}".html_safe, opt
+    end
+
+    def wrapper(links)
+      wrapper  = @options[:wrapper]
+      wrap_opt = { class: @options[:wrapper_class] }
+      wrap_tag = links.html_safe
+      wrap_tag = tag wrapper, wrap_tag, wrap_opt if wrapper.present?
+
+      wrap_tag
+    end
+
+    def pagination_info
+      current = tag :strong, current_entries, class: 'current'
+      total   = tag :strong, total_entries, class: 'total'
+
+      "Displaying #{current} of #{total} #{collection_name}".html_safe
+    end
+
+    def pager
+      items = [previous_link, next_link]
+      wrapper items.map(&:to_s).join
+    end
+
+    def pagination
+      items = page_numbers.map { |page| page == :sep ? item_sep : page_link(page) }
+      items = [previous_link, *items, next_link]
+
+      wrapper items.map(&:to_s).join
+    end
   end
 end

data/lib/smart_pagination/version.rb

@@ -1,3 +1,3 @@
 module SmartPagination
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

data/lib/smart_pagination.rb

@@ -6,7 +6,6 @@ module SmartPagination
   extend ActiveSupport::Autoload
   extend ActiveSupport::Concern
 
-  # Autoload modules
   autoload :Renderer
   autoload :Helper
 
@@ -15,7 +14,6 @@ module SmartPagination
   end
 end
 
-# Include action view helpers
 if defined? ActionView::Base
   ActionView::Base.send :include, SmartPagination::Helper
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_pagination
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_paginate
@@ -88,9 +88,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -118,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: View helpers for SmartPaginate

data/CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at info@hardpixel.eu. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile.lock

@@ -1,61 +0,0 @@
-PATH
-  remote: .
-  specs:
-    smart_pagination (0.1.0)
-      actionview (>= 4.0.0, < 5.2)
-      smart_paginate (~> 0.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionview (5.1.1)
-      activesupport (= 5.1.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.1.1)
-      activesupport (= 5.1.1)
-    activerecord (5.1.1)
-      activemodel (= 5.1.1)
-      activesupport (= 5.1.1)
-      arel (~> 8.0)
-    activesupport (5.1.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (8.0.0)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    erubi (1.6.0)
-    i18n (0.8.4)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mini_portile2 (2.1.0)
-    minitest (5.10.2)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    rake (10.5.0)
-    smart_paginate (0.2.0)
-      activerecord (>= 4.0.0, < 5.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.14)
-  minitest (~> 5.0)
-  rake (~> 10.0)
-  smart_pagination!
-
-BUNDLED WITH
-   1.14.6