marginalia 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4d1334e6fae088b614c33883053c675e8ce3208
-  data.tar.gz: ea48070a0ad0b210045ff6cc8eb485d9db115e3a
+  metadata.gz: bda214f48d77afb13f9c9182a550272d4e654c4f
+  data.tar.gz: 5d199a1edd3a808254824a2bb45e22deca536e22
 SHA512:
-  metadata.gz: 06d3dc8986bdfc70351ece60860aa79e4822f83e0cbcc0cb8211c9197dbf4fa8320f1017f15cbfa9aac40c296ae6a37f8054aa566fac832fe2f02d628d65d073
-  data.tar.gz: fdee2ee3f3e0bec89b52e54c22056811d7bd4e4cd167d6ef38e00446f25c16cc03f3cd730f4e8456a32ba67ff66b39046a2adb289acb0c9d4a8fc149b75957ba
+  metadata.gz: 7f7ee0ed6593d2a639c31787a559a86db0367b63ed79dde39966a4264904bbbd77d822e01be212ae40e7a573330281cb75489fc08e577c28e4d059712bcd2a86
+  data.tar.gz: 4963089d9d9609fd5dbdae17c36e6ed001cea24b81550febdf0826fc3fe13d574f34c8bb51a1ffc6b270e30ba68dd6c14b3d693cec8fcc6bfa4370d8fdee144a

data/.travis.yml

@@ -1,21 +1,18 @@
 language: ruby
 
 rvm:
-  - 2.1
-  - 2.2
   - 2.3.1
+  - 2.4.4
+  - 2.5.1
 
 sudo: false
 
 script: bundle exec rake db:reset test:all
 
 env:
-  - "RAILS_VERSION=3.1.12"
-  - "RAILS_VERSION=3.2.19"
-  - "RAILS_VERSION=4.0.8"
-  - "RAILS_VERSION=4.1.8"
   - "RAILS_VERSION=4.2.0"
-  - "RAILS_VERSION=3.2.19 TEST_RAILS_API=true"
-  - "RAILS_VERSION=4.0.8 TEST_RAILS_API=true"
-  - "RAILS_VERSION=4.1.8 TEST_RAILS_API=true"
+  - "RAILS_VERSION=5.0.6"
+  - "RAILS_VERSION=5.1.5"
   - "RAILS_VERSION=4.2.0 TEST_RAILS_API=true"
+  - "RAILS_VERSION=5.0.6 TEST_RAILS_API=true"
+  - "RAILS_VERSION=5.1.5 TEST_RAILS_API=true"

data/Gemfile

@@ -9,6 +9,8 @@ if "4.2.5" > version
 else
   gem 'mysql2', '>= 0.3.13', '< 0.5'
 end
+gem 'pg', '~> 0.15'
+gem 'sqlite3'
 
 rails = case version
 when "master"

data/Rakefile

@@ -5,26 +5,26 @@ task :default => ['test:all']
 
 namespace :test do
   desc "test all drivers"
-  task :all => [:mysql, :mysql2, :postgresql, :sqlite]
+  task :all => [:mysql2, :postgresql, :sqlite]
 
   desc "test mysql driver"
   task :mysql do
-    sh "DRIVER=mysql ruby -Ilib -Itest test/*_test.rb"
+    sh "DRIVER=mysql bundle exec ruby -Ilib -Itest test/*_test.rb"
   end
 
   desc "test mysql2 driver"
   task :mysql2 do
-    sh "DRIVER=mysql2 ruby -Ilib -Itest test/*_test.rb"
+    sh "DRIVER=mysql2 bundle exec ruby -Ilib -Itest test/*_test.rb"
   end
-  
+
   desc "test PostgreSQL driver"
   task :postgresql do
-    sh "DRIVER=postgresql DB_USERNAME=postgres ruby -Ilib -Itest test/*_test.rb"
+    sh "DRIVER=postgresql DB_USERNAME=postgres bundle exec ruby -Ilib -Itest test/*_test.rb"
   end
-  
+
   desc "test sqlite3 driver"
   task :sqlite do
-    sh "DRIVER=sqlite3 ruby -Ilib -Itest test/*_test.rb"
+    sh "DRIVER=sqlite3 bundle exec ruby -Ilib -Itest test/*_test.rb"
   end
 end
 
