rails_sql_prettifier 5.0.3 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf8c24bd9ffa08aa300b4c6540027a1e6a2c288dc4661c93834748d445711e42
-  data.tar.gz: ef7945e5d80df9daff0603f3b87f8ed7c209d35b971d0b1817bf94fa409cde21
+  metadata.gz: dc8698d2cb6da1287057ee6d57f4fa1d494efa19bcc013157012d0a055176243
+  data.tar.gz: 6e41b147fd207cc2ad6afcd48508b1ebb0e6cf183d5d3829b61fffff71e1ed30
 SHA512:
-  metadata.gz: 3f2790f713dd38d823a78f947a4fa4234a8c4a8e7ad5e799804d7eb9b43d5ecfbd7b82bcefcbb5fc69fd12512d1a686b50056be9a226413d7e90590005f0bf80
-  data.tar.gz: 817035ebee03c657e04a83b5817ec87a6cb36c19d91d9498b30d31236342a10a88af6d9b760673eed4d2655b36ef20a419e0c00c78c32880423d74b09208546d
+  metadata.gz: 4b2da81bae482d9269ae444ceb7c58b73c0d769755b45d2455656169c117bfe22a18ec0288989689479c385afa5c86f00ae826f3c477d5b987e04e3da97acdcf
+  data.tar.gz: 6030b09100f99471a4874b4f30ccea42184a76eda6f6a7d8a1cb89233498f2b403766ef14981fdfaef15cca1413cdbeb9e5f17fb31e91e07729d779dd609a470

data/.ruby-gemset

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

data/CHANGELOG.md

@@ -1,10 +1,6 @@
-# 5.0.3
-* active record versioning is properly aligned now
+# 6.0.2
 
-# 5.0.2
-* Fixed issue with Niceql.configure not configuring anything + test covered
-
-# 5.0.0
-
-* This a active record prior to 6.0 version compatible niceql integration 
-  ( main difference is StatementInvalid initialization, starting version 6 it has named param sql: for original query ) 
+* 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/README.md

@@ -1,12 +1,7 @@
 # RailsSQLPrettifier
 
-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 started as a code extraction from niceql version 0.4.x. 
-
-It has versioning aligned to the ActiveRecord versions, niceql prior to 0.5 version had hardcoded logic branches based on ActiveRecord versioning. 
-
-That is hard to maintain and hard to test, and also coupling with AR is breaking the original idea of the niceql to be a dependentless solution, so now the niceql is a completely railsfree gem yeay! ( It still has some some checks related to AR implemetations in the error prettifying methods. It will be completely decoupled in the future )
+This is an ActiveRecord integration for a niceql gem.
+Niceql is a small, nice, simple and zero dependency solution for SQL prettifying for Ruby. 
 
 Any reasonable suggestions are welcome. 
 
@@ -28,13 +23,10 @@ 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
-gem 'rails_sql_prettifier', '~> X.X.X'
+gem 'rails_sql_prettifier'
 ```
 
 And then execute:

data/lib/rails_sql_prettifier/version.rb

@@ -1,3 +1,3 @@
 module RailsSQLPrettifier
-  VERSION = '5.0.3'
+  VERSION = '6.0.2'
 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 NiceQLConfigExt
+  module ARNiceQLConfig
     extend ActiveSupport::Concern
 
     included do
@@ -64,19 +64,17 @@ module RailsSQLPrettifier
       self.prettify_active_record_log_output = false
       self.prettify_pg_errors = ar_using_pg_adapter?
     end
-  end
 
-  module NiceqlExt
-    def configure
-      super
+    module ClassMethods
+      def configure
+        super
 
-      if config.pg_adapter_with_nicesql && defined?( ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter )
-        ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include( PostgresAdapterNiceQL)
-      end
+        ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(PostgresAdapterNiceQL) if config.pg_adapter_with_nicesql
 
-      ::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( RailsSQLPrettifier::ErrorExt ) if config.prettify_pg_errors && config.ar_using_pg_adapter?
+        ::ActiveRecord::StatementInvalid.include( Niceql::ErrorExt ) if config.prettify_pg_errors && config.ar_using_pg_adapter?
+      end
     end
   end
 
@@ -84,8 +82,5 @@ module RailsSQLPrettifier
    ::Arel::TreeManager,
    ::Arel::Nodes::Node].each { |klass| klass.send(:include, ArExtentions) }
 
-  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 )
+  NiceQLConfig.include( ARNiceQLConfig )
 end

data/rails_sql_prettifier.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.4'
   spec.add_dependency "niceql", '~> 0.5'
 
-  spec.add_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"
@@ -42,7 +42,4 @@ Gem::Specification.new do |spec|
   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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_sql_prettifier
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 6.0.2
 platform: ruby
 authors:
 - alekseyl
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-09 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceql
@@ -28,16 +28,22 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
-  type: :runtime
+    - - "<"
+      - !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
@@ -122,34 +128,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        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.1'
 description: 'This is an ActiveRecord integration for the SQL prettifier gem niceql. '
 email:
 - leshchuk@gmail.com
@@ -157,20 +135,17 @@ 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,40 +0,0 @@
-exit
-ActiveRecord::Base.connection_config[:adapter]
-ActiveRecord::Base.connection_config.adapter
-ActiveRecord::Base.connection_config
-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

data/Dockerfile

@@ -1,20 +0,0 @@
-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/docker-compose.yml

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