rails_sql_prettifier 6.0.4 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b61bd785fc014de67c05ebea9dfb6004c19522ecdbaecd223a8dc59cf3c717d6
-  data.tar.gz: d192a000935de406e55c4c6119bdd4286176b40a2f7473b7443d584c02187767
+  metadata.gz: fd0305095915e20ebc2a5b5529c0681f4e82795c1dd748764185c2aeef922298
+  data.tar.gz: 286a20bb4acc2213dd4d8fe3e97f48977857360d2ab65a6b03f8d017f4add700
 SHA512:
-  metadata.gz: 3d85372a2cae35a3d590f7632c7e579b7b7595a7a680ceaffcfb4170bcce561ad12701669f85f7e3c29e2e52fca99fcc126982ecb8e412d6e20ca7a506c4cdc1
-  data.tar.gz: f885d1b7fcff14a35098d05c7802040e16233a4c21601c3299d56618219ab9255b3d794148c7a98d9222d786ed8d154bcc735c39f621494092448f5e25ec21c7
+  metadata.gz: a3010b72fd84d20a273ae11880a624a2758158354249abd1534020810d94f20297a8d73306ed36b31ad69fe24a9367931e59cc4b07fe90b9d57a9743122c2bef
+  data.tar.gz: 2c06865138f0a7fe2c407673f567b4c1721c7ac799598ec0252682d995808c7bfd26fe11236895f9d7749768e48dbebf4e08517a7f68ae7196331d9c31a89d89

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+#6.0.5
+* fixed issue [#20](https://github.com/alekseyl/niceql/issues/20)
+* adding support for multiple ruby versions testing using docker-compose
+
 # 6.0.4
 * Now AR is a dependency not a development dependency
 

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 = '6.0.4'
+  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

@@ -38,10 +38,11 @@ Gem::Specification.new do |spec|
   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: 6.0.4
+  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
@@ -86,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
@@ -148,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
@@ -169,6 +183,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Dockerfile
+- Dockerfile_30
 - Gemfile
 - LICENSE.txt
 - README.md