marginalia 1.1.4 → 1.1.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fcc2f32dfc16f2e22667bcab682490c5428aa70f
+  data.tar.gz: f76f558831423192621127cc4b5de1a042bed3c9
+SHA512:
+  metadata.gz: 05331b951bb74bcfffeeda0873b9d66b7919e97a66a764c07b0f7dcfef088266bf08c0552d16652b20f9ffcdaa3f526af8d828d9bffe97cacd8869a3bf0326f9
+  data.tar.gz: 09ed9f59adc63e455abf796fc5ef365c7756e992a1894643982ac85e3fee5257d61b6f26c0f72104f71fdc9658c1e7f11a19aa5ffbc92e62c028b7445b56e862

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p484
+2.1.0

data/.travis.yml

@@ -1,19 +1,10 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - ruby-head
+  - 2.1.0
 script: bundle exec rake db:reset test:all
 env:
-  - "RAILS_VERSION=3.2.15"
-  - "RAILS_VERSION=4.0.1"
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-  exclude:
-    - rvm: 1.8.7
-      env: "RAILS_VERSION=4.0.1"
-    - rvm: 1.9.2
-      env: "RAILS_VERSION=4.0.1"
+  - "RAILS_VERSION=3.1.12"
+  - "RAILS_VERSION=3.2.16"
+  - "RAILS_VERSION=4.0.2"

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-version = ENV["RAILS_VERSION"] || "3.2.15"
+version = ENV["RAILS_VERSION"] || "4.0.2"
 
 rails = case version
 when "master"

data/README.md

@@ -1,4 +1,4 @@
-# marginalia [![Build Status](https://secure.travis-ci.org/37signals/marginalia.png?branch=master)](http://travis-ci.org/37signals/marginalia)
+# marginalia [![Build Status](https://secure.travis-ci.org/basecamp/marginalia.png?branch=master)](http://travis-ci.org/basecamp/marginalia)
 
 Attach comments to your ActiveRecord queries. By default, it adds the application, controller, and action names as a
 comment at the end of each query.
@@ -23,11 +23,6 @@ tested on Rails 2.3.5 through 3.2-stable. It has also been tested for sqlite3 an
 
 Patches are welcome for other database adapters. 
 
-**The preferred way to get support is to send an email to
-marginalia@librelist.com. Github issues
-and pull requests will be checked occassionally, but email is the
-fastest way to get help.**
-
 ## Installation
 
 ### For Rails 3.x:

data/lib/marginalia.rb

@@ -8,14 +8,19 @@ module Marginalia
     def self.included(instrumented_class)
       Marginalia::Comment.components = [:application, :controller, :action]
       instrumented_class.class_eval do
-        if instrumented_class.method_defined? :execute
+        if instrumented_class.method_defined?(:execute)
           alias_method :execute_without_marginalia, :execute
           alias_method :execute, :execute_with_marginalia
         end
 
-        if instrumented_class.method_defined? :exec_query
-          alias_method :exec_query_without_marginalia, :exec_query
-          alias_method :exec_query, :exec_query_with_marginalia
+        is_mysql2 = defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter) &&
+          ActiveRecord::ConnectionAdapters::Mysql2Adapter == instrumented_class
+        # Dont instrument exec_query on mysql2 and AR 3.2+, as it calls execute internally
+        unless is_mysql2 && ActiveRecord::VERSION::STRING > "3.1"
+          if instrumented_class.method_defined?(:exec_query)
+            alias_method :exec_query_without_marginalia, :exec_query
+            alias_method :exec_query, :exec_query_with_marginalia
+          end
         end
       end
     end

data/marginalia.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test}/*`.split("\n")
   gem.name          = "marginalia"
   gem.require_paths = ["lib"]
-  gem.version       = "1.1.4"
+  gem.version       = "1.1.5"
   gem.license       = "MIT"
 
   gem.add_runtime_dependency "actionpack", ">= 2.3"
@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "mysql2"
   gem.add_development_dependency "pg"
   gem.add_development_dependency "sqlite3"
+  gem.add_development_dependency "mocha"
 
-  gem.summary = description = %q{Attach comments to your ActiveRecord queries.}
+  gem.summary = gem.description = %q{Attach comments to your ActiveRecord queries.}
 end

data/test/query_comments_test.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'test/unit'
+require 'mocha/test_unit'
 require 'logger'
 require 'pp'
 require 'active_record'
@@ -42,6 +43,13 @@ class MarginaliaTest < Test::Unit::TestCase
     @env = Rack::MockRequest.env_for('/')
   end
 
+  def test_double_annotate
+    ActiveRecord::Base.connection.expects(:annotate_sql).returns("select id from posts").once
+    ActiveRecord::Base.connection.send(:select, "select id from posts")
+  ensure
+    ActiveRecord::Base.connection.unstub(:annotate_sql)
+  end
+
   def test_query_commenting_on_mysql_driver_with_no_action
     ActiveRecord::Base.connection.execute "select id from posts"
     assert_match %r{select id from posts /\*application:rails\*/$}, @queries.first

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marginalia
 version: !ruby/object:Gem::Version
-  version: 1.1.4
-  prerelease: 
+  version: 1.1.5
 platform: ruby
 authors:
 - Noah Lorang
@@ -11,130 +10,130 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: mocha
+  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'
+description: Attach comments to your ActiveRecord queries.
 email:
 - noah@37signals.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -148,26 +147,25 @@ files:
 homepage: https://github.com/37signals/marginalia
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Attach comments to your ActiveRecord queries.
 test_files: []