caboose-cms 0.2.16 → 0.2.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDgyNDZmMmVhZDBiMjQ2NGVmODgxMDI4NjAyYWRhMzg2NTEyNTRhNg==
+    MGFhZWRjYWIzMDIxNjk5YjUyNDU4NDQ1YjNmZDc5MWQ5MzdiNmM0NA==
   data.tar.gz: !binary |-
-    N2Q3Mzg3NTBkNjIzYmYzMDlkZDc1YTlkY2I2ZTk2YjM4N2IwNTgyNQ==
+    N2NlNTFjNDQ4Mzc5OGI2NzIwM2VmZGZkMGRjMDlkMDA5Njg0MDExNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjQyODY1ZDk1ZTI2MzgwMTBlYjRmYzA1MWM0MDJmNDQ0MGEyZTViNWM1ZWY5
-    YzBkMzJjMWM4NDg3YmYzNWNiY2ZkZGRhY2ZkMzRiNTQ0ZDhlNDY2NGQxNTlk
-    YzgxYjlhZjdlYTg3ZDQwYWE4YjYyNDJjZDhiODYwYmIxN2Q4ZGM=
+    NGUxMGY2NjQ5MWYzZjIwOTk4MmI2MDY3ZjRjMGY5NjkzM2IxOTlhZGVlNDg3
+    M2M2NGVlOTY1OWZhZmZiNjk4NDI2YzA5ZjU1NGY5NTI2ZDk1ZWIyMmQ5NWU5
+    MTYwYmUxYTMyMzE2OTBjMzVlYmZjYWUyNjJhNjM2OGUwM2VjYTM=
   data.tar.gz: !binary |-
-    N2ExZmUzMDViMDdkNTYwODEwZjIwYTY3ZWU3NmUxOWZhMGNmNTE5OTkzMGEx
-    ODU0YTJkNDQzY2Q4OGViYjZmOWJiNzAwNTZjYzc3NTE2MzE0OTM1MjJkNzBm
-    YTIyYmE2YzZhZGUwMzUwZmIzNDYxMTNhNDNjMzM0OTM5ZWM5Nzc=
+    Yzk4NWQxN2IwODM1YWEzNzdlZTA3ZGM4ZjQyMDRjYjJjMGE0YTIwYzMyOGFh
+    NTliM2U5NzJjYWRkM2Q0NDdkYWNhY2Q4ZTE0NTcyNzBlZjU2NTEwNGE3ZGI3
+    MzMyMGVlNTg0NTU3NzUxMzAyNGEzN2U5YTRkYjg5NmUzMmQ5MTI=

data/app/models/caboose/page_bar_generator.rb

@@ -141,11 +141,27 @@ module Caboose
     end
     
     def where
-      vars = {}
+      sql = []
+      values = []
   	  @params.each do |k,v|
-  	    vars[k] = v if !v.nil? && v.length > 0 
+        next if v.nil? || v.length == 0
+        if k.ends_with?('_gte')
+          sql << "`#{k[0..-5]}` >= ?"
+        elsif k.ends_with?('_gt')
+          sql << "`#{k[0..-4]}` > ?"
+        elsif k.ends_with?('_lte')
+          sql << "`#{k[0..-5]}` <= ?"
+        elsif k.ends_with?('_lt')
+          sql << "`#{k[0..-4]}` < ?"
+        else
+          sql << "`#{k}` = ?"
+        end        
+        values << v
   	  end
-  	  return vars
+  	  sql_str = sql.join(' and ')
+  	  sql = [sql_str]  	   	  
+  	  values.each { |v| sql << v }
+  	  return sql
     end
     
     def limit

data/app/models/caboose/pager.rb

