From 67d4a2aa34eb29a2049dea6bbb5bda028d8f654d Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Fri, 6 Nov 2015 17:08:42 +0800
Subject: [PATCH] sandi metz function simplification

---
 app/controllers/synapses_controller.rb        |  3 +-
 app/controllers/users_controller.rb           |  2 -
 app/helpers/users_helper.rb                   | 21 ++--------
 app/models/user.rb                            | 39 ++++++++++++-------
 ...151028061513_metacode_asset_path_update.rb |  3 +-
 5 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/app/controllers/synapses_controller.rb b/app/controllers/synapses_controller.rb
index dc36ff28..2c3c08d0 100644
--- a/app/controllers/synapses_controller.rb
+++ b/app/controllers/synapses_controller.rb
@@ -50,8 +50,7 @@ class SynapsesController < ApplicationController
   
   # DELETE synapses/:id
   def destroy
-    @current = current_user
-    @synapse = Synapse.find(params[:id]).authorize_to_delete(@current)
+    @synapse = Synapse.find(params[:id]).authorize_to_delete(current_user)
     @synapse.delete if @synapse
       
     respond_to do |format|
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 683e6200..bb645614 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,5 +1,4 @@
 class UsersController < ApplicationController
-
   before_filter :require_user, only: [:edit, :update, :updatemetacodes]
     
   respond_to :html, :json 
@@ -14,7 +13,6 @@ class UsersController < ApplicationController
   # GET /users/:id/edit
   def edit
     @user = current_user
-    
     respond_with(@user)  
   end
   
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 977e5709..3c08494e 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -1,22 +1,9 @@
 module UsersHelper
-
-   ## this one is for building our custom JSON autocomplete format for typeahead
+  # build custom json autocomplete for typeahead
   def autocomplete_user_array_json(users)
-    temp = []
-    users.each do |u|
-      user = {}
-      user['id'] = u.id
-      user['label'] = u.name
-      user['value'] = u.name
-      user['profile'] = u.image.url(:sixtyfour)
-      user['mapCount'] = u.maps.count
-      user['generation'] = u.generation
-      user['created_at'] = u.created_at.strftime("%m/%d/%Y")
-      user['rtype'] = "mapper"
-      
-      temp.push user
+    json_users = []
+    users.each do |user|
+     json_users.push user.as_json_for_autocomplete
     end
-    return temp
   end
-  
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index f6b0d65a..a0966405 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -40,6 +40,7 @@ class User < ActiveRecord::Base
   # Validate the attached image is image/jpg, image/png, etc
   validates_attachment_content_type :image, :content_type => /\Aimage\/.*\Z/
 
+  # override default as_json
   def as_json(options={})
     { :id => self.id,
       :name => self.name,
@@ -47,27 +48,36 @@ class User < ActiveRecord::Base
       :admin => self.admin
     }
   end
+
+  def as_json_for_autocomplete
+    user = {}
+    user['id'] = u.id
+    user['label'] = u.name
+    user['value'] = u.name
+    user['profile'] = u.image.url(:sixtyfour)
+    user['mapCount'] = u.maps.count
+    user['generation'] = u.generation
+    user['created_at'] = u.created_at.strftime("%m/%d/%Y")
+    user['rtype'] = "mapper"
+  end
   
+  #generate a random 8 letter/digit code that they can use to invite people
   def generate_code
-    #generate a random 8 letter/digit code that they can use to invite people
 	  self.code = rand(36**8).to_s(36)
-
     $codes.push(self.code)
-
     self.generation = self.get_generation
   end
 
   def get_generation
-    if self.joinedwithcode == self.code
-      # if your joinedwithcode equals your code you must be GEN 0
-      gen = 0
-    elsif self.generation
-      # if your generation has already been calculated then just return that value
-      gen = self.generation
+    calculate_generation() if generation.nil?
+    generation
+  end
+
+  def calculate_generation
+    if code == joinedwithcode
+      update(generation: 0)
     else
-      # if your generation hasn't been calculated, base it off the
-      # generation of the person whose code you joined with + 1
-      gen = User.find_by_code(self.joinedwithcode).get_generation + 1
+      update(generation: User.find_by_code(joinedwithcode) + 1
     end
   end
   
@@ -75,13 +85,12 @@ class User < ActiveRecord::Base
     # make sure we always return a UserPreference instance
     if read_attribute(:settings).nil?
       write_attribute :settings, UserPreference.new
-      read_attribute :settings
-    else
-      read_attribute :settings
     end
+    read_attribute :settings
   end
   
   def settings=(val)
     write_attribute :settings, val
   end
+
 end
diff --git a/db/migrate/20151028061513_metacode_asset_path_update.rb b/db/migrate/20151028061513_metacode_asset_path_update.rb
index 062e9d7e..be3607d1 100644
--- a/db/migrate/20151028061513_metacode_asset_path_update.rb
+++ b/db/migrate/20151028061513_metacode_asset_path_update.rb
@@ -2,8 +2,7 @@ class MetacodeAssetPathUpdate < ActiveRecord::Migration
   def change
     Metacode.all.each do |metacode|
       if metacode.icon.start_with?("/assets/icons/")
-        metacode.icon = metacode.icon.gsub(/^\/assets\/icons/, "https://s3.amazonaws.com/metamaps-assets/metacodes")
-        metacode.save
+        metacode.update(icon: metacode.icon.gsub(/^\/assets\/icons/, "https://s3.amazonaws.com/metamaps-assets/metacodes"))
       end
     end
   end