rails_sql_prettifier 5.0.3 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf8c24bd9ffa08aa300b4c6540027a1e6a2c288dc4661c93834748d445711e42
-  data.tar.gz: ef7945e5d80df9daff0603f3b87f8ed7c209d35b971d0b1817bf94fa409cde21
+  metadata.gz: fd0305095915e20ebc2a5b5529c0681f4e82795c1dd748764185c2aeef922298
+  data.tar.gz: 286a20bb4acc2213dd4d8fe3e97f48977857360d2ab65a6b03f8d017f4add700
 SHA512:
-  metadata.gz: 3f2790f713dd38d823a78f947a4fa4234a8c4a8e7ad5e799804d7eb9b43d5ecfbd7b82bcefcbb5fc69fd12512d1a686b50056be9a226413d7e90590005f0bf80
-  data.tar.gz: 817035ebee03c657e04a83b5817ec87a6cb36c19d91d9498b30d31236342a10a88af6d9b760673eed4d2655b36ef20a419e0c00c78c32880423d74b09208546d
+  metadata.gz: a3010b72fd84d20a273ae11880a624a2758158354249abd1534020810d94f20297a8d73306ed36b31ad69fe24a9367931e59cc4b07fe90b9d57a9743122c2bef
+  data.tar.gz: 2c06865138f0a7fe2c407673f567b4c1721c7ac799598ec0252682d995808c7bfd26fe11236895f9d7749768e48dbebf4e08517a7f68ae7196331d9c31a89d89

data/.ruby-gemset

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

data/CHANGELOG.md

@@ -1,10 +1,16 @@
-# 5.0.3
-* active record versioning is properly aligned now
+#6.0.5
+* fixed issue [#20](https://github.com/alekseyl/niceql/issues/20)
+* adding support for multiple ruby versions testing using docker-compose
 
-# 5.0.2
+# 6.0.4
+* Now AR is a dependency not a development dependency
+
+# 6.0.3
 * Fixed issue with Niceql.configure not configuring anything + test covered
 
-# 5.0.0
+#6.0.2
 
-* 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/Dockerfile_30

@@ -0,0 +1,20 @@
+FROM ruby:3.0.3-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

@@ -3,8 +3,17 @@ version: "3.7"
 services:
   test:
     build: .
-    image: niceql
-    command: service postgresql start && rake test
+    image: rsp_6_0
+    command: /bin/bash -c 'service postgresql start && rake test'
+    volumes:
+      - '.:/app'
+
+  test_3_0:
+    build:
+      context: .
+      dockerfile: Dockerfile_30
+    image: rsp_6_0_3_0
+    command: /bin/bash -c 'service postgresql start && rake test'
     volumes:
       - '.:/app'
 

data/lib/rails_sql_prettifier/version.rb

@@ -1,3 +1,3 @@
 module RailsSQLPrettifier
-  VERSION = '5.0.3'
+  VERSION = '6.0.5'
 end

data/lib/rails_sql_prettifier.rb

@@ -28,11 +28,13 @@ module RailsSQLPrettifier
   end
 
   module AbstractAdapterLogPrettifier
-    def log( sql, *args, &block )
+    private
+    def log( sql, *args, **kwargs, &block )
       # \n need to be placed because AR log will start with action description + time info.
       # rescue sql - just to be sure Prettifier wouldn't break production
       formatted_sql = "\n" + Niceql::Prettifier.prettify_sql(sql) rescue sql
-      super( formatted_sql, *args, &block )
+
+      super( formatted_sql, *args, **kwargs, &block )
     end
   end
 

data/rails_sql_prettifier.gemspec

@@ -32,17 +32,17 @@ 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_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 "awesome_print"
   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'
+  spec.add_development_dependency 'stubberry', '~> 0.2'
 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.5
 platform: ruby
 authors:
 - alekseyl
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-09 00:00:00.000000000 Z
+date: 2022-01-19 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'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   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
@@ -80,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: differ
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +162,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 description: 'This is an ActiveRecord integration for the SQL prettifier gem niceql. '
 email:
 - leshchuk@gmail.com
@@ -157,13 +177,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".byebug_history"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Dockerfile
+- Dockerfile_30
 - Gemfile
 - LICENSE.txt
 - README.md

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