rails_sql_prettifier 5.0.0 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd1acaf8f6f82312ccb1422330645c2365b3e4f93c9874da2645c62866310836
-  data.tar.gz: bad3c23c4af4d0d3d3d8200f2ae38309df6cc332e92ab6466713f1956ee91739
+  metadata.gz: f1ee709955e95f1203d8f1e64feb5e51309123c92f7eeeee50fa44d9688511c3
+  data.tar.gz: b44477d11671c84097e66e2b69393a458f9a57cd2ab0c6aa4507e23105af3f80
 SHA512:
-  metadata.gz: 3b16a4ee0ba376dc3f7ae3e3d2eaec46bd08cdda2e525b4a59be827e82ae5c161d90fd236e418bb226a8cca54aaebf6e5e590161fa529f52c25e0f025db27e42
-  data.tar.gz: ab755ea34ed0bc3c910ee02895a94a35c7a1f4de4d123188f66985a9cd68950f8d708cdc3ba8d5cf7a590403b8e77c4186ebae44ecc31d5e1fcc8cc0dca63836
+  metadata.gz: 84862ea11984c33d2c198a6c7a0ec340a4f90d35463abe971280580e1f3f4d97db47486c838c13e854898c8c01c4d511fd2f74f5ab57068667159f2218d1cda8
+  data.tar.gz: 9e72db1724def7dc7fec82a5198281badc9b81fba4bcc01f3a51dfae23fd4ef1700f2369db7312fb97497c1c1caa2dbee0cb4b526466feb5a8887802b33f0f8f

data/.gitignore

@@ -8,4 +8,5 @@
 /spec/reports/
 /tmp/
 /inspectionProfiles/
-.idea
+.idea
+.byebug_history

data/.ruby-gemset

@@ -1 +1 @@
-rails_sql_prettifier_ar_5
+rails_sql_prettifier_ar_6_0

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# 6.0.3
+* Fixed issue with Niceql.configure not configuring anything + test covered
+
+#6.0.2
+
+* This a active record prior to 7.0 version and >= 6.1 compatible niceql integration 
+  ar < 6.0 breaking change: 
+  * StatementInvalid initialization has a breaking change: starting version 6 it has named param sql: for original query )
+  

data/Dockerfile

@@ -0,0 +1,20 @@
+FROM ruby:2.7.5-bullseye
+
+WORKDIR /app
+RUN  apt-get update && apt-get -y install lsb-release
+#
+RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
+    sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \
+    apt-get update && apt-get -y install postgresql postgresql-client-12
+
+RUN sh -c 'echo "local   all             all                                     trust" > /etc/postgresql/14/main/pg_hba.conf' && \
+    service postgresql start && \
+    psql -U postgres -c 'CREATE DATABASE "niceql-test"'
+
+RUN  gem install bundler
+
+COPY lib/rails_sql_prettifier/version.rb /app/lib/rails_sql_prettifier/version.rb
+COPY rails_sql_prettifier.gemspec /app/
+COPY Gemfil* /app/
+#
+RUN bundle install

data/README.md

@@ -1,7 +1,9 @@
 # RailsSQLPrettifier
 
-This is an ActiveRecord integration for a niceql gem.
-Niceql is a small, nice, simple and zero dependency solution for SQL prettifying for Ruby. 
+This is an ActiveRecord integration for a niceql gem ( niceql is a small, nice, simple and zero dependency solution for the SQL prettifying in ruby ).
+
+This gem is an extraction from niceql version 0.4.x. Its separated by different ActiveRecord versions, previous it had some version logic branching e.t.c. 
+but that is hard to maintain and test, and also breaking the idea of niceql to be dependentless solution, so now niceql is a completely railsfree solution yeay!
 
 Any reasonable suggestions are welcome. 
 
@@ -23,6 +25,9 @@ after:
 
 ## Installation
 
+rails_sql_prettifier, has several version compatible with different active_record versions, so pay attention to the right versioning
+if whenever you specify versions manually.   
+
 Add this line to your application's Gemfile:
 
 ```ruby

data/docker-compose.yml

@@ -0,0 +1,10 @@
+version: "3.7"
+
+services:
+  test:
+    build: .
+    image: niceql
+    command: service postgresql start && rake test
+    volumes:
+      - '.:/app'
+

data/lib/rails_sql_prettifier/version.rb

@@ -1,3 +1,3 @@
 module RailsSQLPrettifier
-  VERSION = '5.0.0'
+  VERSION = '6.0.3'
 end

data/lib/rails_sql_prettifier.rb

@@ -2,8 +2,8 @@ require "rails_sql_prettifier/version"
 require 'active_record'
 require "niceql"
 
+
 module RailsSQLPrettifier
-  include Niceql
 
   module ArExtentions
     def exec_niceql
@@ -44,7 +44,7 @@ module RailsSQLPrettifier
     end
   end
 
-  module ARNiceQLConfig
+  module NiceQLConfigExt
     extend ActiveSupport::Concern
 
     included do
@@ -55,10 +55,7 @@ module RailsSQLPrettifier
 
 
     def ar_using_pg_adapter?
-      adapter = ActiveRecord::Base.try(:connection_db_config).try(:adapter) ||
-        ActiveRecord::Base.try(:connection_config)&.with_indifferent_access&.dig(:adapter)
-
-      adapter == 'postgresql'
+      ActiveRecord::Base.try(:connection_config)&.with_indifferent_access&.dig(:adapter) == 'postgresql'
     end
 
     def initialize
@@ -67,17 +64,19 @@ module RailsSQLPrettifier
       self.prettify_active_record_log_output = false
       self.prettify_pg_errors = ar_using_pg_adapter?
     end
+  end
 
-    module ClassMethods
-      def configure
-        super
+  module NiceqlExt
+    def configure
+      super
 
-        ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(PostgresAdapterNiceQL) if config.pg_adapter_with_nicesql
+      if config.pg_adapter_with_nicesql && defined?( ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter )
+        ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include( PostgresAdapterNiceQL)
+      end
 
-        ::ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend( AbstractAdapterLogPrettifier ) if config.prettify_active_record_log_output
+      ::ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend( AbstractAdapterLogPrettifier ) if config.prettify_active_record_log_output
 
-        ::ActiveRecord::StatementInvalid.include( Niceql::ErrorExt ) if config.prettify_pg_errors && config.ar_using_pg_adapter?
-      end
+      ::ActiveRecord::StatementInvalid.include( RailsSQLPrettifier::ErrorExt ) if config.prettify_pg_errors && config.ar_using_pg_adapter?
     end
   end
 
@@ -85,5 +84,8 @@ module RailsSQLPrettifier
    ::Arel::TreeManager,
    ::Arel::Nodes::Node].each { |klass| klass.send(:include, ArExtentions) }
 
-  NiceQLConfig.include( ARNiceQLConfig )
+  Niceql::NiceQLConfig.include( NiceQLConfigExt )
+
+  # we need to use a prepend otherwise it's not preceding Niceql.configure in a lookup chain
+  Niceql.singleton_class.prepend( NiceqlExt )
 end

data/rails_sql_prettifier.gemspec

@@ -31,16 +31,18 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = '>= 2.4'
-  spec.add_dependency "niceql", '>= 0.5.1'
+  spec.add_dependency "niceql", '~> 0.5'
 
-  spec.add_development_dependency "activerecord", "< 6.0"
+  spec.add_development_dependency "activerecord", '>= 6.0', '< 6.1'
 
   spec.add_development_dependency "bundler", ">= 1"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.0"
 
-  spec.add_development_dependency "differ"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "benchmark-ips"
-  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency "differ", '~> 0.1'
+  spec.add_development_dependency "pry-byebug", '~> 3.9'
+  spec.add_development_dependency 'sqlite3', '~> 1'
+  spec.add_development_dependency 'pg', '~> 1'
+
+  spec.add_development_dependency 'stubberry', '~> 0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_sql_prettifier
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.3
 platform: ruby
 authors:
 - alekseyl
@@ -14,30 +14,36 @@ dependencies:
   name: niceql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -84,58 +90,72 @@ dependencies:
   name: differ
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: benchmark-ips
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: stubberry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 description: 'This is an ActiveRecord integration for the SQL prettifier gem niceql. '
 email:
 - leshchuk@gmail.com
@@ -143,18 +163,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".byebug_history"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yml
 - err_now.png
 - err_was.png
 - lib/benchmark/cat.rb

data/.byebug_history

@@ -1,36 +0,0 @@
-c
-ActiveRecord.version <= Gem::Version.new(5)
-c
-ActiveRecord.version 
-exit
-ActiveRecord.version 
-c
-exit
-si.sql
-si
-c
-sql_body
-n
-s
-original_sql_query
-err
-s
-up
-s
-up
-s
-up
-s
-super
-try(:sql)
-Niceql.config.prettify_pg_errors
-c
-exit
-err_template
- si.to_s
-exit
- err_caret_line
-err_quote_caret_offset
-c
- err.lines[1].index( '...' ).to_i
-err_caret_line