caboose-cms 0.2.99 → 0.2.100

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjZhMDhjMzMyMGJmOTFhMTFiOWRkNGZkNTMwYTE3ZDFiOGFiMGNiNg==
+    ZWU0MjQ4ZTg2ODI3ZDczYWQ3YzJjOTBkNWE2NzA5NzQ1NDMxZTM0Yg==
   data.tar.gz: !binary |-
-    NTdhMmRjOGZhYjhhNzJiMWVkODUyY2Y0ZTUxNDEyMTY5NjIxM2YzNw==
+    ZDNhZTBhMDI2OWM1YTJhMzkyNWI5OWUyNmZkMzI2YjE5ZGRiM2Y4MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjUwMjM5ZTk4ZjhiNmU0ODZmNTNkYTI3M2M0N2U3MDc4YzcyMDU3Nzk0MmU2
-    ZWM4NDJjOTIwMWIxZDc0OTg5ZDk3ZTAwMzlkNjY1MTYzNTQ3ZTM1ZjljMjky
-    ZDg2NTM4MWQxMDZmZTllODEzZmJlODRhNzJlM2Y0MjcxNGI0MmI=
+    NGU0Zjk5MTUxNGU4Y2RlZjQ0NzVmYWVmZGY4NmYyYjA3OTI4NjFkOGQ1MTdm
+    ZjU1YWQxZTU2YjFmZTA1YzdmYmMwNzgzOTU2NjhiMDkxYzVjOTgyMmU4NjZj
+    MzNkNTM0ODJlNmU1Y2RmNzU0YzMwOWRlYTJiNGRmZDk2N2YwN2I=
   data.tar.gz: !binary |-
-    ZWE4N2IwOTExYzBlMTE5ODRiODQ0YWZiZGYyZmQxM2FmZTgxNmY5MDk3ZjVh
-    Zjg0MmJiZjFlOGUwNjYyOWZhZWRlNDE0Mjg1YmUwZDdhNjFmMTBmZWJlNWM1
-    NGFmMjZmMGQyNzVkOTY3ODI3OThhYmM2YmMyZDZmOWNmMThiZTQ=
+    MDc4ZWYwNTkwMzg1YTUyZGIxYTAxNzY0MGJlYzljNDhiN2NjODE0ZGFlNmFm
+    M2FjMjhmNGE2ZTBiOTAwYzlmY2IyODE4NTliYjk0NGU0MmNhYWFmOWI2NjMx
+    OTdjNDI5OTE0ODExYThiNTNlOWM4MWJkZTYzNDJiYzJlYzRjNGI=

data/app/helpers/caboose/products_helper.rb

@@ -0,0 +1,19 @@
+module Caboose
+  module ProductsHelper
+    
+    def average_review(product_id)
+      all_reviews = Review.where(:product_id => product_id)
+      score = 0
+      count = 0
+      all_reviews.each do |r|
+        if r.rating && r.rating != 0
+          score += r.rating
+          count += 1
+        end
+      end
+      return score/count if count > 0
+      return 0
+    end
+    
+  end
+end

data/app/models/caboose/page_bar_generator.rb

@@ -1,3 +1,13 @@
+# Note: 
+#   For includes to work with namespaces other than the root namespace, the 
+#   full namespaced class_name has to be set in the model on the association 
+#   being included.  For example:
+#
+#   class Animals::Dog
+#     has_many :friends, :class_name => 'Animals::Dog'
+#   end
+#   
+
 module Caboose
   class PageBarGenerator  
     #
@@ -28,14 +38,37 @@ module Caboose
   			'base_url'		    => '',
   			'page'			      => 1,
   			'item_count'		  => 0,
-  			'items_per_page'  => 10
+  			'items_per_page'  => 10,
+  			'includes'        => nil # Hash of association includes
+  			                         # {
+  			                         #   search_field_1 => [association_name, join_table, column_name],
+  			                         #   search_field_2 => [association_name, join_table, column_name]
+  			                         # }
   		}      
   		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] }
   		fix_desc
-  		@options['item_count'] = @options['model'].constantize.where(where).count  		  		
+  		   		
+  		@options['item_count'] = model_with_includes.where(where).count  		  		
+  	end
+  	
+  	def model_with_includes
+  	  m = @options['model'].constantize
+  		return m if @options['includes'].nil?
+  		
+  		associations = []
+  		@options['includes'].each do |field, arr|
+  		  next if @params[field].nil? || (@params[field].kind_of?(String) && @params[field].length == 0)
+        associations << arr[0]
+      end      
+  		associations.uniq.each { |assoc| m = m.includes(assoc) }
+  		return m
+  	end
+  	
+  	def table_name_of_association(assoc)  	    	  
+  	  return @options['model'].constantize.reflect_on_association(assoc.to_sym).class_name.constantize.table_name
   	end
   	
   	def fix_desc
@@ -61,13 +94,25 @@ module Caboose
       return true
   	end
   	
-  	def items
-    	assoc = @options['model'].constantize.where(where)
+  	def items  		
+  		assoc = model_with_includes.where(where)
     	if @options['items_per_page'] != -1
     	  assoc = assoc.limit(limit).offset(offset)
     	end
     	return assoc.reorder(reorder).all
   	end
+  	
+  	def all_items
+  	  return model_with_includes.where(where).all
+    end
+  	
+  	def item_values(attribute)
+  	  arr = []
+  	  model_with_includes.where(where).all.each do |m|
+  	    arr << m[attribute]
+  	  end    	
+    	return arr.uniq
+    end  	  
   		
   	def generate
   	    	  
@@ -137,7 +182,8 @@ module Caboose
   	        vars.push("#{k}[]=#{v2}") if !v2.nil? && v2.length > 0
   	      end
   	    else  	      
-  	      vars.push("#{k}=#{v}") if !v.nil? && v.length > 0
+  	      next if v.nil? || (v.kind_of?(String) && v.length == 0)
+  	      vars.push("#{k}=#{v}")
   	    end  	      	    
   	  end
   	  return URI.escape(vars.join('&'))
@@ -158,30 +204,45 @@ module Caboose
     
     def where
       sql = []
-      values = []      
+      values = []
+      table = @options['model'].constantize.table_name      
   	  @params.each do |k,v|
-        next if v.nil? || v.length == 0
+        next if v.nil? || (v.kind_of?(String) && v.length == 0)
+        
+        col = nil        
+        if @options['includes'] && @options['includes'].include?(k)           
+          arr = @options['includes'][k]
+          col = "#{table_name_of_association(arr[0])}.#{arr[1]}"
+        end        
         
         sql2 = ""
         if k.ends_with?('_gte')
-          sql2 = "#{k[0..-5]} >= ?"
+          col = "#{table}.#{k[0..-5]}" if col.nil?
+          sql2 = "#{col} >= ?"
         elsif k.ends_with?('_gt')
-          sql2 = "#{k[0..-4]} > ?"
+          col = "#{table}.#{k[0..-4]}" if col.nil?
+          sql2 = "#{col} > ?"
         elsif k.ends_with?('_lte')
-          sql2 = "#{k[0..-5]} <= ?"
+          col = "#{table}.#{k[0..-5]}" if col.nil?
+          sql2 = "#{col} <= ?"
         elsif k.ends_with?('_lt')
-          sql2 = "#{k[0..-4]} < ?"
+          col = "#{table}.#{k[0..-4]}" if col.nil?          
+          sql2 = "#{col} < ?"
         elsif k.ends_with?('_bw')
-          sql2 = "upper(#{k[0..-4]}) like ?"
+          col = "#{table}.#{k[0..-4]}" if col.nil?
+          sql2 = "upper(#{col}) like ?"
           v = v.kind_of?(Array) ? v.collect{ |v2| "#{v2}%".upcase } : "#{v}%".upcase          
         elsif k.ends_with?('_ew')
-          sql2 = "upper(#{k[0..-4]}) like ?"
+          col = "#{table}.#{k[0..-4]}" if col.nil?
+          sql2 = "upper(#{col}) like ?"
           v = v.kind_of?(Array) ? v.collect{ |v2| "%#{v2}".upcase } : "%#{v}".upcase
         elsif k.ends_with?('_like')
-          sql2 = "upper(#{k[0..-6]}) like ?"
+          col = "#{table}.#{k[0..-6]}" if col.nil?
+          sql2 = "upper(#{col}) like ?"
           v = v.kind_of?(Array) ? v.collect{ |v2| "%#{v2}%".upcase } : "%#{v}%".upcase
-        else          
-          sql2 = "#{k} = ?"
+        else
+          col = "#{table}.#{k}" if col.nil?
+          sql2 = "#{col} = ?"
         end
         
         if v.kind_of?(Array)

data/app/models/caboose/utilities/schema.rb

@@ -6,6 +6,11 @@ class Caboose::Utilities::Schema
     return nil
   end
   
+  # Columns (in order) that were removed in the development of the gem.
+  def self.removed_columns
+    return nil
+  end
+  
   # Any column indexes that need to exist in the database
   def self.indexes
     return nil      
@@ -29,7 +34,9 @@ class Caboose::Utilities::Schema
   def self.create_schema
     return if self.schema.nil?
     
-    rename_tables            
+    rename_tables
+    remove_columns
+    
     c = ActiveRecord::Base.connection
     self.schema.each do |model, columns|
       tbl = model.table_name
@@ -53,6 +60,7 @@ class Caboose::Utilities::Schema
         else          
           
           # Add a temp column
+          c.remove_column tbl, "#{col[0]}_temp" if c.column_exists?(tbl, "#{col[0]}_temp")
           if col.count > 2
             c.add_column tbl, "#{col[0]}_temp", col[1], col[2]
           else
@@ -105,6 +113,17 @@ class Caboose::Utilities::Schema
     self.renamed_tables.each do |old_name, new_name|
       c.rename_table old_name, new_name if c.table_exists?(old_name)
     end
-  end    
+  end
+  
+  # Removes a set of tables 
+  def self.remove_columns
+    return if self.removed_columns.nil?
+    c = ActiveRecord::Base.connection
+    self.removed_columns.each do |model, columns|
+      columns.each do |col|
+        c.remove_column model.table_name, col if c.column_exists?(model.table_name, col)
+      end
+    end
+  end
   
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.99'
+  VERSION = '0.2.100'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.99
+  version: 0.2.100
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,6 +176,7 @@ files:
 - app/helpers/caboose/application_helper.rb
 - app/helpers/caboose/pages_helper.rb
 - app/helpers/caboose/permissions_helper.rb
+- app/helpers/caboose/products_helper.rb
 - app/models/caboose/approval_request.rb
 - app/models/caboose/asset.rb
 - app/models/caboose/authenticator.rb