active_record-comments 0.0.1 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3479f24b30ad73efbf9937f33c94c3f722e8dac7
+  data.tar.gz: 4f399eabfb49d657ffb82dcd702eb66ee20a54bb
+SHA512:
+  metadata.gz: 19a92d96e8c9faebeb5b9a0d34287e9abd150f3fd98f9296fd01e286178f8c4f95687cca52db24976a33b8dde38dd291c10c980f8fae7b71d7eec46c574a492e
+  data.tar.gz: bd39c3c075ec5a66b1a2db8566abd48675fd3a64af43c6bd12d1e1b62a088c70f04da3f64fdac96f5104b40c83f951cab192f1e14c25bd7cf4e599027bc0f96b

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (C) 2013 AUTHOR_NAME <AUTHOR_EMAIL>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/active_record/comments.rb

@@ -25,31 +25,11 @@ module ActiveRecord
   end
 end
 
-if ActiveRecord::VERSION::MAJOR == 2
-  class << ActiveRecord::Base
-    def construct_finder_sql_with_comments(options)
-      sql = construct_finder_sql_without_comments(options)
-      ActiveRecord::Comments.with_comment_sql(sql)
-    end
-    alias_method_chain(:construct_finder_sql, :comments)
-
-    def construct_calculation_sql_with_comments(operation, column_name, options)
-      sql = construct_calculation_sql_without_comments(operation, column_name, options)
-      ActiveRecord::Comments.with_comment_sql(sql)
-    end
-    alias_method_chain(:construct_calculation_sql, :comments)
-  end
-else
-  klass = if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
-    Arel::SelectManager
-  else
-    ActiveRecord::Relation
-  end
-
-  klass.class_eval do
-    alias to_sql_with_comments to_sql
-    def to_sql
-      ActiveRecord::Comments.with_comment_sql(to_sql_with_comments)
-    end
+# log is called by execute in all db adapters
+ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
+  def log_with_comment_injection(query, *args, &block)
+    query = ActiveRecord::Comments.with_comment_sql(query)
+    log_without_comment_injection(query, *args, &block)
   end
+  alias_method_chain :log, :comment_injection
 end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: active_record-comments
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -33,53 +30,30 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .travis.yml
-- Appraisals
-- Gemfile
-- Gemfile.lock
-- Rakefile
-- Readme.md
-- active_record-comments.gemspec
-- gemfiles/activerecord_2.3.gemfile
-- gemfiles/activerecord_2.3.gemfile.lock
-- gemfiles/activerecord_3.0.gemfile
-- gemfiles/activerecord_3.0.gemfile.lock
-- gemfiles/activerecord_3.1.gemfile
-- gemfiles/activerecord_3.1.gemfile.lock
-- gemfiles/activerecord_3.2.gemfile
-- gemfiles/activerecord_3.2.gemfile.lock
+- MIT-LICENSE
 - lib/active_record/comments.rb
-- spec/active_record/comments_spec.rb
-- spec/spec_helper.rb
-homepage: http://github.com/grosser/active_record-comments
+homepage: https://github.com/grosser/active_record-comments
 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'
-      segments:
-      - 0
-      hash: -2889031802467512839
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2889031802467512839
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Comments for activerecord
 test_files: []

data/.travis.yml

@@ -1,8 +0,0 @@
-rvm:
-  - ree
-  - 1.9.3
-gemfile:
-  - gemfiles/activerecord_2.3.gemfile
-  - gemfiles/activerecord_3.0.gemfile
-  - gemfiles/activerecord_3.1.gemfile
-  - gemfiles/activerecord_3.2.gemfile

data/Appraisals

@@ -1,5 +0,0 @@
-["2.3", "3.0", "3.1", "3.2"].each do |version|
-  appraise "activerecord_#{version}" do
-    gem "activerecord", "~> #{version}.0"
-  end
-end

data/Gemfile

@@ -1,8 +0,0 @@
-source :rubygems
-gemspec
-
-gem "appraisal"
-gem "bump"
-gem "rake"
-gem "rspec", "~>2"
-gem "sqlite3"

data/Gemfile.lock

@@ -1,51 +0,0 @@
-PATH
-  remote: .
-  specs:
-    active_record-comments (0.0.1)
-      activerecord
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    appraisal (0.5.1)
-      bundler
-      rake
-    arel (3.0.2)
-    builder (3.0.4)
-    bump (0.3.8)
-    diff-lcs (1.1.3)
-    i18n (0.6.1)
-    multi_json (1.5.0)
-    rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    sqlite3 (1.3.6)
-    tzinfo (0.3.35)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_record-comments!
-  appraisal
-  bump
-  rake
-  rspec (~> 2)
-  sqlite3

data/Rakefile

@@ -1,11 +0,0 @@
-require "bundler/gem_tasks"
-require "bump/tasks"
-require "appraisal"
-
-task :spec do
-  sh "rspec spec/"
-end
-
-task :default do
-  sh "bundle exec rake appraisal:install && bundle exec rake appraisal spec"
-end

data/Readme.md

@@ -1,27 +0,0 @@
-Adds comments to your activerecord queries so you can seem where they came from or what user caused them.<br/>
-for on Rails 2 + 3 + 4
-
-Install
-=======
-
-    gem install active_record-comments
-
-Usage
-=====
-
-    require "active_record/comments"
-
-    # => SELECT ... /* user.rb:123 */
-    result = ActiveRecord::Comments.comment("user.rb:123"){ User.where("x like y").count }
-
-    # => SELECT ... /* account cleanup initial */
-    result = ActiveRecord::Comments.comment("account cleanup") do
-      ActiveRecord::Comments.comment("initial"){ User.where("x like y").count }
-    end
-
-Author
-======
-[Michael Grosser](http://grosser.it)<br/>
-michael@grosser.it<br/>
-License: MIT<br/>
-[![Build Status](https://travis-ci.org/grosser/active_record-comments.png)](https://travis-ci.org/grosser/active_record-comments)

data/active_record-comments.gemspec

@@ -1,11 +0,0 @@
-name = "active_record-comments"
-
-Gem::Specification.new name, "0.0.1" do |s|
-  s.summary = "Comments for activerecord"
-  s.authors = ["Michael Grosser"]
-  s.email = "michael@grosser.it"
-  s.homepage = "http://github.com/grosser/#{name}"
-  s.files = `git ls-files`.split("\n")
-  s.license = "MIT"
-  s.add_runtime_dependency "activerecord"
-end

data/gemfiles/activerecord_2.3.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source :rubygems
-
-gem "appraisal"
-gem "bump"
-gem "rake"
-gem "rspec", "~>2"
-gem "sqlite3"
-gem "activerecord", "~> 2.3.0"
-
-gemspec :path=>"../"

data/gemfiles/activerecord_2.3.gemfile.lock

@@ -1,39 +0,0 @@
-PATH
-  remote: /Users/mgrosser/code/tools/active_record-comments
-  specs:
-    active_record-comments (0.0.0)
-      activerecord
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activerecord (2.3.15)
-      activesupport (= 2.3.15)
-    activesupport (2.3.15)
-    appraisal (0.5.1)
-      bundler
-      rake
-    bump (0.3.9)
-    diff-lcs (1.1.3)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    sqlite3 (1.3.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_record-comments!
-  activerecord (~> 2.3.0)
-  appraisal
-  bump
-  rake
-  rspec (~> 2)
-  sqlite3

data/gemfiles/activerecord_3.0.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source :rubygems
-
-gem "appraisal"
-gem "bump"
-gem "rake"
-gem "rspec", "~>2"
-gem "sqlite3"
-gem "activerecord", "~> 3.0.0"
-
-gemspec :path=>"../"

data/gemfiles/activerecord_3.0.gemfile.lock

@@ -1,50 +0,0 @@
-PATH
-  remote: /Users/mgrosser/code/tools/active_record-comments
-  specs:
-    active_record-comments (0.0.0)
-      activerecord
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.19)
-      activesupport (= 3.0.19)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.19)
-      activemodel (= 3.0.19)
-      activesupport (= 3.0.19)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.19)
-    appraisal (0.5.1)
-      bundler
-      rake
-    arel (2.0.10)
-    builder (2.1.2)
-    bump (0.3.9)
-    diff-lcs (1.1.3)
-    i18n (0.5.0)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    sqlite3 (1.3.7)
-    tzinfo (0.3.35)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_record-comments!
-  activerecord (~> 3.0.0)
-  appraisal
-  bump
-  rake
-  rspec (~> 2)
-  sqlite3

data/gemfiles/activerecord_3.1.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source :rubygems
-
-gem "appraisal"
-gem "bump"
-gem "rake"
-gem "rspec", "~>2"
-gem "sqlite3"
-gem "activerecord", "~> 3.1.0"
-
-gemspec :path=>"../"

data/gemfiles/activerecord_3.1.gemfile.lock

@@ -1,52 +0,0 @@
-PATH
-  remote: /Users/mgrosser/code/tools/active_record-comments
-  specs:
-    active_record-comments (0.0.0)
-      activerecord
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.1.10)
-      activesupport (= 3.1.10)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.10)
-      activemodel (= 3.1.10)
-      activesupport (= 3.1.10)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activesupport (3.1.10)
-      multi_json (>= 1.0, < 1.3)
-    appraisal (0.5.1)
-      bundler
-      rake
-    arel (2.2.3)
-    builder (3.0.4)
-    bump (0.3.9)
-    diff-lcs (1.1.3)
-    i18n (0.6.1)
-    multi_json (1.2.0)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    sqlite3 (1.3.7)
-    tzinfo (0.3.35)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_record-comments!
-  activerecord (~> 3.1.0)
-  appraisal
-  bump
-  rake
-  rspec (~> 2)
-  sqlite3

data/gemfiles/activerecord_3.2.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source :rubygems
-
-gem "appraisal"
-gem "bump"
-gem "rake"
-gem "rspec", "~>2"
-gem "sqlite3"
-gem "activerecord", "~> 3.2.0"
-
-gemspec :path=>"../"

data/gemfiles/activerecord_3.2.gemfile.lock

@@ -1,52 +0,0 @@
-PATH
-  remote: /Users/mgrosser/code/tools/active_record-comments
-  specs:
-    active_record-comments (0.0.0)
-      activerecord
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    appraisal (0.5.1)
-      bundler
-      rake
-    arel (3.0.2)
-    builder (3.0.4)
-    bump (0.3.9)
-    diff-lcs (1.1.3)
-    i18n (0.6.1)
-    multi_json (1.5.0)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    sqlite3 (1.3.7)
-    tzinfo (0.3.35)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_record-comments!
-  activerecord (~> 3.2.0)
-  appraisal
-  bump
-  rake
-  rspec (~> 2)
-  sqlite3

data/spec/active_record/comments_spec.rb

@@ -1,96 +0,0 @@
-require "spec_helper"
-
-describe ActiveRecord::Comments do
-  def normalize_sql(sql)
-    sql.gsub("``", '""').gsub("  ", " ").strip
-  end
-
-  describe ".current_comment" do
-    it "be empty when not called" do
-      ActiveRecord::Comments.comment("xxx"){}
-      ActiveRecord::Comments.send(:current_comment).should == nil
-    end
-
-    it "be filled when called" do
-      result = nil
-      ActiveRecord::Comments.comment("xxx") do
-        result = ActiveRecord::Comments.send(:current_comment)
-      end
-      "xxx".should == result
-    end
-
-    it "concat" do
-      result = nil
-      ActiveRecord::Comments.comment("xxx") do
-        ActiveRecord::Comments.comment("yyy") do
-          result = ActiveRecord::Comments.send(:current_comment)
-        end
-      end
-      result.should == "xxx yyy"
-    end
-
-    it "unpop" do
-      result = nil
-      ActiveRecord::Comments.comment("xxx") do
-        ActiveRecord::Comments.comment("yyy") { }
-        result = ActiveRecord::Comments.send(:current_comment)
-      end
-      result.should == "xxx"
-    end
-  end
-
-  describe ".comment" do
-    it "return results" do
-      ActiveRecord::Comments.comment("xxx"){ 1 }.should == 1
-    end
-  end
-
-  if ActiveRecord::VERSION::MAJOR == 2
-    describe "#construct_finder_sql" do
-      it "not be there when not called" do
-        ActiveRecord::Comments.comment("xxx"){ }
-        normalize_sql(User.scoped(:conditions => {:id => 1}).send(:construct_finder_sql, {})).should ==
-          'SELECT * FROM "users" WHERE ("users"."id" = 1)'
-      end
-
-      it "be there when called" do
-        result = nil
-        ActiveRecord::Comments.comment("xxx") do
-          result = User.scoped(:conditions => {:id => 1}).send(:construct_finder_sql, {})
-        end
-        normalize_sql(result).should == 'SELECT * FROM "users" WHERE ("users"."id" = 1) /* xxx */'
-      end
-    end
-
-    describe "#construct_calculation_sql_with_comments" do
-      it "not be there when not called" do
-        ActiveRecord::Comments.comment("xxx"){ }
-        normalize_sql(User.scoped(:conditions => {:id => 1}).send(:construct_calculation_sql_with_comments, "count", "id", {})).should ==
-          'SELECT count("users".id) AS count_id FROM "users" WHERE ("users"."id" = 1)'
-      end
-
-      it "be there when called" do
-        result = nil
-        ActiveRecord::Comments.comment("xxx") do
-          result = User.scoped(:conditions => {:id => 1}).send(:construct_calculation_sql_with_comments, "count", "id", {})
-        end
-        normalize_sql(result).should == 'SELECT count("users".id) AS count_id FROM "users" WHERE ("users"."id" = 1) /* xxx */'
-      end
-    end
-  else
-    describe "#to_sql" do
-      it "not be there when not called" do
-        ActiveRecord::Comments.comment("xxx"){ }
-        normalize_sql(User.where(:id => 1).to_sql).should == 'SELECT "users".* FROM "users" WHERE "users"."id" = 1'
-      end
-
-      it "be there when called" do
-        result = nil
-        ActiveRecord::Comments.comment("xxx") do
-          result = User.where(:id => 1).to_sql
-        end
-        normalize_sql(result).should == 'SELECT "users".* FROM "users" WHERE "users"."id" = 1 /* xxx */'
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,16 +0,0 @@
-require "active_record/comments"
-
-ActiveRecord::Base.establish_connection(
-  :adapter => "sqlite3",
-  :database => ":memory:"
-)
-
-ActiveRecord::Schema.verbose = false
-ActiveRecord::Schema.define(:version => 1) do
-  create_table :users do |t|
-    t.string :name
-  end
-end
-
-class User < ActiveRecord::Base
-end