firebug 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d545d18663f423f86f0fc36abe0e816dd2a4c3ae
-  data.tar.gz: dc8299e1e7b113809a310081455cba07adebf56a
+  metadata.gz: c7ae866f5a57fc4cd5782c1d42232a83b473541e
+  data.tar.gz: ea21d35182344dedc599830d373177714098963e
 SHA512:
-  metadata.gz: c16a02261c7639885fce6f821cba409a8cf8fcb162004693482998a96a91784ea38a5bf56625b9a0037da8f2a5ad21fce0688c43411346f94dcda4e4299ebe37
-  data.tar.gz: cf737fe94d2f8a12a232575990672d3de72ea5505fce1f6fa6311363f187e51409175cc809fde2ab808dba76ecbf760cac1b866fedaf422b1801cc2671552526
+  metadata.gz: 543016ca23566df1e2e76790e0c85688a30102851df90f137f19bbbed502141e1308576613768292d56c468bfd5bfbf6bb1abdd2d3d5a4a4b1f65642071ab6ca
+  data.tar.gz: b5776e9dbc85cb9f3b7e35984c4a2047fcc9b2484b467c100c2f48898671b4e57f256f054cee3bf3f8a3a927901bc78da98145d12ef7a254c6ffcb2e09235c1b

data/.circleci/config.yml

@@ -25,12 +25,9 @@ restore_gems: &restore_gems
       - firebug-{{ checksum "Gemfile.lock" }}
 
 jobs:
-  # Since a workspace can't persist the root of the working directory we are using the caching mechanism to save
-  # the repository.
   checkout-code:
     <<: *defaults
     steps:
-      - *restore_repo
       - checkout
       - save_cache:
           key: repo-{{ .Branch }}-{{ .Revision }}
@@ -45,10 +42,9 @@ jobs:
       - run:
           name: Install Bundler dependencies
           command: |
-            bin/bundle install --deployment \
-                                --path=vendor/bundle \
-                                --jobs=4 \
-                                --retry=3
+            bin/bundle install --path=vendor/bundle \
+                               --jobs=4 \
+                               --retry=3
       - save_cache:
           key: firebug-{{ checksum "Gemfile.lock" }}
           paths:
@@ -66,22 +62,15 @@ jobs:
       - *attach_workspace
       - run:
           name: Set bundler path
-          command: bundle --path vendor/bundle
-      - run:
-          name: Setup Code Climate test-reporter
-          command: |
-            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-            chmod +x ./cc-test-reporter
+          command: bin/bundle --path vendor/bundle
       - run:
           name: Run tests
           command: |
-            ./cc-test-reporter before-build
             bin/bundle exec rspec --profile 10 \
                                   --format RspecJunitFormatter \
                                   --out test_results/rspec.xml \
                                   --format progress \
                                   $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-            ./cc-test-reporter after-build -t simplecov coverage/.resultset.json
       - store_test_results:
           path: test_results
       - store_artifacts:
@@ -97,11 +86,11 @@ jobs:
       - *restore_repo
       - *attach_workspace
       - run:
-          name: Install rubocop
-          command: gem install rubocop rubocop-rspec
+          name: Set bundler path
+          command: bin/bundle --path vendor/bundle
       - run:
           name: Run rubocop
-          command: rubocop -c .rubocop.yml
+          command: bin/bundle exec rubocop
 
 workflows:
   version: 2
@@ -113,8 +102,7 @@ workflows:
             - checkout-code
       - run-rubocop:
           requires:
-            - checkout-code
+            - bundle-dependencies
       - run-specs:
           requires:
             - bundle-dependencies
-            - run-rubocop

data/README.md

@@ -1,4 +1,5 @@
 # Firebug [![CircleCI](https://circleci.com/gh/rvshare/firebug.svg?style=svg)](https://circleci.com/gh/rvshare/firebug)
