show gravatar display name and bitcoin adress

dennisvandehoef · dennisvandehoef · commit aed307aef219 · 2015-02-11T21:42:26.000+01:00
diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss
@@ -1,3 +1,13 @@
 // Place all the styles related to the Users controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+
+.from-gravatar{
+  display: block;
+  margin-bottom: 15px;
+  cursor: pointer;
+  font-style: italic;
+  margin-top: -12px;
+  padding-left: 14px;
+}
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -24,6 +24,14 @@ def balance
     tips.decided.unpaid.sum(:amount)
   end
 
+  def gravatar_bitcoin
+    gravatar.get_value :currency, :bitcoin
+  end
+
+  def gravatar_display_name
+    gravatar.get_value :displayName
+  end
+
   def display_name
     attributes['display_name'].presence || name.presence || nickname.presence || email
   end
@@ -63,6 +71,10 @@ def ready_for_withdrawal?
 
   private
 
+  def gravatar
+    @gravatar ||= Gravatar::new(email)
+  end
+
   def set_login_token!
     loop do
       self.login_token = SecureRandom.urlsafe_base64
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
@@ -5,7 +5,7 @@
   = btc_human @user.balance
 %p
   %small= raw t('.threshold', threshold: btc_human(CONFIG["min_payout"]))
-    
+
 - if @user_tips.count > 0
   %p
     %strong Last Tips
@@ -21,7 +21,13 @@
 %p= @user.email
 = twitter_bootstrap_form_for @user do |f|
   = f.text_field :bitcoin_address, placeholder: t('.bitcoin_address_placeholder')
+  - if @user.gravatar_bitcoin.present?
+    %span.from-gravatar{data:{for: 'user[bitcoin_address]', value: @user.gravatar_bitcoin }}
+      = "#{t('.use_from_gravatar')}: #{@user.gravatar_bitcoin}"
   = f.text_field :display_name
+  - if @user.gravatar_display_name.present?
+    %span.from-gravatar{data:{for: 'user[display_name]', value: @user.gravatar_display_name }}
+      = "#{t('.use_from_gravatar')}: #{@user.gravatar_display_name}"
   - if f.object.bitcoin_address.blank?
     = f.check_box :unsubscribed, t('.notify'), { checked: !f.object.unsubscribed? }, '0', '1'
   %br
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -176,6 +176,7 @@ en:
       submit_user: Update user info
       change_password: Change your password
       submit_password: Change my password
+      use_from_gravatar: Use from your gravatar profile
   withdrawals:
     index:
       title: Last Withdrawals
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
@@ -176,6 +176,7 @@ nl:
       submit_user: Gegevens opslaan
       change_password: Wijzig wachtwoord
       submit_password: Wijzig mijn wachtwoord
+      use_from_gravatar: Gebruik van je gravatar profiel
   withdrawals:
     index:
       title: Laatste terugroepingen
