user_switcher 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3387dcbd68cff720cf1b0394964830ce1ad5ea35768f713e16a2cde6287600bb
-  data.tar.gz: 01a79572bdc05f16eda5b9a6d0f4a87220491b30597e579cac2d3c1ca2975d45
+  metadata.gz: a5ebb17d7d0453866c0f74c182403298555cfdb2fd5dd301c2dede6368bf028a
+  data.tar.gz: 3fe71ea3d7ed7c5a0b7af6f68e081804675b66509354cc7903a7823080d4771f
 SHA512:
-  metadata.gz: 989d36c1585d9e63abe5b74e239e58c451f5978a4fa2b1e1e63c294bd72a0a7fde8dd2dd8ddf47811dcc28e26e18935b388b53e7dc5700662e706a12232ad2fd
-  data.tar.gz: b93a782c0d35c6f53763edc9168a5230dba4d800f1b3f67e2f2ab3881c962188330a161e8d0fd3aeac49e3dca6e6df30cb17288658bcdc63219d2c5e11d88168
+  metadata.gz: 232cda7d8dd162df723e7746fa0b128c66ddf0c73233bf40ea5c62e8c13b52848f0dc67c29a64936fb06b782fc0005965833bb60b0d48f65947d656c91aa15b8
+  data.tar.gz: 76bf8a37d560402d73e7553237fea7bbe28dceafee499292745f4e9fbbc3c4e319af07b3f8271ace8eb1681c4e4b19f1f1d4ad27fcde64a6bb216c55a5269f34

data/app/controllers/user_switcher/user_sessions_controller.rb

@@ -4,6 +4,7 @@ module UserSwitcher
     if defined?(Sorcery)
       skip_before_action :require_login, raise: false
     end
+
     before_action :prepare_login_params
 
     def create
@@ -13,7 +14,7 @@ module UserSwitcher
     private
 
     def prepare_login_params
-      user_param = params[:users].find { |param| param[:id] == params[:user_id] }
+      user_param = (params[:users] || [{}]).find { |user| user[:id] == params[:user_id] }
       return if user_param.blank?
 
       params[:id] = user_param[:id]

data/config/routes.rb

@@ -1,3 +1,7 @@
-UserSwitcher::Engine.routes.draw do
-  post "login", to: "user_sessions#create"
+Rails.application.routes.draw do
+  if UserSwitcher.enabled?
+    scope UserSwitcher.config.routes_prefix, module: "user_switcher" do
+      post "login", to: "user_sessions#create", as: "user_switcher_login"
+    end
+  end
 end

data/lib/user_switcher/config.rb

@@ -7,15 +7,25 @@ module UserSwitcher
     def config
       @_config ||= Config.new
     end
+
+    def enabled?
+      !!config.enabled
+    end
   end
 
   class Config
-    attr_accessor :login_url, :login_procedure
+    attr_accessor :login_url, :login_procedure, :enabled, :routes_prefix
 
     def initialize
       @login_url = "/user_switcher/login"
       @users = load_users_from_file
       @login_procedure = default_login_procedure
+      @routes_prefix = "user_switcher"
+      @enabled = if defined?(Rails)
+                   Rails.env.development?
+                 else
+                   false
+                 end
     end
 
     def default_login_procedure

data/lib/user_switcher/middlewares/switcher_inserter.rb

@@ -9,7 +9,6 @@ module UserSwitcher::Middlewares
 
       @users = config[:users] || []
       @login_url = config[:login_url]
-      @form_erb = config[:form_erb] || load_form_erb
     end
 
     def call(env)
@@ -25,10 +24,10 @@ module UserSwitcher::Middlewares
         when Array
           body = body[0]
         end
-
         body = body.dup if body.frozen?
+
         new_body = insert_form(body)
-        new_body = insert_style(new_body)
+        new_body = insert_inner_head(new_body)
         headers['Content-Length'] &&= new_body.bytesize.to_s
 
         [status, headers, [new_body]]
@@ -43,20 +42,24 @@ module UserSwitcher::Middlewares
       html.gsub %r{<body(.*?)>(.*)<\/body>}mi, '<body\1>' + form + '\2</body>'
     end
 
-    def insert_style(html)
-      html.sub %r{<head(.*?)>(.*)<\/head>}mi, '<head\1>\2' + style + '</head>'
+    def insert_inner_head(html)
+      html.sub %r{<head(.*?)>(.*)<\/head>}mi, '<head\1>\2' + head + '</head>'
     end
 
     def form
-      @form ||= ERB.new(@form_erb).result(binding)
+      @form ||= ERB.new(load_form_erb).result(binding)
+    end
+
+    def head
+      @head ||= ERB.new(load_head_erb).result(binding)
     end
 
-    def style
-      @style ||= File.read(File.expand_path('../views/style.html', __dir__))
+    def load_head_erb
+      File.read(File.expand_path('../views/head.html.erb', __dir__))
     end
 
     def load_form_erb
-      File.read(File.expand_path('../views/form.erb', __dir__))
+      File.read(File.expand_path('../views/form.html.erb', __dir__))
     end
   end
 end

data/lib/user_switcher/railtie.rb

@@ -1,5 +1,7 @@
 module UserSwitcher
   def self.initialize!(app)
+    return if !UserSwitcher.enabled?
+
     app.middleware.insert(-1, UserSwitcher::Middlewares::SwitcherInserter, UserSwitcher.config.to_middleware_config)
   end
 

data/lib/user_switcher/version.rb

@@ -1,3 +1,3 @@
 module UserSwitcher
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/user_switcher/views/{style.html → head.html.erb}

@@ -19,5 +19,4 @@
 #user_switcher_menu input {
   margin: 0; padding: 0;
 }
-
 </style>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: user_switcher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ykpythemind
@@ -72,8 +72,8 @@ files:
 - lib/user_switcher/middlewares/switcher_inserter.rb
 - lib/user_switcher/railtie.rb
 - lib/user_switcher/version.rb
-- lib/user_switcher/views/form.erb
-- lib/user_switcher/views/style.html
+- lib/user_switcher/views/form.html.erb
+- lib/user_switcher/views/head.html.erb
 homepage: https://github.com/ykpythemind/user_switcher
 licenses:
 - MIT