Additional fixes in controllers

rohitpaulk · rohitpaulk · commit 033c01554305 · 2015-01-01T13:33:22.000+05:30
There were a few leftovers from rocket_tag in the networks, opportunities and protips controllers. + indentation fix on migration
diff --git a/Gemfile b/Gemfile
@@ -94,6 +94,9 @@ gem 'foreman'
 # Better logging
 gem 'awesome_print'
 
+# Tagging
+gem 'acts-as-taggable-on', '~> 3.4'
+
 gem 'faraday', '~> 0.8.1'
 gem 'metamagic'
 
@@ -135,12 +138,6 @@ gem 'mongoid'
 gem 'mongo'
 gem 'mongoid_taggable'
 gem 'bson_ext'
-#Tagging
-gem 'rocket_tag'
-gem 'squeel', '1.0.1'
-
-gem 'acts-as-taggable-on', '~> 3.4'
-
 gem 'strong_parameters'
 gem 'postgres_ext'
 # ElasticSearch client
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -477,8 +477,6 @@ GEM
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    polyamorous (0.5.0)
-      activerecord (~> 3.0)
     polyglot (0.3.5)
     poro_plus (1.0.2)
     posix-spawn (0.3.9)
@@ -595,9 +593,6 @@ GEM
     rest-client (1.7.2)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rocket_tag (0.5.6)
-      activerecord (>= 3.2.0)
-      squeel (~> 1.0.0)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -690,10 +685,6 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    squeel (1.0.1)
-      activerecord (~> 3.0)
-      activesupport (~> 3.0)
-      polyamorous (~> 0.5.0)
     strong_parameters (0.2.3)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
@@ -858,7 +849,6 @@ DEPENDENCIES
   redcarpet
   redis-rails (~> 3.2)
   rest-client
-  rocket_tag
   rspec-rails
   rubocop
   ruby-progressbar
@@ -875,7 +865,6 @@ DEPENDENCIES
   slim-rails
   spring
   spring-commands-rspec
-  squeel (= 1.0.1)
   stripe!
   stripe-ruby-mock!
   strong_parameters
diff --git a/app/controllers/networks_controller.rb b/app/controllers/networks_controller.rb
@@ -41,7 +41,7 @@ def members
 
   def show
     @protips = []
-    @topics  = @network.tags
+    @topics  = @network.tag_list
 
     if (params[:sort].blank? && params[:filter].blank?) || params[:sort] == 'upvotes'
       @protips      = @network.most_upvoted_protips(@per_page, @page)
@@ -141,7 +141,7 @@ def destroy
 
   def add_tag
     tag = params[:tag]
-    @network.tags << tag
+    @network.tag_list.add(tag)
 
     respond_to do |format|
       if @network.save
@@ -155,8 +155,8 @@ def add_tag
   end
 
   def remove_tag
-    tag           = params[:tag]
-    @network.tags = @network.tags.delete(tag)
+    tag = params[:tag]
+    @network.tag_list.remove(tag)
 
     respond_to do |format|
       if @network.save
@@ -171,7 +171,7 @@ def remove_tag
 
   def update_tags
     tags          = params[:tags][:tags]
-    @network.tags = tags.split(',').map(&:strip).select { |tag| Tag.exists?(name: tag) }
+    @network.tag_list = tags.split(',').map(&:strip).select { |tag| Tag.exists?(name: tag) }
 
     respond_to do |format|
       if @network.save
diff --git a/app/controllers/opportunities_controller.rb b/app/controllers/opportunities_controller.rb
@@ -1,7 +1,7 @@
 class OpportunitiesController < ApplicationController
   before_action :lookup_team, only: [:activate, :deactivate, :new, :create, :edit, :update, :visit]
   before_action :lookup_opportunity, only: [:edit, :update, :activate, :deactivate, :visit]
-  before_action :cleanup_params_to_prevent_rocket_tag_error
+  before_action :cleanup_params_to_prevent_tagging_error
   before_action :validate_permissions, only: [:new, :edit, :create, :update, :activate, :deactivate]
   before_action :verify_payment, only: [:new, :create]
   before_action :stringify_location, only: [:create, :update]
@@ -131,10 +131,10 @@ def header_ok
     end
   end
 
-  def cleanup_params_to_prevent_rocket_tag_error
-    if params[:opportunity] && params[:opportunity][:tags]
-      params[:opportunity][:tags] = "#{params[:opportunity][:tags]}".split(',').map(&:strip).reject(&:empty?).join(",")
-      params[:opportunity][:tags] = nil if params[:opportunity][:tags].strip.blank?
+  def cleanup_params_to_prevent_tagging_error
+    if params[:opportunity] && params[:opportunity][:tag_list]
+      params[:opportunity][:tag_list] = "#{params[:opportunity][:tag_list]}".split(',').map(&:strip).reject(&:empty?).join(",")
+      params[:opportunity][:tag_list] = nil if params[:opportunity][:tag_list].strip.blank?
     end
   end
 
@@ -151,7 +151,7 @@ def all_job_locations
   end
 
   def all_job_skills
-    Rails.cache.fetch('job_skills', expires_in: 23.hours) { Opportunity.all.flat_map(&:tags).uniq.compact }
+    Rails.cache.fetch('job_skills', expires_in: 23.hours) { Opportunity.all.flat_map(&:tag_list).uniq.compact }
   end
 
   def closest_to_user(user)
diff --git a/app/controllers/protips_controller.rb b/app/controllers/protips_controller.rb
@@ -187,7 +187,7 @@ def create
   def update
     # strong_parameters will intentionally fail if a key is present but has an empty hash. :(
     update_params = if params[:protip] && params[:protip].keys.present?
-                      params.require(:protip).permit(:title, :body, :user_id, topic_list: [])
+                      params.require(:protip).permit(:title, :body, :user_id, :topic_list)
                     else
                       {}
                     end
diff --git a/config/initializers/acts_as_taggable_on.rb b/config/initializers/acts_as_taggable_on.rb
@@ -1,2 +1,3 @@
+# Replace this with default parser before upgrading to AATO 4.0+
 ActsAsTaggableOn.delimiter = [' ', ',']
 ActsAsTaggableOn.force_lowercase = true
diff --git a/db/migrate/20141231203425_replace_rocket_tag_with_aato.rb b/db/migrate/20141231203425_replace_rocket_tag_with_aato.rb
@@ -1,12 +1,12 @@
 class ReplaceRocketTagWithAato < ActiveRecord::Migration
   def up
-  	# This was created by rocket_tag but not used anywhere.
-  	drop_table :alias_tags
+    # This was created by rocket_tag but not used anywhere.
+    drop_table :alias_tags
 
-  	# This is something that AATO has that rocket_tag doesn't.
-  	add_column :tags, :taggings_count, :integer, default: 0
+    # This is something that AATO has that rocket_tag doesn't.
+    add_column :tags, :taggings_count, :integer, default: 0
 
-  	# Populate the taggings_count properly
+    # Populate the taggings_count properly
     ActsAsTaggableOn::Tag.reset_column_information
     ActsAsTaggableOn::Tag.find_each do |tag|
       ActsAsTaggableOn::Tag.reset_counters(tag.id, :taggings)
@@ -22,6 +22,6 @@ def up
   end
 
   def down
-  	raise ActiveRecord::IrreversibleMigration
+    raise ActiveRecord::IrreversibleMigration
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+# Replace this with default parser before upgrading to AATO 4.0+`
`1`	`2`	`ActsAsTaggableOn.delimiter = [' ', ',']`
`2`	`3`	`ActsAsTaggableOn.force_lowercase = true`