janus 0.5.0 → 0.6.0

data/lib/janus/rails.rb

@@ -0,0 +1,17 @@
+require 'janus'
+require 'janus/routes'
+
+module Janus
+  autoload :Mailer,                    'janus/mailer'
+  autoload :TestHelper,                'janus/test_helper'
+
+  autoload :Helpers,                   'janus/controllers/helpers'
+  autoload :UrlHelpers,                'janus/controllers/url_helpers'
+  autoload :InternalHelpers,           'janus/controllers/internal_helpers'
+
+  autoload :SessionsController,        'janus/controllers/sessions_controller'
+  autoload :RegistrationsController,   'janus/controllers/registrations_controller'
+  autoload :ConfirmationsController,   'janus/controllers/confirmations_controller'
+  autoload :PasswordsController,       'janus/controllers/passwords_controller'
+end
+

data/lib/janus/routes.rb

@@ -42,7 +42,6 @@ module ActionDispatch # :nodoc:
       #    new_user_password GET    /users/password/new(.:format)  {:controller=>"users/passwords", :action=>"new"}
       #   edit_user_password GET    /users/password/edit(.:format) {:controller=>"users/passwords", :action=>"edit"}
       #                      PUT    /users/password(.:format)      {:controller=>"users/passwords", :action=>"update"}
-      #                      DELETE /users/password(.:format)      {:controller=>"users/passwords", :action=>"destroy"}
       # 
       def janus(*resources)
         ActionController::Base.send(:include, Janus::Helpers)    unless ActionController::Base.include?(Janus::Helpers)
@@ -67,7 +66,7 @@ module ActionDispatch # :nodoc:
             end
             
             resource :confirmation, :only => [:show, :new, :create] if options[:confirmation]
-            resource :password, :except => [:index, :show] if options[:password]
+            resource :password, :except => [:index, :show, :destroy] if options[:password]
           end
           
           ActionController::Base.janus(singular)

data/lib/janus/sinatra.rb

@@ -0,0 +1,51 @@
+require "janus"
+require "sinatra/base"
+
+module Sinatra
+  module Janus
+    module Helpers
+      def janus
+        @janus ||= ::Janus::Manager.new(request, request.cookies)
+      end
+
+      def authenticate!(scope)
+        janus.authenticate!(scope)
+      end
+
+      def signed_in?(scope)
+        janus.authenticate?(scope)
+      end
+    end
+
+    def self.registered(app)
+      app.helpers Helpers
+    end
+  end
+
+  def janus(*resources)
+    resources.each do |plural|
+      singular = plural.to_s.singularize
+      klass = singular.camelize.constantize
+
+      class_eval <<-EOV
+        def authenticate_#{singular}!
+          authenticate!(:#{singular})
+        end
+
+        def #{singular}_signed_in?
+          signed_in?(:#{singular})
+        end
+
+        def current_#{singular}
+          @current_#{singular} ||= janus.authenticate(:#{singular})
+        end
+
+        def #{singular}_session
+          janus.session(:#{singular}) if #{singular}_signed_in?
+        end
+      EOV
+    end
+  end
+
+  register Janus
+end

metadata

@@ -1,75 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: janus
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Julien Portalier
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-17 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-07-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bcrypt-ruby
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: scrypt
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: addressable
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Authentication engine for Ruby on Rails.
 email: ysbaddaden@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - README.rdoc
 - lib/janus.rb
 - lib/janus/config.rb
@@ -94,139 +90,37 @@ files:
 - lib/janus/models/remote_authenticatable.rb
 - lib/janus/models/remote_token.rb
 - lib/janus/models/trackable.rb
+- lib/janus/rails.rb
 - lib/janus/routes.rb
+- lib/janus/sinatra.rb
 - lib/janus/strategies.rb
 - lib/janus/strategies/base.rb
 - lib/janus/strategies/database_authenticatable.rb
 - lib/janus/strategies/rememberable.rb
 - lib/janus/strategies/remote_authenticatable.rb
 - lib/janus/test_helper.rb
-- test/functional/home_controller_test.rb
-- test/functional/janus/mailer_test.rb
-- test/functional/janus/manager_test.rb
-- test/functional/users/confirmations_controller_test.rb
-- test/functional/users/passwords_controller_test.rb
-- test/functional/users/registrations_controller_test.rb
-- test/functional/users/sessions_controller_test.rb
-- test/functional/users_controller_test.rb
-- test/integration/users/rememberable_test.rb
-- test/integration/users/remote_test.rb
-- test/integration/users/sessions_test.rb
-- test/integration/users/trackable_test.rb
-- test/rails_app/app/controllers/application_controller.rb
-- test/rails_app/app/controllers/blogs_controller.rb
-- test/rails_app/app/controllers/home_controller.rb
-- test/rails_app/app/controllers/users/confirmations_controller.rb
-- test/rails_app/app/controllers/users/passwords_controller.rb
-- test/rails_app/app/controllers/users/registrations_controller.rb
-- test/rails_app/app/controllers/users/sessions_controller.rb
-- test/rails_app/app/controllers/users_controller.rb
-- test/rails_app/app/helpers/application_helper.rb
-- test/rails_app/app/mailers/janus_mailer.rb
-- test/rails_app/app/models/remote_token.rb
-- test/rails_app/app/models/user.rb
-- test/rails_app/config/application.rb
-- test/rails_app/config/boot.rb
-- test/rails_app/config/environment.rb
-- test/rails_app/config/environments/development.rb
-- test/rails_app/config/environments/production.rb
-- test/rails_app/config/environments/test.rb
-- test/rails_app/config/initializers/janus.rb
-- test/rails_app/config/initializers/secret_token.rb
-- test/rails_app/config/initializers/session_store.rb
-- test/rails_app/config/routes.rb
-- test/rails_app/db/migrate/20110323153820_create_users.rb
-- test/rails_app/db/migrate/20110331153546_create_remote_tokens.rb
-- test/rails_app/db/schema.rb
-- test/rails_app/db/seeds.rb
-- test/test_helper.rb
-- test/unit/confirmable_test.rb
-- test/unit/janus_test.rb
-- test/unit/rememberable_test.rb
-- test/unit/remote_authenticatable_test.rb
-- test/unit/remote_token_test.rb
-- test/unit/reset_password_test.rb
-- test/unit/trackable_test.rb
-- test/unit/user_test.rb
-has_rdoc: true
 homepage: http://github.com/ysbaddaden/janus
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Authentication engine for Ruby on Rails.
-test_files: 
-- test/functional/home_controller_test.rb
-- test/functional/janus/mailer_test.rb
-- test/functional/janus/manager_test.rb
-- test/functional/users/confirmations_controller_test.rb
-- test/functional/users/passwords_controller_test.rb
-- test/functional/users/registrations_controller_test.rb
-- test/functional/users/sessions_controller_test.rb
-- test/functional/users_controller_test.rb
-- test/integration/users/rememberable_test.rb
-- test/integration/users/remote_test.rb
-- test/integration/users/sessions_test.rb
-- test/integration/users/trackable_test.rb
-- test/rails_app/app/controllers/application_controller.rb
-- test/rails_app/app/controllers/blogs_controller.rb
-- test/rails_app/app/controllers/home_controller.rb
-- test/rails_app/app/controllers/users/confirmations_controller.rb
-- test/rails_app/app/controllers/users/passwords_controller.rb
-- test/rails_app/app/controllers/users/registrations_controller.rb
-- test/rails_app/app/controllers/users/sessions_controller.rb
-- test/rails_app/app/controllers/users_controller.rb
-- test/rails_app/app/helpers/application_helper.rb
-- test/rails_app/app/mailers/janus_mailer.rb
-- test/rails_app/app/models/remote_token.rb
-- test/rails_app/app/models/user.rb
-- test/rails_app/config/application.rb
-- test/rails_app/config/boot.rb
-- test/rails_app/config/environment.rb
-- test/rails_app/config/environments/development.rb
-- test/rails_app/config/environments/production.rb
-- test/rails_app/config/environments/test.rb
-- test/rails_app/config/initializers/janus.rb
-- test/rails_app/config/initializers/secret_token.rb
-- test/rails_app/config/initializers/session_store.rb
-- test/rails_app/config/routes.rb
-- test/rails_app/db/migrate/20110323153820_create_users.rb
-- test/rails_app/db/migrate/20110331153546_create_remote_tokens.rb
-- test/rails_app/db/schema.rb
-- test/rails_app/db/seeds.rb
-- test/test_helper.rb
-- test/unit/confirmable_test.rb
-- test/unit/janus_test.rb
-- test/unit/rememberable_test.rb
-- test/unit/remote_authenticatable_test.rb
-- test/unit/remote_token_test.rb
-- test/unit/reset_password_test.rb
-- test/unit/trackable_test.rb
-- test/unit/user_test.rb
+test_files: []

data/test/functional/home_controller_test.rb

@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class HomeControllerTest < ActionController::TestCase
-  test "should get index" do
-    get :index
-    assert_response :ok
-  end
-end

data/test/functional/janus/mailer_test.rb

@@ -1,14 +0,0 @@
-require 'test_helper'
-
-class Janus::MailerTest < ActionMailer::TestCase
-  test "reset_password_instructions" do
-    users(:julien).generate_reset_password_token!
-    
-    mail = JanusMailer.reset_password_instructions(users(:julien)).deliver
-    assert_equal [users(:julien).email], mail.to
-    assert !mail.subject.blank?
-    
-    url = edit_user_password_url(:token => users(:julien).reset_password_token)
-    assert_match Regexp.new(Regexp.escape(url)), mail.encoded
-  end
-end

data/test/functional/janus/manager_test.rb

@@ -1,94 +0,0 @@
-require 'test_helper'
-
-class Janus::ManagerTest < ActionController::TestCase
-  test "should log user in and out" do
-    @janus.login(users(:julien))
-    assert @janus.authenticated?(:user), "Expected user to be authenticated."
-    assert_equal users(:julien), @janus.user(:user)
-    
-    @janus.logout(:user)
-    assert !@janus.authenticated?(:user), "Expected user to not be authenticated."
-    assert_nil @janus.user(:user)
-  end
-
-  test "should log user in and out with custom scope" do
-    @janus.login(users(:julien), :scope => :custom)
-    assert @janus.authenticated?(:custom), "Expected user to be authenticated."
-    assert_equal users(:julien), @janus.user(:custom)
-    
-    @janus.logout(:custom)
-    assert !@janus.authenticated?(:custom), "Expected user to not be authenticated."
-    assert_nil @janus.user(:custom)
-  end
-
-  test "should log users in different scopes" do
-    @janus.login(users(:julien), :scope => :user)
-    @janus.login(users(:martha), :scope => :admin)
-    assert @janus.authenticated?(:user),  "Expected user to be authenticated."
-    assert @janus.authenticated?(:admin), "Expected admin to be authenticated."
-    assert_equal users(:julien), @janus.user(:user)
-    assert_equal users(:martha), @janus.user(:admin)
-    
-    @janus.logout(:admin)
-    assert  @janus.authenticated?(:user),  "Expected user to still be authenticated."
-    assert !@janus.authenticated?(:admin), "Expected admin to no longer be authenticated."
-    assert_equal users(:julien), @janus.user(:user)
-    assert_nil @janus.user(:admin)
-  end
-
-  test "should logout all scopes at once" do
-    @janus.login(users(:julien), :scope => :user)
-    @janus.login(users(:martha), :scope => :admin)
-    assert @janus.authenticated?(:user),  "Expected user to be authenticated."
-    assert @janus.authenticated?(:admin), "Expected admin to be authenticated."
-    
-    @janus.logout
-    assert !@janus.authenticated?(:user),  "Expected user to no longer be authenticated."
-    assert !@janus.authenticated?(:admin), "Expected admin to no longer be authenticated."
-  end
-
-  test "should reset session after logout from last scope" do
-    @janus.login(users(:julien), :scope => :user)
-    @janus.login(users(:martha), :scope => :admin)
-    
-    @janus.logout(:admin)
-    assert_not_nil session['janus']
-    
-    @janus.logout(:user)
-    assert_nil session['janus']
-  end
-
-  test "should set and unset the user manually" do
-    @janus.set_user(users(:martha))
-    assert @janus.authenticated?(:user), "Expected user to be authenticated."
-    assert_equal users(:martha), @janus.user(:user)
-    
-    @janus.unset_user(:user)
-    assert !@janus.authenticated?(:user), "Expected user to not be authenticated."
-    assert_nil @janus.user(:user)
-  end
-
-  test "should set and unset the user manually in different scopes" do
-    @janus.set_user(users(:martha), :scope => :user)
-    @janus.set_user(users(:julien), :scope => :admin)
-    assert @janus.authenticated?(:user),  "Expected user to be authenticated."
-    assert @janus.authenticated?(:admin), "Expected admin to be authenticated."
-    assert_equal users(:martha), @janus.user(:user)
-    assert_equal users(:julien), @janus.user(:admin)
-    
-    @janus.unset_user(:user)
-    assert !@janus.authenticated?(:user),  "Expected user to no longer be authenticated."
-    assert  @janus.authenticated?(:admin), "Expected admin to still be authenticated."
-    assert_nil @janus.user(:user)
-    assert_equal users(:julien), @janus.user(:admin)
-    
-    @janus.unset_user(:martha)
-  end
-
-  test "authenticate!" do
-    assert_raise(Janus::NotAuthenticated) { @janus.authenticate!(:user) }
-    
-    @janus.set_user(users(:julien))
-    assert_nothing_raised { @janus.authenticate!(:user) }
-  end
-end