periscope_rails 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    periscope_rails (0.0.5)
+    periscope_rails (0.0.6)
       activesupport (~> 3.0)
       rails (~> 3.0)
 

data/app/periscope/periscope_controller.rb

@@ -36,25 +36,26 @@ class PeriscopeController < ActionController::Base
     elsif (command_words & bad_words).size > 0
       error_message = "Potentially harmful keyword found, blocking script."
     else
-      begin
+      begin #for whole query
         active_record = PeriscopeRails::Config.get_active_record()
-        active_record.transaction do
-          if PeriscopeRails::Config.block_expensive_queries?
-            cost_row = ""
-            begin
-              cost_row = active_record.connection.select_all("explain #{command}")[0]["QUERY PLAN"]
-            rescue
-              puts "Warning: Periscope was unable to cost this query (1): #{command}"
-            end
-            cost_row =~ /rows=(\d+) width=(\d+)\)$/
-            row_count, width = $1.to_i, $2.to_i
-            if row_count > 0 and width > 0
-              raise "Command blocked, it may be too slow. Estimated at #{row_count} rows, commands must return fewer than #{PeriscopeRails::Config.max_rows} rows." if row_count > PeriscopeRails::Config.max_rows
-              raise "Command blocked, it may be too slow. Estimated at #{row_count * width} bytes, commands use less than #{PeriscopeRails::Config.max_size} bytes." if row_count * width > PeriscopeRails::Config.max_size
-            else
-              puts "Warning: Periscope was unable to cost this query (2): #{command}"
+        begin #just for costing
+          active_record.transaction do #costing
+            if PeriscopeRails::Config.block_expensive_queries?
+              active_record.connection.select_all("explain #{command}")[0]["QUERY PLAN"] =~ /rows=(\d+) width=(\d+)\)$/
+              row_count, width = $1.to_i, $2.to_i
+              if row_count > 0 and width > 0
+                raise "Command blocked, it may be too slow. Estimated at #{row_count} rows, commands must return fewer than #{PeriscopeRails::Config.max_rows} rows." if row_count > PeriscopeRails::Config.max_rows
+                raise "Command blocked, it may be too slow. Estimated at #{row_count * width} bytes, commands use less than #{PeriscopeRails::Config.max_size} bytes." if row_count * width > PeriscopeRails::Config.max_size
+              else
+                puts "Warning: Periscope was unable to cost this query (2): #{command}"
+              end
             end
+            raise "OK" #abort all transactions for extra protection
           end
+        rescue Exception => e
+          puts "Warning: Periscope was unable to cost this query (1): #{command}" unless e.message == "OK"
+        end
+        active_record.transaction do #execution
           rows = active_record.connection.select_all(command)
           rows.each do |row|
             row.each_key do |column|

data/lib/periscope_rails/version.rb

@@ -1,3 +1,3 @@
 module PeriscopeRails
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/periscope_rails.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary = "Rails API for Periscope Database Viewer"
   s.description = "Periscope allows you to query your production database. The gem provides the API for Periscope to communicate with your Rails app."
   s.files = Dir["{app,lib,config}/**/*"] + ["MIT-LICENSE", "Rakefile", "Gemfile", "README.rdoc"]
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.add_dependency "activesupport" , "~> 3.0"
   s.add_dependency "rails"         , "~> 3.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: periscope_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000Z
+date: 2012-05-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &26545716 !ruby/object:Gem::Requirement
+  requirement: &27484104 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *26545716
+  version_requirements: *27484104
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &26545428 !ruby/object:Gem::Requirement
+  requirement: &27483816 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *26545428
+  version_requirements: *27483816
 description: Periscope allows you to query your production database. The gem provides
   the API for Periscope to communicate with your Rails app.
 email: