Merge pull request #156 from seuros/unused

seuros · seuros · commit d95155a87e4b · 2014-08-08T01:08:59.000+01:00
remove unused field
diff --git a/app/models/concerns/user_oauth.rb b/app/models/concerns/user_oauth.rb
@@ -20,7 +20,6 @@ def apply_oauth(oauth)
           self.twitter_token     = oauth[:credentials][:token]
           self.twitter_secret    = oauth[:credentials][:secret]
           self.about             = extract_from_oauth_extras(:description, oauth) if self.about.blank?
-          self.joined_twitter_on = extract_joined_on(oauth) if self.joined_twitter_on.blank?
         when 'developer'
           logger.debug "Using the Developer Strategy for OmniAuth"
           logger.ap oauth, :debug
@@ -45,7 +44,6 @@ def for_omniauth(auth)
       if user = find_with_oauth(auth)
         user.apply_oauth(auth)
         user.save! if user.changed?
-        return user
       else
         user = new(
             name: auth[:info][:name],
@@ -56,31 +54,21 @@ def for_omniauth(auth)
         user.avatar.download! avatar_url_for(auth)    unless Rails.env.test?
         user.apply_oauth(auth)
         user.username = auth[:info][:nickname]
-        return user
       end
+      user
     end
 
     def find_with_oauth(oauth)
       case oauth[:provider]
         when 'github'
-          github_scope = (oauth[:uid] ? where(github_id: oauth[:uid]) : where(github: oauth[:info][:nickname]))
-          raise "Not a unique github credential #{oauth[:uid] || oauth[:info][:nickname]}" if github_scope.count > 1
-          return github_scope.first
+          (oauth[:uid] ? find_by_github_id(oauth[:uid]) : find_by_github(oauth[:info][:nickname]))
         when 'linkedin'
-          linkedin_scope = where(linkedin_id: oauth[:uid])
-          raise "Not a unique linkedin credential #{oauth[:uid]}" if linkedin_scope.count > 1
-          return linkedin_scope.first
+          find_by_linkedin_id(oauth[:uid])
         when 'twitter'
-          twitter_scope = where(twitter_id: oauth[:uid])
-          raise "Not a unique twitter credential #{oauth[:uid]}" if twitter_scope.count > 1
-          return twitter_scope.first
-        when 'developer'
-          fail 'Developer Strategy must not be used in production.' if Rails.env.production?
-          developer_scope = where(email: oauth[:uid])
-          raise "Looks like there's duplicate users for the email '#{oauth[:uid]}'. Check user ids: #{developer_scope.map(&:id).join(', ')}" if developer_scope.count > 1
-          return developer_scope.first
+          find_by_twitter_id(oauth[:uid])
         else
-          raise "Unexpected provider: #{oauth[:provider]}"
+          fail 'Developer Strategy must not be used in production.' if Rails.env.production?
+          find_by_email(oauth[:uid])
       end
     end
 
diff --git a/app/models/concerns/user_twitter.rb b/app/models/concerns/user_twitter.rb
@@ -14,7 +14,6 @@ def clear_twitter!
       self.twitter = nil
       self.twitter_token = nil
       self.twitter_secret = nil
-      self.joined_twitter_on = nil
       save!
     end
   end
diff --git a/db/migrate/20140807214719_remove_joined_twitter_on_from_user.rb b/db/migrate/20140807214719_remove_joined_twitter_on_from_user.rb
@@ -0,0 +1,6 @@
+class RemoveJoinedTwitterOnFromUser < ActiveRecord::Migration
+  def up
+    remove_column :users, :joined_twitter_on
+  end
+
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140801145543) do
+ActiveRecord::Schema.define(:version => 20140807214719) do
 
   add_extension "citext"
 
@@ -546,7 +546,6 @@
     t.string   "referred_by"
     t.text     "about"
     t.date     "joined_github_on"
-    t.date     "joined_twitter_on"
     t.string   "avatar"
     t.string   "banner"
     t.datetime "remind_to_invite_team_members"
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
@@ -247,7 +247,6 @@
       expect(assigns[:user].twitter_secret).to eq('8fRS1ZARd6Wm53wvvDwHNrBmZcW0H2aSwmQjuOTHl')
       expect(assigns[:user].twitter_id).to eq('6271932')
       expect(assigns[:user].location).to eq('San Francisco')
-      expect(assigns[:user].joined_twitter_on).to eq(Date.parse('Wed May 23 21:14:29 +0000 2007'))
       expect(assigns[:user].about).to eq('Dad. Amateur Foodie. Founder Extraordinaire of @coderwall')
     end
   end
diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb
@@ -82,7 +82,6 @@
 #  referred_by                   :string(255)
 #  about                         :text
 #  joined_github_on              :date
-#  joined_twitter_on             :date
 #  avatar                        :string(255)
 #  banner                        :string(255)
 #  remind_to_invite_team_members :datetime
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
@@ -397,7 +397,6 @@ class AlsoNotaBadge < BadgeBase
 #  referred_by                   :string(255)
 #  about                         :text
 #  joined_github_on              :date
-#  joined_twitter_on             :date
 #  avatar                        :string(255)
 #  banner                        :string(255)
 #  remind_to_invite_team_members :datetime

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +class RemoveJoinedTwitterOnFromUser < ActiveRecord::Migration
 +  def up
 +    remove_column :users, :joined_twitter_on
 +  end
++
 +end