any_login 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78acd82458c3e2232727e97c166b4c807e5d7475
-  data.tar.gz: d750ddfdc1d2eea5d122c124d1e0464415381ce0
+  metadata.gz: 20568f225a8efe5884f585653d3a4c6a8dc903c9
+  data.tar.gz: 3844864cab8b9890ea36f7006c3002515687ea45
 SHA512:
-  metadata.gz: 9646d6e0440d2a14856bc0cfa5e1060c5233fd15a89e1f4b76431fdff78bad96bfcfe2c7f937ce2d3954914ad813e7722e0a94c1514d19973607df2f0e9bba61
-  data.tar.gz: ec8ca298be95e38512466f863055be36f28c7144afe14e8b0e0b84d1e5a79c234ffb4aa7970bdd7b3a06b8fb4008476e983d7dbcc0140b78fe60419315cbd33b
+  metadata.gz: 7ee4cff920af9d339601b373f67a162bdf645b35e86a3db438dc33d969ab9088739f413d192cf8cf7b88479fae5648f18dbbc9446df16cb7042a312442bd6dbc
+  data.tar.gz: ef523b6321f70735afd6407eef3f0dacff0889260417039eeb9013274d78ea434c4e6d5e795466127eea395af49ecc1406ee74f48b42e5b22cf9c3d644abd272

data/app/helpers/any_login/application_helper.rb

@@ -46,7 +46,11 @@ module AnyLogin
         if respond_to?(AnyLogin.provider::Controller.any_login_current_user_method) &&
            user = send(AnyLogin.provider::Controller.any_login_current_user_method)
           content_tag :span, :class => 'any_login_user_information' do
-            raw("Current #{AnyLogin.klass_name}: #{h(AnyLogin.name_method.call(user)[0])} — ID: #{user.id}")
+            if AnyLogin.name_method.is_a?(Symbol)
+              raw("Current #{AnyLogin.klass_name}: #{h(user.send(AnyLogin.name_method)[0])} — ID: #{user.id}")
+            else
+              raw("Current #{AnyLogin.klass_name}: #{h(AnyLogin.name_method.call(user)[0])} — ID: #{user.id}")
+            end
           end
         end
       end

data/lib/any_login.rb

@@ -82,41 +82,51 @@ module AnyLogin
       if grouped?
         [e[0], e[1].collect(&name_method)]
       else
-        name_method.call(e)
+        if name_method.is_a?(Symbol)
+          e.send(name_method)
+        else
+          name_method.call(e)
+        end
       end
     end
   end
 
   def self.klass
-    @@klass ||= AnyLogin.klass_name.constantize
+    @@klass = AnyLogin.klass_name.constantize
   end
 
   private
 
+  def self.format_collection_raw(result)
+    if result.is_a?(Hash) || (Object.const_defined?("OrderedHash") && result.is_a?(OrderedHash))
+      result.to_a
+    else
+      result
+    end
+  end
+
   def self.collection_raw
-    @@collection_raw ||= begin
+    @@collection_raw = begin
       result = AnyLogin.klass.send(AnyLogin.collection_method)
       if limit == :none
-        result
-      elsif result.is_a?(ActiveRecord::Relation)
-        result.limit(limit)
-      elsif result.is_a?(Array)
-        result.take(limit)
-      elsif result.is_a?(Hash) || result.is_a?(OrderedHash)
-        result.to_a
+        format_collection_raw(result)
       else
-        result
+        if result.is_a?(ActiveRecord::Relation)
+          format_collection_raw(result.limit(limit))
+        else
+          format_collection_raw(result.take(limit))
+        end
       end
     end
   end
 
   def self.collection_type
-    @@collection_type ||=
-                          if collection_raw[1].is_a?(Array)
-                            :grouped
-                          else
-                            :single
-                          end
+    @@collection_type =
+                        if collection_raw[1].is_a?(Array)
+                          :grouped
+                        else
+                          :single
+                        end
     @@collection_type
   end
 

