jakewendt-active_record_sunspotter 4.2.3 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6810cf2b3c02218cc34009c92e9e1ecb08660ea0
-  data.tar.gz: 3e9be60fba6f8cae035a2db6f11811c8defd2213
+  metadata.gz: 35f83b3ce50782184ab2796a0494209427149d6a
+  data.tar.gz: b8d8f067f22acdf040dd60f403242a5a4480fcbc
 SHA512:
-  metadata.gz: f011ea06d05c0627205cca1ec6b7989d3b2b22c62fb44af5f37789c6bb55ea610bb7b6d13bcca21171d9ae998acd11a757e42de0b270ba44fb5615bb5394e1b3
-  data.tar.gz: 2f2515f9c60cd4cbd86601ca5b94b1e075d0d046862cd3abd57d56d64fefbbeda8c890518ee06b9a6cd1d9bd71f614ce327e3bb0f464a6059ff3b077551350b3
+  metadata.gz: adc093eabbd67feff1b5b7e6cf4cccd8b71f1cf6a7ea72dc11e911e15c485142783ae6867a7dcb1e027cfa3174234c09b7b656e31dc6c523f7c383780978777f
+  data.tar.gz: e3208e3f2211fe1596df752e4fe7634edeaf8c9b98fd675bfe4cd92096252d7858959930b697cca6fbfe67929164a2cafb1a6e26ac4e027e2073b2a04e2a0ac9

data/lib/active_record_sunspotter/search_sunspot_for.rb

@@ -77,6 +77,9 @@ module ActiveRecordSunspotter::SearchSunspotFor
 
 						end	#	if params[p]
 
+#if f.type == :dynamic
+#	dynamic f.namespace { facet f.
+#else
 						#	facet.sort
 						#	This param determines the ordering of the facet field constraints.
 						#	    count - sort the constraints by count (highest count first)
@@ -90,6 +93,7 @@ module ActiveRecordSunspotter::SearchSunspotFor
 						#	put this inside the else condition as the if block is
 						#	for ranges and it calls facet
 						facet p.to_sym, :sort => :index if f.facetable
+#end
 
 					end
 

data/lib/active_record_sunspotter/sunspot_column.rb

@@ -4,6 +4,7 @@ class ActiveRecordSunspotter::SunspotColumn < OpenStruct
 	def initialize(*args)
 		#	some sensible defaults
 		default_options = {
+			:group     => 'Main',
 			:type      => :string, 
 			:orderable => true, 
 			:facetable => false, 
@@ -16,13 +17,7 @@ class ActiveRecordSunspotter::SunspotColumn < OpenStruct
 			options[:name] = args.first.to_s
 		end
 
-#		if( options[:type] == :null_yndk_string ) && options[:meth].blank?
-#			options[:meth] = ->(s){ YNDK[s.send(:name)]||'NULL' }
-#			options[:type] = :string
-#		end
-
 		default_options.update(options)
-#		default_options[:orderable] = false if options[:type] == :multistring
 		default_options[:orderable] = false if options[:multiple]
 		default_options[:filterable] = true if options[:facetable]
 		super default_options

data/lib/active_record_sunspotter/sunspot_helper.rb

@@ -89,8 +89,7 @@ module ActiveRecordSunspotter::SunspotHelper
 			next if row.value.blank?
 
 			label = if col.ranges
-				col.ranges.detect{|r|
-					r[:range].to_s == row.value.to_s }[:name] || 'RANGE NOT FOUND'
+				col.ranges.detect{|r| r[:range].to_s == row.value.to_s }[:name] || 'RANGE NOT FOUND'
 			else
 				row.value
 			end

data/lib/active_record_sunspotter/sunspotability.rb

@@ -6,19 +6,23 @@ module ActiveRecordSunspotter::Sunspotability
 			#
 			#	MUST delay execution of code until included as cattr_accessor is ActiveRecord specific
 			#
-			cattr_accessor :all_sunspot_columns
-			self.all_sunspot_columns = []		#	order is only relevant to the facets
+			cattr_accessor :sunspot_columns
+			cattr_accessor :sunspot_column_groups
+			self.sunspot_columns = []		#	order is only relevant to the facets
+			self.sunspot_column_groups = []
 		end
 	end
 
 	module ClassMethods
 
 		def add_sunspot_column(*args)
-			all_sunspot_columns.push( ActiveRecordSunspotter::SunspotColumn.new( *args ) )
+			new_column = ActiveRecordSunspotter::SunspotColumn.new( *args )
+			sunspot_columns.push( new_column )
+			sunspot_column_groups.push( new_column.group ) unless sunspot_column_groups.include?( new_column.group )
 		end
 	
 		def sunspot_orderable_columns
-			all_sunspot_columns.select{|c|c.orderable}
+			sunspot_columns.select{|c|c.orderable}
 		end
 	
 		def sunspot_orderable_column_names
@@ -26,7 +30,7 @@ module ActiveRecordSunspotter::Sunspotability
 		end
 	
 		def sunspot_default_columns
-			all_sunspot_columns.select{|c|c.default}
+			sunspot_columns.select{|c|c.default}
 		end
 	
 		def sunspot_default_column_names
@@ -34,23 +38,26 @@ module ActiveRecordSunspotter::Sunspotability
 		end
 	
 		def sunspot_all_filters
-			all_sunspot_columns.select{|c|c.filterable}
+			sunspot_columns.select{|c|c.filterable}
 		end
 
 		#	in the order that they will appear on the page
 		def sunspot_all_facets
-			all_sunspot_columns.select{|c|c.facetable}
+			sunspot_columns.select{|c|c.facetable}
 		end
 		def sunspot_all_facet_names
 			sunspot_all_facets.collect(&:name)
 		end
 	
-		def sunspot_columns
-			all_sunspot_columns
+		def all_sunspot_columns
+			sunspot_columns
 		end
+#		def sunspot_columns
+#			all_sunspot_columns
+#		end
 	
 		def sunspot_column_names
-			all_sunspot_columns.collect(&:name)
+			sunspot_columns.collect(&:name)
 		end
 	
 		def sunspot_available_column_names
@@ -58,21 +65,57 @@ module ActiveRecordSunspotter::Sunspotability
 		end
 	
 		def sunspot_date_columns
-			all_sunspot_columns.select{|c|c.type == :date }
+			sunspot_columns.select{|c|c.type == :date }
+		end
+
+		def sunspot_columns_in_group(group)
+			sunspot_columns.select{|c|c.group == group }
+		end
+		def sunspot_column_names_in_group(group)
+			sunspot_columns.select{|c|c.group == group }.collect(&:name).sort
 		end
 	
 		def searchable_plus(&block)
 			searchable do
-				#
-				#	Trying to simplify.  Simplify?  Minimize?
-				#	Will I need all of the above methods after this is done?
-				#
-#	.select{|c| c.facetable }
-#	or just use "sunspot_all_facets" instead of "all_sunspot_columns"
-#	WAIT!  If aren't indexed, then can't be sorted on.
-				all_sunspot_columns.select{|c| ![:boolean,:nulled_string].include?(c.type) }.each{|c|
+
+				sunspot_columns.select{|c| ![:boolean].include?(c.type) }.each{|c|
 					options = {}
 					options[:multiple] = true if( c.multiple )
+					options[:trie] = true if( [:integer,:float,:time].include?(c.type) )
+#					if c.type == :dynamic
+#						dynamic_string c.namespace do 
+#							c.kvp.call(self)
+#						end
+#					else
+						send( c.type, c.name, options ){
+							c.hash_table.has_key?(:meth) ? c.meth.call(self) : send( c.name )
+						}
+#					end
+				}
+	
+				#
+				#			yield if block_given?
+				#			yield block if block_given?
+				#
+				#
+				#	20140815 - Something like this is probably what is needed
+				#		could then possibly just override the searchable method.
+				#
+				#	instance_exec(&block)
+				#
+
+			end	
+			#
+			#	this works, but why can't I just yield inside the block
+			#
+			searchable &block if block_given?
+	
+		end
+
+	end	#	module ClassMethods
+
+end
+__END__
 #
 #	I don't think that trie works with :long or :double
 #	I got this when I tried a :double
@@ -81,7 +124,8 @@ module ActiveRecordSunspotter::Sunspotability
 #	I found documentation that says that Lucene/Solr should work for longs and doubles?
 #
 #
-#	these are missing in sunspot 2.0.  I added them in my taxonomy app
+#	these are missing in sunspot 2.0.  I added them in my taxonomy app.
+#	Still not in 2.1.1 sunspot-2.1.1/lib/sunspot/type.rb
 #
 #	module Sunspot::Type
 #		class TrieDoubleType < DoubleType
@@ -97,29 +141,10 @@ module ActiveRecordSunspotter::Sunspotability
 #	end
 #
 #					options[:trie] = true if( [:integer,:long,:double,:float,:time].include?(c.type) )
-					options[:trie] = true if( [:integer,:float,:time].include?(c.type) )
-					send( c.type, c.name, options ){
-						c.hash_table.has_key?(:meth) ? c.meth.call(self) : send( c.name )
-					}
-	#
-	#	booleans? nulled_strings?
-	#
-				}
-	
-	
-	#			yield if block_given?
-	#			yield block if block_given?
-			end	
-	
-	#	this works, but why can't I just yield inside the block
-			searchable &block if block_given?
-	
-		end
 
-	end	#	module ClassMethods
 
-end
-__END__
+
+
 
 What's the point of adding a column to the index that isn't faceted?
 It would basically just be useful as a column, which is why I was

data/vendor/assets/javascripts/sunspot.js

@@ -10,10 +10,12 @@ jQuery(function(){
 		jQuery(this).parent().next().toggle('blind',500);
 		jQuery(this).prev().toggleClass('ui-icon-triangle-1-e');
 		jQuery(this).prev().toggleClass('ui-icon-triangle-1-s');
+//	jQuery(this).parent().toggleClass('open');
 		return false;
 	});
 
-	jQuery( "#selected_columns, #unselected_columns" ).sortable({
+//	jQuery( "#selected_columns, #unselected_columns" ).sortable({
+	jQuery( ".selectable_columns" ).sortable({
 		connectWith: ".selectable_columns"
 	}).disableSelection();
 

data/vendor/assets/stylesheets/sunspot.css.scss

@@ -123,6 +123,7 @@ tr:nth-child(2n+1) { background-color: #F5F1E8; }
 		display:block;
 		padding: 5px;
 		border-top: 1px solid silver;
+		border-left: 1px solid silver;
 		background-color:#EEE;
 		text-align: left;
 		* {
@@ -139,6 +140,7 @@ tr:nth-child(2n+1) { background-color: #F5F1E8; }
 	}
 	div.facet_field {
 		display:none;
+		margin-left: 5px;
 		ul {
 			padding-left: 35px;
 		/* I want a 10px padding, but also want the wordwrap indented 

data/vendor/views/sunspot/_select_columns.html.erb

@@ -1,8 +1,13 @@
+<hr/>
 <div class="facet_toggle">
-<span class="ui-icon ui-icon-triangle-1-e">&nbsp;</span><a href="javascript:void(0)">Column Selection</a>
-</div>
-<div id='columns' class='facet_field'>
-	<p>Used Columns</p>
+<span class="ui-icon ui-icon-triangle-1-e">&nbsp;</span
+	><a href="javascript:void(0)">Column Selection</a>
+</div><!-- div class="facet_toggle" -->
+
+<!--<div id='columns' class='facet_field'> Is the id needed here? Doesn't appear so. -->
+<div class='facet_field'>
+	<p>Selected Columns</p>
+<!-- Is id needed for select all AND MORE IMPORTANTLY THE CONVERSION TO PARAMS QUERY -->
 	<ul id="selected_columns" class="selectable_columns">
 		<% columns.each do |column| %>
 			<%# NEED to find a way to use the id, but already using id matching these 
@@ -10,15 +15,44 @@
 			<%= content_tag(:li, column )%>
 		<% end %>
 	</ul>
-	<p>Unused Columns</p>
-	<ul id="unselected_columns" class="selectable_columns">
-		<% (@sunspot_search_class.sunspot_available_column_names - columns).each do |column| %>
-			<%# NEED to find a way to use the id, but already using id matching these 
-					column names in the facet selectors %>
-			<%= content_tag(:li, column )%>
+
+	<% if @sunspot_search_class.sunspot_column_groups.length > 1 %>
+		<p>Available Columns (now grouped)</p>
+	<% else %>
+		<p>Available Columns</p>
+	<% end %>
+	<!--<ul id="unselected_columns" class="selectable_columns"> id needed for select all-->
+
+	<% @sunspot_search_class.sunspot_column_groups.each do |group| %>
+
+		<% if @sunspot_search_class.sunspot_column_groups.length > 1 %>
+			<div class="facet_toggle">
+			<span class="ui-icon ui-icon-triangle-1-e">&nbsp;</span
+				><a href="javascript:void(0)"><%= group %></a>
+			</div><!-- div class="facet_toggle" -->
+			<div class='facet_field'>
 		<% end %>
-	</ul>
+
+			<ul class="selectable_columns">
+				<% @sunspot_search_class.sunspot_column_names_in_group(group).each do |column| %>
+					<% unless columns.include?( column ) %>
+						<%# NEED to find a way to use the id, but already using id matching these 
+								column names in the facet selectors %>
+						<%# 20141114 - WHY? I write comments like these without reasons? %>
+						<%= content_tag(:li, column )%>
+					<% end %><%# unless columns.include?( column ) %>
+				<% end %>
+			</ul>
+
+		<% if @sunspot_search_class.sunspot_column_groups.length > 1 %>
+			</div><!-- div class='facet_field' -->
+		<% end %>
+
+	<% end %><%# @sunspot_search_class.sunspot_column_groups.each do |group| %>
+
+<!--
 	<p><a id='select_all_columns' href="javascript:void(0)">Select All</a>&nbsp;
      <a id='unselect_all_columns' href="javascript:void(0)">Unselect All</a></p>
 	<p>too many columns can result in a uri which is too large.</p>
+-->
 </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jakewendt-active_record_sunspotter
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.3.0
 platform: ruby
 authors:
 - George 'Jake' Wendt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sunspot_rails