marginalia 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f9f187276b089ab51a1f5e267f8e58e125b1ec6
-  data.tar.gz: 011dbacbca884d0c40b757e408603a51e4b75639
+  metadata.gz: 3a294ff04a314d5e24a21f5995e3e2913d25d5da
+  data.tar.gz: dd9e9e133e72f570379eec9936d8d0fe794de4e3
 SHA512:
-  metadata.gz: b4992f558f137d11af12f9cc4208dcfa7d9a2d8c2bf7be426bdca1668cf44aca39777206f4abe8f51cb12acbbea07683883ec4cc6956bf46a0ce7770594fe4b2
-  data.tar.gz: 639570873d23475c04fe0ba94bcb84c317efd4bbaee87d3a978dc013c8cd6191ce8ee077d6fc8001940d57267335f26c9846a419a5adc7faba77d5487866c52d
+  metadata.gz: 7b1b2e1a5da6e9efe3043bdf2485b20990737d65a4d5ea6f86b9cae3a9c7415dd4c7b31702d48625f2f6edd8b15c57c98842819726bef55d347939da5d154256
+  data.tar.gz: a228a5805de1281142fa85f8c6e9b416956ef8acca7e2e2c6e84b59cbc55f634bfacebdf5228d38f36b1102666b50841f628995b96acfc7b297ed0cc4670a6d0

data/.ruby-version

@@ -1 +1 @@
-2.2.0
+2.2.3

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 
 rvm:
-  - 1.9.3
-  - 2.0.0
   - 2.1
   - 2.2
+  - 2.3
 
 sudo: false
 

data/Gemfile

@@ -3,6 +3,13 @@ source "https://rubygems.org"
 gemspec
 
 version = ENV["RAILS_VERSION"] || "4.2.0"
+
+if "4.2.5" > version
+  gem 'mysql2', '~> 0.3.13'
+else
+  gem 'mysql2', '>= 0.3.13', '< 0.5'
+end
+
 rails = case version
 when "master"
   {:github => "rails/rails"}

data/README.md

@@ -29,10 +29,6 @@ Patches are welcome for other database adapters.
 
     # Gemfile
     gem 'marginalia'
-    
-    # config/application.rb
-    require 'marginalia/railtie'
-
 
 ### For Rails 2.x:
 
@@ -94,6 +90,8 @@ default. In addition, implementation is provided for:
   * `:controller_with_namespace` to include the full classname (including namespace)
     of the controller.
   * `:job` to include the classname of the ActiveJob being performed.
+  * `:hostname` to include ```Socket.gethostname```.
+  * `:pid` to include current process id. 
 
 Pull requests for other included comment components are welcome.
 

data/lib/marginalia.rb

@@ -56,6 +56,13 @@ module Marginalia
       exec_query_without_marginalia(annotate_sql(sql), name, binds)
     end
 
+    if ActiveRecord::VERSION::MAJOR >= 5
+      def exec_query_with_marginalia(sql, name = 'SQL', binds = [], options = {})
+        options[:prepare] ||= false
+        exec_query_without_marginalia(annotate_sql(sql), name, binds, options)
+      end
+    end
+
     def exec_delete_with_marginalia(sql, name = 'SQL', binds = [])
       exec_delete_without_marginalia(annotate_sql(sql), name, binds)
     end
@@ -68,7 +75,11 @@ module Marginalia
   module ActionControllerInstrumentation
     def self.included(instrumented_class)
       instrumented_class.class_eval do
-        around_filter :record_query_comment
+        if respond_to?(:around_action)
+          around_action :record_query_comment
+        else
+          around_filter :record_query_comment
+        end
       end
     end
 

data/marginalia.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |gem|
   gem.authors       = ["Noah Lorang", "Nick Quaranto", "Taylor Weibley"]
-  gem.email         = ["noah@37signals.com"]
-  gem.homepage      = "https://github.com/37signals/marginalia"
+  gem.email         = ["noah@37signals.com", "github@arthurnn.com"]
+  gem.homepage      = "https://github.com/basecamp/marginalia"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test}/*`.split("\n")
   gem.name          = "marginalia"
   gem.require_paths = ["lib"]
-  gem.version       = "1.3.0"
+  gem.version       = "1.4.0"
   gem.license       = "MIT"
 
   gem.add_runtime_dependency "actionpack", ">= 2.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marginalia
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Noah Lorang
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -141,6 +141,7 @@ dependencies:
 description: Attach comments to your ActiveRecord queries.
 email:
 - noah@37signals.com
+- github@arthurnn.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -158,7 +159,7 @@ files:
 - lib/marginalia/railtie.rb
 - marginalia.gemspec
 - test/query_comments_test.rb
-homepage: https://github.com/37signals/marginalia
+homepage: https://github.com/basecamp/marginalia
 licenses:
 - MIT
 metadata: {}
@@ -178,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Attach comments to your ActiveRecord queries.