+[![Gem Version](https://badge.fury.io/rb/firebug.svg)](https://badge.fury.io/rb/firebug)
 
 A gem for working with CodeIgniter sessions in ruby.
 
@@ -83,7 +84,7 @@ version, push git commits and tags, and push the `.gem`file to
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at
-[https://github.com/afrase/firebug](https://github.com/afrase/firebug.)
+[https://github.com/rvshare/firebug](https://github.com/rvshare/firebug).
 
 ## License
 

data/firebug.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec| # rubocop:disable BlockLength
   spec.add_dependency 'activerecord', '~> 5.0'
   spec.add_dependency 'ruby-mcrypt', '~> 0.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'database_cleaner', '~> 1.6', '>= 1.6.2'
   spec.add_development_dependency 'pry', '~> 0.11.3'
   spec.add_development_dependency 'rake', '~> 12.3'

data/lib/action_dispatch/session/code_igniter_store.rb

@@ -7,6 +7,8 @@ module ActionDispatch
   module Session
     # A session store for Rails to handle Pyro sessions.
     class CodeIgniterStore < AbstractStore
+      SESSION_RECORD_KEY = 'rack.session.record'
+
       # @param [Object] app
       # @param [Hash] options
       # @option options [String] :key ('default_pyrocms') The session cookie name.
@@ -26,10 +28,13 @@ module ActionDispatch
       # @param [String] sid
       # @return [Array<String, Hash>]
       def find_session(req, sid)
-        model = find_session_model(req, sid)
-        # +Rack::Session::Abstract::Persisted#load_session+ expects this to return an Array with the first value being
-        # the session ID and the second the actual session data.
-        [model.session_id, model.user_data]
+        silence_logger(req) do
+          model = find_session_model(req, sid)
+          req.env[SESSION_RECORD_KEY] = model
+          # +Rack::Session::Abstract::Persisted#load_session+ expects this to return an Array with the first value being
+          # the session ID and the second the actual session data.
+          [model.session_id, model.user_data]
+        end
       end
 
       # Should the session be persisted?
@@ -63,17 +68,20 @@ module ActionDispatch
       # @param [Hash] _options
       # @return [String] encrypted and base64 encoded string of the session data.
       def write_session(req, sid, session, _options)
-        model = find_session_model(req, sid)
-        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
-          user_data: session
-        }
-        # Returning false will cause Rack to output a warning.
-        return false unless model.update(model_params)
-        # Return the encrypted cookie format of the data. Rack sets this value as the cookie in the response
-        model.cookie_data
+        silence_logger(req) do
+          model = find_session_model(req, sid)
+          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
+            user_data: session
+          }
+          # Returning false will cause Rack to output a warning.
+          return false unless model.update(model_params)
+          req.env[SESSION_RECORD_KEY] = model
+          # Return the encrypted cookie format of the data. Rack sets this value as the cookie in the response
+          model.cookie_data
+        end
       end
 
       # Deletes then creates a new session in the database.
@@ -87,11 +95,14 @@ module ActionDispatch
       # @param [Hash] options
       # @return [String] the new session id
       def delete_session(req, sid, options)
-        # Get the current database record for this session then delete it.
-        find_session_model(req, sid).delete
-        return if options[:drop]
-        # Generate a new one and return it's ID
-        find_session_model(req).tap { |s| s.save if options[:renew] }.session_id
+        silence_logger(req) do
+          # Get the current database record for this session then delete it.
+          find_session_model(req, sid).delete
+          return if options[:drop]
+          req.env[SESSION_RECORD_KEY] = nil
+          # Generate a new one and return it's ID
+          find_session_model(req).tap { |s| s.save if options[:renew] }.session_id
+        end
       end
 
       # Tries to find the session ID in the requests cookies.
@@ -116,7 +127,7 @@ module ActionDispatch
       # @return [Firebug::Session]
       def find_session_model(req, sid=nil)
         if sid
-          model = Firebug::Session.find_by(find_by_params(req, sid))
+          model = req.env[SESSION_RECORD_KEY] || 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.
@@ -142,6 +153,16 @@ module ActionDispatch
         end
         params
       end
+
+      # @param [ActionDispatch::Request] req
+      def silence_logger(req)
+        logger = req.env['action_dispatch.logger'] || ActiveRecord::Base.logger
+        if logger && Firebug.config.silence_logger
+          logger.silence { yield }
+        else
+          yield
+        end
+      end
     end
   end
 end

data/lib/firebug/configuration.rb

@@ -13,6 +13,8 @@ module Firebug
   #   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.
+  # @attr [Boolean] silence_logger
+  #   Silence ActiveRecord logs.
   # @attr [Proc] session_filter
   #   Return true if this request should have it's session written.
   #   @see ActionDispatch::Session::CodeIgniterStore#commit_session?
@@ -24,11 +26,13 @@ module Firebug
     attr_accessor :match_user_agent
     attr_accessor :match_ip_address
     attr_accessor :session_filter
+    attr_accessor :silence_logger
 
     def initialize
       self.truncate_user_agent = false
       self.match_user_agent = false
       self.match_ip_address = false
+      self.silence_logger = true
       # default to always writing the session
       self.session_filter = ->(_) { true }
     end

data/lib/firebug/version.rb

@@ -2,5 +2,5 @@
 
 module Firebug
   # The current version of Firebug
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firebug
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Aaron Frase
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement