firebug 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 796b86c8a6af3f8a9bf29550ababbfa8832800ea
-  data.tar.gz: e6a76a738061ecb0e85e1933c74c25b0c39bcef1
+  metadata.gz: 45efa98f665949bc503297c7f4f8c46ff43d60fc
+  data.tar.gz: 4a93d2a74d29ded79c048796d04ebd38c8ef11ae
 SHA512:
-  metadata.gz: fc490c46299de656fc4f3fa42807e9f7b4a3b501d6e25a75c98d838a4ead98cf77e479b41d9a05809722791aee212d01284fbda9b1c761934dc53d9c62ee8d2a
-  data.tar.gz: 91eceecffd4cb36e4772d6fe8952fc794b93a008a3eeb260d014c715a8a11b34c87d95a78e1f23343260e9a746219ddd3040e2148e4abac07932327274e9394a
+  metadata.gz: b8820e847d97883e5ed050d7195c0a48bd0e32ba586af32bbeb2c146325659eee6102fec7d305d9df3d7372c6dcc654c6975607b94a5b1416b90813ee55e2786
+  data.tar.gz: 2f66962cda34ed35ca59255af7338c5fb7318d43cc3aa0939ce33260a61dbbbae7764dde927b8ba0aded2f813c8192d96903db4089d23c4fa9495d1b3350c6ad

data/Gemfile.lock

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

data/lib/action_dispatch/session/code_igniter_store.rb

@@ -34,7 +34,7 @@ module ActionDispatch
         model_params = {
           session_id: model.session_id,
           user_agent: req.user_agent || '', # user_agent can't be null
-          ip_address: req.remote_ip || '',  # ip_address can't be null
+          ip_address: req.ip || '',         # ip_address can't be null
           user_data: session
         }
         # Returning false will cause Rack to output a warning.
@@ -76,7 +76,10 @@ module ActionDispatch
       # @return [Firebug::Session]
       def find_session_model(req, sid=nil)
         if sid
-          model = Firebug::Session.find_by(session_id: sid)
+          p = { session_id: sid }
+          p[:ip_address] = req.ip if Firebug.configuration.match_ip
+          p[:user_agent] = req.user_agent if Firebug.configuration.match_useragent
+          model = Firebug::Session.find_by(p)
           return model if model
         end
 
@@ -84,7 +87,7 @@ module ActionDispatch
           session_id: sid || generate_sid,
           last_activity: Time.current.to_i,
           user_agent: req.user_agent,
-          ip_address: req.remote_ip
+          ip_address: req.ip
         )
       end
     end

data/lib/firebug/configuration.rb

@@ -5,10 +5,22 @@ 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
+  # @attr [Boolean] match_useragent
+  # @attr [Boolean] match_ip
   class Configuration
     attr_reader :table_name
 
     attr_accessor :key
+    attr_accessor :truncate_useragent
+    attr_accessor :match_useragent
+    attr_accessor :match_ip
+
+    # def initialize
+    #   @truncate_useragent = false
+    #   @match_useragent = false
+    #   @match_ip = false
+    # end
 
     # Sets the table name for +Firebug::Session+
     #

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(value[0...120])
+      super(Firebug.configuration.truncate_useragent ? 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.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firebug
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Aaron Frase
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack