caboose-cms 0.3.60 → 0.3.61

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDNjNzU4MWUxM2VhNDcyOTcwOTcyOTFhMGM1M2JiNGFhOWIxMWY1Mg==
+    MDQyNzBlMzgzYzVkMjI0OTYwOWIyNDYxNmE0YTBhYjQzZWEyMTM5ZQ==
   data.tar.gz: !binary |-
-    MWEyYTdkNDFiNDY2MTI0M2VlYzI5MTlhNDYyYzYxMDFhZTRlMmE4Nw==
+    OTQ4ZGM3MWZkNjc4ZTdiMmEzMzVlMDMzOTVlMDgxN2VjY2ZkZDMwYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODg1OGU4OWU3NTY1MGU0MjZlYzNkYzQxNDI5YTc0NTg5YzlmODY1Y2IzNzI5
-    MTI2ZmZjMWFkOGI1ZjJiOTk5Mjc5ZjMxYTIxMzgxMTk4YjhlZjMxYjdkOTEw
-    OWVjODBiZjY2Y2Q4YTlkZDRjYWFhODFhYTY4YzQ4ZDU4YjA1NDc=
+    MjQ4MWEwNTcwNjA1MjQ2OGRmMGNiMTgzMGQ4NzJhNzgwMjc3ZTYyZDNlYzQ3
+    Njc5MjM5MTgyYmMyMjZiODM0MDQwMzkxYTBmNWIxNjA3MjQyNzlkOTJhOTI2
+    MDRhMmVjNjUwMGIwMTY2M2ZkNGZmMjQ3NDg4YWFiYTQxNWEwNGQ=
   data.tar.gz: !binary |-
-    OGJiODRmOGM5YWQwMzNiNWM3N2EzY2JjZTJjMzk4ZjAyZGM0MTE0NTk0ZWFj
-    YjU3ZDFiYmZhZTk1NWIzZjhiNjk2NzJiNDkxZjA0ZTA2ZDkwNjBkZTk1OGM5
-    ZjBmZGQ4NTkxMTM4ZDEwNjIxNTdiZTI2ZjE5Y2M5YTU1Nzk3ZTU=
+    ZGIzNTg5MTc5MzlhMmJlN2E2M2RjZDg4MWFkMTIyNWU5OTY5MTBhM2RiMzUx
+    ZTM0ZmU4YzRkYjlmNDA5Zjg4NjliNDZiYzM2YzE0MWY0N2NkY2E2MGQ1ZmJl
+    ZmMxYzA3YTNhNjFiZDhjZDFiZmVmOTZhNjZlMTk4NTBlYjA5ZmU=

data/app/controllers/caboose/application_controller.rb

@@ -12,7 +12,6 @@ module Caboose
       # Modify the built-in params array with URL params if necessary
       parse_url_params if Caboose.use_url_params
       
-      
       session['use_redirect_urls'] = true if session['use_redirect_urls'].nil?
       
       # Initialize AB Testing

data/app/models/caboose/page_bar_generator.rb

@@ -21,7 +21,7 @@ module Caboose
     #		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, :custom_url_vars    
+    attr_accessor :original_params, :params, :options, :custom_url_vars    
   	
     #def initialize(post_get, params = nil, options = nil, &custom_url_vars = nil)
   	def initialize(post_get, params = nil, options = nil)
@@ -31,7 +31,7 @@ module Caboose
   	  
   		# Note: a few keys are required:
   		# base_url, page, itemCount, itemsPerPage
-  		@orginal_params = {}
+  		@original_params = {}
   		@params = {}
   		@options = {
   		  'model'           => '',
@@ -49,10 +49,10 @@ module Caboose
   			                         #   search_field_2 => [association_name, join_table, column_name]
   			                         # }  			
   		}      
-  		params.each { |key, val|
+  		params.each do |key, val|
   		  @original_params[key] = val
   		  @params[key] = val 
-  		}
+  		end
   		options.each { |key, val| @options[key] = val }
   		
   		#@params.each  { |key, val|  		  
@@ -69,7 +69,8 @@ module Caboose
         keys_to_delete << key        
   		}
   		keys_to_delete.each { |k| @params.delete(k) }
-  		new_params.each { |k,v| @params[k] = v }        		
+  		new_params.each { |k,v| @params[k] = v }
+  		@original_params.each { |k,v| @original_params[k] = post_get[k] ? post_get[k] : v }
   		@params.each  { |k,v| @params[k]  = post_get[k] ? post_get[k] : v }        			
   		@options.each { |k,v| @options[k] = post_get[k] ? post_get[k] : v }
   		
@@ -147,8 +148,7 @@ module Caboose
       return true
   	end
   	
-  	def items
-      Caboose.log(where)  		
+  	def items        		
   		assoc = model_with_includes.where(where)
     	if @options['items_per_page'] != -1
     	  assoc = assoc.limit(limit).offset(offset)
@@ -234,9 +234,9 @@ module Caboose
   	  if !@custom_url_vars.nil?
   	    return @custom_url_vars.call @options['base_url'], @params
   	  end
-  	  
+  	    	  
   	  vars = []
-  	  @params.each do |k,v|  	    
+  	  @original_params.each do |k,v|          	    
   	    next if @options['skip'].include?(k)
   	    k = @options['abbreviations'].include?(k) ? @options['abbreviations'][k] : k  	      	    
   	    if v.kind_of?(Array)
@@ -256,9 +256,15 @@ module Caboose
   	      end  	        
   	    end  	      	    
   	  end
-  	  vars.push("sort=#{@options['sort']}")
-  		vars.push("desc=#{@options['desc']}")  		
-  		vars.push("page=#{@options['page']}")  			
+  	  if @use_url_params
+  	    vars.push("sort/#{@options['sort']}")
+  		  vars.push("desc/#{@options['desc']}")  		
+  		  #vars.push("page/#{@options['page']}")
+      else
+        vars.push("sort=#{@options['sort']}")
+  		  vars.push("desc=#{@options['desc']}")  		
+  		  #vars.push("page=#{@options['page']}")
+  		end  			
   	  return "#{@options['base_url']}" if vars.length == 0
   	  if @use_url_params
   	    vars = URI.escape(vars.join('/'))  	    

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.60'
+  VERSION = '0.3.61'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.60
+  version: 0.3.61
 platform: ruby
 authors:
 - William Barry