caboose-cms 0.3.58 → 0.3.59

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDQ2MmQxOTgxZTExYTNiOTUwMDIzNTQwM2U0NTZjOGRmNTM1Yjc0Zg==
+    MzYxMGM3OTFjZTExMzM3ODNlMGRkYWM5NjU0OWUzMjEzNWZiNGI0MQ==
   data.tar.gz: !binary |-
-    MGMyNWI2NTQ5ZDEzNDcxMmRkOTQ0OWVjN2NkMjYzMWU0MWFiOTYyNg==
+    ZDE0N2YwOTExZWE3ZTU1NGFiODc5ZmJlMjEwMmYyYzMzODAzMWE5OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTcxODE0NTg1N2Q2YWMzN2JlMDJmY2VhM2RlNzUwMmM4MjJkYzc4MzdiMjg4
-    MjUwNzE1MjVjOGZkNDMxODU4ZmZkZTkzMDVkODgxN2E2OTFjZmY2NTA0Y2Rk
-    YmJkYmQzNGM4NGZmMTVkM2IyYjljOWQ1MmU4M2RjMWEzMWY1YWU=
+    Y2ZkMzE2YjA1MWY5MjMwYzQwMTMwNjU2YTRlNTM3NTlkMTZiOTdjZWZjYzUy
+    N2IyZDI5OWY0MTUyZDI3ZTc2N2ZlMGZmY2U5NzU3M2VjMmJmZTJmOTI4Yzgx
+    MTZhMjNlNGQ4MzEyYzEzYjQwZGU0OWVkMTk0NmViYTBjMWRkMGI=
   data.tar.gz: !binary |-
-    MGY1NDU4Y2NlOWNhYjkxYjIyODdmNDdlYTE4NWI4YTk5NWM5YThhMjE2YWFk
-    MjRiMGI5NzYxOTA4YzFjNGViMmM4NWJhZGVmYmI3M2M2YWM2OThjOTliYTll
-    OGQxNmQ2NGE1MzNmYmIyNGQyMDYyNGYzMmI2YmQ5NmNmNjdlNWQ=
+    NTY3MzU1NzhkYzY0ODE0YjJkZDE2ODM4NWZhYWRlMDA2ODJlOWI5MTg2NDIx
+    MGI2ZTVkNjQ5MjlkNGFiOTVjNDBmZGZmNzBiOGNkNjhhMjFlOTkyZjc2N2Zj
+    ZDkyYTFjOTA0OTNkYTI4YWIwYTE5N2IzNThkNTlmMTQ4Y2RmOGQ=

data/app/models/caboose/page_bar_generator.rb

@@ -49,12 +49,26 @@ module Caboose
   			                         # }  			
   		}      
   		params.each   { |key, val| @params[key]  = val }
-  		options.each  { |key, val| @options[key] = val }  		
-  		@params.each  { |key, val|  		  
-  		  k = @options['abbreviations'].include?(key) ? @options['abbreviations'][key] : nil  		  
-  		  @params[key] = post_get[key].nil? ? (k && !post_get[k].nil? ? post_get[k] : val) : post_get[key]  		   
-  		}			
-  		@options.each { |key, val| @options[key] = post_get[key].nil? ? val : post_get[key] }
+  		options.each  { |key, val| @options[key] = val }
+  		
+  		#@params.each  { |key, val|  		  
+  		#  k = @options['abbreviations'].include?(key) ? @options['abbreviations'][key] : nil  		  
+  		#  @params[key] = post_get[key].nil? ? (k && !post_get[k].nil? ? post_get[k] : val) : post_get[key]  		          
+  		#}
+  		
+  		new_params = {}
+  		keys_to_delete = []
+  		@params.each  { |key, val|
+  		  next if !@options['abbreviations'].has_key?(key)  		  
+  		  long_key = @options['abbreviations'][key]  		  
+        new_params[long_key] = val
+        keys_to_delete << key        
+  		}
+  		keys_to_delete.each { |k| @params.delete(k) }
+  		new_params.each { |k,v| @params[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 }
+  		
   		#@custom_url_vars = custom_url_vars if !custom_url_vars.nil?
   		@use_url_params = @options['use_url_params'].nil? ? Caboose.use_url_params : @options['use_url_params']
       
@@ -129,7 +143,8 @@ module Caboose
       return true
   	end
   	
-  	def items  		
+  	def items
+      Caboose.log(where)  		
   		assoc = model_with_includes.where(where)
     	if @options['items_per_page'] != -1
     	  assoc = assoc.limit(limit).offset(offset)

data/app/models/caboose/user.rb

@@ -5,7 +5,7 @@ class Caboose::User < ActiveRecord::Base
   has_many :roles, :through => :role_memberships
   has_attached_file :image, 
     :path => 'users/:id_:style.:extension',
-    :default_url => '/images/default_user_image.jpg',    
+    :default_url => "#{Caboose::cdn_domain}/images/default_user_image.jpg",    
     :styles => {
       :tiny  => '150x200>',
       :thumb => '300x400>',

data/lib/caboose.rb

@@ -42,6 +42,10 @@ module Caboose
   mattr_accessor :website_domain
   @@website_domain = "http://www.google.com"
   
+  # CDN domain
+  mattr_accessor :cdn_domain
+  @@cdn_domain = ""
+  
   # Email settings
   mattr_accessor :email_from
   @@email_from = "webmaster@caboosecms.com"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.58'
+  VERSION = '0.3.59'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.58
+  version: 0.3.59
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails