click_house 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dbe7ae01f5130dc0d18d9f9456ad75c2fdcc04bfe815debac344c93ce9bd00e
-  data.tar.gz: 4f7c8ab45593d9d37744ea9125c202052a99f582cd0887e251af790973c8a22a
+  metadata.gz: 402590e2de7189b46fca70711b33bf8428ccbc677d8d98ad4205b470bcf5eeb4
+  data.tar.gz: b3a33602650115c46c638347b993d118921e7254a2ed9f20bdb92ad30c50a05a
 SHA512:
-  metadata.gz: f865c9753769cfa587ce59e428d45a664d1b976b535418e86bba7688ab3b0255177d9de7201479a683635c7376ae0958ad7803490328f55f003ba10ec098c2fc
-  data.tar.gz: ae3cf74cc163b842f9e27d49c84165b94858fe9b91461aa6a0bfde7404d9c9175a663a099c75e9eaf4e05ec8a1bc2dbf1840e0ed1f26f48590dc217dd6a8b4e1
+  metadata.gz: 4d71565e61efb57711463fa3b4071d418ad8136656d64e3de15fbb7f4b48134ab284e9b2dc13b0dcbdf77dd9bee19aa4757593b0dee98480ac6cd64cc4e85a5f
+  data.tar.gz: c2d45bd01a211acfb8be077d38ac93807c191c95a3a6fe2a6ac63a7a097b5c599351f0c6282b86d533eff2dd59d2820c0f824ffd975d0cd6692636eb0bb31e48

data/.github/workflows/main.yml

@@ -8,13 +8,13 @@ jobs:
 
     services:
       clickhouse:
-        image: yandex/clickhouse-server:21.3
+        image: yandex/clickhouse-server:22.1
         ports: 
           - 8123:8123
 
     strategy:
       matrix:
-        ruby-version: [3.0, 2.7, 2.6, 2.5, 2.4]
+        ruby-version: [3.1, 3.0, 2.7, 2.6]
 
     steps:
       - uses: actions/checkout@v2

data/.rubocop.yml

@@ -50,6 +50,8 @@ Performance/RedundantEqualityComparisonBlock:
   Enabled: true
 Performance/RedundantSplitRegexpArgument:
   Enabled: true
+Performance/MapCompact:
+  Enabled: true
 
 # ============================== Metrics ============================
 Metrics/ClassLength:
@@ -73,6 +75,8 @@ Naming/MethodParameterName:
   Enabled: false
 Naming/AccessorMethodName:
   Enabled: false
+Naming/InclusiveLanguage:
+  Enabled: true
 
 # ============================== Layout =============================
 Layout/LineLength:
@@ -111,7 +115,7 @@ Layout/SpaceAroundMethodCallOperator:
   Enabled: true
 Layout/SpaceBeforeBrackets:
   Enabled: true
-Lint/AmbiguousAssignment:
+Layout/LineEndStringConcatenationIndentation:
   Enabled: true
 
 # ============================== Style ==============================
@@ -235,6 +239,14 @@ Style/HashConversion:
   Enabled: true
 Style/Documentation:
   Enabled: false
+Style/InPatternThen:
+  Enabled: true
+Style/MultilineInPatternThen:
+  Enabled: true
+Style/QuotedSymbols:
+  Enabled: true
+Style/StringChars:
+  Enabled: true
 
 # ============================== Lint ==============================
 Lint/DuplicateMethods:
@@ -319,3 +331,7 @@ Lint/SymbolConversion:
   Enabled: true
 Lint/TripleQuotes:
   Enabled: true
+Lint/AmbiguousAssignment:
+  Enabled: true
+Lint/EmptyInPattern:
+  Enabled: true

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.6.0
+* [PR](https://github.com/shlima/click_house/pull/19) handle value returned as nil in float and integer types (case of Aggregate Function Combinators) 
+* [PR](https://github.com/shlima/click_house/pull/18) Fix Faraday deprecation
+
 # 1.5.0
 * add support for 'WITH TOTALS' modifier in response
 * send SQL in GET request's body [#12](https://github.com/shlima/click_house/pull/12)

data/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     click_house (1.5.0)
-      faraday
+      faraday (>= 1.7)
       faraday_middleware
 
 GEM
@@ -10,60 +10,74 @@ GEM
   specs:
     ast (2.4.2)
     coderay (1.1.3)
-    diff-lcs (1.4.4)
-    faraday (1.4.1)
+    diff-lcs (1.5.0)
+    faraday (1.9.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      multipart-post (>= 1.2, < 3)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
     faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
-    faraday_middleware (1.0.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
     method_source (1.0.0)
     multipart-post (2.1.1)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    parallel (1.21.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
-    rexml (3.2.4)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.2.0)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.11.0)
+    rspec-support (3.10.3)
+    rubocop (1.25.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.10.1)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.13.2)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
-    unicode-display_width (2.0.0)
+    ruby2_keywords (0.0.5)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -78,4 +92,4 @@ DEPENDENCIES
   rubocop-performance
 
 BUNDLED WITH
-   2.2.14
+   2.3.3

data/click_house.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Modern Ruby database driver for ClickHouse'
   spec.description   = 'Yandex ClickHouse database interface for Ruby'
   spec.homepage      = 'https://github.com/shlima/click_house'
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'faraday'
+  spec.add_dependency 'faraday', '>= 1.7'
   spec.add_dependency 'faraday_middleware'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-server:21.3
+    image: yandex/clickhouse-server:22.1
     ports:
       - "8123:8123"
       - "9000:9000"

data/lib/click_house/connection.rb

@@ -52,7 +52,7 @@ module ClickHouse
         conn.options.open_timeout = config.open_timeout
         conn.headers = config.headers
         conn.ssl.verify = config.ssl_verify
-        conn.basic_auth(config.username, config.password) if config.auth?
+        conn.request(:basic_auth, config.username, config.password) if config.auth?
         conn.response Middleware::Logging, logger: config.logger!
         conn.response Middleware::RaiseError
         conn.response :json, content_type: %r{application/json}

data/lib/click_house/type/float_type.rb

@@ -4,7 +4,7 @@ module ClickHouse
   module Type
     class FloatType < BaseType
       def cast(value)
-        Float(value)
+        Float(value) unless value.nil?
       end
 
       def serialize(value)

data/lib/click_house/type/integer_type.rb

@@ -4,7 +4,7 @@ module ClickHouse
   module Type
     class IntegerType < BaseType
       def cast(value)
-        Integer(value)
+        Integer(value) unless value.nil?
       end
 
       def serialize(value)

data/lib/click_house/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClickHouse
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: click_house
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Aliaksandr Shylau
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -203,14 +203,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Modern Ruby database driver for ClickHouse