pg-eyeballs 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8318a41826d020850ea248b42562f98495e7b319
-  data.tar.gz: cb5b794673a55abde012a232b2d21660c58f2b73
+  metadata.gz: 3ecb0ed349340e392cd51a2d08f8a3fb406718ee
+  data.tar.gz: d88af55b891ed2700cadaac3e952f1fcbb9db2c4
 SHA512:
-  metadata.gz: 421cc9c3588a38bfc9c9d0ac05c43e068012f407cb9eca5d03fae6e17e8635f7cfe57daed87509efd632586ef37632bd050cff69be93550faef7c6fd57a67d59
-  data.tar.gz: b668d16c03dc16e7d5f7b1b6f3ccb97f9b64c5c4c4c7166785025bbe2858465bb6a398f8195c700353c32f31c0c992a88789643ea5c124cbfcdb792037307af0
+  metadata.gz: fe3eb5223f725effb48c363429741ae5c4e9722067c8871b2eefb0acaa338f133b1d8d15ef2e81395ed3541e827f0d4305cd82a9b0d5d70a5cb15b4473f936b3
+  data.tar.gz: 49d459f9e8b2de48050bb791a03223ba619172dde4484c04b934272f10081caae16347aa1ad1fc88487b6488efdcb871f12e2485f975b323ae546f4c42033727

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "activerecord-4" do
+  gem "activerecord", ">= 4.0.0", "< 5.0.0"
+end
+
+appraise "activerecord-5" do
+  gem "activerecord", ">= 5.0.0", "< 6.0.0"
+end

data/Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'pry'
 gem 'pry-byebug'
 gem 'awesome_print'
+gem 'appraisal'
 
 # Specify your gem's dependencies in pg-eyeballs.gemspec
 gemspec

data/README.md

@@ -4,7 +4,7 @@
 `pg-eyeballs` is a ruby gem that gives you detailed information about how the
 SQL queries created by the active record code you write are executed by the database.
 It gives you an easy, ruby friendly way to see the output of the Postgres
