rails_sql_prettifier 6.1.1 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 459c1f20e82eb14b0130418cb1161272383ae9f9f902164100b2a4d81bbabb9c
-  data.tar.gz: db5ee936e31bd470ac74940b2fa086e4a1aec84004cb05971c6434e8f5cb2ea1
+  metadata.gz: 1f24b775719e8b291b04f98e5250f142cf2eea713bd52bb70a61e507482973ff
+  data.tar.gz: d00ab131a78b10c28cdcd5c9a569f04825076b9c2073f0388e2b27a21016332a
 SHA512:
-  metadata.gz: a159e5b627abaa4ac80c70092668aad54f11f871c13a57e83585e38851d2f522273653d79871b2b087d1bce83de00c9119b6b2d7c28b60d7b75c8b13b1e3dde1
-  data.tar.gz: 4feabc414ccf282a7462c44527514449735b8bcdf9b2b84afe3b873735176cecbe1dcc40dfa6745b67af114391a1a38808cc3658bae4e45e8b242267932e32ce
+  metadata.gz: 43aae20d26a1a826b1811eb48a665e6c7e2031e694dd7a15172d4f422264a4ea668d17e9406fbce2cd2935e291010ff4894ce7e1f92d67461a6c0be106aa3df7
+  data.tar.gz: 3866f5f935657553421215fe5a1bfde3f70c2b96ed40041850245d0124aa469bdb613aa13b856923667e55963aff5579d795ebe3b07b55f5b3ceeadd30e9e621

data/.gitignore

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

data/CHANGELOG.md

@@ -1,8 +1,8 @@
 # 6.1.0
 
 * This a active record prior to 7.0 version and >= 6.1 compatible niceql integration 
-  ar < 6.0: 
-  * StatementInvalid initialization, starting version 6 it has named param sql: for original query )
+  ar < 6.0 breaking change: 
+  * StatementInvalid initialization ahs a breaking change: starting version 6 it has named param sql: for original query )
   
   ar <= 6.1: 
-  * Starting from 6.1 connection_db_config used as standalone object instead of connection_config
+  * Starting from 6.1 connection_db_config method replaced connection_config which was a hash

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 = '6.1.1'
+  VERSION = '6.1.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 ARNiceQLConfig
+  module NiceQLConfigExt
     extend ActiveSupport::Concern
 
     included do
@@ -64,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
 
@@ -82,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

@@ -42,4 +42,7 @@ 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_sql_prettifier
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.2
 platform: ruby
 authors:
 - alekseyl
@@ -128,6 +128,34 @@ 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
@@ -141,12 +169,14 @@ files:
 - ".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