omniauth-identity 1.1.0 → 1.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f63f80480a42c6089f050cae1a70ebe9195f925d
+  data.tar.gz: 3b229b38d48396559ac41f65712c931bc4f76590
+SHA512:
+  metadata.gz: 91cbf121086311eb85cf68345b58eeac85e165ce3119a58bc148ddf470e77050664efc986e40eb2099b7b1f306b7119457445535fa1d1512bae9c975e54fbae2
+  data.tar.gz: 729a821aa7e9cf31e847fe1f98e87ac04e2ffb031c45405e3421617edd3ac841412840670bbdb333c806fa9330adde986bbc28bf7ecd60a4aa5e45673d2907b9

data/Gemfile.lock

@@ -1,31 +1,40 @@
 PATH
   remote: .
   specs:
-    omniauth-identity (1.0.0)
+    omniauth-identity (1.1.1)
       bcrypt-ruby (~> 3.0)
       omniauth (~> 1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.1)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    addressable (2.2.6)
-    arel (3.0.0)
+    addressable (2.3.5)
+    arel (3.0.2)
     bcrypt-ruby (3.0.1)
-    bson (1.5.2)
-    bson_ext (1.5.2)
-      bson (= 1.5.2)
-    builder (3.0.0)
+    bson (1.9.0)
+    bson_ext (1.9.0)
+      bson (~> 1.9.0)
+    builder (3.0.4)
+    coderay (1.0.9)
+    couch_potato (1.0.1)
+      activemodel
+      couchrest (~> 1.2.0)
+      json (~> 1.6)
+    couchrest (1.2.0)
+      mime-types (~> 1.15)
+      multi_json (~> 1.0)
+      rest-client (~> 1.6.1)
     datamapper (1.2.0)
       dm-aggregates (~> 1.2.0)
       dm-constraints (~> 1.2.0)
@@ -36,90 +45,116 @@ GEM
       dm-transactions (~> 1.2.0)
       dm-types (~> 1.2.0)
       dm-validations (~> 1.2.0)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.4)
     dm-aggregates (1.2.0)
       dm-core (~> 1.2.0)
     dm-constraints (1.2.0)
       dm-core (~> 1.2.0)
-    dm-core (1.2.0)
-      addressable (~> 2.2.6)
+    dm-core (1.2.1)
+      addressable (~> 2.3)
     dm-migrations (1.2.0)
       dm-core (~> 1.2.0)
-    dm-serializer (1.2.1)
+    dm-serializer (1.2.2)
       dm-core (~> 1.2.0)
-      fastercsv (~> 1.5.4)
-      json (~> 1.6.1)
-      json_pure (~> 1.6.1)
-      multi_json (~> 1.0.3)
+      fastercsv (~> 1.5)
+      json (~> 1.6)
+      json_pure (~> 1.6)
+      multi_json (~> 1.0)
     dm-timestamps (1.2.0)
       dm-core (~> 1.2.0)
     dm-transactions (1.2.0)
       dm-core (~> 1.2.0)
-    dm-types (1.2.1)
-      bcrypt-ruby (~> 3.0.0)
+    dm-types (1.2.2)
+      bcrypt-ruby (~> 3.0)
       dm-core (~> 1.2.0)
-      fastercsv (~> 1.5.4)
-      json (~> 1.6.1)
-      multi_json (~> 1.0.3)
-      stringex (~> 1.3.0)
-      uuidtools (~> 2.1.2)
+      fastercsv (~> 1.5)
+      json (~> 1.6)
+      multi_json (~> 1.0)
+      stringex (~> 1.4)
+      uuidtools (~> 2.1)
     dm-validations (1.2.0)
       dm-core (~> 1.2.0)
-    fastercsv (1.5.4)
-    ffi (1.0.11)
+    fastercsv (1.5.5)
+    ffi (1.9.0)
+    formatador (0.2.4)
     growl (1.0.3)
