safer_rails_console 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9f52ef5501b4906fd7f43c3a5dc3a8157dacba7da2d5cd996d1028f8d97f5fe
-  data.tar.gz: 5d0e92eef385a29a45fb2f24eeb994bc9b5539d7ba2c01ab067bc2a35777f08f
+  metadata.gz: 5f61723272246766a45a0702be74e266718e55035ce8ccfa8a1c4eaab6618d28
+  data.tar.gz: d5d421c94e15b1fb9bfbd8d532d24ed95c9f76c8250e8620257bb95071f5e801
 SHA512:
-  metadata.gz: d7ce0f981844828f22da23738147ca9bd35355feb5ab20971381ae0407bde0b7da3c57c2630f88aa8a382afc6a70f90fcfb818e604671a124255e921c45478ec
-  data.tar.gz: 6ad946fb0b38d899890ef70aa5d83f15078f07782eeb56221549d5f40962f88b4db8f5e2e0dee2782c40a29922a1d273de8c722a8f75ba81282608ad275a02d9
+  metadata.gz: 8da50a1178203391fcc23bdd42f9970aa1ebe140cc5be1f3916a7b71ab1eaef44189d37fcb0cb6345b00960a566d01f907a226fdd4392c649c59840b95029af1
+  data.tar.gz: 2a97efb1bfba5e451a5cee1cf23bf9a2a6ac8d9898c164f5f58c890bb80acd0dbacb1fdb332f69c7be2eee632f3343f96247bde00ab0057b15e8526a5ad89f0d

data/.gitignore

