entrance 0.2.3 → 0.2.4

data/.gitignore

@@ -1 +1,3 @@
 .DS_Store
+pkg
+Gemfile.lock

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

@@ -1,4 +1,4 @@
-%w(./app/models logger sinatra/base sinatra/flash entrance).each { |lib| require lib }
+%w(./app/models sinatra/base sinatra/flash entrance).each { |lib| require lib }
 
 module Example
 
@@ -46,7 +46,7 @@ module Example
         login!(user, remember)
 
         flash[:success] = 'Welcome back!'
-        redirect(session[:return_to] || to('/'))
+        redirect_to_stored_or to('/')
       else
         flash[:error] = "Couldn't log you in. Please try again."
         redirect to('/login')
@@ -61,4 +61,4 @@ module Example
 
   end
 
-end
+end

data/examples/sinatra-app/config.ru

@@ -1,5 +1,5 @@
 require './app/routes'
 
 map '/' do
-	run Example::Routes
+  run Example::Routes
 end

data/lib/entrance/ciphers.rb

@@ -1,4 +1,3 @@
-
 module Entrance
 
   module Ciphers

data/lib/entrance/config.rb

@@ -28,8 +28,8 @@ module Entrance
       @access_denied_message_key  = nil # e.g. 'messages.access_denied'
       @reset_password_mailer      = 'UserMailer'
       @reset_password_method      = 'reset_password_request'
-      @reset_password_window      = 1.hour
-      @remember_for               = 2.weeks
+      @reset_password_window      = 60 * 60 # 1.hour
+      @remember_for               = 60 * 24 * 14 # 2.weeks
       @cookie_domain              = nil
       @cookie_secure              = true
       @cookie_path                = '/'

data/lib/entrance/controller.rb

@@ -96,12 +96,13 @@ module Entrance
     end
 
     def store_location
-      session[:return_to] = request.fullpath
+      path = request.fullpath
+      session[:return_to] = path unless ['/favicon.ico'].include?(path)
     end
 
     def redirect_to_stored_or(default_path)
-      common_redirect(session[:return_to] || default_path)
-      session[:return_to] = nil
+      stored = session.delete(:return_to)
+      common_redirect(stored || default_path, true)
     end
 
     def redirect_to_back_or(default_path)
@@ -162,9 +163,10 @@ module Entrance
       end
     end
 
-    def common_redirect(url)
+    # when redirecting to stored_path
+    def common_redirect(url, with_base = false)
       if respond_to?(:redirect)
-        redirect(to(url)) # sinatra
+        return with_base ? redirect(url) : redirect(to(url)) # sinatra
       else
         redirect_to(url)  # rails
       end

data/lib/entrance/model.rb

@@ -1,30 +1,27 @@
-require 'active_support/concern'
-
 module Entrance
   module Model
-    extend ActiveSupport::Concern
 
-    included do
+    def self.included(base)
 
       # 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.
-      unless respond_to?(:where)
-        raise "#{Entrance.config.model} does not have a class .where() method. Cannot continue."
+      unless base.respond_to?(:where)
+        raise "#{base.name} does not have a .where() class method. Cannot continue."
       end
 
-      fields = if self.respond_to?(:columns)   # ActiveRecord::Base
-        self.columns.collect(&:name)
-      elsif self.respond_to?(:keys)            # MongoMapper::Document
-        self.keys.keys
+      fields = if base.respond_to?(:columns)   # ActiveRecord::Base
+        base.columns.collect(&:name)
+      elsif base.respond_to?(:keys)            # MongoMapper::Document
+        base.keys.keys
       else                                     # just get setters in the class
-        self.instance_methods(false).select { |m| m[/\=$/] }.map { |s| s.sub('=', '') }
+        base.instance_methods(false).select { |m| m[/\=$/] }.map { |s| s.sub('=', '') }
       end.map { |el| el.to_sym }
 
       %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 #{Entrance.config.model} model." 
+          raise "Couldn't find '#{field}' in #{base.name} model." 
         end
       end
 
@@ -46,16 +43,17 @@ module Entrance
           end
 
           Entrance.config.can?(what, true)
-          include what.to_sym == :remember ? RememberMethods : ResetMethods
+          base.include what.to_sym == :remember ? RememberMethods : ResetMethods
         end
       end
 
-      if respond_to?(:validates)
-        validates :password, :presence => true, :length => 6..32, :if => :password_required?
-        validates :password, :confirmation => true, :if => :password_required?
-        validates :password_confirmation, :presence => true, :if => :password_required?
+      if base.respond_to?(:validates)
+        base.validates :password, :presence => true, :length => 6..32, :if => :password_required?
+        base.validates :password, :confirmation => true, :if => :password_required?
+        base.validates :password_confirmation, :presence => true, :if => :password_required?
       end
 
+      base.extend(ClassMethods)
     end
 
     module ClassMethods

data/lib/entrance/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"