@@ -0,0 +1,166 @@
+module Caboose
+  class Pager  
+    #
+    # Parameters:
+    #	params:	array of key/value pairs that must include the following:
+    #		base_url: 		url without querystring onto which the parameters are added.	
+    #		itemCount:		Total number of items.
+    #
+    #	In addition, the following parameters are not required but may be 
+    #	included in the array:	
+    #		itemsPerPage:	Number of items you want to show per page. Defaults to 10 if not present.
+    #		page: Current page number.  Defaults to 0 if not present.
+    #
+    attr_accessor :params, :options
+  	
+  	def initialize(post_get, params = nil, options = nil)
+  	  
+  	  params  = {} if params.nil?
+  	  options = {} if options.nil?
+  	  
+  		# Note: a few keys are required:
+  		# base_url, page, itemCount, itemsPerPage
+  		@params = {}
+  		@options = {
+  		  'model'           => '',
+  			'sort' 			      => '',
+  			'desc' 			      => false,
+  			'base_url'		    => '',
+  			'page'			      => 1,
+  			'item_count'		  => 0,
+  			'items_per_page'  => 10
+  		}      
+  		params.each   { |key, val| @params[key]  = val }
+  		options.each  { |key, val| @options[key] = val }
+  		@params.each  { |key, val| @params[key]  = post_get[key].nil? ? val : post_get[key] }			
+  		@options.each { |key, val| @options[key] = post_get[key].nil? ? val : post_get[key] } 
+  		@options['item_count'] = @options['model'].constantize.where(where).count
+  		
+  	end
+  	
+  	def ok(val)
+      return false if val.nil?
+      return true  if val.is_a? Array
+      return true  if val.is_a? Hash
+      return true  if val.is_a? Integer
+      return true  if val.is_a? Fixnum
+      return true  if val.is_a? Float
+      return true  if val.is_a? Bignum
+      return true  if val.is_a? TrueClass
+      return true  if val.is_a? FalseClass
+      return false if val == ""
+      return true
+  	end
+  	
+  	def items
+    	return @options['model'].constantize.where(where).limit(limit).offset(offset).reorder(reorder).all
+  	end
+  		
+  	def generate
+  	    	  
+  		# Check for necessary parameter values
+  		return false if !ok(@options['base_url']) # Error: base_url is required for the page bar generator to work.
+  		return false if !ok(@options['item_count']) # Error: itemCount is required for the page bar generator to work.
+  		
+  		# Set default parameter values if not present
+  		@options['items_per_page'] = 10  if @options["items_per_page"].nil?
+  		@options['page']           = 1   if @options["page"].nil?		
+  		
+  		# Variables to make the search form work 
+  		vars = get_vars()
+  		page = @options["page"].to_i
+  		
+  		Caboose.log(@options)
+  				
+  		# Max links to show (must be odd) 
+  		total_links = 5
+  		prev_page = page - 1
+  		next_page = page + 1
+  		total_pages = (@options['item_count'].to_f / @options['items_per_page'].to_f).ceil
+  		
+  		if (total_pages < total_links)
+  			start = 1
+  			stop = total_pages			
+  		else
+  			start = page - (total_links/2).floor			
+  			start = 1 if start < 1
+  			stop = start + total_links - 1
+  			
+  			if (stop > total_pages)
+  				stop = total_pages				
+  				start = stop - total_links  				
+  				start = 1 if start < 1
+  			end
+  		end
+  		
+  		base_url = @params['base_url']
+  		str = ''
+  		str << "<p>Results: showing page #{page} of #{total_pages}</p>\n"
+  		
+  		if (total_pages > 1)
+  		  str << "<div class='page_links'>\n"
+  		  if (page > 1)
+  		    str << "<a href='#{base_url}?#{vars}&page=#{prev_page}'>Previous</a>"
+  	    end
+  		  for i in start..stop
+  		  	if (page != i)
+  		  	  str << "<a href='#{base_url}?#{vars}&page=#{i}'>#{i}</a>"
+  		  	else
+  		  		str << "<span class='current_page'>#{i}</span>"
+  		  	end
+  		  end
+  		  if (page < total_pages)
+  		  	str << "<a href='#{base_url}?#{vars}&page=#{next_page}'>Next</a>"
+  		  end
+  		  str << "</div>\n"
+      end
+      
+  		return str
+  	end
+  	
+  	def get_vars()  
+  	  vars = []
+  	  @params.each do |k,v|
+  	    vars.push("#{k}=#{v}") if !v.nil? && v.length > 0 
+  	  end
+  	  return URI.escape(vars.join('&'))
+  	end
+  	
+    def sortable_table_headings(cols)
+      vars = get_vars()
+    	str = ''
+      
+    	# key = sort field, value = text to display
+    	cols.each do |sort, text|
+    		desc  = @options['sort'] == sort ? (@options['desc'] ? 0 : 1) : 0
+    		arrow = @options['sort'] == sort ? (@options['desc'] ? ' &uarr;' : ' &darr;') : ''					
+    		link = @options['base_url'] + "?#{vars}&sort=#{sort}&desc=#{desc}"
+    		str += "<th><a href='#{link}'>#{text}#{arrow}</a></th>\n"
+    	end
+    	return str  	
+    end
+    
+    def where
+      vars = {}
+  	  @params.each do |k,v|  	    
+  	    vars[k] = v if !v.nil? && v.length > 0 
+  	  end
+  	  return vars
+    end
+    
+    def limit
+      return @options['items_per_page'].to_i
+    end
+    
+    def offset
+      return (@options['page'].to_i - 1) * @options['items_per_page'].to_i
+    end
+    
+    def reorder
+      if (!@options['sort'].nil? && @options['sort'].length > 0)
+        return @options['sort']
+      end
+      return "id"
+    end
+  end
+end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.16'
+  VERSION = '0.2.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - William Barry
@@ -180,6 +180,7 @@ files:
 - app/models/caboose/page_bar_generator.rb
 - app/models/caboose/page_permission.rb
 - app/models/caboose/page_plugin.rb
+- app/models/caboose/pager.rb
 - app/models/caboose/permission.rb
 - app/models/caboose/permission_plugin.rb
 - app/models/caboose/role.rb