marginalia 1.1.3 → 1.1.4

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 tmp
 marginalia_test
+Gemfile.lock

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p484

data/.travis.yml

@@ -3,4 +3,17 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - ruby-head
 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"

data/Gemfile

@@ -1,3 +1,14 @@
 source "https://rubygems.org"
 
 gemspec
+
+version = ENV["RAILS_VERSION"] || "3.2.15"
+
+rails = case version
+when "master"
+  {:github => "rails/rails"}
+else
+  "~> #{version}"
+end
+
+gem "rails", rails

data/lib/marginalia.rb

@@ -22,7 +22,7 @@ module Marginalia
 
     def annotate_sql(sql)
       comment = Marginalia::Comment.construct_comment
-      if comment.present? && !sql.match(comment)
+      if comment.present? && !sql.include?(comment)
         "#{sql} /*#{comment}*/"
       else
         sql

data/lib/marginalia/comment.rb

@@ -40,11 +40,11 @@ module Marginalia
       end
 
       def self.action
-        @controller.action_name if @controller.respond_to? :action_name 
+        @controller.action_name if @controller.respond_to? :action_name
       end
 
       def self.line
-        Marginalia::Comment.lines_to_ignore ||= /\.rvm|gem|vendor|marginalia|rbenv/
+        Marginalia::Comment.lines_to_ignore ||= /\.rvm|gem|vendor\/|marginalia|rbenv/
         last_line = caller.detect do |line|
           line !~ Marginalia::Comment.lines_to_ignore
         end

data/lib/marginalia/railtie.rb

@@ -29,7 +29,7 @@ module Marginalia
           Marginalia::Comment.update!(self)
           yield
         ensure
-          Marginalia::Comment.clear! 
+          Marginalia::Comment.clear!
         end
         around_filter :record_query_comment
       end
@@ -61,9 +61,9 @@ module Marginalia
         end
       end
 
-      if defined? ActiveRecord::ConnectionAdapters::SQLiteAdapter
-        if ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::SQLiteAdapter)
-          ActiveRecord::ConnectionAdapters::SQLiteAdapter.module_eval do
+      if defined? ActiveRecord::ConnectionAdapters::SQLite3Adapter
+        if ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::SQLite3Adapter)
+          ActiveRecord::ConnectionAdapters::SQLite3Adapter.module_eval do
             include Marginalia::ActiveRecordInstrumentation
           end
         end

data/marginalia.gemspec

@@ -8,11 +8,11 @@ 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.3"
+  gem.version       = "1.1.4"
   gem.license       = "MIT"
 
-  gem.add_runtime_dependency "actionpack", ">= 2.3", "< 3.3"
-  gem.add_runtime_dependency "activerecord", ">= 2.3", "< 3.3"
+  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"

data/test/query_comments_test.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'test/unit'
 require 'logger'
 require 'pp'
@@ -46,6 +47,13 @@ class MarginaliaTest < Test::Unit::TestCase
     assert_match %r{select id from posts /\*application:rails\*/$}, @queries.first
   end
 
+  if ENV["DRIVER"] =~ /^mysql/
+    def test_query_commenting_on_mysql_driver_with_binary_chars
+      ActiveRecord::Base.connection.execute "select id from posts /* \x81\x80\u0010\ */"
+      assert_equal "select id from posts /* \x81\x80\u0010 */ /*application:rails*/", @queries.first
+    end
+  end
+
   def test_query_commenting_on_mysql_driver_with_action
     PostsController.action(:driver_only).call(@env)
     assert_match %r{select id from posts /\*application:rails,controller:posts,action:driver_only\*/$}, @queries.first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marginalia
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,39 +11,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &16267500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.3'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3.3'
   type: :runtime
   prerelease: false
-  version_requirements: *16267500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &16266080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.3'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3.3'
   type: :runtime
   prerelease: false
-  version_requirements: *16266080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16263360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -51,10 +55,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16263360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &16262280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,10 +71,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16262280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &19117300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,10 +87,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19117300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &19115920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -84,10 +103,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19115920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &19114480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -95,7 +119,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19114480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - noah@37signals.com
@@ -104,10 +133,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rbenv-version
+- .ruby-version
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -138,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Attach comments to your ActiveRecord queries.

data/.rbenv-version

@@ -1 +0,0 @@
-1.9.3-p0

data/Gemfile.lock

@@ -1,67 +0,0 @@
-PATH
-  remote: .
-  specs:
-    marginalia (1.1.0)
-      actionpack (>= 2.3, < 3.3)
-      activerecord (>= 2.3, < 3.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activesupport (3.1.3)
-      multi_json (~> 1.0)
-    arel (2.2.1)
-    builder (3.0.0)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    multi_json (1.1.0)
-    mysql (2.8.1)
-    mysql2 (0.3.11)
-    pg (0.13.2)
-    rack (1.3.6)
-    rack-cache (1.1)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rake (0.9.2.2)
-    sprockets (2.0.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    tilt (1.3.3)
-    tzinfo (0.3.32)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  marginalia!
-  mysql
-  mysql2
-  pg
-  rake
-  sqlite3