backframe 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e529a26c3cbb16f7d83f915b683b34f3e5bcda1
-  data.tar.gz: 7bd6df514bf432abc3dcf49f5e7433bf1912399e
+  metadata.gz: a4cf68307b7e4daf0e68e92f0422863254c24505
+  data.tar.gz: eaf759579d793fde01b51a47098d601dde692644
 SHA512:
-  metadata.gz: fc67fc81127e6656d2609b79aa23a90a9c36ddb220e8c391e0397f6bebde978d91b7d7fa0e67a1242380e2e830d76afbb4d16af184419e469e4272eb6258bb6a
-  data.tar.gz: 588a8dbd70ab692476712e1d44ddd450b4750b715e2a33250b7981c29e02447d63857557840c662133f14ba952b1dcd9d0ae560f7d9c1fcf66dbdcf4ea120da5
+  metadata.gz: c6a168a9ddb869906d7d59fb6cd46311a3dfc7eac766df01c020dc05a01658ce2f1aeacbc103ec7205521e79b2e1db53e943425d0fe9ffddee392a37cf80fd99
+  data.tar.gz: 604de21a7be658700f2024b92051b2f945da6c8046b1cb64b5bcfa1a6d8989218718e2bbd04f6208b6ae6c21d36a902dd3d22240138569524ff14b240f43c071

data/lib/backframe/actioncontroller/acts_as_activation.rb

@@ -12,13 +12,15 @@ module Backframe
 
         arguments = args[0]
 
+        activation = arguments[:activation] || 'Backframe::Activation'
+
         class_eval <<-EOV
 
           layout 'signin'
-          before_action :load_#{model.underscore}, :except => :show
+          before_action :load_user, :except => :show
 
           def show
-            @activation = Backframe::Activation.find_by(:token => params[:token])
+            @activation = #{activation}.find_by(:token => params[:token])
             if @activation.nil?
               flash[:error] = I18n.t(:activation_invalid)
               redirect_to account_signin_path
@@ -50,8 +52,8 @@ module Backframe
 
           private
 
-            def load_#{model.underscore}
-              @activation = Backframe::Activation.find_by(:id => session[:activation_id])
+            def load_user
+              @activation = #{activation}.find_by(:id => session[:activation_id])
               @user = @activation.user
               if @user.nil?
                 flash[:error] = I18n.t(:activation_invalid)

data/lib/backframe/actioncontroller/acts_as_reset.rb

@@ -12,11 +12,13 @@ module Backframe
 
         arguments = args[0]
 
+        reset = arguments[:reset] || 'Backframe::Reset'
+
         class_eval <<-EOV
 
           layout 'signin'
           before_action :redirect_if_signed_in
-          before_action :load_#{model.underscore}, :except => [:new,:show]
+          before_action :load_user, :except => [:new,:show]
 
           def new
             if request.post?
@@ -34,7 +36,7 @@ module Backframe
           end
 
           def show
-            @reset = Backframe::Reset.find_by(:token => params[:token])
+            @reset = #{reset}.find_by(:token => params[:token])
             if @reset.nil?
               flash[:error] = I18n.t(:reset_invalid)
               redirect_to '#{arguments[:prefix]}/signin'
@@ -43,7 +45,7 @@ module Backframe
               redirect_to '#{arguments[:prefix]}/signin'
             else
               @reset.claim
-              session[:reset_id] = @reset.user.id
+              session[:reset_id] = @reset.id
               flash[:error] = I18n.t(:reset_password)
               redirect_to '#{arguments[:prefix]}/reset/password'
             end
@@ -66,8 +68,9 @@ module Backframe
 
           private
 
-            def load_#{model.underscore}
-              @user = #{model}.find_by(:id => session[:reset_id])
+            def load_user
+              @reset = #{reset}.find_by(:id => session[:reset_id])
+              @user = @activation.user
               if @user.nil?
                 flash[:error] = I18n.t(:reset_invalid)
                 redirect_to account_signin_path

data/lib/backframe/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Backframe
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backframe
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Greg Kops