entrance 0.3.3 → 0.3.4

data/lib/entrance/addons/omniauth.rb

@@ -41,11 +41,13 @@ module Entrance
 
         end
 
-        app.include ::Entrance::Controller # provides redirects, etc
+        app.send(:include, Entrance::Controller) # provides redirects, etc
 
         app.use ::OmniAuth::Builder do
           # this is run after the app has initialized, so it's safe to use it here.
-          ::OmniAuth.config.test_mode = true if app.settings.auth_test?
+          if app.settings.respond_to?(:auth_test)
+            ::OmniAuth.config.test_mode = true if app.settings.auth_test?
+          end
 
           app.settings.auth_providers.each do |name, options|
             # puts "Initializing #{name} provider: #{options.inspect}"
@@ -73,6 +75,10 @@ module Entrance
 
         end # get, post
 
+        app.get '/auth/failure' do
+          redirect_with('/', :error, params[:message])
+        end
+
       end # registered
 
       def logger
@@ -91,9 +97,8 @@ module Entrance
       end
 
       def can_authenticate_with?(service)
-        return true if OmniAuth.config.test_mode and service.to_sym == :default
-
-        options.auth_providers.keys.map(&:to_sym).include?(service.to_sym)
+        return true if ::OmniAuth.config.test_mode and service.to_sym == :default
+        settings.auth_providers.keys.map(&:to_sym).include?(service.to_sym)
       end
 
       def find_user_with_username(username)

data/lib/entrance/addons/sinatra.rb

@@ -6,7 +6,7 @@ module Entrance
 
     def self.registered(app)
 
-      app.include ::Entrance::Controller
+      app.send(:include, ::Entrance::Controller)
 
       app.get '/login' do
         if logged_in?

data/lib/entrance/model.rb

@@ -27,7 +27,7 @@ module Entrance
         %w(username_attr password_attr).each do |key|
           field = Entrance.config.send(key)
           unless fields.include?(field.to_sym)
-            raise "Couldn't find '#{field}' in #{base.name} model."
+            raise "Couldn't find '#{field}' in #{self.name} model."
           end
         end
 

data/lib/entrance/version.rb

@@ -1,7 +1,7 @@
 module Entrance
   MAJOR = 0
   MINOR = 3
-  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.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors: