actionset 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b171c6d0633fadbb7ed8a263d5fc5ab7ebfb5e6
-  data.tar.gz: c79bd79c80f9184c2b908c626aa3b364f2cdf44d
+  metadata.gz: f859bd2af027550824912a5fa2ea15856bf355b9
+  data.tar.gz: fb7d494de37f4eddc01697c032d20de7a6526870
 SHA512:
-  metadata.gz: fb79688137902f9141f5943bbc306a4cba6f9a85b2c721a2e8a5e82f8f55e2268924d2dea789091fe150798f0af89a0aa3a36114b205e039dd7d322b7cafac8d
-  data.tar.gz: 97c17b2f681911aaf8d2a1c71993df5e684b6c426ce3305e0ce0b71cf52a8254d99197bdf3b5305455d5899fa6610c51fe6e0b71ea115f6fd06f9740a7eb47a4
+  metadata.gz: 61ba01690350f529f1fb1ad0b7cc4084500b57878f055e3ac2d93f80ac7ca4d54df1b4a65a64136e851e5674a0198a8a7c602449a1774fbd319f400311c9a0c5
+  data.tar.gz: bb723d0784f6a44a6b5f01d05b4ed1ac5c50c3156d0983fafbb58ebcfd5fb0b3fc9238204c9e3d48ee3ae4a10ee8674d280eda6c1018b4e1d8270ee68e38e123

data/CHANGELOG

@@ -1,3 +1,7 @@
+v 0.5.0
+  - Replace the use of `@filters` with the helper method `form_for_object_from_param(:filter)`
+  - Fix the pagination and sorting path helper methods to ensure they don't remove pre-existing params
+  - Rearrange the pagination helpers into a loose collection of micro-helpers
 v 0.4.2
   - Ensure that the sort_link_for helper method can work with symbol attributes
 v 0.4.1

data/actionset.gemspec

@@ -27,15 +27,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'railties'
 
   spec.add_development_dependency 'rails', '~> 5.1.0'
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rspec-rails', '~> 3.6'
-  spec.add_development_dependency 'database_cleaner', '~> 1.6.1'
-  spec.add_development_dependency 'capybara', '~> 2.15.1'
-  spec.add_development_dependency 'combustion', '~> 0.7.0'
-  spec.add_development_dependency 'factory_girl', '~> 4.8.0'
-  spec.add_development_dependency 'faker', '~> 1.8.4'
-  spec.add_development_dependency 'simplecov', '~> 0.15.0'
-  spec.add_development_dependency 'simplecov-console', '~> 0.4.2'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'database_cleaner'
+  spec.add_development_dependency 'capybara'
+  spec.add_development_dependency 'combustion'
+  spec.add_development_dependency 'factory_girl'
+  spec.add_development_dependency 'faker'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov-console'
 end

data/lib/action_set.rb

@@ -4,7 +4,6 @@ require 'rails/railtie'
 require 'active_support/core_ext/object/blank'
 require 'active_support/lazy_load_hooks'
 require 'active_set'
-require 'ostruct'
 
 require 'action_set/version'
 require_relative './action_set/instruction/value'
@@ -16,12 +15,6 @@ module ActionSet
     ::ActionView::Base.send :include, Helpers::HelperMethods
   end
 
-  class Filter < OpenStruct
-    def model_name
-      OpenStruct.new(param_key: 'filter')
-    end
-  end
-
   module ClassMethods
   end
 
@@ -31,7 +24,6 @@ module ActionSet
     end
 
     def filter_set(set)
-      set_filters_ivar
       active_set = ensure_active_set(set)
       active_set = active_set.filter(filter_structure(set)) if filter_params.any?
       active_set
@@ -56,11 +48,6 @@ module ActionSet
       send_data(transformed_data, export_set_options(request.format))
     end
 
-    def set_filters_ivar
-      @filters = JSON.parse(filter_params.to_json,
-                            object_class: Filter)
-    end
-
     private
 
     def filter_structure(set)

data/lib/action_set/helpers/helper_methods.rb

@@ -1,24 +1,16 @@
 # frozen_string_literal: true
 
-require_relative './sort/current_direction_for_helper'
-require_relative './sort/description_for_helper'
 require_relative './sort/link_for_helper'
-require_relative './sort/next_direction_for_helper'
-require_relative './sort/path_for_helper'
 require_relative './pagination/links_for_helper'
 require_relative './pagination/path_for_helper'
+require_relative './params/form_for_object_helper'
 
 module ActionSet
   module Helpers
     module HelperMethods
-      include Sort::CurrentDirectionForHelper
-      include Sort::DescriptionForHelper
       include Sort::LinkForHelper
-      include Sort::NextDirectionForHelper
-      include Sort::PathForHelper
-
-      include Pagination::PathForHelper
       include Pagination::LinksForHelper
+      include Params::FormForObjectHelper
     end
   end
 end

data/lib/action_set/helpers/pagination/current_page_description_for_helper.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative './current_page_for_helper'
+require_relative './total_pages_for_helper'
+
+module Pagination
+  module CurrentPageDescriptionForHelper
+    include Pagination::CurrentPageForHelper
+    include Pagination::TotalPagesForHelper
+
+    def pagination_current_page_description_for(set)
+      description = "Page <strong>#{pagination_current_page_for(set)}</strong> of <strong>#{pagination_total_pages_for(set)}</strong>".html_safe
+
+      content_tag(:span,
+                  description,
+                  class: 'page-current')
+    end
+  end
+end

data/lib/action_set/helpers/pagination/current_page_for_helper.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Pagination
+  module CurrentPageForHelper
+    def pagination_current_page_for(set)
+      set.instructions.dig(:paginate, :page)
+    end
+  end
+end

data/lib/action_set/helpers/pagination/first_page_link_for_helper.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative './current_page_for_helper'
+require_relative './path_for_helper'
+
+module Pagination
+  module FirstPageLinkForHelper
+    include Pagination::CurrentPageForHelper
+    include Pagination::PathForHelper
+
+    def pagination_first_page_link_for(set)
+      if pagination_current_page_for(set) > 1
+        link_to('« First', pagination_path_for(1), class: 'page-link page-first')
+      else
+        content_tag(:span, '« First', class: 'page-link page-first disabled')
+      end
+    end
+  end
+end

data/lib/action_set/helpers/pagination/last_page_link_for_helper.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative './current_page_for_helper'
+require_relative './total_pages_for_helper'
+require_relative './path_for_helper'
+
+module Pagination
+  module LastPageLinkForHelper
+    include Pagination::CurrentPageForHelper
+    include Pagination::TotalPagesForHelper
+    include Pagination::PathForHelper
+
+    def pagination_last_page_link_for(set)
+      current_page = pagination_current_page_for(set)
+      total_pages = pagination_total_pages_for(set)
+
+      if current_page != total_pages && current_page <= total_pages
+        link_to('Last »',  pagination_path_for(total_pages), class: 'page-link page-last')
+      else
+        content_tag(:span, 'Last »', class: 'page-link page-last disabled')
+      end
+    end
+  end
+end

data/lib/action_set/helpers/pagination/links_for_helper.rb

@@ -1,79 +1,29 @@
+# frozen_string_literal: true
+
+require_relative './first_page_link_for_helper'
+require_relative './prev_page_link_for_helper'
+require_relative './current_page_description_for_helper'
+require_relative './next_page_link_for_helper'
+require_relative './last_page_link_for_helper'
+
 module Pagination
   module LinksForHelper
+    include Pagination::FirstPageLinkForHelper
+    include Pagination::PrevPageLinkForHelper
+    include Pagination::CurrentPageDescriptionForHelper
+    include Pagination::NextPageLinkForHelper
+    include Pagination::LastPageLinkForHelper
+
     def pagination_links_for(set)
       content_tag(:nav, class: 'pagination', 'aria-label': 'Page navigation') do
         safe_join([
-          link_to_first_page(set),
-          link_to_prev_page(set),
-          description_of_current_page(set),
-          link_to_next_page(set),
-          link_to_last_page(set)
+          pagination_first_page_link_for(set),
+          pagination_prev_page_link_for(set),
+          pagination_current_page_description_for(set),
+          pagination_next_page_link_for(set),
+          pagination_last_page_link_for(set)
         ])
       end
     end
-
-    private
-
-    def description_of_current_page(set)
-      description = "Page&nbsp;<strong>#{current_page_for(set)}</strong>&nbsp;of&nbsp;<strong>#{total_pages_for(set)}</strong>".html_safe
-
-      content_tag(:span,
-                  description,
-                  class: 'page-current')
-    end
-
-    def link_to_first_page(set)
-      if current_page_for(set) > 1
-        link_to('« First', paginate_path_for(1), class: 'page-link page-first')
-      else
-        content_tag(:span, '« First', class: 'page-link page-first disabled')
-      end
-    end
-
-    def link_to_prev_page(set)
-      current_page = current_page_for(set)
-
-      if current_page > 1 && current_page <= total_pages_for(set)
-        link_to('‹ Prev', paginate_path_for(current_page - 1), rel: 'prev', class: 'page-link page-prev')
-      else
-        content_tag(:span, '‹ Prev', class: 'page-link page-prev disabled')
-      end
-    end
-
-    def link_to_last_page(set)
-      current_page = current_page_for(set)
-      total_pages = total_pages_for(set)
-
-      if current_page != total_pages && current_page <= total_pages
-        link_to('Last »',  paginate_path_for(total_pages), class: 'page-link page-last')
-      else
-        content_tag(:span, 'Last »', class: 'page-link page-last disabled')
-      end
-    end
-
-    def link_to_next_page(set)
-      current_page = current_page_for(set)
-      total_pages = total_pages_for(set)
-
-      if current_page != total_pages && current_page <= total_pages
-        link_to('Next ›', paginate_path_for(current_page + 1), rel: 'next', class: 'page-link page-next')
-      else
-        content_tag(:span, 'Next ›', class: 'page-link page-next disabled')
-      end
-    end
-
-    def total_pages_for(set)
-      total_set_size = set.set.count
-
-      (total_set_size.to_f / page_size_for(set)).ceil
-    end
-
-    def current_page_for(set)
-      set.instructions.dig(:paginate, :page)
-    end
-
-    def page_size_for(set)
-      set.instructions.dig(:paginate, :size)
-    end
   end
 end

data/lib/action_set/helpers/pagination/next_page_link_for_helper.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative './current_page_for_helper'
+require_relative './total_pages_for_helper'
+require_relative './path_for_helper'
+
+module Pagination
+  module NextPageLinkForHelper
+    include Pagination::CurrentPageForHelper
+    include Pagination::TotalPagesForHelper
+    include Pagination::PathForHelper
+
+    def pagination_next_page_link_for(set)
+      current_page = pagination_current_page_for(set)
+      total_pages = pagination_total_pages_for(set)
+
+      if current_page != total_pages && current_page <= total_pages
+        link_to('Next ›', pagination_path_for(current_page + 1), rel: 'next', class: 'page-link page-next')
+      else
+        content_tag(:span, 'Next ›', class: 'page-link page-next disabled')
+      end
+    end
+  end
+end

data/lib/action_set/helpers/pagination/page_size_for_helper.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Pagination
+  module PageSizeForHelper
+    def pagination_page_size_for(set)
+      set.instructions.dig(:paginate, :size)
+    end
+  end
+end

data/lib/action_set/helpers/pagination/path_for_helper.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
+require_relative '../params/current_helper'
+
 module Pagination
   module PathForHelper
-    def paginate_path_for(page)
+    def pagination_path_for(page)
       page ||= 1
       url_for paginate_params_for(page)
     end
@@ -8,9 +12,10 @@ module Pagination
     private
 
     def paginate_params_for(page)
