actionset 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f859bd2af027550824912a5fa2ea15856bf355b9
-  data.tar.gz: fb7d494de37f4eddc01697c032d20de7a6526870
+  metadata.gz: 2cc1754eed05ab67bf65fe136f44a632ba04ea39
+  data.tar.gz: ba34642fd14eb52a4a06a878eeacc8f15f5a244e
 SHA512:
-  metadata.gz: 61ba01690350f529f1fb1ad0b7cc4084500b57878f055e3ac2d93f80ac7ca4d54df1b4a65a64136e851e5674a0198a8a7c602449a1774fbd319f400311c9a0c5
-  data.tar.gz: bb723d0784f6a44a6b5f01d05b4ed1ac5c50c3156d0983fafbb58ebcfd5fb0b3fc9238204c9e3d48ee3ae4a10ee8674d280eda6c1018b4e1d8270ee68e38e123
+  metadata.gz: 9c9e268b59574dc5ea13129989a742ed921ab866f7bb679a33bc219ed8569a7d627fa4e403604a7514cb00119b1128e12b7a7f05f7185cf39a87e012430b3abc
+  data.tar.gz: 8fae13323ed5efef44857f881cf1b65fb62293e1a7eaed4f922343741d8beb0fb1c5737acf3d0a2ef72b270e9983e1a71d82a178f18f0633da67540aa1410e16

data/CHANGELOG

@@ -1,3 +1,7 @@
+v 0.5.1
+  - Fix the sorting path helper to only ever allow single-vector sorting
+  - Fix the pagination description helper to have proper HTML spacing
+  - Add an `export_path_for(format)` helper for generating a path
 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

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative '../params/current_helper'
+
+module Export
+  module PathForHelper
+    include Params::CurrentHelper
+
+    def export_path_for(format)
+      url_for export_params_for(format)
+    end
+
+    private
+
+    def export_params_for(format)
+      current_params
+        .deep_merge(only_path: true,
+                    transform: {
+                      format: format
+                    })
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module Pagination
     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
+      description = "Page&nbsp;<strong>#{pagination_current_page_for(set)}</strong>&nbsp;of&nbsp;<strong>#{pagination_total_pages_for(set)}</strong>".html_safe
 
       content_tag(:span,
                   description,

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

@@ -4,6 +4,8 @@ require_relative '../params/current_helper'
 
 module Pagination
   module PathForHelper
+    include Params::CurrentHelper
+
     def pagination_path_for(page)
       page ||= 1
       url_for paginate_params_for(page)

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

@@ -16,10 +16,10 @@ module Sort
 
     def sort_params_for(attribute)
       current_params
-        .deep_merge(only_path: true,
-                    sort: {
-                      attribute => next_sort_direction_for(attribute)
-                    })
+        .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.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionset
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Stephen Margheim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-01 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeset
@@ -227,6 +227,7 @@ files:
 - bin/setup
 - config.ru
 - lib/action_set.rb
+- lib/action_set/helpers/export/path_for_helper.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