caboose-cms 0.4.98 → 0.4.99

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjYzN2Q2YWFlN2Y5NDEwNTJlMzhhYWY4MTUyMWU5YTg4NTlhMjhiYQ==
+    ZGExNDQyODU4OTg2YmNhMDQyNDNlMThiYWIyOTY0NjAxMjU2MzkyNA==
   data.tar.gz: !binary |-
-    MTMwYjNkNzg1YjkyYzQ3OGNjMDEzMmQ5NThiMTI2YjkyMzc1OTM2MQ==
+    MjcwZThhMzJmNjkwNWM5NGIyN2U2MjIwOTAzN2ZjNDYyYmZkNTc0OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MGEwZWMxZDJiZmJkYWQ1ODVjYTY3NmI3MmM1YmZiZWNjYWM2MTA4M2E5YjNj
-    MTYxMjhmNzljNzVlZWNjZGUyNWFhNDhiNzhiMjFlOTU4ZjYyMzgwMGQzZjA3
-    MDc1MzNjZTM0ZDQzNTExMjQ1ODYxN2M0Mzk4Y2M0NmIxZDVlMzY=
+    ZmQ0MWYxNzQ0Zjc5NjE3Yzk2Y2JhMTZjNDFjYmI4YTA5MTJlNWRmODY2Zjgz
+    NmFmYzViMDMwOWMyZGE5MWIxZTNkZjdiMmRhNjJhZjA3ZWNmZWQ3YmQ5ODI2
+    ZmFkMjI5ZWQ2ZDk2MWNmOTk4YjkyYjczZjIyMjMyOTVhZWFiYWM=
   data.tar.gz: !binary |-
-    YTkwN2YxYTYyOWJiYzU5ZjQ1NTE1YTIyNmUyODJlODQ4NDk4ZDVjMzBhYjdi
-    YWVhMmZhYTcwY2FkZDQ3NzcyZTc5OTQ5YjA3M2QxNDYxYjM3YzVjYWRkM2Ex
-    NjlmNGJmZDBjZmI0YjI3OWYzYTkwNjJkMmMwMTI5N2Y2M2NlN2I=
+    YmI2MzlhMzM0ZTJmYTgxMWMwMjIwNjVmZDY1ZDBlMjIwNjQ5YmJhNDJlOWZl
+    YmI0ZWExOGVjYTdmNDVjOTc3NjhiYTU4NGI5MjQ0NzJiYzJmOGZiYjFjMzI5
+    YjdkYjVkMzllNDUxOTE4Mzg5Y2Y4M2I2OGMxNzFjMTI0MjI3ZDE=

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 :original_params, :params, :options, :custom_url_vars    
+    attr_accessor :original_params, :params, :options, :custom_url_vars, :post_get    
   	
     #def initialize(post_get, params = nil, options = nil, &custom_url_vars = nil)
   	def initialize(post_get, params = nil, options = nil)
@@ -31,6 +31,7 @@ module Caboose
   	  
   		# Note: a few keys are required:
   		# base_url, page, itemCount, itemsPerPage
+  		@post_get = post_get
   		@original_params = {}
   		@params = {}
   		@options = {
@@ -83,7 +84,10 @@ module Caboose
   	end
   	
   	def set_item_count
-  	  @options['item_count'] = model_with_includes.where(where).count
+  	  m = model_with_includes.where(self.where)
+  	  n = self.near
+  	  m = m.near(n[0], n[1]) if n
+  	  @options['item_count'] = m.count
   	end
   	
   	def model_with_includes
@@ -146,21 +150,29 @@ module Caboose
   	end
   	
   	def items        		
-  		assoc = model_with_includes.where(where)
+  	  assoc = model_with_includes.where(self.where)
+      n = self.near
+      assoc = assoc.near(n[0], n[1]) if n  		
     	if @options['items_per_page'] != -1
-    	  assoc = assoc.limit(limit).offset(offset)
+    	  assoc = assoc.limit(self.limit).offset(self.offset)
     	end
-    	return assoc.reorder(reorder).all
+    	return assoc.reorder(self.reorder).all
   	end
   	
   	def all_items
-  	  return model_with_includes.where(where).all
+  	  m = model_with_includes.where(self.where)
+  	  n = self.near
+  	  m = m.near(n[0], n[1]) if n
+  	  return m.all
     end
   	
   	def item_values(attribute)
   	  arr = []
-  	  model_with_includes.where(where).all.each do |m|
-  	    arr << m[attribute]
+  	  m = model_with_includes.where(self.where)
+  	  n = self.near
+  	  m = m.near(n[0], n[1]) if n
+  	  m.all.each do |m2|  	  
+  	    arr << m2[attribute]
   	  end    	
     	return arr.uniq
     end  	  
@@ -305,6 +317,7 @@ module Caboose
       table = @options['model'].constantize.table_name      
   	  @params.each do |k,v|
         next if v.nil? || (v.kind_of?(String) && v.length == 0)
+        next if k.ends_with?('_near')
         
         col = nil        
         if @options['includes'] && @options['includes'].include?(k)           
@@ -396,6 +409,21 @@ module Caboose
   	  return sql        	  
     end
     
+    def near      
+  	  @params.each do |k,v|
+        next if !k.ends_with?('_near')        
+        arr = k.split('_')
+        if arr.length == 3          
+          location = @post_get[arr[0]]
+          radius = @post_get[arr[1]]          
+          v = [location, radius] if location && radius && location.strip.length > 0 && radius.strip.length > 0
+        end                
+        next if v.nil? || !v.is_a?(Array) || v.count != 2
+        return v
+      end
+      return nil        	  
+    end
+    
     def limit
       return @options['items_per_page'].to_i
     end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.98'
+  VERSION = '0.4.99'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.98
+  version: 0.4.99
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails