devise-remote-user 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c22c1528b31943554d224bf190fcc0ff7abb81c
-  data.tar.gz: c5dd7031e1926d72301aac9694ae375e317802a3
+  metadata.gz: 5ea43fa1645bacbef76625f16da7ddb09df554f9
+  data.tar.gz: 3b45eb2d414829ad1e12a168132437e5085b0e57
 SHA512:
-  metadata.gz: 75dac7385bbdb025cac7159f6e14b6ab40d28ca3eaa3cc0abd520b05a3161cc2da80f9f8c03d622f7b5ee6fdf6a849ec8c7670c472ad76b7d97651bc2fc945fb
-  data.tar.gz: 526eb0280f61dc90f3d7cd3261a4528af94c31d8548a2b8881ed2e55e6ddf2c6d544e87ec082baf1f7775b98fe3ff314234495e71d2fd19532d31ced3483d01b
+  metadata.gz: 0ad42b730848ab59b73bfc1b26ae04c20f43109ca35550565a0f3bec067119310c38693c27e4bcea70dffdb54ec033c9bb67c31ef6dcba2a044d075cd7aff88d
+  data.tar.gz: 7b988dedda661d1056357674a25adf692025f5796bcdadbd8738239c43902c1b69b439ca90c74d96b7005f5d3f7e3d27f6356610578f6fee9b1a6f01d840c871

data/.travis.yml

@@ -0,0 +1,2 @@
+rvm:
+  - 2.1.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013, Duke University Libraries
+Copyright (c) Duke University.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -11,7 +11,7 @@ are permitted provided that the following conditions are met:
   list of conditions and the following disclaimer in the documentation and/or
   other materials provided with the distribution.
 
-  Neither the name of the {organization} nor the names of its
+  Neither the name of Duke University nor the names of its
   contributors may be used to endorse or promote products derived from
   this software without specific prior written permission.
 

data/Rakefile

@@ -15,6 +15,6 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 
 desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
+RSpec::Core::RakeTask.new(:spec => ['app:db:migrate', 'app:db:test:prepare'])
 
 task :default => :spec

data/lib/devise_remote_user.rb

@@ -35,6 +35,15 @@ module DeviseRemoteUser
   def self.configure
     yield self
   end
+  
+  def self.remote_user_id env
+    case env_key
+    when Proc
+      env_key.call(env)
+    else
+      env[env_key]
+    end
+  end
 
 end
 
@@ -42,4 +51,3 @@ Devise.add_module(:remote_user_authenticatable,
                   :strategy => true,
                   :controller => :sessions,
                   :model => 'devise_remote_user/model')
-

data/lib/devise_remote_user/controller_behavior.rb

@@ -9,7 +9,7 @@ module DeviseRemoteUser
     private 
 
     def remote_user_authenticated?
-      request.env[DeviseRemoteUser.env_key].present?
+      DeviseRemoteUser.remote_user_id(request.env).present?
     end
 
   end

data/lib/devise_remote_user/manager.rb

@@ -46,7 +46,7 @@ module DeviseRemoteUser
     end
 
     def remote_user_id
-      env[DeviseRemoteUser.env_key]
+      DeviseRemoteUser.remote_user_id(env)
     end
 
     def auth_key

data/lib/devise_remote_user/strategy.rb

@@ -6,7 +6,7 @@ module Devise
     class RemoteUserAuthenticatable < Authenticatable
 
       def valid?
-        env[DeviseRemoteUser.env_key].present?
+        DeviseRemoteUser.remote_user_id(env).present?
       end
 
       def authenticate!

data/lib/devise_remote_user/version.rb

@@ -1,3 +1,3 @@
 module DeviseRemoteUser
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/dummy/config/environments/development.rb

@@ -20,7 +20,7 @@ Dummy::Application.configure do
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations
-  config.active_record.migration_error = :page_load
+  #config.active_record.migration_error = :page_load
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large

data/spec/dummy/config/initializers/secret_token.rb

@@ -9,4 +9,4 @@
 
 # Make sure your secret_key_base is kept private
 # if you're sharing your code publicly.
-Dummy::Application.config.secret_key_base = 'd21fd8b56cd95305d2900f46c17cfecf9cfd198395a33c487af053c3c8e8cfc6bd1846dc9d40731f1d98ae9dd571d3d88be03af97cc46c5cf112b6c2e69f8fc2'
+Dummy::Application.config.secret_token = 'd21fd8b56cd95305d2900f46c17cfecf9cfd198395a33c487af053c3c8e8cfc6bd1846dc9d40731f1d98ae9dd571d3d88be03af97cc46c5cf112b6c2e69f8fc2'

data/spec/dummy/db/schema.rb

@@ -9,30 +9,30 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended that you check this file into your version control system.
+# It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20131101184256) do
+ActiveRecord::Schema.define(:version => 20131101184256) do
 
-  create_table "users", force: true do |t|
-    t.string   "email",                  default: "", null: false
-    t.string   "encrypted_password",     default: "", null: false
+  create_table "users", :force => true do |t|
+    t.string   "email",                  :default => "", :null => false
+    t.string   "encrypted_password",     :default => "", :null => false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
+    t.integer  "sign_in_count",          :default => 0,  :null => false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
     t.string   "first_name"
     t.string   "last_name"
     t.string   "nickname"
     t.string   "display_name"
   end
 
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  add_index "users", ["email"], :name => "index_users_on_email", :unique => true
+  add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
 
 end

data/spec/lib/devise_remote_user_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe DeviseRemoteUser do
+  context ".remote_user_id" do
+    let(:mock_env) { { 'REMOTE_USER' => 'some-id' } }
+    context "with a string for the env_key" do
+      before do
+        DeviseRemoteUser.env_key = "REMOTE_USER"
+      end
+      
+      it "should retrieve the key from the env" do
+        expect(DeviseRemoteUser.remote_user_id(mock_env)).to eq "some-id"
+      end
+    end
+  
+    context "with a proc for the env_key" do
+      before do
+        DeviseRemoteUser.env_key = lambda { |env| "#{env['REMOTE_USER']}@example.com" }
+      end
+      
+      it "should retrieve the key from the env" do
+        expect(DeviseRemoteUser.remote_user_id(mock_env)).to eq "some-id@example.com"
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise-remote-user
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - David Chandek-Stark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -111,6 +111,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -187,6 +188,7 @@ files:
 - spec/dummy/tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
 - spec/factories/user_factories.rb
 - spec/factories/user_factories.rb~
+- spec/lib/devise_remote_user_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/duke-libraries/devise-remote-user
 licenses:
@@ -269,4 +271,5 @@ test_files:
 - spec/dummy/tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
 - spec/factories/user_factories.rb
 - spec/factories/user_factories.rb~
+- spec/lib/devise_remote_user_spec.rb
 - spec/spec_helper.rb