omniauth-identity 1.0.0.rc2 → 1.0.0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    omniauth-identity (1.0.0.beta1)
-      omniauth (= 1.0.0.beta1)
+    omniauth-identity (1.0.0.rc2)
+      omniauth (~> 1.0.0.rc2)
 
 GEM
   remote: http://rubygems.org/
@@ -20,7 +20,7 @@ GEM
       multi_json (~> 1.0)
     arel (2.2.1)
     bcrypt-ruby (3.0.1)
-    bson (1.4.1)
+    bson (1.3.1)
     bson_ext (1.4.1)
     builder (3.0.0)
     diff-lcs (1.1.3)
@@ -36,16 +36,22 @@ GEM
     i18n (0.6.0)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    mongo (1.4.1)
-      bson (= 1.4.1)
-    mongoid (2.3.2)
-      activemodel (~> 3.1)
-      mongo (~> 1.4)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    mongo_mapper (0.9.2)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      plucky (~> 0.3.8)
+    mongoid (2.2.3)
+      activemodel (~> 3.0)
+      mongo (~> 1.3)
       tzinfo (~> 0.3.22)
     multi_json (1.0.3)
-    omniauth (1.0.0.beta1)
+    omniauth (1.0.0.rc2)
       hashie (~> 1.2)
       rack
+    plucky (0.3.8)
+      mongo (~> 1.3)
     rack (1.3.5)
     rack-test (0.6.1)
       rack (>= 1.0)
@@ -79,7 +85,8 @@ DEPENDENCIES
   guard-bundler
   guard-rspec
   maruku (~> 0.6)
-  mongoid (~> 2.3)
+  mongo_mapper
+  mongoid (~> 2.2.3)
   omniauth-identity!
   rack-test (~> 0.5)
   rake (~> 0.8)

data/README.markdown

@@ -18,25 +18,43 @@ look something like this:
 
 Next, you need to create a model (called `Identity by default`) that will be
 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. You just
-need to subclass the relevant class:
+are pre-built models for popular ORMs that make this dead simple.
+
+### ActiveRecord
+
+Just subclass `OmniAuth::Identity::Models::ActiveRecord` and provide fields
+in the database for all of the fields you are using.
 
     class Identity < OmniAuth::Identity::Models::ActiveRecord
       # Add whatever you like!
     end
 
-Adapters are provided for `ActiveRecord` and `MongoMapper` and are
-autoloaded on request (but not loaded by default so no dependencies are
-injected).
+### Mongoid
 
-You can also use `Mongoid`, but you need to include it in your class:
+Include the `OmniAuth::Identity::Models::Mongoid` mixin and specify
+fields that you will need.
 
     class Identity
       include Mongoid::Document
       include OmniAuth::Identity::Models::Mongoid
 
-      # Add whatever you like!
-      
+      field :email, type: String
+      field :name, type: String
+      field :password_digest, type: String
+    end
+
+### MongoMapper
+
+Include the `OmniAuth::Identity::Models::MongoMapper` mixin and specify
+fields that you will need.
+
+    class Identity
+      include MongoMapper::Document
+      include OmniAuth::Identity::Models::MongoMapper
+
+      key :email, String
+      key :name, String
+      key :password_digest, String
     end
 
 Once you've got an Identity persistence model and the strategy up and

data/lib/omniauth-identity/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Identity
-    VERSION = '1.0.0.rc2'
+    VERSION = '1.0.0'
   end
 end

data/lib/omniauth/identity.rb

@@ -10,7 +10,7 @@ module OmniAuth
     autoload :SecurePassword,   'omniauth/identity/secure_password'
     module Models
       autoload :ActiveRecord,   'omniauth/identity/models/active_record'
-      # autoload :MongoMapper,  'omniauth/identity/models/mongo_mapper'
+      autoload :MongoMapper,    'omniauth/identity/models/mongo_mapper'
       autoload :Mongoid,        'omniauth/identity/models/mongoid'
     end
   end

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

@@ -0,0 +1,28 @@
+require 'mongo_mapper'
+
+module OmniAuth
+  module Identity
+    module Models
+      module MongoMapper
+        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(key)
+              where(auth_key => key).first
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/omniauth-identity.gemspec

@@ -2,17 +2,18 @@
 require File.dirname(__FILE__) + '/lib/omniauth-identity/version'
 
 Gem::Specification.new do |gem|
