arel_extensions 1.2.18 → 1.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa9a6b85c040899418d6aa0b3be8c745eccaa9a7f91ccd9c7696ba741e506af
-  data.tar.gz: 8a593bd6fe526d54c3b81e75621cc3045149410df842aae0357478b13f39abe7
+  metadata.gz: 8b1349341148022d22f5f1db49226c8279bfc9474e48dfbeed4741f68dedc1bc
+  data.tar.gz: 8ef43ffbefa6e47f95bde8e9212b195e877cd97700ec113cb0a394fd0eff8014
 SHA512:
-  metadata.gz: 381a51239e6eb8ab5db7c64aecbb3b8595a80466c166064ed7d8e7b30a4b9fffc7b23acd2d1aa6871a9d7c5f65239b162fa1386c7a15b956f4d3786c44b4214d
-  data.tar.gz: e31d110fa811e4ca31085fdceeb8df319af19a87781eec92131550b68e3a84f3fe655d0b9cf71b9d6c89a2d6098b08910310893a199a9e0f41e2319dc297d6e0
+  metadata.gz: 962602c8cf871c1456401b48edd21e8348af1a54b851873c634ce64248bd0dbd293a798adb3bb3f3e9f62fe4778f74f3627c54bffbd8fb5aa62a920cdc0c3846
+  data.tar.gz: df1669b0b8b3a87dce3d68d402d1e89d3abca492e66b9032bb70a2817471b6a1a64f879674c6b84a201e3f8865d62920d694229bcd65ec0dde2da4818a72a3de

data/.github/workflows/ruby.yml