@@ -13,3 +13,4 @@
 
 # Appraisal gemfile.lock
 /gemfiles/*.gemfile.lock
+out

data/.travis.yml

@@ -9,26 +9,23 @@ before_install:
   - gem install bundler
 
 before_script:
-  - cp spec/internal/database.yml.travis spec/internal/rails_4_2/config/database.yml
   - cp spec/internal/database.yml.travis spec/internal/rails_5_0/config/database.yml
   - cp spec/internal/database.yml.travis spec/internal/rails_5_1/config/database.yml
   - cp spec/internal/database.yml.travis spec/internal/rails_5_2/config/database.yml
+  - cp spec/internal/database.yml.travis spec/internal/rails_6_0/config/database.yml
 
 script:
   - bundle exec rubocop
   - bundle exec rspec
 
 rvm:
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.5.6
 
 gemfile:
-  - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
   - gemfiles/5.1.gemfile
   - gemfiles/5.2.gemfile
+  - gemfiles/6.0.gemfile
 
 matrix:
   fast_finish: true

data/Appraisals

@@ -1,7 +1,3 @@
-appraise '4.2' do
-  gem 'rails', '~> 4.2.0'
-end
-
 appraise '5.0' do
   gem 'rails', '~> 5.0.0'
 end
@@ -11,5 +7,9 @@ appraise '5.1' do
 end
 
 appraise '5.2' do
-  gem 'rails', '~>5.2.0'
+  gem 'rails', '~> 5.2.0'
+end
+
+appraise '6.0' do
+  gem 'rails', '~> 6.0.0'
 end

data/gemfiles/5.2.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~>5.2.0"
+gem "rails", "~> 5.2.0"
 
 gemspec path: "../"

data/gemfiles/{4.2.gemfile → 6.0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.0"
+gem "rails", "~> 6.0.0"
 
 gemspec path: "../"

data/lib/safer_rails_console/consoles/irb.rb

@@ -1,6 +1,10 @@
 include SaferRailsConsole::Colors
 
-app_name = ::Rails.application.class.parent.to_s.underscore.dasherize
+app_name = if SaferRailsConsole::RailsVersion.six_or_above?
+             ::Rails.application.class.module_parent.to_s.underscore.dasherize
+           else
+             ::Rails.application.class.parent.to_s.underscore.dasherize
+           end
 env_name = SaferRailsConsole.environment_name
 status = ::Rails.application.sandbox ? 'read-only' : 'writable'
 color = SaferRailsConsole.prompt_color

data/lib/safer_rails_console/patches/boot/sandbox_flag.rb

@@ -15,37 +15,6 @@ module SaferRailsConsole
         end
 
         module Rails
-          module CommandsTasks4
-            def console
-              require_command!('console')
-              ::Rails::Console.singleton_class.prepend(::SaferRailsConsole::Patches::Boot::SandboxFlag::Rails::Console4)
-              super
-            end
-          end
-
-          module Console4
-            def parse_arguments(arguments)
-              options = {}
-
-              OptionParser.new do |opt|
-                ::SaferRailsConsole::Patches::Boot::SandboxFlag.console_options(opt, options)
-                opt.on('--debugger', 'Enable the debugger.') { |v| options[:debugger] = v }
-                opt.parse!(arguments)
-              end
-
-              if arguments.first && arguments.first[0] != '-'
-                env = arguments.first
-                options[:environment] = if available_environments.include? env
-                                          env
-                                        else
-                                          %w(production development test).detect { |e| e =~ /^#{env}/ } || env
-                                        end
-              end
-
-              options
-            end
-          end
-
           module CommandsTasks50
             def console
               require_command!('console')
@@ -72,13 +41,10 @@ module SaferRailsConsole
   end
 end
 
-if SaferRailsConsole::RailsVersion.four_two?
-  require 'rails/commands/commands_tasks'
-  ::Rails::CommandsTasks.prepend(SaferRailsConsole::Patches::Boot::SandboxFlag::Rails::CommandsTasks4)
-elsif SaferRailsConsole::RailsVersion.five_zero?
+if SaferRailsConsole::RailsVersion.five_zero?
   require 'rails/commands/commands_tasks'
   ::Rails::CommandsTasks.prepend(SaferRailsConsole::Patches::Boot::SandboxFlag::Rails::CommandsTasks50)
-elsif SaferRailsConsole::RailsVersion.five_one? || SaferRailsConsole::RailsVersion.five_two?
+elsif SaferRailsConsole::RailsVersion.five_one_or_above?
   require 'rails/command'
   require 'rails/commands/console/console_command'
   # Rails 5.1 and 5.2 defaults `sandbox` to `false`, but we need it to NOT have a default value and be `nil` when it is not user-specified

data/lib/safer_rails_console/patches/railtie/sandbox.rb

@@ -25,7 +25,7 @@ module SaferRailsConsole
 end
 
 if SaferRailsConsole::RailsVersion.supported?
-  if SaferRailsConsole::RailsVersion.five_one? || SaferRailsConsole::RailsVersion.five_two?
+  if SaferRailsConsole::RailsVersion.five_one_or_above?
     require 'rails/commands/console/console_command'
   else
     require 'rails/commands/console'

data/lib/safer_rails_console/patches/sandbox/auto_rollback.rb

@@ -22,14 +22,6 @@ module SaferRailsConsole
 
         module ActiveRecord
           module ConnectionAdapters
-            module PostgreSQLAdapter42
-              def execute_and_clear(sql, name, binds)
-                super
-              rescue => e
-                SaferRailsConsole::Patches::Sandbox::AutoRollback.handle_and_reraise_exception(e)
-              end
-            end
-
             module PostgreSQLAdapter5
               def execute_and_clear(sql, name, binds, prepare: false)
                 super
@@ -45,9 +37,5 @@ module SaferRailsConsole
 end
 
 if defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-  if SaferRailsConsole::RailsVersion.four_two?
-    ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(SaferRailsConsole::Patches::Sandbox::AutoRollback::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter42)
-  else
-    ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(SaferRailsConsole::Patches::Sandbox::AutoRollback::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter5)
-  end
+  ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(SaferRailsConsole::Patches::Sandbox::AutoRollback::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter5)
 end

data/lib/safer_rails_console/rails_version.rb

@@ -6,12 +6,7 @@ module SaferRailsConsole
 
     class << self
       def supported?
-        four_two? || five_zero? || five_one? || five_two?
-      end
-
-      def four_two?
-        @is_four_two = Gem::Requirement.new('~> 4.2.0').satisfied_by?(SaferRailsConsole::RailsVersion::RAILS_VERSION) if @is_four_two.nil?
-        @is_four_two
+        five_zero? || five_one? || five_two? || six_zero?
       end
 
       def five_zero?
@@ -24,10 +19,25 @@ module SaferRailsConsole
         @is_five_one
       end
 
+      def five_one_or_above?
+        @is_five_one_or_above = SaferRailsConsole::RailsVersion::RAILS_VERSION >= ::Gem::Version.new('5.1.0') if @is_five_one_or_above.nil?
+        @is_five_one_or_above
+      end
+
       def five_two?
         @is_five_two = Gem::Requirement.new('~> 5.2.0').satisfied_by?(SaferRailsConsole::RailsVersion::RAILS_VERSION) if @is_five_two.nil?
         @is_five_two
       end
+
+      def six_zero?
+        @is_six_zero = Gem::Requirement.new('~> 6.0.0').satisfied_by?(SaferRailsConsole::RailsVersion::RAILS_VERSION) if @is_six_zero.nil?
+        @is_six_zero
+      end
+
+      def six_or_above?
+        @is_six_or_above = SaferRailsConsole::RailsVersion::RAILS_VERSION >= ::Gem::Version.new('6.0.0') if @is_six_or_above.nil?
+        @is_six_or_above
+      end
     end
   end
 end

data/lib/safer_rails_console/version.rb

@@ -1,3 +1,3 @@
 module SaferRailsConsole
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/safer_rails_console.gemspec

@@ -31,14 +31,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'appraisal', '~> 2.2'
-  spec.add_development_dependency 'bundler', '~> 1.15'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'mixlib-shellout', '~> 2.2'
   spec.add_development_dependency 'overcommit', '~> 0.39.0'
-  spec.add_development_dependency 'pg', '~> 0.21'
+  spec.add_development_dependency 'pg', '~> 1.1'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.6'
   spec.add_development_dependency 'salsify_rubocop', '~> 0.48.0'
-  spec.add_development_dependency 'sqlite3', '~> 1.3'
   spec.add_development_dependency 'wwtd', '~> 1.3'
-  spec.add_runtime_dependency 'rails', '>= 4.2', '< 5.3'
+  spec.add_runtime_dependency 'rails', '>= 5.0', '< 6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safer_rails_console
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Salsify, Inc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.48.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
@@ -156,20 +142,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
 description: This gem makes Rails console sessions less dangerous in specified environments
   by warning, color-coding, auto-sandboxing, and allowing read-only external connections
   (disables job queueing, non-GET requests, etc.)
@@ -192,10 +178,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
+- gemfiles/6.0.gemfile
 - lib/safer_rails_console.rb
 - lib/safer_rails_console/colors.rb
 - lib/safer_rails_console/console.rb
@@ -231,8 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Make rails console less dangerous!