-[`EXPLAIN` command](https://www.postgresql.org/docs/9.4/static/using-explain.html) and integrates with the popular query analysis tool [`gocmdpev`](https://github.com/simon-engledew/gocmdpev). 
+[`EXPLAIN` command](https://www.postgresql.org/docs/9.4/static/using-explain.html) and integrates with the popular query analysis tool [`gocmdpev`](https://github.com/simon-engledew/gocmdpev).
 
 Using it you can see:
 - What queries were run
@@ -48,7 +48,7 @@ more than one query, for instance when it has a `preload` or with certain
 subqueries
 ```ruby
 User.all.preload(:profiles).eyeballs.explain(options: [:verbose], format: :yaml)
-['- Plan: 
+['- Plan:
       Node Type: "Seq Scan"
       Relation Name: "users"
       Schema: "public"
@@ -57,10 +57,10 @@ User.all.preload(:profiles).eyeballs.explain(options: [:verbose], format: :yaml)
       Total Cost: 22.30
       Plan Rows: 1230
       Plan Width: 36
-      Output: 
+      Output:
       - "id"
-      - "email"', 
- '- Plan:     
+      - "email"',
+ '- Plan:
       Node Type: "Seq Scan"
       Relation Name: "profiles"
       Schema: "public"
@@ -69,7 +69,7 @@ User.all.preload(:profiles).eyeballs.explain(options: [:verbose], format: :yaml)
       Total Cost: 36.75
       Plan Rows: 11
       Plan Width: 8
-      Output: 
+      Output:
         - "id"
         - "user_id"
       Filter: "(profiles.user_id = 1)"'
@@ -179,6 +179,11 @@ To use, also from inside your Rails project directory, run
 eyeballs User.preload(:profiles)
 ```
 
+## Compatibility
+
+`pg-eyeballs` has been tested with Rails versions 4 and 5. It may work on
+earlier versions, but I haven't tried it.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -189,8 +194,13 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/bradurani/pg-eyeballs. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
+### Running the tests
+
+First, `bundle install`. After this, if you are using the default
+database, first thing is to run `createdb eyeballs_test`. After this
+you can run the tests with `rake`.
+
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/gemfiles/activerecord_4.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry"
+gem "pry-byebug"
+gem "awesome_print"
+gem "appraisal"
+gem "activerecord", ">= 4.0.0", "<= 5.0.0"
+
+gemspec :path => "../"

data/gemfiles/activerecord_4.gemfile.lock

@@ -0,0 +1,83 @@
+PATH
+  remote: ../
+  specs:
+    pg-eyeballs (1.0.1)
+      activerecord (>= 4.0, < 6.0)
+      pg
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      builder (~> 3.1)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      arel (~> 6.0)
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (6.0.3)
+    awesome_print (1.7.0)
+    builder (3.2.2)
+    byebug (9.0.6)
+    coderay (1.1.1)
+    database_cleaner (1.5.3)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    json (1.8.3)
+    method_source (0.8.2)
+    minitest (5.9.1)
+    pg (0.19.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.0)
+      byebug (~> 9.0)
+      pry (~> 0.10)
+    rake (10.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    slop (3.6.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (>= 4.0.0, <= 5.0.0)
+  appraisal
+  awesome_print
+  bundler (~> 1.12)
+  database_cleaner
+  pg-eyeballs!
+  pry
+  pry-byebug
+  rake (~> 10.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.13.2

data/gemfiles/activerecord_5.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry"
+gem "pry-byebug"
+gem "awesome_print"
+gem "appraisal"
+gem "activerecord", ">= 5.0.0", "<=6.0.0"
+
+gemspec :path => "../"

data/gemfiles/activerecord_5.gemfile.lock

@@ -0,0 +1,80 @@
+PATH
+  remote: ../
+  specs:
+    pg-eyeballs (1.0.1)
+      activerecord (>= 4.0, < 6.0)
+      pg
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (7.1.2)
+    awesome_print (1.7.0)
+    byebug (9.0.6)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.2)
+    database_cleaner (1.5.3)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    method_source (0.8.2)
+    minitest (5.9.1)
+    pg (0.19.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.0)
+      byebug (~> 9.0)
+      pry (~> 0.10)
+    rake (10.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    slop (3.6.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (>= 5.0.0, <= 6.0.0)
+  appraisal
+  awesome_print
+  bundler (~> 1.12)
+  database_cleaner
+  pg-eyeballs!
+  pry
+  pry-byebug
+  rake (~> 10.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.13.2

data/lib/eyeballs/inspector.rb

@@ -23,9 +23,9 @@ module Eyeballs
     end
 
     def queries
-      @queries ||= query_array.map do |query_binding|
-        build_sql(query_binding)
-      end
+      @relation.connection.to_sql(query_array).map { |query|
+        build_sql(query)
+      }
     end
 
     def to_s(options: OPTIONS)
@@ -53,7 +53,7 @@ module Eyeballs
       to_hash_array.each do |h|
         system("echo '#{h.to_json}' | gocmdpev")
       end
-      nil 
+      nil
     end
 
     private
@@ -66,20 +66,20 @@ module Eyeballs
 
     def validate_format!(format)
       unless FORMATS.include?(format)
-        raise Eyeballs::UnknownFormatError, "Unknown Format #{format}" 
+        raise Eyeballs::UnknownFormatError, "Unknown Format #{format}"
       end
     end
 
     def validate_options!(options)
       options.each do |option|
         unless OPTIONS.include?(option)
-          raise Eyeballs::UnknownOptionError, "Unknown Option #{option}" 
+          raise Eyeballs::UnknownOptionError, "Unknown Option #{option}"
         end
       end
     end
 
     def explain_query(query, format, options)
-      "EXPLAIN (#{explain_options(format, options)}) #{query}" 
+      "EXPLAIN (#{explain_options(format, options)}) #{query}"
     end
 
     def explain_options(format, options)
@@ -91,15 +91,18 @@ module Eyeballs
     end
 
     def build_sql(query_binding)
-      sql = query_binding[0]
-      values = query_binding[1].map do |b|
-        cast_type = b[0].cast_type
-        cast_value = cast_type.type_cast_for_database(b[1])
-        quoted_value = @relation.connection.quote(cast_value)
+      query_binding[1].each.with_index.reduce(query_binding[0]) do |sql,(value, index)|
+        sql.sub("$#{index + 1}", @relation.connection.quote(extract_value(value)))
       end
-      values.each.with_index.reduce(sql) do |sql,(value, index)|
-        sql.sub("$#{index + 1}", value.to_s)
+    end
+
+    def extract_value(value)
+      if value.is_a?(Array) #Rails 4
+        value.last
+      elsif value.is_a?(ActiveRecord::Relation::QueryAttribute) #Rails 5
+        value.value
       end
     end
+
   end
 end

data/lib/eyeballs/version.rb

@@ -1,3 +1,3 @@
 module Eyeballs
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/pg-eyeballs.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "database_cleaner"
 
-  spec.add_dependency "activerecord", ">=4.0", "<5.0"
+  spec.add_dependency "activerecord", ">=4.0", "<6.0"
   spec.add_dependency "pg"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg-eyeballs
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Brad Urani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +113,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -122,6 +123,10 @@ files:
 - bin/gocmdpev
 - bin/setup
 - circle.yml
+- gemfiles/activerecord_4.gemfile
+- gemfiles/activerecord_4.gemfile.lock
+- gemfiles/activerecord_5.gemfile
+- gemfiles/activerecord_5.gemfile.lock
 - gocmdpev.png
 - lib/eyeballs/errors.rb
 - lib/eyeballs/includes.rb