corn_starch 1.1.31 → 1.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aaf9d2c710d5e3f3ad50059133c12afcef33990
-  data.tar.gz: 1feb33bf48116b33a722d6f66c77ed8141ff2071
+  metadata.gz: 16185f8705ad108d7b8eb20cd2f940542bb96ec2
+  data.tar.gz: 6cf6c94a3118a276c713a7963af7d3bda5315b24
 SHA512:
-  metadata.gz: 4717bedf7e0c2ccb01c98aea6075ba16f202a399eb3558d3fb15e69a428496f52b1750ba1451ec18d9eb76b31595569b9e29fa859e98e4295bb30e17a8fcde3a
-  data.tar.gz: 1a44826c405c804e8c83c11703f147b44894ee605f475a47d6f30ec4773e169089db83cdb2cc12961979ddf01fa5888ea3d8dcfc7932c874c91da89780b2997b
+  metadata.gz: 0ac8f0d0c6b8525a094eca4a2946c12a9fd2953d9073f9df541034e6e560952c03cfbbc0fec5198b4a3bf853802bb34f4a8a75e11ef2e70546559c1101c277e0
+  data.tar.gz: 0f9f90f663b225fba0aae66ac47f7e3409c66ddd1130043ba96299026e0c3c964a68df64c903440ca7836e407bd3d8ab56ccffa0f14fec1297261bf8f30c400c

data/app/controllers/corn_starch/corn_starch_controller.rb

@@ -50,26 +50,19 @@ module CornStarch
 		def pagination_filter
 
 			# Create Pagination
-			@cs_pagination ||= {}
+			@pagination ||= {}
 			session[:pagination] ||= {}
 
 			# Set Records Per Page from Request Arguments
 			session[:pagination][:recs_per_page] = params[:records_per_page].to_i if params[:records_per_page]
 
 			# Init Pagination Vars
-			@cs_pagination[:current] = 0
-			@cs_pagination[:links] = []
-			@cs_pagination[:pg_count] = 0
-
-			# DEBUG
-			puts "================== FILTER : #{@cs_pagination.inspect} / #{session.inspect} / #{CORNSTARCH_CONF.inspect}"
+			@pagination[:current] = 0
+			@pagination[:links] = []
+			@pagination[:pg_count] = 0
 
 			# Acquire Records per Page from Session / Configuration
-			@cs_pagination[:recs_per_page] = (session[:pagination][:recs_per_page] || CORNSTARCH_CONF[:pagination][:records_per_page][:default]).to_i
-
-			# DEBUG
-			puts "================== FILTER2 : #{@cs_pagination.inspect}"
-
+			@pagination[:recs_per_page] = (session[:pagination][:recs_per_page] || CORNSTARCH_CONF[:pagination][:records_per_page][:default]).to_i
 		end
 
 		##################
@@ -104,7 +97,7 @@ module CornStarch
 
 		# Get Records
 		def get_records model, params
-			cs_paginate unisearch(model, params[:search]), params
+			paginate unisearch(model, params[:search]), params
 		end
 
 		# Universal Search
@@ -153,30 +146,27 @@ module CornStarch
 		end
 
 		# Paginate
-		def cs_paginate collection, params
+		def paginate collection, params
 
 			# Acquire Current Page
 			current = (params[:current_page] || 0).to_i
 
 			# Compute Page Count
 			total = collection.count
-			@cs_pagination[:pg_count] = (total / @cs_pagination[:recs_per_page]) + (((total % @cs_pagination[:recs_per_page]) > 0) ? 1 : 0)
-
-			# DEBUG
-			puts "================== PAGINATION : #{@cs_pagination.inspect}"
+			@pagination[:pg_count] = (total / @pagination[:recs_per_page]) + (((total % @pagination[:recs_per_page]) > 0) ? 1 : 0)
 
 			# Compute Page Range
 			range_start = current - (CORNSTARCH_CONF[:pagination][:page_range] / 2)
 			range_start = 0 if range_start < 0
 			range_end = current + (CORNSTARCH_CONF[:pagination][:page_range] / 2)
-			range_end = @cs_pagination[:pg_count] - 1 if range_end >= @cs_pagination[:pg_count]
+			range_end = @pagination[:pg_count] - 1 if range_end >= @pagination[:pg_count]
 
 			# Create Page Links
-			@cs_pagination[:links] = range_start .. range_end
-			@cs_pagination[:current] = current
+			@pagination[:links] = range_start .. range_end
+			@pagination[:current] = current
 
 			# Fetch Records
-			collection.limit(@cs_pagination[:recs_per_page]).offset current * @cs_pagination[:recs_per_page]
+			collection.limit(@pagination[:recs_per_page]).offset current * @pagination[:recs_per_page]
 		end
 
 		# Generic Notice Messages

data/config/initializers/corn_starch_config.rb

@@ -14,9 +14,6 @@ CORNSTARCH_CONF = YAML::load_file CORNSTARCH_CONF_FILE if File.exist? CORNSTARCH
 CORNSTARCH_CONF ||= {}
 CORNSTARCH_CONF.deep_symbolize_keys!
 
-# DEBUG
-puts "=========== CONFIG (loaded from file) : #{CORNSTARCH_CONF.inspect}"
-
 ######################
 # Configure Defaults #
 ######################

data/lib/corn_starch/version.rb

@@ -1,3 +1,3 @@
 module CornStarch
-  VERSION = '1.1.31'
+  VERSION = '1.1.32'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: corn_starch
 version: !ruby/object:Gem::Version
-  version: 1.1.31
+  version: 1.1.32
 platform: ruby
 authors:
 - Eresse