sql_tagger 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/sql_tagger/mysql.rb

@@ -1,8 +1,8 @@
 require 'sql_tagger'
 require 'mysql'
 
-class Mysql
-  include SqlTagger::Initializer
+module SqlTagger::Mysql
+  extend SqlTagger::ModuleMethods
 
   # @see Mysql#query
   def query_with_sql_tagger(sql, &block)
@@ -13,9 +13,6 @@ class Mysql
   def prepare_with_sql_tagger(query)
     prepare_without_sql_tagger(@sql_tagger.tag(query))
   end
-
-  ['query', 'prepare'].each do |method|
-    alias_method "#{method}_without_sql_tagger", method
-    alias_method method, "#{method}_with_sql_tagger"
-  end
 end
+
+Mysql.send(:include, SqlTagger::Mysql)

data/lib/sql_tagger/mysql2.rb

@@ -0,0 +1,13 @@
+require 'sql_tagger'
+require 'mysql2'
+
+module SqlTagger::Mysql2
+  extend SqlTagger::ModuleMethods
+
+  # @see Mysql2::Client#query
+  def query_with_sql_tagger(sql, opts ={})
+    query_without_sql_tagger(@sql_tagger.tag(sql), opts)
+  end
+end
+
+Mysql2::Client.send(:include, SqlTagger::Mysql2)

data/lib/sql_tagger.rb

@@ -16,7 +16,7 @@ class SqlTagger
   attr_reader :exclusion_cache
 
   def initialize
-    @exclusion_pattern = /^#{RbConfig::CONFIG['prefix']}|\/vendor\//
+    @exclusion_pattern = /^#{RbConfig::CONFIG['prefix']}|\/bundle\/|\/vendor\//
     @exclusion_cache = Set.new
   end
 
@@ -79,4 +79,18 @@ class SqlTagger
       initialize_without_sql_tagger(*args, &block)
     end
   end
+
+  module ModuleMethods
+    # Callback that includes SqlTagger::Initializer and does method aliasing.
+    #
+    # @param [Module] base
+    def included(base)
+      base.send(:include, SqlTagger::Initializer)
+      self.instance_methods.map(&:to_s).grep(/_with_sql_tagger$/).each do |with_method|
+        target = with_method.sub(/_with_sql_tagger$/, '')
+        base.send(:alias_method, "#{target}_without_sql_tagger", target)
+        base.send(:alias_method, target, with_method)
+      end
+    end
+  end
 end

data/spec/sql_tagger/mysql2_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'sql_tagger/mysql2'
+
+describe Mysql2::Client do
+  before :all do
+    @db = Mysql2::Client.new
+  end
+
+  after :all do
+    @db.close
+  end
+
+  it_should_behave_like 'connections with sql_tagger'
+
+  describe '#query' do
+    it 'works' do
+      results = @db.query('SELECT 1 AS one', :symbolize_keys => true)
+      results.to_a.should == [{:one => 1}]
+    end
+
+    it 'calls SqlTagger#tag' do
+      @db.sql_tagger.should_receive(:tag).and_return('/* something.rb */ SELECT 1')
+      @db.query('SELECT 1')
+    end
+  end
+end

data/sql_tagger.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rspec')
   s.add_development_dependency('mysql')
+  s.add_development_dependency('mysql2')
 
   s.files = ['MIT-LICENSE', 'README.rdoc', 'VERSION', 'sql_tagger.gemspec'] +
     Dir.glob('lib/**/*')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sql_tagger
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Toby Hsieh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-16 00:00:00 -07:00
+date: 2013-07-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mysql2
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: sql_tagger inserts stack trace comments into SQL queries.
 email: 
 executables: []
@@ -60,8 +74,10 @@ files:
 - VERSION
 - sql_tagger.gemspec
 - lib/sql_tagger/mysql.rb
+- lib/sql_tagger/mysql2.rb
 - lib/sql_tagger.rb
 - spec/spec_helper.rb
+- spec/sql_tagger/mysql2_spec.rb
 - spec/sql_tagger/mysql_spec.rb
 - spec/sql_tagger_spec.rb
 has_rdoc: true
@@ -100,5 +116,6 @@ specification_version: 3
 summary: Stack trace comments for SQL queries
 test_files: 
 - spec/spec_helper.rb
+- spec/sql_tagger/mysql2_spec.rb
 - spec/sql_tagger/mysql_spec.rb
 - spec/sql_tagger_spec.rb