corn_starch 1.1.28 → 1.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8450b658f3a7ed9d59dbf8ed811267587391bbf8
-  data.tar.gz: c1e4deca76bcf0fb9d81ac881cddeae235a5e6ed
+  metadata.gz: c1f37a1cfabdef11f3e988c6d0448845acc95500
+  data.tar.gz: 341cbd345a63aebc9b6454c236d4ca5b0cb76a8a
 SHA512:
-  metadata.gz: 49f83dac344f3d7f60294d1cfe307295cb0fdd0415aed2b2b4d930b4633e6e67f1f3936bd533fe2b57cd186c02db3e7c7dd69646f8ad9961e802c9223206ec32
-  data.tar.gz: 8b87cdf328219a7a38c48c09e3057df60c35d8b73561b1e4ac54d3d9152ba9765024e00bde2ba5fc132c94a349df2549a3ec0c138038ee30571384aacfbacab7
+  metadata.gz: da221456ae55916d8f5d8153f0831e6d43a24ef660f61973c2a2d5442aaa64fd0231f4cc50647bd412137032693aa1462bcabb56d8df78dacabba917e5270d34
+  data.tar.gz: f01e223cb548173fba91fa3b0eb48a4884acbca59346d75d9c392c3e9a06cb647484e16226e0080e6574b86b1b94e1948c13852e9f85fee7582983c4d4bfc9db

data/app/controllers/corn_starch/corn_starch_controller.rb

@@ -50,21 +50,21 @@ module CornStarch
 		def pagination_filter
 
 			# Create Pagination
-			@pagination ||= {}
+			@cs_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
-			@pagination[:current] = 0
-			@pagination[:links] = []
-			@pagination[:pg_count] = 0
+			@cs_pagination[:current] = 0
+			@cs_pagination[:links] = []
+			@cs_pagination[:pg_count] = 0
 
 			# Acquire Records per Page from Session / Configuration
-			@pagination[:recs_per_page] = (session[:pagination][:recs_per_page] || CORNSTARCH_CONF[:pagination][:records_per_page][:default]).to_i
+			@cs_pagination[:recs_per_page] = (session[:pagination][:recs_per_page] || CORNSTARCH_CONF[:pagination][:records_per_page][:default]).to_i
 
 			# DEBUG
-			puts "================== FILTER : #{@pagination.inspect}"
+			puts "================== FILTER : #{@cs_pagination.inspect}"
 
 		end
 
@@ -100,7 +100,7 @@ module CornStarch
 
 		# Get Records
 		def get_records model, params
-			paginate unisearch(model, params[:search]), params
+			cs_paginate unisearch(model, params[:search]), params
 		end
 
 		# Universal Search
@@ -149,30 +149,30 @@ module CornStarch
 		end
 
 		# Paginate
-		def paginate collection, params
+		def cs_paginate collection, params
 
 			# Acquire Current Page
 			current = (params[:current_page] || 0).to_i
 
 			# Compute Page Count
 			total = collection.count
-			@pagination[:pg_count] = (total / @pagination[:recs_per_page]) + (((total % @pagination[:recs_per_page]) > 0) ? 1 : 0)
+			@cs_pagination[:pg_count] = (total / @cs_pagination[:recs_per_page]) + (((total % @cs_pagination[:recs_per_page]) > 0) ? 1 : 0)
 
 			# DEBUG
-			puts "================== PAGINATION : #{@pagination.inspect}"
+			puts "================== PAGINATION : #{@cs_pagination.inspect}"
 
 			# 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 = @pagination[:pg_count] - 1 if range_end >= @pagination[:pg_count]
+			range_end = @cs_pagination[:pg_count] - 1 if range_end >= @cs_pagination[:pg_count]
 
 			# Create Page Links
-			@pagination[:links] = range_start .. range_end
-			@pagination[:current] = current
+			@cs_pagination[:links] = range_start .. range_end
+			@cs_pagination[:current] = current
 
 			# Fetch Records
-			collection.limit(@pagination[:recs_per_page]).offset current * @pagination[:recs_per_page]
+			collection.limit(@cs_pagination[:recs_per_page]).offset current * @cs_pagination[:recs_per_page]
 		end
 
 		# Generic Notice Messages

data/lib/corn_starch/version.rb

@@ -1,3 +1,3 @@
 module CornStarch
-  VERSION = '1.1.28'
+  VERSION = '1.1.29'
 end

metadata

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