-    guard (1.0.0)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-bundler (0.1.3)
-      bundler (>= 1.0.0)
-      guard (>= 0.2.2)
-    guard-rspec (0.6.0)
-      guard (>= 0.10.0)
-    hashie (1.2.0)
-    i18n (0.6.0)
-    json (1.6.5)
-    json_pure (1.6.5)
-    maruku (0.6.0)
+    guard (1.8.1)
+      formatador (>= 0.2.4)
+      listen (>= 1.0.0)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-bundler (1.0.0)
+      bundler (~> 1.0)
+      guard (~> 1.1)
+    guard-rspec (3.0.2)
+      guard (>= 1.8)
+      rspec (~> 2.13)
+    hashie (2.0.5)
+    i18n (0.6.1)
+    json (1.8.0)
+    json_pure (1.8.0)
+    listen (1.2.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    lumberjack (1.0.4)
+    maruku (0.6.1)
       syntax (>= 1.0.0)
-    mongo (1.5.2)
-      bson (= 1.5.2)
-    mongo_mapper (0.11.0)
+    method_source (0.8.1)
+    mime-types (1.23)
+    mongo (1.9.0)
+      bson (~> 1.9.0)
+    mongo_mapper (0.12.0)
       activemodel (~> 3.0)
       activesupport (~> 3.0)
-      plucky (~> 0.4.0)
-    mongoid (2.4.4)
-      activemodel (~> 3.1)
-      mongo (~> 1.3)
+      plucky (~> 0.5.2)
+    mongoid (3.1.4)
+      activemodel (~> 3.2)
+      moped (~> 1.4)
+      origin (~> 1.0)
       tzinfo (~> 0.3.22)
-    multi_json (1.0.4)
-    omniauth (1.1.0)
-      hashie (~> 1.2)
+    moped (1.5.0)
+    multi_json (1.7.7)
+    omniauth (1.1.4)
+      hashie (>= 1.2, < 3)
       rack
-    plucky (0.4.4)
+    origin (1.1.0)
+    plucky (0.5.2)
       mongo (~> 1.5)
-    rack (1.4.1)
-    rack-test (0.6.1)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rake (0.9.2.2)
-    rb-fsevent (0.9.0)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    stringex (1.3.2)
+    rake (0.9.6)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.0)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
+      ffi (>= 0.5.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    slop (3.4.5)
+    stringex (1.5.1)
     syntax (1.0.0)
-    thor (0.14.6)
-    tzinfo (0.3.31)
-    uuidtools (2.1.2)
+    thor (0.18.1)
+    tzinfo (0.3.37)
+    uuidtools (2.1.4)
 
 PLATFORMS
   ruby
@@ -127,6 +162,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 3.1)
   bson_ext
+  couch_potato
   datamapper
   growl
   guard

data/README.markdown

@@ -26,7 +26,7 @@ able to persist the information provided by the user. Luckily for you, there
 are pre-built models for popular ORMs that make this dead simple.
 
 **Note:** OmniAuth Identity is different from many other user authentication
-systems in that it is *not* intended to be associated with your primary
+systems in that it is *not* built to store authentication information in your primary
 `User` model. Instead, the `Identity` model should be **associated** with your
 `User` model giving you maximum flexibility to include other authentication
 strategies such as Facebook, Twitter, etc.
