contour 2.1.0.beta17 → 2.1.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06c1f851aa201f8b055336424f8f786f4428c090
-  data.tar.gz: 6dcb4f35ccf617568aaa820907a2583efec5124d
+  metadata.gz: 6eeafc1e71115e595174207a08eecefb9fef34b6
+  data.tar.gz: 084f8740106fc73858ccc8e4b39541bbd8d5edae
 SHA512:
-  metadata.gz: 4f7d6c9c0640d083d851c3ab42d9291e68cd1fce9582904d35b4a1d39745062b3ee6ed38693c8f3464b6fea6f9c2455ad4359a5afe12a4199d2e59f4a0c91e4f
-  data.tar.gz: 76bd1bf6ebcc9f160c919073b5f819834d9ae7ae831c95b62f7bc5b33b7e6a8451ed02b51680e4d2d4125a4b08846cc8891c60a877c74e26c50fee938074e83e
+  metadata.gz: b66c708d48d51b7e688c5f91c63270e6f54367f5dd209b787dc2e65970e7f1dec4033382a2fe053c299d3c5bc8adeba8ef33f760a685f1b49fee467ee3e6d25c
+  data.tar.gz: bf7230763663e68a6ea71a467a412a789873c2e3c2d1d7c43c7229cc48969d9bf2a8ec60290998e8ff38fb4d902a3c097760097d0450e4ebadf459368a4c080b

data/CHANGELOG.md

@@ -7,6 +7,10 @@
   - `links: [ ..., { header: 'Dropdown header' }, ... ]`
 - Removed bootstrap-scroll-modal since it collided with BS3's implementation
 - Updated HighCharts to 3.0.5
+- Available authentications table can be included via the following partial:
+  - `render partial: 'contour/authentications/authentications'`
+  - Authentications can be added and removed through this view
+  - Authentications can now be integrated on existing settings pages instead of being a separate page
 - **Gem Changes**
   - Updated to Devise 3.0.3
 

data/app/assets/stylesheets/contour.css

@@ -12,7 +12,5 @@
  *= require datepicker
  *= require timepicker
  *= require contour/about
- *= require contour/authentication
- *= require contour/errors
  *= require spinner
 */

data/app/controllers/contour/authentications_controller.rb

@@ -2,7 +2,6 @@ class Contour::AuthenticationsController < ApplicationController
   skip_before_action :verify_authenticity_token, only: :create
 
   def index
-    @authentications = current_user.authentications if current_user
   end
 
   def passthru
@@ -43,14 +42,16 @@ class Contour::AuthenticationsController < ApplicationController
         end
       end
     else
-      redirect_to authentications_path, alert: "Authentication not successful."
+      redirect_to authentications_path, alert: 'Authentication not successful.'
     end
   end
 
   def destroy
     @authentication = current_user.authentications.find(params[:id])
     @authentication.destroy
-    flash[:notice] = "Successfully destroyed authentication."
-    redirect_to authentications_path
+    respond_to do |format|
+      format.html { redirect_to authentications_path, notice: 'Successfully removed authentication.' }
+      format.js
+    end
   end
 end

data/app/views/contour/authentications/_add_remove_table.html.erb

@@ -0,0 +1,31 @@
+<% if current_user %>
+  <table class="table table-striped" style="table-layout:fixed">
+    <thead>
+      <tr>
+        <th></th>
+        <th>Provider</th>
+        <th>User ID</th>
+        <th>Actions</th>
+      </tr>
+    </thead>
+
+    <% PROVIDERS.each do |provider| %>
+      <% url_params = (provider == :google_apps) ? '?domain=gmail.com' : '' %>
+      <% provider_name = OmniAuth.config.camelizations[provider.to_s.downcase] || provider.to_s.titleize %>
+      <% image_name = provider.to_s.downcase %>
+      <% authentication = current_user.authentications.find_by_provider(provider.to_s.downcase) %>
+      <tr>
+        <td><%= image_tag "contour/#{image_name}_32.png", height: '32px' %></td>
+        <td><%= provider_name %></td>
+        <td><%= authentication.uid if authentication %></td>
+        <td>
+          <% if authentication %>
+            <%= link_to 'Remove', authentication, remote: true, method: :delete, class: 'btn btn-xs btn-danger-inverse', data: { confirm: 'Are you sure you want to remove this authentication option?' } %>
+          <% else %>
+            <%= link_to 'Add', "#{request.script_name}/#{OmniAuth.config.path_prefix.split('/').last.to_s}/#{provider.to_s.downcase}#{url_params}", class: 'btn btn-xs btn-default' %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>

data/app/views/contour/authentications/_authentications.html.erb

@@ -0,0 +1,3 @@
+<div id="authentications">
+  <%= render partial: 'contour/authentications/add_remove_table' %>
+</div>

data/app/views/contour/authentications/destroy.js.erb

@@ -0,0 +1 @@
+$("#authentications").html("<%= escape_javascript(render("contour/authentications/add_remove_table")) %>");

data/app/views/contour/authentications/index.html.erb

@@ -3,25 +3,4 @@
   <h1><%= @title %></h1>
 </div>
 
-<% if @authentications %>
-  <% unless @authentications.empty? %>
-    <p><strong>You can sign in to this account using:</strong></p>
-    <div class="authentications">
-      <% for authentication in @authentications %>
-        <div class="authentication">
-          <%= image_tag "contour/#{authentication.provider}_32.png", height: "32px" %>
-          <div class="provider"><%= authentication.provider.titleize %></div>
-          <div class="uid"><%= authentication.uid %></div>
-          <%= link_to "X", authentication, method: :delete, class: "remove", data: { confirm: 'Are you sure you want to remove this authentication option?' } %>
-        </div>
-      <% end %>
-      <div style="clear:both"></div>
-    </div>
-  <% end %>
-  <p><strong>Add another service to sign in with:</strong></p>
-<% else %>
-  <p><strong>Sign in through one of these services:</strong></p>
-<% end %>
-
-
-<%= render partial: 'contour/authentications/index' %>
+<%= render partial: 'contour/authentications/authentications' %>

data/lib/contour/engine.rb

@@ -6,7 +6,7 @@ module Contour
     engine_name :contour
 
     # Overwrite Rails errors to use Twitter/Contour CSS classes
-    config.action_view.field_error_proc = Proc.new { |html_tag, instance| "<span class=\"control-group-error\">#{html_tag}</span>".html_safe }
+    config.action_view.field_error_proc = Proc.new { |html_tag, instance| "<span class=\"has-error\">#{html_tag}</span>".html_safe }
 
   end
 end

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 2
     MINOR = 1
     TINY = 0
-    BUILD = "beta17" # nil, "pre", "rc", "rc2"
+    BUILD = "rc" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

data/test/controllers/authentications_controller_test.rb

@@ -12,7 +12,6 @@ class Contour::AuthenticationsControllerTest < ActionController::TestCase
   test "should get index" do
     get :index
     assert_response :success
-    assert_not_nil assigns(:authentications)
   end
 
   # TODO: Remove
@@ -50,9 +49,9 @@ class Contour::AuthenticationsControllerTest < ActionController::TestCase
 
   test "should destroy authentication" do
     assert_difference('Authentication.count', -1) do
-      delete :destroy, id: @authentication.to_param
+      delete :destroy, id: @authentication, format: 'js'
     end
 
-    assert_redirected_to authentications_path
+    assert_template 'destroy'
   end
 end