@@ -0,0 +1,102 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:11.6-alpine
+        env:
+          POSTGRES_DB: arext_test
+        ports:
+          - 5432:5432
+        # needed because the postgres container does not provide a healthcheck
+        options: >-
+          --health-cmd "pg_isready -d arext_test -U postgres -p 5432"
+          --health-interval 10s 
+          --health-timeout 5s 
+          --health-retries 5
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: true
+          MYSQL_USERNAME: travis
+          MYSQL_DATABASE: arext_test
+        ports:
+          - 3306:3306
+        options: >-
+          --health-cmd="mysqladmin ping" 
+          --health-interval=10s 
+          --health-timeout=5s 
+          --health-retries=3
+      
+    strategy:
+      matrix:
+        ruby-version: 
+          - 3.0.0-preview1
+          - 2.7
+          - 2.5
+          - 2.3
+        rails-version: 
+          - 6_1
+          - 6
+          - 5_2
+        exclude:
+          - ruby-version: 2.3
+            rails-version: 6_1
+          - ruby-version: 2.3
+            rails-version: 6
+          - ruby-version: 3.0.0-preview1
+            rails-version: 5.2
+    continue-on-error: ${{ true }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@21351ecc0a7c196081abca5dc55b08f085efe09a
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+    - name: Setup gemspec
+      if: ${{ matrix.rails-version == '6_1' || matrix.rails-version == '6' }}
+      run: cp ./gemspecs/arel_extensions-v2.gemspec ./arel_extensions.gemspec
+    - name: Install dependencies
+      run: |
+        export BUNDLE_GEMFILE=gemfiles/rails${{ matrix.rails-version }}.gemfile
+        bundle install
+    - name: Run test to_sql
+      run: rake test:to_sql
+    - name: Run test Postgres
+      env:
+        PGHOST: localhost
+        PGUSER: postgres
+      run: rake test:postgresql
+    - name: Run test MySql
+      env: 
+        DB_CONNECTION: mysql
+        DB_HOST: 127.0.0.1
+        DB_PORT: 3306
+        DB_DATABASE: arext_test
+        DB_USERNAME: travis
+      run: |
+        sudo apt-get install -y mysql-client
+        mysql --host 127.0.0.1 --port 3306 -uroot -e 'create user travis;'
+        mysql --host 127.0.0.1 --port 3306 -uroot -e 'GRANT ALL PRIVILEGES ON arext_test.* TO travis;'
+        rake test:mysql

data/arel_extensions.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency('activerecord', '>= 6.0')
+  s.add_dependency('arel', '>= 6.0')
 
   s.add_development_dependency('minitest', '~> 5.9')
   s.add_development_dependency('rdoc', '~> 4.0')
   s.add_development_dependency('rake', '~> 12.3.3')
-end
+end

data/gemfiles/rails6.gemfile

@@ -12,8 +12,8 @@ group :development, :test do
   gem "mysql2", '0.5.2', platforms: [:mri, :mswin, :mingw]
   gem "pg",'< 1.0.0', platforms: [:mri, :mingw]
 
-  gem "tiny_tds", platforms: [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
-  gem "activerecord-sqlserver-adapter", platforms: [:mri, :mingw]
+  #gem "tiny_tds", platforms: [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
+  #gem "activerecord-sqlserver-adapter", platforms: [:mri, :mingw]
 
   gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 6.0.0' if ENV.has_key? 'ORACLE_HOME'
@@ -27,4 +27,4 @@ group :development, :test do
   gem "activerecord-jdbcmssql-adapter", platforms: :jruby
 end
 
-gemspec path: "../gemspec_v2/"
+gemspec path: "../"

data/gemfiles/rails6_1.gemfile

@@ -0,0 +1,30 @@
+source "https://rubygems.org"
+
+gem 'rails', '~> 6.1.0'
+
+
+group :development, :test do
+  gem 'activesupport', '~> 6.1.0'
+  gem 'activemodel', '~> 6.1.0'
+  gem 'activerecord', '~> 6.1.0'
+
+  gem "sqlite3", '~> 1.4', platforms: [:mri, :mswin, :mingw]
+  gem "mysql2", '0.5.2', platforms: [:mri, :mswin, :mingw]
+  gem "pg",'~> 1.1', platforms: [:mri, :mingw]
+
+  #gem "tiny_tds", platforms: [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
+  #gem "activerecord-sqlserver-adapter", platforms: [:mri, :mingw]
+
+  gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 6.0.0' if ENV.has_key? 'ORACLE_HOME'
+
+  # for JRuby
+  gem 'activerecord-jdbc-adapter', platforms: :jruby
+  gem "jdbc-sqlite3", platforms: :jruby
+  gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
+  gem "activerecord-jdbcmysql-adapter", platforms: :jruby
+  gem "activerecord-jdbcpostgresql-adapter", platforms: :jruby
+  gem "activerecord-jdbcmssql-adapter", platforms: :jruby
+end
+
+gemspec path: "../"

data/gemspecs/arel_extensions-v1.gemspec

@@ -0,0 +1,28 @@
+$:.push File.expand_path("../lib", __FILE__)
+require "arel_extensions/version"
+
+Gem::Specification.new do |s|
+  s.name        = "arel_extensions"
+  s.version     = ArelExtensions::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Yann Azoury", "Félix Bellanger", "Julien Delporte"]
+  s.email       = ["yann.azoury@faveod.com", "felix.bellanger@faveod.com", "julien.delporte@faveod.com"]
+  s.homepage    = "https://github.com/Faveod/arel-extensions"
+  s.description = "Adds new features to Arel"
+  s.summary     = "Extending Arel"
+  s.license     = 'MIT'
+
+  s.rdoc_options = ["--main", "README.md"]
+  s.extra_rdoc_files = ["MIT-LICENSE.txt", "README.md", 'functions.html']
+
+  # Manifest
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
+
+  s.add_dependency('arel', '>= 6.0')
+
+  s.add_development_dependency('minitest', '~> 5.9')
+  s.add_development_dependency('rdoc', '~> 4.0')
+  s.add_development_dependency('rake', '~> 12.3.3')
+end

data/generate_gems.sh

@@ -1,14 +1,15 @@
 
-gem uninstall arel_extensions
+#gem uninstall arel_extensions
 
 # VERSION ~> 1
 cp ./version_v1.rb lib/arel_extensions/version.rb
+cp ./gemspecs/arel_extensions-v1.gemspec ./arel_extensions.gemspec
 gem build ./arel_extensions.gemspec
 
 # VERSION ~> 2
 cp ./version_v2.rb lib/arel_extensions/version.rb
 mv ./arel_extensions.gemspec ./arel_extensions.gemspec.bck
-cp ./gemspec_v2/arel_extensions-v2.gemspec ./arel_extensions.gemspec
+cp ./gemspecs/arel_extensions-v2.gemspec ./arel_extensions.gemspec
 gem build ./arel_extensions.gemspec
 cp ./version_v1.rb lib/arel_extensions/version.rb
-cp ./arel_extensions.gemspec.bck ./arel_extensions.gemspec
+cp ./gemspecs/arel_extensions-v1.gemspec ./arel_extensions.gemspec

data/lib/arel_extensions.rb

@@ -16,8 +16,10 @@ class Arel::Nodes::Casted
   include Arel::AliasPredication
 
   # They forget to define hash.
-  def hash
-    [self.class, self.val, self.attribute].hash
+  if Gem::Version.new(Arel::VERSION) < Gem::Version.new("10.0.0")
+    def hash
+      [self.class, self.val, self.attribute].hash
+    end
   end
 end
 

data/lib/arel_extensions/math_functions.rb

@@ -63,15 +63,15 @@ module ArelExtensions
 
     # Aggregate Functions
     def std opts = {unbiased: true}
-      ArelExtensions::Nodes::Std.new self, opts
+      ArelExtensions::Nodes::Std.new self, **opts
     end
 
     def variance opts = {unbiased: true}
-      ArelExtensions::Nodes::Variance.new self, opts
+      ArelExtensions::Nodes::Variance.new self, **opts
     end
 
     def sum opts = {unbiased: true}
-      ArelExtensions::Nodes::Sum.new self, opts
+      ArelExtensions::Nodes::Sum.new self, **opts
     end
 
     # function that can be invoked to produce random numbers between 0 and 1

data/lib/arel_extensions/nodes/concat.rb

@@ -46,7 +46,7 @@ module ArelExtensions::Nodes
 
     def initialize node, separator = ', ', **opts
       @separator = convert_to_node(separator)
-      super node, opts
+      super node, **opts
     end
   end
 end

data/lib/arel_extensions/nodes/std.rb

@@ -4,9 +4,9 @@ module ArelExtensions
       RETURN_TYPE = :number
       attr_accessor :unbiased_estimator
 
-      def initialize node, opts = {}
+      def initialize node, **opts
         @unbiased_estimator = opts[:unbiased] ? true : false
-        super node, opts
+        super node, **opts
       end
     end
 
@@ -14,9 +14,9 @@ module ArelExtensions
       RETURN_TYPE = :number
       attr_accessor :unbiased_estimator
 
-      def initialize node, opts = {}
+      def initialize node, **opts
         @unbiased_estimator = opts[:unbiased] ? true : false
-        super node, opts
+        super node, **opts
       end
     end
   end

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.2.18".freeze
+  VERSION = "1.2.19".freeze
 end

data/lib/arel_extensions/visitors/to_sql.rb

@@ -3,6 +3,15 @@ module ArelExtensions
     class Arel::Visitors::ToSql
       COMMA = ', ' unless defined?(COMMA)
 
+      # Escape properly the string expression expr.
+      # Take care of escaping.
+      def make_json_string expr
+        Arel::Nodes.build_quoted('"') \
+        + expr
+            .replace('\\','\\\\').replace('"','\"').replace("\n", '\n') \
+        + '"'
+      end
+
       # Math Functions
       def visit_ArelExtensions_Nodes_Abs o, collector
         collector << "ABS("
@@ -589,7 +598,7 @@ module ArelExtensions
       def json_value(o,v)
         case o.type_of_node(v)
         when :string
-          Arel.when(v.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + v.replace('\\','\\\\').replace('"','\"') + '"')
+          Arel.when(v.is_null).then(Arel::Nodes.build_quoted("null")).else(make_json_string(v))
         when :date
           s = v.format('%Y-%m-%d')
           Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
@@ -624,7 +633,7 @@ module ArelExtensions
             if i != 0
               res += ', '
             end
-            res += Arel::Nodes.build_quoted('"') + ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("").replace('\\','\\\\').replace('"','\"') + '": '
+            res += make_json_string(ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("")) + ': '
             res += json_value(o,v)
           end
           res += '}'
@@ -646,7 +655,7 @@ module ArelExtensions
             if i != 0
               res = res + ', '
             end
-            kv = Arel::Nodes.build_quoted('"') + ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("").replace('\\','\\\\').replace('"','\"') + '": '
+            kv = make_json_string(ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("")) + ': '
             kv += json_value(o,v)
             res = res + kv.group_concat(', ', order: Array(orders)).coalesce('')
           end

data/test/database.yml

@@ -10,6 +10,8 @@ mysql:
   adapter: mysql2
   database: arext_test
   username: travis
+  host: 127.0.0.1
+  port: 3306
   encoding: utf8
 jdbc-mysql:
   adapter: jdbcmysql

data/version_v1.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.2.18".freeze
+  VERSION = "1.2.19".freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.15".freeze
+  VERSION = "2.0.16".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.2.18
+  version: 1.2.19
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,10 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,6 +81,7 @@ extra_rdoc_files:
 - functions.html
 files:
 - ".codeclimate.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -105,7 +106,9 @@ files:
 - gemfiles/rails5_1_4.gemfile
 - gemfiles/rails5_2.gemfile
 - gemfiles/rails6.gemfile
-- gemspec_v2/arel_extensions-v2.gemspec
+- gemfiles/rails6_1.gemfile
+- gemspecs/arel_extensions-v1.gemspec
+- gemspecs/arel_extensions-v2.gemspec
 - generate_gems.sh
 - init/mssql.sql
 - init/mysql.sql
@@ -219,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Extending Arel