jump_in 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57658a9f021f93df365961389568711509f87ade
-  data.tar.gz: 8403fd961358c66d60087d4fb1710eafa0e7ce33
+  metadata.gz: 02f203abdbcb811bd639a3fa104d92a0652bd15c
+  data.tar.gz: f937a624cd2312f898fab4fea8100076501260d3
 SHA512:
-  metadata.gz: 00b6cdeb5a579770178b9b5126571d725baf82927a331d8bd29981bc6fc481b6e95edf8781631b8156e53a1a7f784ea2d57f23120c50e6b8d48c70fa5548e289
-  data.tar.gz: fad2351ffa003c311d4fc0b1cf408bf199ba3967f283b7b7b7b782d3c25a8efd6392836d858a1d56be65bd7fe88c9c5520df17136188afa51e9e53ef952d66d8
+  metadata.gz: 02cea282d3b3aa8f9b4c965a048a9b8fd54f2064b6bc97665b08f20f3ec70932b13faaaf22b26f2eee8d30d4b77fd858b30b982fa73f4b837072191406055ff6
+  data.tar.gz: 614217631f5e9cad53d8899de4fd6e3ed45ae7de878ee7d2d0999b12435f18060dd375e5721845049d09cbba3f04a2b1060255e305a6446d32c09c624272137b

data/lib/generators/jump_in/install_generator.rb

@@ -1,13 +1,12 @@
 module JumpIn
   module Generators
-    class ConfigInitializerGenerator < Rails::Generators::Base
+    class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path('../../templates', __FILE__)
       desc 'Creates JumpIn initializer for your application'
 
-      def prepare_initializer
+      def copy_initializer
         template 'jump_in_initializer.rb', 'config/initializers/jump_in.rb'
-        puts 'Install complete. You can now customize JumpIn defaults in your
-          config/initializers/jump_in.rb.'
+        puts 'Install complete. You can now customize JumpIn defaults in your config/initializers/jump_in.rb.'
       end
     end
   end

data/lib/jump_in.rb

@@ -5,7 +5,6 @@ require 'jump_in/authentication/cookies'
 require 'jump_in/strategies'
 require 'jump_in/password_reset'
 require 'jump_in/tokenator'
-
 # JumpIn top-level module
 module JumpIn
   class Error < StandardError

data/lib/jump_in/authentication.rb

@@ -7,6 +7,8 @@ module JumpIn
       base.extend(ClassMethods)
       base.send :helper_method, :current_user, :logged_in? if
         base.respond_to? :helper_method
+      base.const_set('GET_CURRENT_USER', [])
+      const_set('APP_MAIN_CONTROLLER', base)
     end
 
     # LOGGING IN
@@ -55,12 +57,12 @@ module JumpIn
     # CLASS METHODS
 
     module ClassMethods
-      def jumpin_callback(callback, method_to_be_called)
+      def jumpin_callback(callback, jumpin_method)
         jumpin_constant = callback.upcase
-        unless constants.include?(jumpin_constant)
+        unless self.constants.include?(jumpin_constant)
           const_set(jumpin_constant, [])
         end
-        const_get(jumpin_constant) << method_to_be_called
+        const_get(jumpin_constant) << jumpin_method
       end
 
       def jumpin_use(persistence:)
@@ -77,7 +79,7 @@ module JumpIn
 
     def get_current_user
       current_user = nil
-      self.class::GET_CURRENT_USER.each do |current_user_finder|
+      self.class.const_get(:GET_CURRENT_USER).each do |current_user_finder|
         current_user = send(current_user_finder)
         break if current_user
       end

data/lib/jump_in/authentication/cookies.rb

@@ -8,6 +8,15 @@ module JumpIn
           klass.jumpin_callback :on_login,         :set_user_cookies
           klass.jumpin_callback :on_logout,        :remove_user_cookies
           klass.jumpin_callback :get_current_user, :current_user_from_cookies
+
+          APP_MAIN_CONTROLLER.class_eval do
+            def current_user_from_cookies
+              return nil unless cookies.signed[:jump_in_id] &&
+                                cookies.signed[:jump_in_class]
+              klass = cookies.signed[:jump_in_class].constantize
+              klass.find_by(id: cookies.signed[:jump_in_id])
+            end
+          end
         end
 
         def set_user_cookies(user:)
@@ -22,13 +31,6 @@ module JumpIn
           cookies.delete :jump_in_class
           cookies.delete :jump_in_id
         end
-
-        def current_user_from_cookies
-          return nil unless cookies.signed[:jump_in_id] &&
-                            cookies.signed[:jump_in_class]
-          klass = cookies.signed[:jump_in_class].constantize
-          klass.find_by(id: cookies.signed[:jump_in_id])
-        end
       end
     end
   end

data/lib/jump_in/authentication/session.rb

@@ -8,6 +8,14 @@ module JumpIn
           klass.jumpin_callback :on_login,         :set_user_session
           klass.jumpin_callback :on_logout,        :remove_user_session
           klass.jumpin_callback :get_current_user, :current_user_from_session
+
+          APP_MAIN_CONTROLLER.class_eval do
+            def current_user_from_session
+              return nil unless session[:jump_in_id] && session[:jump_in_class]
+              klass = session[:jump_in_class].constantize
+              klass.find_by(id: session[:jump_in_id])
+            end
+          end
         end
 
         def set_user_session(user:)
@@ -21,11 +29,6 @@ module JumpIn
           session.delete :jump_in_id
         end
 
-        def current_user_from_session
-          return nil unless session[:jump_in_id] && session[:jump_in_class]
-          klass = session[:jump_in_class].constantize
-          klass.find_by(id: session[:jump_in_id])
-        end
       end
     end
   end

data/lib/jump_in/version.rb

@@ -1,3 +1,3 @@
 module JumpIn
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/dummy/spec/modules/authentication_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../spec_helper'
-
-class AuthenticationController < ActionController::Base
+class AppMainController < ActionController::Base
   include JumpIn::Authentication
+end
+
+class AuthenticationController < AppMainController
   jumpin_use persistence: [:session, :cookies]
 end
 
@@ -13,7 +15,10 @@ describe AuthenticationController, type: :controller do
     it "it added default constants while including Session & Cookies" do
       expect(subject.class.constants).to include(:ON_LOGIN)
       expect(subject.class.constants).to include(:ON_LOGOUT)
-      expect(subject.class.constants).to include(:GET_CURRENT_USER)
+    end
+
+    it "it adds GET_CURRENT_USER to ApplicationController" do
+      expect(AppMainController.constants).to include(:GET_CURRENT_USER)
     end
 
     it "creates constant with method if constant didn't exist" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jump_in
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - KatarzynaT-B
@@ -22,7 +22,6 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - Rakefile
-- lib/generators/jump_in/config_initializer.rb
 - lib/generators/jump_in/install_generator.rb
 - lib/generators/templates/jump_in_initializer.rb
 - lib/jump_in.rb
@@ -154,4 +153,3 @@ test_files:
 - spec/dummy/spec/modules/tokenator_spec.rb
 - spec/dummy/spec/modules/authentication_spec.rb
 - spec/dummy/Rakefile
-has_rdoc: 

data/lib/generators/jump_in/config_initializer.rb

@@ -1,13 +0,0 @@
-module JumpIn
-  module Generators
-    class ConfigInitializerGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../templates", __FILE__)
-      desc "Creates JumpIn initializer for your application"
-
-      def prepare_initializer
-        template "jump_in_initializer.rb", "config/initializers/jump_in.rb"
-        puts "Install complete. You can now customize JumpIn defaults in your config/initializers/jump_in.rb."
-      end
-    end
-  end
-end