data/lib/any_login/providers/authlogic.rb

@@ -1,23 +1,23 @@
-module AnyLogin
-  module Provider
-    module Authlogic
-
-      module Controller
-
-        def self.any_login_current_user_method
-          @@any_login_current_user_method ||= "current_#{AnyLogin.klass.to_s.underscore}".to_sym
-        end
-
-        def any_login_sign_in
-          @loginable = AnyLogin.klass.find(params[:selected_id].presence || params[:id])
-          Object.const_get("#{AnyLogin.klass}Session").create(@loginable)
-          redirect_to main_app.send(AnyLogin.redirect_path_after_login)
-        end
-
-      end
-
-    end
-  end
-end
-
-AnyLogin.provider = AnyLogin::Provider::Authlogic
+module AnyLogin
+  module Provider
+    module Authlogic
+
+      module Controller
+
+        def self.any_login_current_user_method
+          @@any_login_current_user_method ||= "current_#{AnyLogin.klass.to_s.underscore}".to_sym
+        end
+
+        def any_login_sign_in
+          @loginable = AnyLogin.klass.find(params[:selected_id].presence || params[:id])
+          Object.const_get("#{AnyLogin.klass}Session").create(@loginable)
+          redirect_to main_app.send(AnyLogin.redirect_path_after_login)
+        end
+
+      end
+
+    end
+  end
+end
+
+AnyLogin.provider = AnyLogin::Provider::Authlogic

data/lib/any_login/version.rb

@@ -1,3 +1,3 @@
 module AnyLogin
-  VERSION = '1.1'
-end
+  VERSION = '1.2'
+end

data/lib/generators/any_login/templates/any_login.rb

@@ -1,46 +1,46 @@
-AnyLogin.setup do |config|
-  # # provider (:devise, :authlogic, sorcery, clearance). Provider can be identified automatically based on your Gemfile
-  # config.provider = nil
-
-  # # enabled or not
-  # config.enabled = Rails.env.to_s == 'development'
-
-  # # Account, User, Person, etc
-  # config.klass_name = 'User'
-
-  #  # .all, .active, .admins, .groped_collection, etc ... need to return an array (or hash with arrays) of users
-  # config.collection_method = :all
-
-  # # to format user name in dropdown list
-  # config.name_method = proc { |e| [e.email, e.id] }
-
-  # # after logging in redirect user to path
-  # config.redirect_path_after_login = :root_path
-
-  # # login on select change event OR click on button, or BOTH
-  # config.login_on = :both
-
-  # # position of any_login box top_left, top_right, bottom_left, bottom_right
-  # config.position = :bottom_left
-
-  # # label on Login button
-  # config.login_button_label = 'Login'
-
-  # # prompt message in select
-  # config.select_prompt = "Select #{AnyLogin.klass_name}"
-
-  # # show any_login box by default
-  # config.auto_show = false
-
-  # # limit, integer or :none
-  # config.limit = 10
-
-  # # Enable http basic authentication
-  # config.http_basic_authentication_enabled = false
-
-  # # Enable http basic authentication
-  # config.http_basic_authentication_user_name = 'any_login'
-
-  # # Enable http basic authentication
-  # config.ttp_basic_authentication_password = 'password'
-end
+AnyLogin.setup do |config|
+  # # provider (:devise, :authlogic, sorcery, clearance). Provider can be identified automatically based on your Gemfile
+  # config.provider = nil
+
+  # # enabled or not
+  # config.enabled = Rails.env.to_s == 'development'
+
+  # # Account, User, Person, etc
+  # config.klass_name = 'User'
+
+  #  # .all, .active, .admins, .groped_collection, etc ... need to return an array (or hash with arrays) of users
+  # config.collection_method = :all
+
+  # # to format user name in dropdown list
+  # config.name_method = proc { |e| [e.email, e.id] }
+
+  # # after logging in redirect user to path
+  # config.redirect_path_after_login = :root_path
+
+  # # login on select change event OR click on button, or BOTH
+  # config.login_on = :both
+
+  # # position of any_login box top_left, top_right, bottom_left, bottom_right
+  # config.position = :bottom_left
+
+  # # label on Login button
+  # config.login_button_label = 'Login'
+
+  # # prompt message in select
+  # config.select_prompt = "Select #{AnyLogin.klass_name}"
+
+  # # show any_login box by default
+  # config.auto_show = false
+
+  # # limit, integer or :none
+  # config.limit = 10
+
+  # # Enable http basic authentication
+  # config.http_basic_authentication_enabled = false
+
+  # # Enable http basic authentication
+  # config.http_basic_authentication_user_name = 'any_login'
+
+  # # Enable http basic authentication
+  # config.ttp_basic_authentication_password = 'password'
+end

data/test/dummy-authlogic/app/controllers/user_sessions_controller.rb

@@ -1,20 +1,20 @@
-class UserSessionsController < ApplicationController
-  def new
-    @user = User.new
-  end
-
-  def create
-    @user_session = UserSession.new params.require(:user)
-      .permit(:login, :password)
-    if @user_session.save
-      redirect_to root_path
-    else
-      redirect_to new_user_session_path
-    end
-  end
-
-  def destroy
-    current_user_session.destroy
-    redirect_to new_user_session_path
-  end
-end
+class UserSessionsController < ApplicationController
+  def new
+    @user = User.new
+  end
+
+  def create
+    @user_session = UserSession.new params.require(:user)
+      .permit(:login, :password)
+    if @user_session.save
+      redirect_to root_path
+    else
+      redirect_to new_user_session_path
+    end
+  end
+
+  def destroy
+    current_user_session.destroy
+    redirect_to new_user_session_path
+  end
+end

data/test/dummy-authlogic/app/models/user_session.rb

@@ -1,2 +1,2 @@
-class UserSession < Authlogic::Session::Base
-end
+class UserSession < Authlogic::Session::Base
+end

data/test/dummy-authlogic/app/views/shared/_footer.html.erb

@@ -1,15 +1,15 @@
-<div class="container">
-  <br/>
-  <br/>
-  <br/>
-  <hr/>
-
-  <%= link_to 'Home', root_path %> |
-  <% if current_user %>
-    <%= link_to 'Sign out', user_session_path, method: :delete, data: { confirm: "Are you sure you want to sign out?" } %>
-  <% else %>
-    <%= link_to 'Sign in', new_user_session_path %>
-  <% end %>
-
-  <%= any_login_here %>
-</div>
+<div class="container">
+  <br/>
+  <br/>
+  <br/>
+  <hr/>
+
+  <%= link_to 'Home', root_path %> |
+  <% if current_user %>
+    <%= link_to 'Sign out', user_session_path, method: :delete, data: { confirm: "Are you sure you want to sign out?" } %>
+  <% else %>
+    <%= link_to 'Sign in', new_user_session_path %>
+  <% end %>
+
+  <%= any_login_here %>
+</div>

data/test/dummy-authlogic/app/views/shared/_header.html.erb

