rails_sql_prettifier 6.1.3 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27c2c94ce703f039972dc6a71d7141875b70fbe8ee4c069ca6c0fd0e0a61c8b0
-  data.tar.gz: d4065bbe16258c466c12906f636a606477f35659a10c71ec504a0044d672b24b
+  metadata.gz: 58a944dc1c5ff11aae8445592a777d82edaf2fd812278467d8ebc95d1333ac93
+  data.tar.gz: ca73d669390fa3dd4293279f5e7299f69674295b48677c9234a52cd62f4c95d8
 SHA512:
-  metadata.gz: cfa6e69b57fdf10fbc5508031805423683947bbbd3c7f68cb4c749db131a6e45dc2e58f653fd59c92244cb6e93b42fd277fd63c7451a902814de16b57f1576b0
-  data.tar.gz: 1fc269b0db15097276a0c73dbe7e96f4e796983a4eded9025db72d08f97aeb06929b5ed61759144f598a2bc29682f25c65cffbef9d47c16e93318ab55b488b2a
+  metadata.gz: c3e40ba9047a8ffcf41f928e4b9821235bb2cd671686fb06876256cab46da39eab586d811c6d4488aceb915fa26561e7e11e5d70790973fece1bd1f228a7619a
+  data.tar.gz: 0236a8cab9e9cfb404c10275cc3a6683609653f21d0e2691ecf5f6d60e611be55bffb97fac29671b66d2ffd7a4683b8b1e95d82694403376d14441bff0c58b4f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 6.1.4
+* fixed issue [#20](https://github.com/alekseyl/niceql/issues/20)
+* adding support for multiple ruby versions testing using docker-compose
+
 # 6.1.3
 * 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/README.md

@@ -6,7 +6,7 @@ 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 )
+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 implementations in the error prettifying methods. It will be completely decoupled in the future )
 
 Any reasonable suggestions are welcome. 
 
@@ -94,8 +94,6 @@ end
 
 ## Usage
 
-### With ActiveRecord
-
 ```ruby
   # puts colorized and formatted corresponding SQL query
   Model.scope.niceql
@@ -157,7 +155,10 @@ end
 If your console support more colors or different schemes, or if you prefer different colorization, then you can override ColorizeString methods. 
 Current colors were selected with dark and white console themes in mind, so a niceql colorization works good for dark, and good enough for white.
 
-## 
+## Testing
+```bash
+docker-compose up
+```
 
 ## Contributing
 

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_1
+    command: /bin/bash -c 'service postgresql start && rake test'
+    volumes:
+      - '.:/app'
+
+  test_3_0:
+    build:
+      context: .
+      dockerfile: Dockerfile_30
+    image: rsp_6_1_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.1.3'
+  VERSION = '6.1.4'
 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
 
@@ -53,7 +55,6 @@ module RailsSQLPrettifier
                     :prettify_pg_errors
     end
 
-
     def ar_using_pg_adapter?
       ActiveRecord::Base.connection_db_config.adapter == 'postgresql'
     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.1.3
+  version: 6.1.4
 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
@@ -170,6 +184,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Dockerfile
+- Dockerfile_30
 - Gemfile
 - LICENSE.txt
 - README.md