grapple 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29fe6d42cf2c20b787701ae4129775f325a3a67a
-  data.tar.gz: 274443c21e688445641107e68db1a937baa4848f
+  metadata.gz: fba23ec15fa15e3af330adb21135aa01d7fc086b
+  data.tar.gz: a1400867677c6d2aaf42f960be45cc3a43290882
 SHA512:
-  metadata.gz: 86634330ca55fc613cff43012798c0ab8a5f0e6742c9301e836c20bcc32355c5c43e0a76677c1ffd8cfd6d8936f4ec2eb323ccb17f90e62ece6ddbb7ff9856a8
-  data.tar.gz: 362d5d6e62826ae54ef5dc6759e964a75f2b05e0486b01799e0c7dac0b5b6f84db1d684ec0a34cb025e1388c60508bd7d87aef7c2e4454f81f50e081e7248476
+  metadata.gz: c34626569e41eb3064454c449b39c6bf789addcf65e67891b2adade034e62666dbadc8ef5aec741cbd86466a2f30a0ce148b87e3f2aebc2ccb75756b0e23683b
+  data.tar.gz: c7209519dd827357fa63d1d582ab050cfbd1b83345dbc24ea994c591f969b8d16fd0d39735b8328acbf4dd809e10cf1d661ada5d44bf34672d26125501e2851e

data/lib/grapple/components/html_component.rb

@@ -16,7 +16,13 @@ module Grapple
 				if options[:sort] == params[:sort]
 					options[:dir] = (params[:dir] == 'desc') ? 'asc' : 'desc'
 				end
-				url_params = params.stringify_keys().merge(options.stringify_keys())
+				# Convert ActionController::Parameters to a Hash
+				p = if params.respond_to?(:to_unsafe_h)				
+					params.to_unsafe_h
+				else
+					params.to_h
+				end
+				url_params = p.stringify_keys().merge(options.stringify_keys())
 				if @builder.namespace
 					tmp = {}
 					url_params.each do |key, value|

data/lib/grapple/components/kaminari_infobar.rb

@@ -0,0 +1,40 @@
+module Grapple
+	module Components
+		class KaminariInfobar < HtmlComponent
+
+			setting :message, "Displaying %s - %s of %s results"
+			setting :estimate_message, "Displaying %s - %s of about %s results"
+			setting :no_results_message, "0 results"
+
+			def render
+				estimate = false
+				begin
+					# total_count will throw an error if without_count is being used
+					total_count = records.total_count
+				rescue Exception => e
+					estimate = true
+					total_count = ActiveRecord::Base.connection.execute(
+						"SELECT reltuples AS approximate_row_count FROM pg_class WHERE relname = '#{records.table_name}'"
+					).first["approximate_row_count"].to_i
+				end
+				
+				if total_count > 0
+					offset = (records.current_page - 1) * records.current_per_page
+					start_range = offset + 1
+					end_range = [offset + records.current_per_page, total_count].min
+
+					start_range = ActiveSupport::NumberHelper.number_to_delimited(start_range)
+					end_range = ActiveSupport::NumberHelper.number_to_delimited(end_range)
+					total = ActiveSupport::NumberHelper.number_to_delimited(total_count)
+
+					html = sprintf((estimate ? estimate_message : message), start_range, end_range, total)
+				else
+					html = no_results_message
+				end
+
+				builder.row "<th colspan=\"#{num_columns}\">#{html}</th>", :class => 'infobar'
+			end
+
+		end
+	end
+end

data/lib/grapple/components/kaminari_pagination.rb

@@ -0,0 +1,40 @@
+module Grapple
+	module Components
+		# Generates paging links using will_paginate.
+		#
+		# @example 
+		#   <%= table_for(columns, Post.paginate(page: 2)) do |t| %>
+		#     <%= t.footer do %>
+		#       <%= t.pagination %>
+		#     <% end %>
+		#   <% end %>
+		#
+		class KaminariPagination < HtmlComponent
+
+			setting :no_results_message, :no_search_results
+			setting :renderer, nil
+
+			def render(paginate_parameters = {})
+				td_class = ""
+				if records.instance_of?(Array)
+					html = '&nbsp;'
+				elsif !params[:query].blank? and records.empty?
+					html = h(t(no_results_message))
+					td_class = "class='text-left'"
+				else
+					begin
+						# paginate helper will throw an error if without_count is being used
+						html = template.paginate(records)
+					rescue Exception => e
+						html = template.link_to_prev_page(records, "Previous Page") || ""
+						html += " " if html
+						html += template.link_to_next_page(records, "Next Page") || ""
+					end
+				end
+
+				builder.row "<td colspan=\"#{num_columns}\" #{td_class}>#{html}</td>"
+			end
+		
+		end
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grapple
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Edward Potocko
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -157,6 +157,8 @@ files:
 - lib/grapple/components/html_footer.rb
 - lib/grapple/components/html_header.rb
 - lib/grapple/components/html_row.rb
+- lib/grapple/components/kaminari_infobar.rb
+- lib/grapple/components/kaminari_pagination.rb
 - lib/grapple/components/search_form.rb
 - lib/grapple/components/search_query_field.rb
 - lib/grapple/components/search_submit.rb
@@ -205,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Customizable data grid for Rails