-      current_params.merge(paginate: {
-        page: page
-      })
+      current_params
+        .deep_merge(paginate: {
+                      page: page
+                    })
     end
   end
 end

data/lib/action_set/helpers/pagination/prev_page_link_for_helper.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative './current_page_for_helper'
+require_relative './total_pages_for_helper'
+require_relative './path_for_helper'
+
+module Pagination
+  module PrevPageLinkForHelper
+    include Pagination::CurrentPageForHelper
+    include Pagination::TotalPagesForHelper
+    include Pagination::PathForHelper
+
+    def pagination_prev_page_link_for(set)
+      current_page = pagination_current_page_for(set)
+
+      if current_page > 1 && current_page <= pagination_total_pages_for(set)
+        link_to('‹ Prev', pagination_path_for(current_page - 1), rel: 'prev', class: 'page-link page-prev')
+      else
+        content_tag(:span, '‹ Prev', class: 'page-link page-prev disabled')
+      end
+    end
+  end
+end

data/lib/action_set/helpers/pagination/total_pages_for_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative './page_size_for_helper'
+
+module Pagination
+  module TotalPagesForHelper
+    include Pagination::PageSizeForHelper
+
+    def pagination_total_pages_for(set)
+      total_set_size = set.set.count
+
+      (total_set_size.to_f / pagination_page_size_for(set)).ceil
+    end
+  end
+end

data/lib/action_set/helpers/params/current_helper.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Params
+  module CurrentHelper
+    def current_params
+      return params.to_unsafe_hash if params.respond_to? :to_unsafe_hash
+
+      params
+    end
+  end
+end

data/lib/action_set/helpers/params/form_for_object_helper.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'ostruct'
+
+module Params
+  module FormForObjectHelper
+    def form_for_object_from_param(param)
+      form_for_params = params.fetch(param, {})
+      form_for_requirements = { model_name: { param_key: param } }
+
+      JSON.parse(form_for_params.merge(form_for_requirements).to_json,
+                 object_class: OpenStruct)
+    end
+  end
+end

data/lib/action_set/helpers/sort/current_direction_for_helper.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
+require_relative '../params/current_helper'
+require_relative './formatting_helper'
+
 module Sort
   module CurrentDirectionForHelper
+    include Params::CurrentHelper
+    include Sort::FormattingHelper
+
     def current_sort_direction_for(attribute, format: :short)
       direction = current_params.dig(:sort, attribute).to_s.downcase
 
-      return _ascending(format) if direction.presence_in %w[asc ascending]
-      return _descending(format) if direction.presence_in %w[desc descending]
+      return ascending_str(format) if direction.presence_in %w[asc ascending]
+      return descending_str(format) if direction.presence_in %w[desc descending]
 
       direction
     end
-
-    def current_params
-      return params.to_unsafe_hash if params.respond_to? :to_unsafe_hash
-
-      params
-    end
   end
 end

data/lib/action_set/helpers/sort/description_for_helper.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
+require_relative './next_direction_for_helper'
+
 module Sort
   module DescriptionForHelper
+    include Sort::NextDirectionForHelper
+
     def sort_description_for(attribute)
       "sort by '#{attribute}' in #{next_sort_direction_for(attribute, format: :long)} order"
     end

data/lib/action_set/helpers/sort/formatting_helper.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Sort
+  module FormattingHelper
+    def ascending_str(format)
+      return 'asc' if format.to_s == 'short'
+
+      'ascending'
+    end
+
+    def descending_str(format)
+      return 'desc' if format.to_s == 'short'
+
+      'descending'
+    end
+  end
+end

data/lib/action_set/helpers/sort/link_for_helper.rb

@@ -1,7 +1,13 @@
 # frozen_string_literal: true
 
+require_relative './path_for_helper'
+require_relative './description_for_helper'
+
 module Sort
   module LinkForHelper
