entrance 0.4.3 → 0.4.4

data/examples/sinatra-app/app/models.rb

@@ -4,12 +4,11 @@ require 'mongo_mapper'
 require 'entrance'
 
 MongoMapper.connection = Mongo::Connection.new('localhost')
-MongoMapper.database   = 'entrance-omniauth-example'
+MongoMapper.database   = 'entrance-example'
 
 Entrance.configure do |config|
   config.remember_for  = 1.month
   config.cookie_secure = false # for testing
-  config.access_denied_redirect_to = '/login'
 end
 
 class User

data/examples/sinatra-omniauth/app/models.rb

@@ -4,7 +4,7 @@ require 'mongo_mapper'
 require 'entrance'
 
 MongoMapper.connection = Mongo::Connection.new('localhost')
-MongoMapper.database   = 'entrance-example'
+MongoMapper.database   = 'entrance-omniauth-example'
 
 Entrance.configure do |config|
   config.remember_for  = 1.month
@@ -18,13 +18,16 @@ class User
   key :state, :default => 'active'
 
   key :name
+  key :email, :unique => true
+
+  key :password_hash, String
   key :auth_provider, String
   key :auth_uid, String
 
   key :remember_token
   key :remember_token_expires_at, Time
 
-  provides_entrance :local => false
+  provides_entrance :local => false, :remote => true
 
   def active?
     state.to_sym == :active

data/lib/entrance/addons/omniauth.rb

@@ -33,19 +33,6 @@ module Entrance
 
       def registered(app)
 
-        ::Entrance.model.class_eval do
-
-          def via_omniauth?
-            send(::Entrance.fields.auth_provider).present? \
-              && send(::Entrance.fields.auth_uid).present?
-          end
-
-          def password_required?
-            !via_omniauth? && (password.nil? || @password_changed)
-          end
-
-        end
-
         app.send(:include, Entrance::Controller) # provides redirects, etc
 
         app.use ::OmniAuth::Builder do

data/lib/entrance/fields.rb

@@ -26,10 +26,12 @@ module Entrance
       @auth_uid              = 'auth_uid'
     end
 
-    def validate_field(attr)
-      field = send(attr)
-      unless fields.include?(field.to_sym)
-        raise "Couldn't find '#{field}' in the #{Entrance.model.name} model."
+    def validate(*attrs)
+      attrs.each do |attr|
+        field = send(attr)
+        unless fields.include?(field.to_sym)
+          raise "Couldn't find '#{field}' in the #{Entrance.model.name} model."
+        end
       end
     end
 

data/lib/entrance/model.rb

@@ -9,7 +9,8 @@ module Entrance
 
       def provides_entrance(options = {}, &block)
         Entrance.config.model = self.name
-        local = options.delete(:local) != false
+        local  = options.delete(:local) != false # true by default
+        remote = options.delete(:remote) == true # false by default
 
         # if the target model class does not have a Model.where() method,
         # then login_by_session wont work, nor the ClassMethods below.
@@ -22,11 +23,11 @@ module Entrance
         yield fields if block_given?
 
         # username and remember token are used both for local and remote (omniauth)
-        fields.validate_field(:username)
+        fields.validate(:username)
         fields.validate_option(:remember)
 
         if local # allows password & reset
-          fields.validate_field(:password)
+          fields.validate(:password)
           fields.validate_option(:reset)
 
           if self.respond_to?(:validates)
@@ -35,6 +36,11 @@ module Entrance
             validates :password_confirmation, :presence => true, :if => :password_required?
           end
         end
+
+        if remote
+          fields.validate(:auth_provider, :auth_uid)
+          include RemoteAuthMethods if local # no need to if only remote
+        end
       end
 
       def authenticate(username, password)
@@ -86,14 +92,31 @@ module Entrance
         token
       end
 
+      def forget_me!
+        update_attribute(Entrance.fields.remember_token, nil)
+        update_attribute(Entrance.fields.remember_until, nil) if Entrance.fields.remember_until
+      end
+
+      private
+
       def update_remember_token_expiration!(until_date = nil)
         timestamp = Time.now + (until_date || Entrance.config.remember_for).to_i
         update_attribute(Entrance.fields.remember_until, timestamp)
       end
 
-      def forget_me!
-        update_attribute(Entrance.fields.remember_token, nil)
-        update_attribute(Entrance.fields.remember_until, nil) if Entrance.fields.remember_until
+    end
+
+    module RemoteAuthMethods
+
+      private
+
+      def from_remote_auth?
+        send(::Entrance.fields.auth_provider).present? \
+          && send(::Entrance.fields.auth_uid).present?
+      end
+
+      def password_required?
+        !from_remote_auth? && super
       end
 
     end

data/lib/entrance/version.rb

@@ -1,7 +1,7 @@
 module Entrance
   MAJOR = 0
   MINOR = 4
-  PATCH = 3
+  PATCH = 4
 
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entrance
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors: