marginalia 1.0.2 → 1.0.3

data/.gitignore

@@ -1,3 +1,4 @@
 *.gem
 .bundle
 tmp
+marginalia_test

data/.travis.yml

@@ -3,4 +3,4 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-script: rake db:reset rake:test:all
+script: bundle exec rake db:reset test:all

data/Gemfile.lock

@@ -38,6 +38,7 @@ GEM
     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)
@@ -61,5 +62,6 @@ DEPENDENCIES
   marginalia!
   mysql
   mysql2
+  pg
   rake
   sqlite3

data/README.md

@@ -1,4 +1,4 @@
-# marginalia
+# marginalia [![Build Status](https://secure.travis-ci.org/37signals/marginalia.png?branch=master)](http://travis-ci.org/37signals/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.
@@ -19,7 +19,7 @@ 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. It has also been tesetd using the sqlite3 gem.
+tested on Rails 2.3.5 through 3.2-stable. It has also been tested for sqlite3 and postgres.
 
 Patches are welcome for other database adapters. 
 

data/Rakefile

@@ -5,7 +5,7 @@ task :default => ['test:all']
 
 namespace :test do
   desc "test all drivers"
-  task :all => [:mysql, :mysql2, :sqlite]
+  task :all => [:mysql, :mysql2, :postgresql, :sqlite]
 
   desc "test mysql driver"
   task :mysql do
@@ -17,6 +17,11 @@ namespace :test do
     sh "DRIVER=mysql2 ruby -Ilib -Itest test/*_test.rb"
   end
   
+  desc "test PostgreSQL driver"
+  task :postgresql do
+    sh "DRIVER=postgresql DB_USERNAME=postgres ruby -Ilib -Itest test/*_test.rb"
+  end
+  
   desc "test sqlite3 driver"
   task :sqlite do
     sh "DRIVER=sqlite3 ruby -Ilib -Itest test/*_test.rb"
@@ -24,16 +29,38 @@ namespace :test do
 end
 
 namespace :db do
-  desc "reset database"
-  task :reset => [:drop, :create]
 
-  desc "create database"
-  task :create do
-    sh 'mysql -u root -e "create database marginalia_test;"'
+  desc "reset all databases"
+  task :reset => [:"mysql:reset", :"postgresql:reset"]
+
+  namespace :mysql do
+    desc "reset MySQL database"
+    task :reset => [:drop, :create]
+
+    desc "create MySQL database"
+    task :create do
+      sh 'mysql -u root -e "create database marginalia_test;"'
+    end
+
+    desc "drop MySQL database"
+    task :drop do
+      sh 'mysql -u root -e "drop database if exists marginalia_test;"'
+    end
   end
 
-  desc "drop database"
-  task :drop do
-    sh 'mysql -u root -e "drop database marginalia_test;"'
+  namespace :postgresql do
+    desc "reset PostgreSQL database"
+    task :reset => [:drop, :create]
+
+    desc "create PostgreSQL database"
+    task :create do
+      sh 'createdb -U postgres marginalia_test'
+    end
+
+    desc "drop PostgreSQL database"
+    task :drop do
+      sh 'psql -d postgres -U postgres -c "DROP DATABASE IF EXISTS marginalia_test"'
+    end
   end
+
 end

data/lib/marginalia/railtie.rb

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

data/lib/marginalia.rb

@@ -9,8 +9,10 @@ module Marginalia
         Marginalia.application_name = Rails.application.class.name.split("::").first
       end
       instrumented_class.class_eval do
-        alias_method :execute_without_marginalia, :execute
-        alias_method :execute, :execute_with_marginalia
+        if defined? :execute
+          alias_method :execute_without_marginalia, :execute
+          alias_method :execute, :execute_with_marginalia
+        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.2"
+  gem.version       = "1.0.3"
 
   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 "pg"
   gem.add_development_dependency "sqlite3"
 
   gem.summary = description = %q{Attach comments to your ActiveRecord queries.}

data/test/query_comments_test.rb

@@ -8,7 +8,7 @@ require 'marginalia'
 ActiveRecord::Base.establish_connection({
   :adapter  => ENV["DRIVER"] || "mysql",
   :host     => "localhost",
-  :username => "root",
+  :username => ENV["DB_USERNAME"] || "root",
   :database => "marginalia_test"
 })
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marginalia
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &20036740 !ruby/object:Gem::Requirement
+  requirement: &14527580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -26,10 +26,10 @@ dependencies:
         version: '3.3'
   type: :runtime
   prerelease: false
-  version_requirements: *20036740
+  version_requirements: *14527580
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &20034600 !ruby/object:Gem::Requirement
+  requirement: &14526420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -40,10 +40,10 @@ dependencies:
         version: '3.3'
   type: :runtime
   prerelease: false
-  version_requirements: *20034600
+  version_requirements: *14526420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &20032960 !ruby/object:Gem::Requirement
+  requirement: &14525140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -51,10 +51,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20032960
+  version_requirements: *14525140
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &20031160 !ruby/object:Gem::Requirement
+  requirement: &14514160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,10 +62,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20031160
+  version_requirements: *14514160
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &20030020 !ruby/object:Gem::Requirement
+  requirement: &14513460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,10 +73,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20030020
+  version_requirements: *14513460
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: &14512660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *14512660
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &20028460 !ruby/object:Gem::Requirement
+  requirement: &14511580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -84,7 +95,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20028460
+  version_requirements: *14511580
 description: 
 email:
 - noah@37signals.com