@@ -93,6 +93,26 @@ class Identity
 end
 ```
 
+### CouchPotato
+
+Include the `OmniAuth::Identity::Models::CouchPotatoModule` mixin and specify fields that you will need.
+
+```ruby
+class Identity
+  include CouchPotato::Persistence
+  include OmniAuth::Identity::Models::CouchPotatoModule
+
+  property :email
+  property :password_digest
+
+  def self.where search_hash
+    CouchPotato.database.view Identity.by_email(:key => search_hash)
+  end
+
+  view :by_email, :key => :email
+end
+```
+
 Once you've got an Identity persistence model and the strategy up and
 running, you can point users to `/auth/identity` and it will request
 that they log in or give them the opportunity to sign up for an account.
@@ -160,3 +180,23 @@ For more information on rack endpoints, check out [this
 introduction](http://library.edgecase.com/Rails/2011/01/04/rails-routing-and-rack-endpoints.html)
 and
 [ActionController::Metal](http://rubydoc.info/docs/rails/ActionController/Metal)
+
+## Customizing Locate Conditions
+
+You can customize the way that matching records are found when authenticating.
+For example, for a site with multiple domains, you may wish to scope the search
+within a particular subdomain.  To do so, add :locate_conditions to your config.
+The default value is:
+
+```ruby
+:locate_conditions => lambda { |req| { model.auth_key => req['auth_key']} }
+```
+
+locate_conditions takes a Proc object, and must return a hash.  The resulting hash is used
+as a parameter in the locate method for your ORM.  The proc is evaluated in the
+callback context, and has access to the Identity model (using `model`) and receives the request
+object as a parameter.  Note  that model.auth_key defaults to 'email', but is also configurable.
+
+Note: Be careful when customizing locate_conditions.  The best way to modify the conditions is
+to copy the default value, and then add to the hash.  Removing the default condition will almost
+always break things!

data/lib/omniauth-identity/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Identity
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end

data/lib/omniauth/identity.rb

@@ -6,13 +6,14 @@ module OmniAuth
   end
 
   module Identity
-    autoload :Model,            'omniauth/identity/model'
-    autoload :SecurePassword,   'omniauth/identity/secure_password'
+    autoload :Model,               'omniauth/identity/model'
+    autoload :SecurePassword,      'omniauth/identity/secure_password'
     module Models
-      autoload :ActiveRecord,   'omniauth/identity/models/active_record'
-      autoload :MongoMapper,    'omniauth/identity/models/mongo_mapper'
-      autoload :Mongoid,        'omniauth/identity/models/mongoid'
-      autoload :DataMapper,     'omniauth/identity/models/data_mapper'
+      autoload :ActiveRecord,      'omniauth/identity/models/active_record'
+      autoload :MongoMapper,       'omniauth/identity/models/mongo_mapper'
+      autoload :Mongoid,           'omniauth/identity/models/mongoid'
+      autoload :DataMapper,        'omniauth/identity/models/data_mapper'
+      autoload :CouchPotatoModule, 'omniauth/identity/models/couch_potato'
     end
   end
 end

data/lib/omniauth/identity/model.rb

@@ -23,14 +23,14 @@ module OmniAuth
         # Authenticate a user with the given key and password.
         #
         # @param [String] key The unique login key provided for a given identity.
-        # @param [String] password The presumed password for the identity. 
+        # @param [String] password The presumed password for the identity.
         # @return [Model] An instance of the identity model class.
-        def authenticate(key, password)
-          instance = locate(key)
+        def authenticate(conditions, password)
+          instance = locate(conditions)
           return false unless instance
           instance.authenticate(password)
         end
-        
+
         # Used to set or retrieve the method that will be used to get
         # and set the user-supplied authentication key.
         # @return [String] The method name.

data/lib/omniauth/identity/models/active_record.rb

@@ -9,14 +9,14 @@ module OmniAuth
 
         self.abstract_class = true
         has_secure_password
-       
+
         def self.auth_key=(key)
           super
           validates_uniqueness_of key, :case_sensitive => false
         end
 
-        def self.locate(key)
-          where(auth_key => key).first
+        def self.locate(search_hash)
+          where(search_hash).first
         end
       end
     end

data/lib/omniauth/identity/models/couch_potato.rb

@@ -0,0 +1,31 @@
+require 'couch_potato'
+
+module OmniAuth
+  module Identity
+    module Models
+      # can not be named CouchPotato since there is a class with that name
+      module CouchPotatoModule
+
+        def self.included(base)
+
+          base.class_eval do
+
+            include ::OmniAuth::Identity::Model
+            include ::OmniAuth::Identity::SecurePassword
+
+            has_secure_password
+
+            def self.auth_key=(key)
+              super
+              validates_uniqueness_of key, :case_sensitive => false
+            end
+
+            def self.locate(search_hash)
+              where(search_hash).first
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/omniauth/identity/models/data_mapper.rb

@@ -21,8 +21,8 @@ module OmniAuth
               validates_uniqueness_of :key
             end
 
-            def self.locate(key)
-              all(auth_key => key).first
+            def self.locate(search_hash)
+              all(search_hash).first
             end
           end
         end

data/lib/omniauth/identity/models/mongo_mapper.rb

@@ -16,8 +16,8 @@ module OmniAuth
               validates_uniqueness_of key, :case_sensitive => false
             end
 
-            def self.locate(key)
-              where(auth_key => key).first
+            def self.locate(search_hash)
+              where(search_hash).first
             end
           end
         end

data/lib/omniauth/identity/models/mongoid.rb

@@ -19,8 +19,8 @@ module OmniAuth
               validates_uniqueness_of key, :case_sensitive => false
             end
 
-            def self.locate(key)
-              where(auth_key => key).first
+            def self.locate(search_hash)
+              where(search_hash).first
             end
 
           end

data/lib/omniauth/identity/secure_password.rb

@@ -68,7 +68,7 @@ module OmniAuth
         # Encrypts the password into the password_digest attribute.
         def password=(unencrypted_password)
           @password = unencrypted_password
-          unless unencrypted_password.empty?
+          if unencrypted_password && !unencrypted_password.empty?
             self.password_digest = BCrypt::Password.create(unencrypted_password)
           end
         end

data/lib/omniauth/strategies/identity.rb

@@ -1,23 +1,30 @@
 module OmniAuth
   module Strategies
-    # The identity strategy allows you to provide simple internal 
+    # The identity strategy allows you to provide simple internal
     # user authentication using the same process flow that you
     # use for external OmniAuth providers.
     class Identity
       include OmniAuth::Strategy
 
       option :fields, [:name, :email]
+      option :on_login, nil
+      option :on_registration, nil
       option :on_failed_registration, nil
+      option :locate_conditions, lambda{|req| {model.auth_key => req['auth_key']} }
 
       def request_phase
-        OmniAuth::Form.build(
-          :title => (options[:title] || "Identity Verification"),
-          :url => callback_path
-        ) do |f|
-          f.text_field 'Login', 'auth_key'
-          f.password_field 'Password', 'password'
-          f.html "<p align='center'><a href='#{registration_path}'>Create an Identity</a></p>"
-        end.to_response 
+        if options[:on_login]
+          options[:on_login].call(self.env)
+        else
+          OmniAuth::Form.build(
+            :title => (options[:title] || "Identity Verification"),
+            :url => callback_path
+          ) do |f|
+            f.text_field 'Login', 'auth_key'
+            f.password_field 'Password', 'password'
+            f.html "<p align='center'><a href='#{registration_path}'>Create an Identity</a></p>"
+          end.to_response
+        end
       end
 
       def callback_phase
@@ -38,13 +45,17 @@ module OmniAuth
       end
 
       def registration_form
-        OmniAuth::Form.build(:title => 'Register Identity') do |f|
-          options[:fields].each do |field|
-            f.text_field field.to_s.capitalize, field.to_s
-          end
-          f.password_field 'Password', 'password'
-          f.password_field 'Confirm Password', 'password_confirmation'
-        end.to_response
+        if options[:on_registration]
+          options[:on_registration].call(self.env)
+        else
+          OmniAuth::Form.build(:title => 'Register Identity') do |f|
+            options[:fields].each do |field|
+              f.text_field field.to_s.capitalize, field.to_s
+            end
+            f.password_field 'Password', 'password'
+            f.password_field 'Confirm Password', 'password_confirmation'
+          end.to_response
+        end
       end
 
       def registration_phase
@@ -75,7 +86,13 @@ module OmniAuth
       end
 
       def identity
-        @identity ||= model.authenticate(request['auth_key'], request['password'])
+        if options.locate_conditions.is_a? Proc
+          conditions = instance_exec(request, &options.locate_conditions)
+          conditions.to_hash
+        else
+          conditions = options.locate_conditions.to_hash
+        end
+        @identity ||= model.authenticate(conditions, request['password'] )
       end
 
       def model

data/omniauth-identity.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'mongo_mapper'
   gem.add_development_dependency 'datamapper'
   gem.add_development_dependency 'bson_ext'
+  gem.add_development_dependency 'couch_potato'
 
   gem.name = 'omniauth-identity'
   gem.version = OmniAuth::Identity::VERSION

data/spec/omniauth/identity/model_spec.rb

@@ -15,8 +15,14 @@ describe OmniAuth::Identity::Model do
     describe '.authenticate' do
       it 'should call locate and then authenticate' do
         mocked_instance = mock('ExampleModel', :authenticate => 'abbadoo')
-        subject.should_receive(:locate).with('example').and_return(mocked_instance)
-        subject.authenticate('example','pass').should == 'abbadoo'
+        subject.should_receive(:locate).with('email' => 'example').and_return(mocked_instance)
+        subject.authenticate({'email' => 'example'},'pass').should == 'abbadoo'
+      end
+
+      it 'should call locate with additional scopes when provided' do
+        mocked_instance = mock('ExampleModel', :authenticate => 'abbadoo')
+        subject.should_receive(:locate).with('email' => 'example', 'user_type' => 'admin').and_return(mocked_instance)
+        subject.authenticate({'email' => 'example', 'user_type' => 'admin'}, 'pass').should == 'abbadoo'
       end
 
       it 'should recover gracefully if locate is nil' do

data/spec/omniauth/identity/models/active_record_spec.rb

@@ -1,15 +1,13 @@
 require 'spec_helper'
 
 describe(OmniAuth::Identity::Models::ActiveRecord, :db => true) do
-  class TestIdentity < OmniAuth::Identity::Models::ActiveRecord
-    auth_key :ham_sandwich
-  end
+  class TestIdentity < OmniAuth::Identity::Models::ActiveRecord; end
 
-  it 'should locate using the auth key using a where query' do
-    TestIdentity.should_receive(:where).with('ham_sandwich' => 'open faced').and_return(['wakka'])
-    TestIdentity.locate('open faced').should == 'wakka'
+  it 'should delegate locate to the where query method' do
+    TestIdentity.should_receive(:where).with('ham_sandwich' => 'open faced', 'category' => 'sandwiches').and_return(['wakka'])
+    TestIdentity.locate('ham_sandwich' => 'open faced', 'category' => 'sandwiches').should == 'wakka'
   end
-  
+
   it 'should not use STI rules for its table name' do
     TestIdentity.table_name.should == 'test_identities'
   end

data/spec/omniauth/identity/models/couch_potato_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe(OmniAuth::Identity::Models::CouchPotatoModule, :db => true) do
+  class CouchPotatoTestIdentity
+    include CouchPotato::Persistence
+    include OmniAuth::Identity::Models::CouchPotatoModule
+    auth_key :ham_sandwich
+  end
+
+  it 'should delegate locate to the where query method' do
+    CouchPotatoTestIdentity.should_receive(:where).with('ham_sandwich' => 'open faced', 'category' => 'sandwiches').and_return(['wakka'])
+    CouchPotatoTestIdentity.locate('ham_sandwich' => 'open faced', 'category' => 'sandwiches').should == 'wakka'
+  end
+
+end

data/spec/omniauth/identity/models/data_mapper_spec.rb

@@ -15,8 +15,8 @@ describe(OmniAuth::Identity::Models::DataMapper, :db => true) do
     @resource = DataMapperTestIdentity.new
   end
 
-  it 'should locate using the auth key using a all query' do
-    DataMapperTestIdentity.should_receive(:all).with('ham_sandwich' => 'open faced').and_return(['wakka'])
-    DataMapperTestIdentity.locate('open faced').should == 'wakka'
+  it 'should delegate locate to the all query method' do
+    DataMapperTestIdentity.should_receive(:all).with('ham_sandwich' => 'open faced', 'category' => 'sandwiches').and_return(['wakka'])
+    DataMapperTestIdentity.locate('ham_sandwich' => 'open faced', 'category' => 'sandwiches').should == 'wakka'
   end
 end

data/spec/omniauth/identity/models/mongo_mapper_spec.rb

@@ -7,8 +7,9 @@ describe(OmniAuth::Identity::Models::MongoMapper, :db => true) do
     auth_key :ham_sandwich
   end
 
-  it 'should locate using the auth key using a where query' do
-    MongoMapperTestIdentity.should_receive(:where).with('ham_sandwich' => 'open faced').and_return(['wakka'])
-    MongoMapperTestIdentity.locate('open faced').should == 'wakka'
+
+  it 'should delegate locate to the where query method' do
+    MongoMapperTestIdentity.should_receive(:where).with('ham_sandwich' => 'open faced', 'category' => 'sandwiches').and_return(['wakka'])
+    MongoMapperTestIdentity.locate('ham_sandwich' => 'open faced', 'category' => 'sandwiches').should == 'wakka'
   end
 end

data/spec/omniauth/identity/models/mongoid_spec.rb

@@ -7,11 +7,11 @@ describe(OmniAuth::Identity::Models::Mongoid, :db => true) do
     auth_key :ham_sandwich
   end
 
-  it 'should locate using the auth key using a where query' do
-    MongoidTestIdentity.should_receive(:where).with('ham_sandwich' => 'open faced').and_return(['wakka'])
-    MongoidTestIdentity.locate('open faced').should == 'wakka'
+  it 'should delegate locate to the where query method' do
+    MongoidTestIdentity.should_receive(:where).with('ham_sandwich' => 'open faced', 'category' => 'sandwiches').and_return(['wakka'])
+    MongoidTestIdentity.locate('ham_sandwich' => 'open faced', 'category' => 'sandwiches').should == 'wakka'
   end
-  
+
   it 'should not use STI rules for its collection name' do
     MongoidTestIdentity.collection.name.should == 'mongoid_test_identities'
   end

data/spec/omniauth/strategies/identity_spec.rb

@@ -41,7 +41,8 @@ describe OmniAuth::Strategies::Identity do
 
     context 'with valid credentials' do
       before do
-        MockIdentity.should_receive('authenticate').with('john','awesome').and_return(user)
+        MockIdentity.stub('auth_key').and_return('email')
+        MockIdentity.should_receive('authenticate').with({'email' => 'john'},'awesome').and_return(user)
         post '/auth/identity/callback', :auth_key => 'john', :password => 'awesome'
       end
 
@@ -60,8 +61,9 @@ describe OmniAuth::Strategies::Identity do
 
     context 'with invalid credentials' do
       before do
+        MockIdentity.stub('auth_key').and_return('email')
         OmniAuth.config.on_failure = lambda{|env| [401, {}, [env['omniauth.error.type'].inspect]]}
-        MockIdentity.should_receive(:authenticate).with('wrong','login').and_return(false)
+        MockIdentity.should_receive(:authenticate).with({'email' => 'wrong'},'login').and_return(false)
         post '/auth/identity/callback', :auth_key => 'wrong', :password => 'login'
       end
 
@@ -69,6 +71,16 @@ describe OmniAuth::Strategies::Identity do
         last_response.body.should == ':invalid_credentials'
       end
     end
+
+    context 'with auth scopes' do
+
+      it 'should evaluate and pass through conditions proc' do
+        MockIdentity.stub('auth_key').and_return('email')
+        set_app!( :locate_conditions => lambda{|req| {model.auth_key => req['auth_key'], 'user_type' => 'admin'} } )
+        MockIdentity.should_receive('authenticate').with( {'email' => 'john', 'user_type' => 'admin'}, 'awesome' ).and_return(user)
+        post '/auth/identity/callback', :auth_key => 'john', :password => 'awesome'
+      end
+    end
   end
 
   describe '#registration_form' do
@@ -81,13 +93,14 @@ describe OmniAuth::Strategies::Identity do
   describe '#registration_phase' do
     context 'with successful creation' do
       let(:properties){ {
-        :name => 'Awesome Dude', 
+        :name => 'Awesome Dude',
         :email => 'awesome@example.com',
         :password => 'face',
         :password_confirmation => 'face'
       } }
 
       before do
+        MockIdentity.stub('auth_key').and_return('email')
         m = mock(:uid => 'abc', :name => 'Awesome Dude', :email => 'awesome@example.com', :info => {:name => 'DUUUUDE!'}, :persisted? => true)
         MockIdentity.should_receive(:create).with(properties).and_return(m)
       end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-identity
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.1.1
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,65 +125,71 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: datamapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: couch_potato
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Internal authentication handlers for OmniAuth.
@@ -222,6 +211,7 @@ files:
 - lib/omniauth/identity.rb
 - lib/omniauth/identity/model.rb
 - lib/omniauth/identity/models/active_record.rb
+- lib/omniauth/identity/models/couch_potato.rb
 - lib/omniauth/identity/models/data_mapper.rb
 - lib/omniauth/identity/models/mongo_mapper.rb
 - lib/omniauth/identity/models/mongoid.rb
@@ -230,6 +220,7 @@ files:
 - omniauth-identity.gemspec
 - spec/omniauth/identity/model_spec.rb
 - spec/omniauth/identity/models/active_record_spec.rb
+- spec/omniauth/identity/models/couch_potato_spec.rb
 - spec/omniauth/identity/models/data_mapper_spec.rb
 - spec/omniauth/identity/models/mongo_mapper_spec.rb
 - spec/omniauth/identity/models/mongoid_spec.rb
@@ -238,26 +229,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/intridea/omniauth-identity
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Internal authentication handlers for OmniAuth.
 test_files: []
+has_rdoc: