entrance 0.4.8 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1f93f2931fee64ff4cf3798c2773ded125d84494
+  data.tar.gz: 7fd53107e51f3c895724aa8534713747a49f90b7
+SHA512:
+  metadata.gz: 5c201e15df23bbbbc24a089a5db10421cab3800846f48e7d12f6b6bf045e90979fa5084e627cb30d5c02066014a300ba97da90203f61136b12fb379420e63d41
+  data.tar.gz: cb5ee5269797176bc0b1ac999be9a84e747eb9674aea1377671ce95673140cbd27638d64f2429d0c8e36e4c46342ca5206f2b24707ca3e9ba9980f766c7d11d6

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

@@ -29,7 +29,7 @@ class User
 
   provides_entrance
 
-  def active?
+  def can_login?
     state.to_sym == :active
   end
 

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

@@ -27,9 +27,11 @@ class User
   key :remember_token
   key :remember_token_expires_at, Time
 
+  ensure_index [[:auth_provider, 1], [:auth_uid, -1]], :unique => true
+
   provides_entrance :local => false, :remote => true
 
-  def active?
+  def can_login?
     state.to_sym == :active
   end
 

data/lib/entrance/addons/sinatra.rb

@@ -40,7 +40,9 @@ module Entrance
 
       app.post '/login' do
         remember = ['on', 'true', '1'].include?(params[:remember])
-        if user = authenticate_and_login(params[:username], params[:password], remember)
+        if params[:username].blank? or params[:password].blank?
+          redirect_with('/login', :error, "Both fields are required.")
+        elsif user = authenticate_and_login(params[:username], params[:password], remember)
           flash[:success] = 'Welcome back!'
           redirect_to_stored_or(to('/'))
         else

data/lib/entrance/config.rb

@@ -3,17 +3,16 @@ module Entrance
   class Config
 
     attr_accessor *%w(
-      model cipher secret stretches
-      unique_key username_attr password_attr salt_attr
-      remember_token_attr remember_until_attr reset_token_attr reset_until_attr
+      model local_auth remote_auth cipher secret stretches
       access_denied_redirect_to access_denied_message_key
       reset_password_mailer reset_password_method reset_password_window remember_for
       cookie_domain cookie_secure cookie_path cookie_httponly
-      name_attr auth_provider_attr auth_uid_attr
     )
 
     def initialize
       @model                      = 'User'
+      @local_auth                 = true
+      @remote_auth                = false
 
       # strategies
       @cipher                     = Entrance::Ciphers::BCrypt # or Entrance::Ciphers::SHA1

data/lib/entrance/fields.rb

@@ -53,9 +53,6 @@ module Entrance
         end
 
         Entrance.config.can?(what, true)
-
-        mod = what.to_sym == :remember ? Entrance::Model::RememberMethods : Entrance::Model::ResetMethods
-        Entrance.model.send(:include, mod)
       end
     end
 

data/lib/entrance/model.rb

@@ -8,10 +8,13 @@ module Entrance
     module ClassMethods
 
       def provides_entrance(options = {}, &block)
-        Entrance.config.model = self.name
         local  = options.delete(:local) != false # true by default
         remote = options.delete(:remote) == true # false by default
 
+        Entrance.config.model       = self.name
+        Entrance.config.local_auth  = local
+        Entrance.config.remote_auth = remote
+
         # if the target model class does not have a Model.where() method,
         # then login_by_session wont work, nor the ClassMethods below.
         # won't work so we cannot continue.
@@ -24,11 +27,11 @@ module Entrance
 
         # username and remember token are used both for local and remote (omniauth)
         fields.validate(:username)
-        fields.validate_option(:remember)
+        include Entrance::Model::RememberMethods if fields.validate_option(:remember)
 
         if local # allows password & reset
           fields.validate(:password)
-          fields.validate_option(:reset)
+          include Entrance::Model::ResetMethods if fields.validate_option(:reset)
 
           if self.respond_to?(:validates)
             validates :password, :presence => true, :length => 6..32, :if => :password_required?
@@ -44,6 +47,7 @@ module Entrance
       end
 
       def authenticate(username, password)
+        raise 'Local auth disabled!' unless Entrance.config.local_auth
         return if [username, password].any? { |v| v.nil? || v.strip == '' }
 
         query = {}

data/lib/entrance/version.rb

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

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: entrance
 version: !ruby/object:Gem::Version
-  version: 0.4.8
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Doesn't fiddle with your controllers and routes.
@@ -34,7 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - README.md
 - Rakefile
 - entrance.gemspec
@@ -132,26 +129,26 @@ files:
 - spec/fake_model.rb
 homepage: https://github.com/tomas/entrance
 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: entrance
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Lean authentication alternative for Rails and Sinatra.
 test_files: []
+has_rdoc: