devise-stormpath 0.2.0 → 0.2.1

data/app/controllers/devise/stormpath_confirmations_controller.rb

@@ -0,0 +1,9 @@
+class Devise::StormpathConfirmationsController < Devise::ConfirmationsController
+  prepend_before_filter :proxy_stormpath_token
+
+  protected
+
+  def proxy_stormpath_token
+    params[:confirmation_token] = params[:sptoken]
+  end
+end

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

@@ -0,0 +1,30 @@
+<h2>Sign up</h2>
+
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+    <%= devise_error_messages! %>
+
+    <div><%= f.label :email %><br />
+      <%= f.email_field :email, :autofocus => true %></div>
+
+    <div><%= f.label :username %><br />
+      <%= f.text_field :username %></div>
+
+    <div><%= f.label :given_name %><br />
+      <%= f.text_field :given_name %></div>
+
+    <div><%= f.label :middle_name %><br />
+      <%= f.text_field :middle_name %></div>
+
+    <div><%= f.label :surname %><br />
+      <%= f.text_field :surname %></div>
+
+    <div><%= f.label :password %><br />
+      <%= f.password_field :password %></div>
+
+    <div><%= f.label :password_confirmation %><br />
+      <%= f.password_field :password_confirmation %></div>
+
+    <div><%= f.submit "Sign up" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>

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

@@ -0,0 +1,17 @@
+<h2>Sign in</h2>
+
+<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+    <div><%= f.label :username %><br />
+      <%= f.text_field :username, :autofocus => true %></div>
+
+    <div><%= f.label :password %><br />
+      <%= f.password_field :password %></div>
+
+    <% if devise_mapping.rememberable? -%>
+        <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+    <% end -%>
+
+    <div><%= f.submit "Sign in" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/config/locales/en.yml

@@ -1,5 +1,4 @@
 #TODO Customize messages
-
 en:
   devise:
     stormpath_passwords:
@@ -8,3 +7,7 @@ en:
       updated_not_active: 'Your password was changed successfully.'
       send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
       no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+    stormpath_confirmations:
+      confirmed: "Your account was successfully confirmed. You are now signed in."
+      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."

data/devise-stormpath.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency('devise')
-  s.add_dependency('stormpath-rails', '~> 0.4.0')
+  s.add_dependency('stormpath-rails', '>= 0.4.3')
   s.add_dependency('activesupport')
 
   s.add_development_dependency('rake', '~> 10.0.2')

data/lib/devise/models/stormpath_confirmable.rb

@@ -0,0 +1,44 @@
+module Devise
+  module Models
+    module StormpathConfirmable
+      extend ActiveSupport::Concern
+
+      def self.required_fields(klass)
+        [:confirmation_token]
+      end
+
+      included do
+        attr_accessible :confirmation_token
+        attr_accessor :confirmation_token
+      end
+
+      def confirmed?
+        status != "UNVERIFIED"
+      end
+
+      def active_for_authentication?
+        super && confirmed?
+      end
+
+      def inactive_message
+        !confirmed? ? :unconfirmed : super
+      end
+
+      protected
+
+      module ClassMethods
+        def confirm_by_token(token)
+          begin
+            raise RuntimeError.new "Verification token required" unless token
+            account = ::Stormpath::Rails::Client.verify_account_email(token)
+            return self.where(stormpath_url: account.get_href).first
+          rescue RuntimeError => error
+            u = self.new
+            u.errors[:base] << error.message
+            u
+          end
+        end
+      end
+    end
+  end
+end

data/lib/devise/stormpath/routes.rb

@@ -5,4 +5,9 @@ ActionDispatch::Routing::Mapper.class_eval do
     resource :password, :only => [:new, :create, :edit, :update],
              :path => mapping.path_names[:password], :controller => controllers[:stormpath_passwords]
   end
-end
+
+  def devise_confirmation(mapping, controllers)
+    resource :confirmation, :only => [:show],
+             :path => mapping.path_names[:confirmation], :controller => controllers[:stormpath_confirmations]
+  end
+end

data/lib/devise/stormpath/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Stormpath
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/devise-stormpath.rb

@@ -9,3 +9,4 @@ Warden::Strategies.add(:stormpath_authenticatable, Devise::Strategies::Stormpath
 
 Devise.add_module(:stormpath_authenticatable, :route => :session, :strategy => true, :controller => :sessions, :model  => 'devise/models/stormpath_authenticatable')
 Devise.add_module(:stormpath_recoverable, :route => :password, :controller => :stormpath_passwords, :model  => 'devise/models/stormpath_recoverable')
+Devise.add_module(:stormpath_confirmable, :route => :confirmation, :controller => :stormpath_confirmations, :model  => 'devise/models/stormpath_confirmable')

data/spec/devise/models/stormpath_confirmable_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+require "devise/models/stormpath_confirmable"
+
+describe Devise::Models::StormpathConfirmable do
+  class User
+    def self.attr_accessible(*args)
+    end
+
+    include Devise::Models::StormpathConfirmable
+  end
+
+  let(:base) { mock("base") }
+  let(:errors) { mock("errors", :[] => base) }
+  let(:user) { mock("user", errors: errors) }
+
+  describe "::confirm_by_token" do
+    let(:account) { mock("account", get_href: "user href") }
+
+    it "should verify confirmation token at Stormpath and return user if verification passed" do
+      Stormpath::Rails::Client.should_receive(:verify_account_email).with("token").and_return(account)
+      User.should_receive(:where).with(stormpath_url: "user href").and_return([user])
+      User.confirm_by_token("token").should == user
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-stormpath
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -136,17 +136,22 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/devise/stormpath_confirmations_controller.rb
 - app/controllers/devise/stormpath_passwords_controller.rb
+- app/views/devise/registrations/new.html.erb
+- app/views/devise/sessions/new.html.erb
 - config/locales/en.yml
 - devise-stormpath.gemspec
 - lib/devise-stormpath.rb
 - lib/devise/models/stormpath_authenticatable.rb
+- lib/devise/models/stormpath_confirmable.rb
 - lib/devise/models/stormpath_recoverable.rb
 - lib/devise/stormpath/rails.rb
 - lib/devise/stormpath/routes.rb
 - lib/devise/stormpath/version.rb
 - lib/devise/strategies/stormpath_authenticatable.rb
 - spec/devise/models/stormpath_authenticatable_spec.rb
+- spec/devise/models/stormpath_confirmable_spec.rb
 - spec/devise/models/stormpath_recoverable_spec.rb
 - spec/spec_helper.rb
 - spec/support/client.rb
@@ -163,18 +168,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 434371363033819234
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 434371363033819234
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24