@@ -1,33 +1,33 @@
-<!-- Fixed navbar -->
-<nav class="navbar navbar-inverse">
-  <div class="container">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">AnyLogin Dummy</a>
-    </div>
-    <div id="navbar" class="navbar-collapse collapse">
-      <ul class="nav navbar-nav">
-        <li class="active"><a href=".">Home</a></li>
-        <li><a href="/about">About</a></li>
-        <li><a href="#contact">Contact</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="#">Action</a></li>
-            <li><a href="#">Another action</a></li>
-            <li><a href="#">Something else here</a></li>
-            <li role="separator" class="divider"></li>
-            <li class="dropdown-header">Nav header</li>
-            <li><a href="#">Separated link</a></li>
-            <li><a href="#">One more separated link</a></li>
-          </ul>
-        </li>
-      </ul>
-    </div><!--/.nav-collapse -->
-  </div>
-</nav>
+<!-- Fixed navbar -->
+<nav class="navbar navbar-inverse">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">AnyLogin Dummy</a>
+    </div>
+    <div id="navbar" class="navbar-collapse collapse">
+      <ul class="nav navbar-nav">
+        <li class="active"><a href=".">Home</a></li>
+        <li><a href="/about">About</a></li>
+        <li><a href="#contact">Contact</a></li>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="#">Action</a></li>
+            <li><a href="#">Another action</a></li>
+            <li><a href="#">Something else here</a></li>
+            <li role="separator" class="divider"></li>
+            <li class="dropdown-header">Nav header</li>
+            <li><a href="#">Separated link</a></li>
+            <li><a href="#">One more separated link</a></li>
+          </ul>
+        </li>
+      </ul>
+    </div><!--/.nav-collapse -->
+  </div>
+</nav>

data/test/dummy-authlogic/app/views/user_sessions/new.html.erb

@@ -1,11 +1,11 @@
-<%= form_for @user, url: user_session_path, method: :post, html: { class: 'form-horizontal', role: 'form' } do |f| %>
-  <div class='form-group'>
-    <label>Login</label>
-    <%= f.text_field :login, class: 'form-control', placeholder: 'Login' %>
-  </div>
-  <div class='form-group'>
-    <label>Password</label>
-    <%= f.password_field :password, class: 'form-control', placeholder: 'Password' %>
-  </div>
-  <%= f.submit 'Login', class: 'btn btn-primary' %>
-<% end %>
+<%= form_for @user, url: user_session_path, method: :post, html: { class: 'form-horizontal', role: 'form' } do |f| %>
+  <div class='form-group'>
+    <label>Login</label>
+    <%= f.text_field :login, class: 'form-control', placeholder: 'Login' %>
+  </div>
+  <div class='form-group'>
+    <label>Password</label>
+    <%= f.password_field :password, class: 'form-control', placeholder: 'Password' %>
+  </div>
+  <%= f.submit 'Login', class: 'btn btn-primary' %>
+<% end %>

data/test/dummy-authlogic/config/initializers/any_login.rb

@@ -1,6 +1,6 @@
-AnyLogin.setup do |config|
-  config.provider = :authlogic
-  config.login_button_label = 'Sign in with Authlogic'
-  config.klass_name = 'User'
-  config.collection_method = :all
-end
+AnyLogin.setup do |config|
+  config.provider = :authlogic
+  config.login_button_label = 'Sign in with Authlogic'
+  config.klass_name = 'User'
+  config.collection_method = :all
+end

data/test/dummy-clearance/app/models/user_session.rb

@@ -1,2 +1,2 @@
-class UserSession < Authlogic::Session::Base
-end
+class UserSession < Authlogic::Session::Base
+end

data/test/dummy-clearance/app/views/shared/_footer.html.erb

@@ -1,15 +1,15 @@
-<div class="container">
-  <br/>
-  <br/>
-  <br/>
-  <hr/>
-
-  <%= link_to 'Home', root_path %> |
-  <% if signed_in? %>
-    <%= link_to 'Sign out', sign_out_path, method: :delete, data: { confirm: "Are you sure you want to sign out?" } %>
-  <% else %>
-    <%= link_to 'Sign in', sign_in_path %>
-  <% end %>
-
-  <%= any_login_here %>
-</div>
+<div class="container">
+  <br/>
+  <br/>
+  <br/>
+  <hr/>
+
+  <%= link_to 'Home', root_path %> |
+  <% if signed_in? %>
+    <%= link_to 'Sign out', sign_out_path, method: :delete, data: { confirm: "Are you sure you want to sign out?" } %>
+  <% else %>
+    <%= link_to 'Sign in', sign_in_path %>
+  <% end %>
+
+  <%= any_login_here %>
+</div>