greedo 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c37eaa9ca950940e9c87f9ed42e5954d03d06e4
-  data.tar.gz: e5c83b75858b499a110a9ac15aef2ff973c0083e
+  metadata.gz: 48c3028f4ecf306b0c59c53b9bede17f851103cd
+  data.tar.gz: 7ef547c2576e93017b31013cccfee5b367772e7e
 SHA512:
-  metadata.gz: 68a84e842d0191ad79765e733ee98d2283b8ec1e71055437e881de2b57a770d1a66b0638737f3bc0aba681e4d4ff95c6289ae1a41ed722c661b9f87e34bf32d7
-  data.tar.gz: 6a4d333a874b4228d1955e55568c6b4a652c7c64b65a976dfa8998801dd365181a33961d1ed0a06261ac2a60341eaed0d8028797c9d6df8d3db5081e53b7dabb
+  metadata.gz: 96eb11d4a5dcd6f38904289d3e3e8d8fac085fbe8c6a81aaa176f0f3cd1270dcec7c6719ca10d193a567304f6a33207c6436527b170a03cce3fba23ba167e1d9
+  data.tar.gz: 557a57d5eb4c230c044fc0132e79d00555de86c06ac73766b264a4a64d2fb3cfec5838612de033bc5d8e84db0693fe50c9d1cb8e386a8ca25b88f950f162b1a8

data/app/views/greedo/_grid.html.haml

@@ -23,4 +23,6 @@
               = column.value
 
 - if grid.show_pagination?
-  = will_paginate grid.paginator.records, param_name: param_name, renderer: BootstrapPagination::Rails
+  = will_paginate grid.paginator.records, param_name: param_name,
+                                          params: path_params,
+                                          renderer: BootstrapPagination::Rails

data/lib/greedo/grid_helper.rb

@@ -3,9 +3,9 @@ module Greedo
     class Grid
       attr_accessor :paginator
       attr_reader :view_context, :fields, :presenter, :empty_message_text,
-        :order, :order_by
+        :order, :order_by, :path_params
 
-      def initialize(view_context:, order: nil, order_by: nil)
+      def initialize(view_context:, order: nil, order_by: nil, path_params: nil)
         @view_context = view_context
         @row_id = ->(record) { default_row_id(record) }
         @fields = []
@@ -13,6 +13,7 @@ module Greedo
         @empty_message_text = "No data to show."
         @order = order
         @order_by = order_by
+        @path_params = path_params
       end
 
       def configure
@@ -43,7 +44,7 @@ module Greedo
           renderer = ->(record) { present(record).public_send(name) }
         end
 
-        fields << Field.new(name, label, renderer, order, order_by, view_context, sort)
+        fields << Field.new(name, label, renderer, order, order_by, view_context, sort, path_params)
         nil
       end
 
@@ -102,7 +103,8 @@ module Greedo
         end
       end
 
-      Field = Struct.new(:name, :label, :renderer, :order, :order_by, :view_context, :sort) do
+      Field = Struct.new(:name, :label, :renderer, :order, :order_by,
+                         :view_context, :sort, :path_params) do
         def value(record)
           renderer.call(record)
         end
@@ -115,19 +117,23 @@ module Greedo
           order_by == name.to_s && %w(asc desc).include?(order)
         end
 
+        def params
+          view_context.params.merge(path_params)
+        end
+
         def order_desc_path
           if ordered_by? && order == "desc"
-            view_context.url_for(view_context.params)
+            view_context.url_for(params.merge(order: nil, order_by: nil))
           else
-            view_context.url_for(view_context.params.merge(order: :desc, order_by: name))
+            view_context.url_for(params.merge(order: :desc, order_by: name))
           end
         end
 
         def order_asc_path
           if ordered_by? && order == "asc"
-            view_context.url_for(view_context.params)
+            view_context.url_for(params.merge(order: nil, order_by: nil))
           else
-            view_context.url_for(view_context.params.merge(order: :asc, order_by: name))
+            view_context.url_for(params.merge(order: :asc, order_by: name))
           end
         end
 
@@ -153,16 +159,22 @@ module Greedo
                param_name: :page,
                page: params.fetch(param_name) { 1 }.to_i,
                per_page: 20,
+               path_params: {},
                order: params[:order],
                order_by: params[:order_by],
                &block)
-      grid = Grid.new(view_context: self, order: order, order_by: order_by)
+      grid = Grid.new(view_context: self,
+                      order: order,
+                      order_by: order_by,
+                      path_params: path_params)
       grid.configure(&block)
       grid.paginator = Paginator.build(scope,
                                        page: page,
                                        per_page: per_page,
                                        order_by: grid.ordered_by)
-      render partial: "greedo/grid", locals: {grid: grid, param_name: param_name}
+      render partial: "greedo/grid", locals: {grid: grid,
+                                              param_name: param_name,
+                                              path_params: path_params}
     end
   end
 end

data/lib/greedo/version.rb

@@ -1,3 +1,3 @@
 module Greedo
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greedo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Adam Pohorecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler