firebug 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 265efc6f37e57f982967eb40761fb60e60531bd0
-  data.tar.gz: 054e3fe42e2e3676a7cbc7ec36bfe1091730ad80
+  metadata.gz: 5bf90b694d5688ace43fb531d31216567031e06e
+  data.tar.gz: f288b37697c98a382964584e7615851541aa085e
 SHA512:
-  metadata.gz: 12b0f337d394a104b9b76ae1dc60f932395e2725b2fe502e641500cf418c1969c11832b724f0e36fabf8ab1b375bc6c7b674b819e1dc428a466eb4bb3621642f
-  data.tar.gz: b637fdbcdb4b97bdfbfbe94d5ef71f416571f39fc680d585adf9645b1d6d1d1daf61298ef9ae84ed3ece6090d8fe4369528c4b0a776d69c450b716d43afbdde1
+  metadata.gz: d7b1d536b012704b0fec305424c05f81426494023f064816941f056f9553a125f4f3050a28aef1d979fe36784739a5a0b00a6c801b7b9b1d9fc751d528659b4f
+  data.tar.gz: afb6a295079c61ee39530b773711227c90e1422e8fc8b9d1e55f2ce494a3c2d0c985c38e63c5e2b7e479bed11f7b163ccef29f92ab23325f246977ec6f8adc7a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    firebug (0.1.7)
+    firebug (0.1.8)
       actionpack (~> 5.0)
       activerecord (~> 5.0)
       ruby-mcrypt (~> 0.2)

data/lib/action_dispatch/session/code_igniter_store.rb

@@ -76,10 +76,7 @@ module ActionDispatch
       # @return [Firebug::Session]
       def find_session_model(req, sid=nil)
         if sid
-          p = { session_id: sid }
-          p[:user_agent] = req.user_agent if Firebug.configuration.match_user_agent
-          p[:ip_address] = req.remote_ip if Firebug.configuration.match_ip_address
-          model = Firebug::Session.find_by(p)
+          model = Firebug::Session.find_by(find_by_params(req, sid))
           return model if model
           # use a different session ID in case the reason for not finding the record is because the user_agent
           # or ip_address didn't match.
@@ -93,6 +90,18 @@ module ActionDispatch
           ip_address: req.remote_ip
         )
       end
+
+      # @param [ActionDispatch::Request] req
+      # @param [String] sid
+      # @return [Hash]
+      def find_by_params(req, sid)
+        params = { session_id: sid }
+        params[:ip_address] = req.remote_ip if Firebug.configuration.match_ip_address
+        if Firebug.configuration.match_user_agent
+          params[:user_agent] = Firebug.configuration.truncate_user_agent ? req.user_agent[0...120] : req.user_agent
+        end
+        params
+      end
     end
   end
 end

data/lib/firebug/configuration.rb

@@ -5,14 +5,14 @@ module Firebug
   #
   # @attr [String] key the encryption key used to encrypt and decrypt cookies.
   # @attr [String] table_name the name of the sessions table.
-  # @attr [Boolean] truncate_useragent truncate the user-agent to 120 characters.
+  # @attr [Boolean] truncate_user_agent truncate the user-agent to 120 characters.
   # @attr [Boolean] match_user_agent use the user-agent in addition to the session ID.
   # @attr [Boolean] match_ip_address use the remote ip address in addition to the session ID.
   class Configuration
     attr_reader :table_name
 
     attr_accessor :key
-    attr_accessor :truncate_useragent
+    attr_accessor :truncate_user_agent
     attr_accessor :match_user_agent
     attr_accessor :match_ip_address
 

data/lib/firebug/session.rb

@@ -21,7 +21,7 @@ module Firebug
     def user_agent=(value)
       # Pyro seems to truncate the value and since it also uses this value when finding the session, it's important
       # we do the same.
-      super(Firebug.configuration.truncate_useragent ? value[0...120] : value)
+      super(Firebug.configuration.truncate_user_agent ? value[0...120] : value)
     end
 
     # @return [String]

data/lib/firebug/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Firebug
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firebug
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Aaron Frase