Rails 3.1 support

Author: JasonBarnabe

.gitignore

@@ -3,3 +3,4 @@ db/*.sqlite3
 log/*.log
 tmp/
 db
+log/development.sphinx.pid

Gemfile

@@ -2,21 +2,20 @@ source 'http://rubygems.org'
 
 ruby '1.9.3'
 
-gem 'rails', '3.0.20'
+gem 'rails', '~> 3.1.3'
 
-#============= WARNING FROM mysql2 =============
-#This version of mysql2 (0.3.13) doesn't ship with the ActiveRecord adapter.
-#In Rails version 3.1.0 and up, the mysql2 ActiveRecord adapter is included with rails.
-#If you want to use the mysql2 gem with Rails <= 3.0.x, please use the latest mysql2 in the 0.2.x series.
-gem 'mysql2', '~> 0.2.0'
+gem 'mysql2', '~> 0.3.0'
 
 gem 'sanitize'
 
 gem 'csspool', '4.0.0'
 
 gem 'public_suffix'
-gem 'thinking-sphinx', '~> 2.0.14'
-gem 'ts-delayed-delta', '~> 1.1.2'
+gem 'thinking-sphinx', '~> 3.0.0'
+gem 'ts-delayed-delta', '~> 2.0.0'
+gem 'delayed_job', '~> 4.0.0'
+gem 'delayed_job_active_record', '~> 4.0.0'
+
 gem 'will_paginate', '~> 3.0'
 
 gem 'ruby-openid'

Gemfile.lock

@@ -1,91 +1,109 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.20)
-      actionpack (= 3.0.20)
-      mail (~> 2.2.19)
-    actionpack (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.5)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-    activesupport (3.0.20)
-    arel (2.0.10)
-    builder (2.1.2)
+    actionmailer (3.1.12)
+      actionpack (= 3.1.12)
+      mail (~> 2.4.4)
+    actionpack (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.12)
+      activesupport (= 3.1.12)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
+    activesupport (3.1.12)
+      multi_json (~> 1.0)
+    arel (2.2.3)
+    builder (3.0.4)
     csspool (4.0.0)
     delayed_job (4.0.0)
       activesupport (>= 3.0, < 4.1)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
+    delayed_job_active_record (4.0.0)
+      activerecord (>= 3.0, < 4.1)
+      delayed_job (>= 3.0, < 4.1)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.5)
+    innertube (1.1.0)
     json (1.8.1)
-    mail (2.2.20)
-      activesupport (>= 2.3.6)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    middleware (0.1.0)
     mime-types (1.25)
     mini_portile (0.5.1)
-    mysql2 (0.2.20)
+    multi_json (1.8.2)
+    mysql2 (0.3.13)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     polyglot (0.3.3)
     public_suffix (1.3.1)
-    rack (1.2.8)
-    rack-mount (0.6.14)
+    rack (1.3.10)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.0.20)
-      actionmailer (= 3.0.20)
-      actionpack (= 3.0.20)
-      activerecord (= 3.0.20)
-      activeresource (= 3.0.20)
-      activesupport (= 3.0.20)
+    rails (3.1.12)
+      actionmailer (= 3.1.12)
+      actionpack (= 3.1.12)
+      activerecord (= 3.1.12)
+      activeresource (= 3.1.12)
+      activesupport (= 3.1.12)
       bundler (~> 1.0)
-      railties (= 3.0.20)
-    railties (3.0.20)
-      actionpack (= 3.0.20)
-      activesupport (= 3.0.20)
+      railties (= 3.1.12)
+    railties (3.1.12)
+      actionpack (= 3.1.12)
+      activesupport (= 3.1.12)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (~> 0.14.6)
     rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
     riddle (1.5.9)
     ruby-openid (2.3.0)
     sanitize (2.0.6)
       nokogiri (>= 1.4.4)
-    thinking-sphinx (2.0.14)
-      activerecord (>= 3.0.3)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thinking-sphinx (3.0.6)
+      activerecord (>= 3.1.0)
       builder (>= 2.1.2)
-      riddle (>= 1.5.3)
+      innertube (>= 1.0.2)
+      middleware (>= 0.1.0)
+      riddle (>= 1.5.9)
     thor (0.14.6)
+    tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    ts-delayed-delta (1.1.3)
-      delayed_job (>= 2.0.4)
-      thinking-sphinx (>= 1.3.6)
+    ts-delayed-delta (2.0.0)
+      delayed_job
+      thinking-sphinx
     tzinfo (0.3.38)
     will_paginate (3.0.5)
 
@@ -94,11 +112,13 @@ PLATFORMS
 
 DEPENDENCIES
   csspool (= 4.0.0)
-  mysql2 (~> 0.2.0)
+  delayed_job (~> 4.0.0)
+  delayed_job_active_record (~> 4.0.0)
+  mysql2 (~> 0.3.0)
   public_suffix
-  rails (= 3.0.20)
+  rails (~> 3.1.3)
   ruby-openid
   sanitize
-  thinking-sphinx (~> 2.0.14)
-  ts-delayed-delta (~> 1.1.2)
+  thinking-sphinx (~> 3.0.0)
+  ts-delayed-delta (~> 2.0.0)
   will_paginate (~> 3.0)

app/controllers/application_controller.rb

@@ -70,9 +70,9 @@ def consumer
                 return @consumer
         end
 
-        $sorts_map = {'name' => 'short_description', 'total_installs' => 'total_install_count', 'installs_this_week' => 'weekly_install_count', 'created_date' => 'created', 'updated_date' => 'updated', 'popularity' => 'popularity_score', 'relevance' => '@relevance, popularity_score'}
+        $sorts_map = {'name' => 'short_description', 'total_installs' => 'total_install_count', 'installs_this_week' => 'weekly_install_count', 'created_date' => 'created', 'updated_date' => 'updated', 'popularity' => 'popularity_score', 'relevance' => 'myweight, popularity_score'}
 
-        $new_sorts_map = {'name' => 'name DIR', 'total_installs' => 'total_install_count DIR', 'installs_this_week' => 'weekly_install_count DIR', 'created_date' => 'created DIR', 'updated_date' => 'updated DIR', 'popularity' => 'popularity DIR', 'relevance' => '@relevance DIR, popularity DIR'}
+        $new_sorts_map = {'name' => 'name DIR', 'total_installs' => 'total_install_count DIR', 'installs_this_week' => 'weekly_install_count DIR', 'created_date' => 'created DIR', 'updated_date' => 'updated DIR', 'popularity' => 'popularity DIR', 'relevance' => 'myweight DIR, popularity DIR'}
 
 
         private

app/controllers/styles_controller.rb

@@ -443,39 +443,27 @@ def browse
 			new_search_conditions[:category] = category
 		elsif category == 'appnone'
 			#condition += " AND category = 'app' AND subcategory IS NULL"
-			#@use_new_search = false
 			new_search_conditions[:category] = 'app'
 			new_search_conditions[:subcategory] = 'none'
 		elsif category == 'sitenone'
 			#condition += " AND category = 'site' AND subcategory IS NULL"
-			#@use_new_search = false
 			new_search_conditions[:category] = 'site'
 			new_search_conditions[:subcategory] = 'none'
 		elsif category == 'globalnone'
 			#condition += " AND category = 'global' AND subcategory IS NULL"
-			#@use_new_search = false
 			new_search_conditions[:category] = 'global'
 			new_search_conditions[:subcategory] = 'none'
 		else
 			@bc_category = 'site'
 			category = Style.get_subcategory_for_domain(category)
 			@bc_subcategory = category
-			#condition += " AND subcategory = '#{Style.connection.quote_string(category)}'"
 			new_search_conditions[:subcategory] = Riddle.escape(category)
 		end
-		#options[:conditions] = condition
 
-		#if @use_new_search
-			if !$new_sorts_map.keys.include?(params[:sort])
-				params[:sort] = nil
-			end
-			sort = $new_sorts_map[params[:sort] || 'relevance']
-		#else
-		#	if !$sorts_map.keys.include?(params[:sort])
-		#		params[:sort] = nil
-		#	end
-		#	sort = $sorts_map[params[:sort] || 'relevance']
-		#end
+		if !$new_sorts_map.keys.include?(params[:sort])
+			params[:sort] = nil
+		end
+		sort = $new_sorts_map[params[:sort] || 'relevance']
 
 		sort_direction = params[:sort_direction].nil? ? 'desc' : params[:sort_direction].downcase
 		if sort_direction != 'desc'
@@ -490,35 +478,33 @@ def browse
 			params[:per_page] = nil
 		end
 
-		#if @use_new_search
-			# relevant is irrelevant when there are no terms
-			if keywords.nil? and sort == '@relevance DIR, popularity DIR'
-				new_sort = $new_sorts_map['popularity']
-			else
-				new_sort = sort
-			end
-			begin 
-				@styles = Style.search keywords, :match_mode => :extended, :page => params[:page], :order => new_sort.gsub('DIR', sort_direction.upcase), :per_page => options[:per_page], :conditions => new_search_conditions, :populate => true
-				@no_ads = @styles.empty?
-			rescue ThinkingSphinx::SphinxError
-				# back to the main listing
-				redirect_to :controller => 'styles', :action => 'browse', :category => nil, :search_terms => nil
-				return
-			rescue Riddle::OutOfBoundsError
-				# same url, minus the page param
-				redirect_to :controller => 'styles', :action => 'browse', :search_terms => params[:search_terms], :category => params[:category], :format => params[:format], :sort => params[:sort], :sort_direction => params[:sort_direction]
-				return
-			end
-		#else
-		#	@styles = Style.paginate(:all, options)
-		#end
+		# weight is irrelevant when there are no terms
+		if keywords.nil? and sort == 'myweight DIR, popularity DIR'
+			new_sort = $new_sorts_map['popularity']
+		else
+			new_sort = sort
+		end
+		begin 
+			@styles = Style.search keywords, :match_mode => :extended, :page => params[:page], :order => new_sort.gsub('DIR', sort_direction.upcase), :per_page => options[:per_page], :conditions => new_search_conditions, :populate => true, :select => 'weight() myweight'
+			@no_ads = @styles.empty?
+		#rescue ThinkingSphinx::SphinxError => e
+			# back to the main listing, unless we're already there
+		#	raise e if params[:category].nil? and params[:search_terms].nil? and params[:page].nil? and params[:order].nil? and params[:sort].nil? and params[:sort_direction].nil?
+		#	redirect_to :controller => 'styles', :action => 'browse', :category => nil, :search_terms => nil
+		#	return
+		rescue Riddle::OutOfBoundsError
+			# same url, minus the page param
+			redirect_to :controller => 'styles', :action => 'browse', :search_terms => params[:search_terms], :category => params[:category], :format => params[:format], :sort => params[:sort], :sort_direction => params[:sort_direction]
+			return
+		end
+			
 		if search_terms.nil?
 			if !category.nil?
 				c = category
 				c = 'app' if c == 'appnone'
 				@page_title = "#{c.capitalize} themes and skins"
 				@meta_description = "A listing of #{c.capitalize} user styles."
-			elsif sort == '@relevance DIR, popularity DIR' and sort_direction == 'desc'
+			elsif sort == 'myweight DIR, popularity DIR' and sort_direction == 'desc'
 				@page_title = 'Top themes and skins'
 				@meta_description = "A listing of the top user styles that you can customize your browser with." 
 			elsif sort == 'updated DIR' and sort_direction == 'desc'

app/indices/style_index.rb

@@ -0,0 +1,25 @@
+ThinkingSphinx::Index.define :style, :with => :active_record, :delta => ThinkingSphinx::Deltas::DelayedDelta do
+
+	# fields
+	indexes short_description, :as => :name, :sortable => true
+	indexes long_description, :as => :description
+	indexes additional_info
+	indexes category
+	indexes 'IF(ISNULL(subcategory), "none", subcategory)', :as => :subcategory
+	indexes user.name, :as => :author
+
+	# attributes
+	has :popularity_score, :as => :popularity
+	has :created, :updated, :total_install_count, :weekly_install_count, :rating
+
+	where 'obsolete = 0'
+
+	set_property :field_weights => {
+		:subcategory => 10,
+		:name => 5,
+		:author => 5,
+		:description => 2,
+		:additional_info => 1
+	}
+
+end