-  gem.add_runtime_dependency 'omniauth', '~> 1.0.0.rc2'
+  gem.add_runtime_dependency 'omniauth', '~> 1.0'
 
   gem.add_development_dependency 'maruku', '~> 0.6'
   gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'rack-test', '~> 0.5'
   gem.add_development_dependency 'rake', '~> 0.8'
-  gem.add_development_dependency 'rspec', '~> 2.5'
+  gem.add_development_dependency 'rspec', '~> 2.7'
   gem.add_development_dependency 'bcrypt-ruby', '~> 3.0'
   gem.add_development_dependency 'activerecord', '~> 3.1'
-  gem.add_development_dependency 'mongoid', '~> 2.3'
-  gem.add_development_dependency 'bson_ext', '~> 1.4'
+  gem.add_development_dependency 'mongoid'
+  gem.add_development_dependency 'mongo_mapper'
+  gem.add_development_dependency 'bson_ext'
 
   gem.name = 'omniauth-identity'
   gem.version = OmniAuth::Identity::VERSION

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

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe(OmniAuth::Identity::Models::MongoMapper, :db => true) do
+  class MongoMapperTestIdentity
+    include MongoMapper::Document
+    include OmniAuth::Identity::Models::MongoMapper
+    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'
+  end
+end

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-identity
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000Z
+date: 2011-11-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70150675915060 !ruby/object:Gem::Requirement
+  requirement: &70358092253920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70150675915060
+  version_requirements: *70358092253920
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70150675914520 !ruby/object:Gem::Requirement
+  requirement: &70358092252640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70150675914520
+  version_requirements: *70358092252640
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70150675913940 !ruby/object:Gem::Requirement
+  requirement: &70358092252120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70150675913940
+  version_requirements: *70358092252120
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70150675913360 !ruby/object:Gem::Requirement
+  requirement: &70358092251580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70150675913360
+  version_requirements: *70358092251580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70150675912640 !ruby/object:Gem::Requirement
+  requirement: &70358092250860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,21 +65,21 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70150675912640
+  version_requirements: *70358092250860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70150675911880 !ruby/object:Gem::Requirement
+  requirement: &70358092249820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70150675911880
+  version_requirements: *70358092249820
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70150675911300 !ruby/object:Gem::Requirement
+  requirement: &70358092248940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70150675911300
+  version_requirements: *70358092248940
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70150675910160 !ruby/object:Gem::Requirement
+  requirement: &70358092248120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,29 +98,40 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70150675910160
+  version_requirements: *70358092248120
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70150675903920 !ruby/object:Gem::Requirement
+  requirement: &70358092247540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70358092247540
+- !ruby/object:Gem::Dependency
+  name: mongo_mapper
+  requirement: &70358092246700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150675903920
+  version_requirements: *70358092246700
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70150675903280 !ruby/object:Gem::Requirement
+  requirement: &70358092246180 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150675903280
+  version_requirements: *70358092246180
 description: Internal authentication handlers for OmniAuth.
 email:
 - michael@intridea.com
@@ -140,12 +151,14 @@ files:
 - lib/omniauth/identity.rb
 - lib/omniauth/identity/model.rb
 - lib/omniauth/identity/models/active_record.rb
+- lib/omniauth/identity/models/mongo_mapper.rb
 - lib/omniauth/identity/models/mongoid.rb
 - lib/omniauth/identity/secure_password.rb
 - lib/omniauth/strategies/identity.rb
 - omniauth-identity.gemspec
 - spec/omniauth/identity/model_spec.rb
 - spec/omniauth/identity/models/active_record_spec.rb
+- spec/omniauth/identity/models/mongo_mapper_spec.rb
 - spec/omniauth/identity/models/mongoid_spec.rb
 - spec/omniauth/identity/secure_password_spec.rb
 - spec/omniauth/strategies/identity_spec.rb
@@ -177,6 +190,7 @@ summary: Internal authentication handlers for OmniAuth.
 test_files:
 - spec/omniauth/identity/model_spec.rb
 - spec/omniauth/identity/models/active_record_spec.rb
+- spec/omniauth/identity/models/mongo_mapper_spec.rb
 - spec/omniauth/identity/models/mongoid_spec.rb
 - spec/omniauth/identity/secure_password_spec.rb
 - spec/omniauth/strategies/identity_spec.rb