@@ -62,5 +62,4 @@ namespace :db do
       sh 'psql -d postgres -U postgres -c "DROP DATABASE IF EXISTS marginalia_test"'
     end
   end
-
 end

data/ext/mkrf_conf.rb

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'rubygems/command.rb'
+require 'rubygems/dependency_installer.rb'
+
+begin
+  Gem::Command.build_args = ARGV
+  rescue NoMethodError
+end
+
+installer = Gem::DependencyInstaller.new
+begin
+  if RUBY_VERSION < "2.4"
+    installer.install "mysql", ">=0"
+  end
+rescue
+  exit(1)
+end
+
+f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")
+f.write("task :default\n")
+f.close

data/lib/marginalia/comment.rb

@@ -26,9 +26,17 @@ module Marginalia
         end
       end
       ret.chop!
+      ret = self.escape_sql_comment(ret)
       ret
     end
 
+    def self.escape_sql_comment(str)
+      while str.include?('/*') || str.include?('*/')
+        str = str.gsub('/*', '').gsub('*/', '')
+      end
+      str
+    end
+
     def self.clear!
       self.marginalia_controller = nil
     end

data/marginalia.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.authors       = ["Noah Lorang", "Nick Quaranto", "Taylor Weibley"]
-  gem.email         = ["noah@37signals.com", "github@arthurnn.com"]
+  gem.email         = ["noah@37signals.com", "arthurnn@github.com"]
   gem.homepage      = "https://github.com/basecamp/marginalia"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -8,13 +8,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test}/*`.split("\n")
   gem.name          = "marginalia"
   gem.require_paths = ["lib"]
-  gem.version       = "1.5.0"
+  gem.version       = "1.6.0"
   gem.license       = "MIT"
 
   gem.add_runtime_dependency "actionpack", ">= 2.3"
   gem.add_runtime_dependency "activerecord", ">= 2.3"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "mysql"
   gem.add_development_dependency "mysql2"
   gem.add_development_dependency "pg"
   gem.add_development_dependency "sqlite3"
@@ -22,4 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "mocha"
 
   gem.summary = gem.description = %q{Attach comments to your ActiveRecord queries.}
+
+  gem.extensions = ["ext/mkrf_conf.rb"]
 end

data/test/query_comments_test.rb

@@ -18,7 +18,7 @@ def adapter_pool_available?
 end
 
 require "minitest/autorun"
-require 'mocha/test_unit'
+require "mocha/minitest"
 require 'logger'
 require 'pp'
 require 'active_record'
@@ -64,7 +64,11 @@ end
 class PostsController < ActionController::Base
   def driver_only
     ActiveRecord::Base.connection.execute "select id from posts"
-    render :nothing => true
+    if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new('5')
+      render body: nil
+    else
+      render nothing: true
+    end
   end
 end
 
@@ -101,7 +105,6 @@ end
 
 Marginalia::Railtie.insert
 
-
 class MarginaliaTest < MiniTest::Test
   def setup
     @queries = []
@@ -272,6 +275,15 @@ class MarginaliaTest < MiniTest::Test
     end
   end
 
+  def test_good_comment
+    assert_equal Marginalia::Comment.escape_sql_comment('app:foo'), 'app:foo'
+  end
+
+  def test_bad_comments
+    assert_equal Marginalia::Comment.escape_sql_comment('*/; DROP TABLE USERS;/*'), '; DROP TABLE USERS;'
+    assert_equal Marginalia::Comment.escape_sql_comment('**//; DROP TABLE USERS;/*'), '; DROP TABLE USERS;'
+  end
+
   def teardown
     Marginalia.application_name = nil
     Marginalia::Comment.lines_to_ignore = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marginalia
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Noah Lorang
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -54,20 +54,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -141,9 +127,10 @@ dependencies:
 description: Attach comments to your ActiveRecord queries.
 email:
 - noah@37signals.com
-- github@arthurnn.com
+- arthurnn@github.com
 executables: []
-extensions: []
+extensions:
+- ext/mkrf_conf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -153,6 +140,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- ext/mkrf_conf.rb
 - init.rb
 - lib/marginalia.rb
 - lib/marginalia/comment.rb
@@ -179,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Attach comments to your ActiveRecord queries.