safer_rails_console 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e22a55eb2977ecd729a7839b196333e48099183b
-  data.tar.gz: 7521fecaac6acc88c8707325cd65ba441f20b4e7
+  metadata.gz: cdf260deb3867b5bed0d92646aa88de6f64afd03
+  data.tar.gz: 3cbaac5740f226b7a0364168f4ab137d080fe1ec
 SHA512:
-  metadata.gz: ee7b35dda3fa5ca743625ffba0649e99996fef4f1b30d57c81071830799ee1ee3572a387e598b70d3c8cc2c3e908bfdd147ed7d6e4da7b01d170cf9c71cb034c
-  data.tar.gz: a3e5e78324986964cb026a7b3e25406bad453431befd662692f1f17af923c085c30d07d3039324adfaf79619089b3c65edf4991394aae2549be34ba30714e628
+  metadata.gz: 470e4da18f0fe1ad4e10df31ae6189f66c7ee58f66389bc8bc3c6d0224f6f8c816dec8d7b94001b22911778bc595a6da7e0de0e3a360c348e29b56de64f7638f
+  data.tar.gz: a3afb5cc08b8a001879271c7f86b4c78dc5b6cb13d97f2a7602f4ab3ebe96437cc9fb0d22c33ef872fbf9d9daa85e5bd7cc44c43b2e679d2baab112be7c8ef5d

data/.travis.yml

@@ -1,10 +1,19 @@
 language: ruby
 sudo: false
 
+services:
+  - postgresql
+
 bundler_args: --without test --jobs 3 --retry 3
 before_install:
   - gem install bundler
 
+before_script:
+  - cp spec/internal/database.yml.travis spec/internal/rails_4_1/config/database.yml
+  - 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
+
 script:
   - bundle exec rubocop
   - bundle exec rspec

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [v0.1.4](https://github.com/salsify/safer_rails_console/tree/v0.1.4) (2017-08-15)
+[Full Changelog](https://github.com/salsify/safer_rails_console/compare/v0.1.3...v0.1.4)
+
+**Fixed bugs:**
+
+- Invalid cached and prepared statements do not trigger a automatic rollback with PostgreSQL [\#16](https://github.com/salsify/safer_rails_console/issues/16)
+- safer\_rails\_console doesn't work in alerts service rails console mode in sandbox mode [\#13](https://github.com/salsify/safer_rails_console/issues/13)
+
+**Merged pull requests:**
+
+- Patch PostgreSQLAdapter\#execute\_and\_clear instead of AbstractAdapter\#log for auto-rollback [\#15](https://github.com/salsify/safer_rails_console/pull/15) ([timothysu](https://github.com/timothysu))
+
 ## [v0.1.3](https://github.com/salsify/safer_rails_console/tree/v0.1.3) (2017-08-02)
 [Full Changelog](https://github.com/salsify/safer_rails_console/compare/v0.1.2...v0.1.3)
 

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

@@ -2,15 +2,44 @@ module SaferRailsConsole
   module Patches
     module Sandbox
       module AutoRollback
+        def self.rollback_and_begin_new_transaction
+          connection = ::ActiveRecord::Base.connection
+          connection.rollback_db_transaction
+          connection.begin_db_transaction
+        end
+
         module ActiveRecord
           module ConnectionAdapters
-            module AbstractAdapter
-              def log(sql, name = 'SQL', binds = [], statement_name = nil)
-                super(sql, name, binds, statement_name) { yield }
+            module PostgreSQLAdapter41
+              def exec_no_cache(sql, name, binds)
+                super
+              rescue => e
+                SaferRailsConsole::Patches::Sandbox::AutoRollback.rollback_and_begin_new_transaction
+                raise e
+              end
+
+              def exec_cache(sql, name, binds)
+                super
+              rescue => e
+                SaferRailsConsole::Patches::Sandbox::AutoRollback.rollback_and_begin_new_transaction
+                raise e
+              end
+            end
+
+            module PostgreSQLAdapter42
+              def execute_and_clear(sql, name, binds)
+                super
               rescue => e
-                connection = ::ActiveRecord::Base.connection
-                connection.rollback_db_transaction
-                connection.begin_db_transaction
+                SaferRailsConsole::Patches::Sandbox::AutoRollback.rollback_and_begin_new_transaction
+                raise e
+              end
+            end
+
+            module PostgreSQLAdapter5
+              def execute_and_clear(sql, name, binds, prepare: false)
+                super
+              rescue => e
+                SaferRailsConsole::Patches::Sandbox::AutoRollback.rollback_and_begin_new_transaction
                 raise e
               end
             end
@@ -21,4 +50,12 @@ module SaferRailsConsole
   end
 end
 
-::ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(SaferRailsConsole::Patches::Sandbox::AutoRollback::ActiveRecord::ConnectionAdapters::AbstractAdapter)
+if defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+  if SaferRailsConsole::RailsVersion.four_one?
+    ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(SaferRailsConsole::Patches::Sandbox::AutoRollback::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter41)
+  elsif 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
+end

data/lib/safer_rails_console/version.rb

@@ -1,3 +1,3 @@
 module SaferRailsConsole
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

data/safer_rails_console.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.15'
   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 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.6'
   spec.add_development_dependency 'salsify_rubocop', '~> 0.48.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safer_rails_console
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Salsify, Inc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.39.0
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement