marginalia 1.0.0 → 1.0.1

data/README.md

@@ -12,14 +12,16 @@ For example, once enabled, your logs will look like:
     LIMIT 1 
     /*application:BCX,controller:project_imports,action:show*/
 
-You can also these query comments with a tool like [pt-query-digest](http://www.percona.com/doc/percona-toolkit/2.1/pt-query-digest.html#query-reviews) 
+You can also use these query comments along with a tool like [pt-query-digest](http://www.percona.com/doc/percona-toolkit/2.1/pt-query-digest.html#query-reviews) 
 to automate identification of controllers and actions that are hotspots forslow queries.
 
 This gem was created at 37signals. You can read more about how we use it [on
 our blog](http://37signals.com/svn/posts/3130-tech-note-mysql-query-comments-in-rails).
 
 This has been tested and used in production with both the mysql and mysql2 gems, 
-tested on Rails 2.3.5 through 3.2-stable. Patches are welcome for other database adapters. 
+tested on Rails 2.3.5 through 3.2-stable. It has also been tesetd using the sqlite3 gem.
+
+Patches are welcome for other database adapters. 
 
 ## Installation
 

data/Rakefile

@@ -5,7 +5,7 @@ task :default => ['test:all']
 
 namespace :test do
   desc "test all drivers"
-  task :all => [:mysql, :mysql2]
+  task :all => [:mysql, :mysql2, :sqlite]
 
   desc "test mysql driver"
   task :mysql do
@@ -16,6 +16,11 @@ namespace :test do
   task :mysql2 do
     sh "DRIVER=mysql2 ruby -Ilib -Itest test/*_test.rb"
   end
+  
+  desc "test sqlite3 driver"
+  task :sqlite do
+    sh "DRIVER=sqlite3 ruby -Ilib -Itest test/*_test.rb"
+  end
 end
 
 namespace :db do

data/lib/marginalia/railtie.rb

@@ -48,6 +48,12 @@ module Marginalia
         end
       end
 
+      if defined? ActiveRecord::ConnectionAdapters::SQLiteAdapter
+        ActiveRecord::ConnectionAdapters::SQLiteAdapter.module_eval do
+          include Marginalia::ActiveRecordInstrumentation
+        end
+      end
+
     end
   end
 end

data/marginalia.gemspec

@@ -8,13 +8,14 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test}/*`.split("\n")
   gem.name          = "marginalia"
   gem.require_paths = ["lib"]
-  gem.version       = "1.0.0"
+  gem.version       = "1.0.1"
 
   gem.add_runtime_dependency "actionpack", ">= 2.3", "< 3.3"
   gem.add_runtime_dependency "activerecord", ">= 2.3", "< 3.3"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "mysql"
   gem.add_development_dependency "mysql2"
+  gem.add_development_dependency "sqlite3 "
 
   gem.summary = description = %q{Attach comments to your ActiveRecord queries.}
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marginalia
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &13238580 !ruby/object:Gem::Requirement
+  requirement: &21947740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -26,10 +26,10 @@ dependencies:
         version: '3.3'
   type: :runtime
   prerelease: false
-  version_requirements: *13238580
+  version_requirements: *21947740
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &13237460 !ruby/object:Gem::Requirement
+  requirement: &21940000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -40,10 +40,10 @@ dependencies:
         version: '3.3'
   type: :runtime
   prerelease: false
-  version_requirements: *13237460
+  version_requirements: *21940000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13236300 !ruby/object:Gem::Requirement
+  requirement: &21935060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -51,10 +51,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13236300
+  version_requirements: *21935060
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &13235060 !ruby/object:Gem::Requirement
+  requirement: &21929500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,10 +62,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13235060
+  version_requirements: *21929500
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &13234220 !ruby/object:Gem::Requirement
+  requirement: &21928680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,7 +73,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13234220
+  version_requirements: *21928680
+- !ruby/object:Gem::Dependency
+  name: ! 'sqlite3 '
+  requirement: &21927380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *21927380
 description: 
 email:
 - noah@37signals.com