+    include Sort::PathForHelper
+    include Sort::DescriptionForHelper
+
     def sort_link_for(attribute, name = nil)
       link_to(name || attribute.to_s.titleize,
               sort_path_for(attribute),

data/lib/action_set/helpers/sort/next_direction_for_helper.rb

@@ -1,30 +1,21 @@
 # frozen_string_literal: true
 
-# depends upon #current_sort_direction_for
+require_relative './current_direction_for_helper'
+require_relative './formatting_helper'
 
 module Sort
   module NextDirectionForHelper
+    include Sort::CurrentDirectionForHelper
+    include Sort::FormattingHelper
+
     def next_sort_direction_for(attribute, format: :short)
       direction = current_sort_direction_for(attribute)
 
-      return _ascending(format) unless direction
-      return _ascending(format) unless direction.presence_in %w[asc desc ascending descending]
-      return _ascending(format) if direction.presence_in %w[desc descending]
-      return _descending(format) if direction.presence_in %w[asc ascending]
-    end
-
-    private
-
-    def _ascending(format)
-      return 'asc' if format.to_s == 'short'
-
-      'ascending'
-    end
-
-    def _descending(format)
-      return 'desc' if format.to_s == 'short'
+      return ascending_str(format) unless direction.presence_in %w[asc desc ascending descending]
+      return ascending_str(format) if direction.presence_in %w[desc descending]
+      return descending_str(format) if direction.presence_in %w[asc ascending]
 
-      'descending'
+      ascending_str(format)
     end
   end
 end

data/lib/action_set/helpers/sort/path_for_helper.rb

@@ -1,7 +1,13 @@
 # frozen_string_literal: true
 
+require_relative '../params/current_helper'
+require_relative './next_direction_for_helper'
+
 module Sort
   module PathForHelper
+    include Params::CurrentHelper
+    include Sort::NextDirectionForHelper
+
     def sort_path_for(attribute)
       url_for sort_params_for(attribute)
     end
@@ -9,10 +15,11 @@ module Sort
     private
 
     def sort_params_for(attribute)
-      current_params.merge(only_path: true,
-                           sort: {
-                             attribute => next_sort_direction_for(attribute)
-                           })
+      current_params
+        .deep_merge(only_path: true,
+                    sort: {
+                      attribute => next_sort_direction_for(attribute)
+                    })
     end
   end
 end

data/lib/action_set/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActionSet
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionset
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Stephen Margheim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeset
@@ -70,156 +70,142 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.15.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.15.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0'
 description: Easily filter, sort, and paginate enumerable sets via web requests.
 email:
 - stephen.margheim@gmail.com
@@ -242,10 +228,21 @@ files:
 - config.ru
 - lib/action_set.rb
 - lib/action_set/helpers/helper_methods.rb
+- lib/action_set/helpers/pagination/current_page_description_for_helper.rb
+- lib/action_set/helpers/pagination/current_page_for_helper.rb
+- lib/action_set/helpers/pagination/first_page_link_for_helper.rb
+- lib/action_set/helpers/pagination/last_page_link_for_helper.rb
 - lib/action_set/helpers/pagination/links_for_helper.rb
+- lib/action_set/helpers/pagination/next_page_link_for_helper.rb
+- lib/action_set/helpers/pagination/page_size_for_helper.rb
 - lib/action_set/helpers/pagination/path_for_helper.rb
+- lib/action_set/helpers/pagination/prev_page_link_for_helper.rb
+- lib/action_set/helpers/pagination/total_pages_for_helper.rb
+- lib/action_set/helpers/params/current_helper.rb
+- lib/action_set/helpers/params/form_for_object_helper.rb
 - lib/action_set/helpers/sort/current_direction_for_helper.rb
 - lib/action_set/helpers/sort/description_for_helper.rb
+- lib/action_set/helpers/sort/formatting_helper.rb
 - lib/action_set/helpers/sort/link_for_helper.rb
 - lib/action_set/helpers/sort/next_direction_for_helper.rb
 - lib/action_set/helpers/sort/path_for_helper.rb