devise_ichain_authenticatable 0.2.1 → 0.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2RmMzFkMDdkZjIyMjYzZmQ5MjNjNzgxOTliNTk0NjhlM2U0Y2FmNA==
-  data.tar.gz: !binary |-
-    MDI2MjhhZTBkMTBjMTcwMGQwM2RkODU4NzIyOTViZjQ5ZmNjMWM4Yg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MzA1YTE4MDA5NTBhNDJmNmRmNGUzNzZhMTNiODJmMGI3MGIxMDIzZmZkMzVj
-    YTJkYTBmMTg1YjcyZGNhYjRjMWJmYWFkZmEwZjk1N2MxNWRlZjY4ZmJlM2I4
-    MWZlNTJlYTc1MGZjODY1YjdhYjNiOThkZjU3NzMzNDBjNTM5ODM=
-  data.tar.gz: !binary |-
-    NmIwZjg1ZTNhZjUwODlkMDgwZDNhMTM0N2M4NTRkZjA0MTU4OTEyOTA1YmYy
-    Mzk4YmE0NWUwZjg2ZGQwYzVjYjFlZDI3Njc1NGI4ZmRhMDc4ZjE2YjU2NjBi
-    NTQ2ZTM2MTdmOGM0NzQzMmNjZTc1OTMwM2VmMjVmYzYzZThjM2U=
+SHA1:
+  metadata.gz: 5c464140caabf7bc6a25efdc813300f15633122e
+  data.tar.gz: ba7d54cf541b68092ed802e76a639a740c0c2f8e
+SHA512:
+  metadata.gz: 81b07af69ed0fd985790d1210c2002d0d639c6815f4665efdc6b062337fb3a068145c4b715d141b5e96d33d7d215604baabed1a399b7d49e64c3209ff8252b32
+  data.tar.gz: 56759efd6146ded0216362b3ccaca0d1a047b2d8208db839c5b6375572c96c10865ef085fa65026e80b09dda0f81ba55fe06cadcd204c94bfabc308f65850878

data/README.md

@@ -11,12 +11,12 @@ desired.
 Requirements
 ------------
 
-The plugin should be compatible with Ruby 1.8.7, 1.9.3 and 2.0, but have only be
-tested in production with Ruby 1.9.3.
+The plugin should be compatible with Ruby 1.8.7, 1.9 and 2.0 (tested with
+1.9.3 and 2.0.0).
 
 In the same way, it should work with any version of Devise equal or greater than 2.2
-and with any version of Rails equal or greater than 3.2, but have only be tested
-with Rails 3.2 and Devise 2.2.
+and with any version of Rails equal or greater than 3.2 (tested with Devise 2.2
+on Rails 3.2 and with Devise 3.1 on Rails 4).
 
 Reporting of success stories with other setups would be highly appreciated.
 
@@ -39,7 +39,11 @@ class User < ActiveRecord::Base
   devise :ichain_authenticatable, :ichain_registerable
 
   def self.for_ichain_username(username, attributes)
-    find_or_create_by_login(username)
+    if user = find_by(login: username)
+      user.update_column(email: attributes[:email]) if user.email != attributes[:email]
+    else
+      user = create(login: username, email: attributes[:email])
+    end
   end
 end
 ```
@@ -66,6 +70,11 @@ Devise.setup do |config|
  # You will always need to set this parameter.
  config.ichain_base_url = "https://my.application.org"
 
+ # Paths (relative to ichain_base_url) used by your proxy
+ # config.ichain_login_path = "ICSLogin/"
+ # config.ichain_registration_path = "ICSLogin/auth-up/"
+ # config.ichain_logout_path = "cmd/ICSLogout/"
+
  # The header used by your iChain proxy to pass the username.
  # config.ichain_username_header = "HTTP_X_USERNAME"
 

data/app/controllers/devise/ichain_sessions_controller.rb

@@ -4,7 +4,7 @@ class Devise::IchainSessionsController < DeviseController
   # GET /resource/sign_in
   def new
     return new_test if ::Devise.ichain_test_mode
-    self.resource = build_resource(nil, :unsafe => true)
+    self.resource = resource_class.new
     @back_url = base_url + after_sign_in_path_for(resource_name)
     # The slash at the end is very important
     @login_url = resource_class.ichain_login_url
@@ -40,7 +40,7 @@ class Devise::IchainSessionsController < DeviseController
   protected
 
   def new_test
-    self.resource = build_resource(nil, :unsafe => true)
+    self.resource = resource_class.new
     @fields = (::Devise.ichain_attribute_headers.keys rescue [])
     @login_url = test_ichain_session_path(resource_name)
     render :new_test

data/app/views/devise/ichain_sessions/new.html.erb

@@ -9,7 +9,7 @@
   <%= text_field_tag :username, "", :autofocus => true %></div>
 
   <div><%= label_tag :Password,  "Password" %><br />
-  <%= text_field_tag :password, "" %></div>
+  <%= password_field_tag :password, "" %></div>
 
   <div><%= submit_tag "Sign in" %></div>
 <% end %>

data/lib/devise_ichain_authenticatable.rb

@@ -15,9 +15,15 @@ module Devise
   @@ichain_proxypath = "reverse"
   @@ichain_username_header = "HTTP_X_USERNAME"
   @@ichain_attribute_headers = {:email => "HTTP_X_EMAIL"}
+  # The slashes at the end of the urls looks to be relevant
+  @@ichain_login_path = "ICSLogin/"
+  @@ichain_registration_path = "ICSLogin/auth-up/"
+  @@ichain_logout_path = "cmd/ICSLogout/"
 
-  mattr_accessor :ichain_test_mode, :ichain_base_url, :ichain_context,
-    :ichain_proxypath, :ichain_username_header, :ichain_attribute_headers
+  mattr_accessor :ichain_test_mode, :ichain_base_url,
+    :ichain_login_path, :ichain_registration_path, :ichain_logout_path,
+    :ichain_context, :ichain_proxypath,
+    :ichain_username_header, :ichain_attribute_headers
 end
 
 Devise.add_module :ichain_authenticatable,

data/lib/devise_ichain_authenticatable/models.rb

@@ -6,18 +6,21 @@ module Devise
       end
 
       module ClassMethods
-        # The slashes at the end of the urls looks to be relevant
+        def ichain_url_for(action)
+          URI::join(::Devise.ichain_base_url || "",
+                    ::Devise.send(:"ichain_#{action}_path")).to_s
+        end
 
         def ichain_registration_url
-          (::Devise.ichain_base_url || "") + "/ICSLogin/"
+          ichain_url_for(:registration)
         end
 
         def ichain_login_url
-          (::Devise.ichain_base_url || "") + "/ICSLogin/auth-up/"
+          ichain_url_for(:login)
         end
 
         def ichain_logout_url
-          (::Devise.ichain_base_url || "") + "/ICHAINLogout/"
+          ichain_url_for(:logout)
         end
       end
 

data/lib/devise_ichain_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module DeviseIchainAuthenticatable
-  VERSION = "0.2.1".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: devise_ichain_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ancor González Sosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.2'
 description: Devise extension to allow authentication via iChain
@@ -58,19 +58,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Devise extension to allow authentication via iChain
 test_files: []
-has_rdoc: