click_house 1.2.5 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 700d57a764315e709b8e78f10a5765801baa2b491aeb4aad6b6cc6c2016f8c74
-  data.tar.gz: 34f61608fd6b67fed90f9ec1d84db1677abdeda86f3c8751fb124457f25274e4
+  metadata.gz: 040e53c977b5a0ef62fd73ef8f8b21915a2ec128d0649e3882dd1779e787ff28
+  data.tar.gz: 0c9c46b6c9ce234b497fbb2cbc0834b09fd697ea6a140544465bda93c66d1b9f
 SHA512:
-  metadata.gz: bff6c7f9bda496860ee38038bde526f706f7f6a1c1be8be0800806c70c24de15764d090e579c4dafe0bf3e86eca18acfce4a3c96542b5e89756182b8711f8aaf
-  data.tar.gz: 5cd4d79cb422ea0feb9171b2e1ca5eb824d50fabdd718e2789c65e1ce75bcefedd60c479a0a46a9488a0c6ac8f352e25caa07e2c417c8ae79c351c2b121ffd3b
+  metadata.gz: 9b93c038ae5da62bdf3a951120da771c21e0b4ce1cd92ed2e381827dacaad0f97fb9121c488d78fab7d6a58ee5ab79d04aed5fb1195d7bd9575cdfd344ab095b
+  data.tar.gz: 52bee84670bfa5c6b8bb8d6566b94f69935b80fc15bc14c1d9223ab3a7be7e7f972c8958b0c28f4836e21ba30b9c8269a1f58375ee87ccf99cbe670df5bd14df

data/.rubocop.yml

@@ -8,7 +8,7 @@ AllCops:
     - 'bin/*'
     - 'spec/**/*'
     - 'vendor/**/*'
-  TargetRubyVersion: 2.6.5
+  TargetRubyVersion: 2.7
 
 Bundler/OrderedGems:
   Enabled: false
@@ -17,6 +17,26 @@ Bundler/OrderedGems:
 Style/Documentation:
   Enabled: false
 
+# =============================== Performance =======================
+Performance/AncestorsInclude:
+  Enabled: true
+Performance/BigDecimalWithNumericArgument:
+  Enabled: true
+Performance/RedundantSortBlock:
+  Enabled: true
+Performance/RedundantStringChars:
+  Enabled: true
+Performance/ReverseFirst:
+  Enabled: true
+Performance/SortReverse:
+  Enabled: true
+Performance/Squeeze:
+  Enabled: true
+Performance/StringInclude:
+  Enabled: true
+Performance/Sum:
+  Enabled: true
+
 # ============================== Metrics ============================
 Metrics/ClassLength:
   Max: 180
@@ -31,22 +51,22 @@ Metrics/AbcSize:
 
 # ============================== Naming =============================
 Naming/PredicateName:
-  NamePrefixBlacklist:
+  ForbiddenPrefixes:
     - is_
 Naming/FileName:
   Enabled: true
   Exclude:
     - 'Gemfile'
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 Naming/AccessorMethodName:
   Enabled: false
 
 # ============================== Layout =============================
-Layout/AlignHash:
+Layout/HashAlignment:
   EnforcedHashRocketStyle: key
   EnforcedColonStyle: key
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
 Layout/CaseIndentation:
   EnforcedStyle: case
@@ -65,12 +85,16 @@ Layout/EmptyLinesAroundBlockBody:
   Enabled: true
 Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: false
 Layout/RescueEnsureAlignment:
   Enabled: false
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
 
 # ============================== Style ==============================
 Style/RescueModifier:
@@ -117,9 +141,109 @@ Style/GuardClause:
   Enabled: false
 Style/TrailingCommaInHashLiteral:
   Enabled: false
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/RedundantFetchBlock:
+  Enabled: true
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
+Style/SlicingWithRange:
+  Enabled: true
+Style/AccessorGrouping:
+  Enabled: false
+Style/ArrayCoercion:
+  Enabled: true
+Style/BisectedAttrAccessor:
+  Enabled: true
+Style/CaseLikeIf:
+  Enabled: true
+Style/HashAsLastArrayItem:
+  Enabled: true
+Style/HashLikeCase:
+  Enabled: true
+Style/RedundantAssignment:
+  Enabled: true
+Style/RedundantFileExtensionInRequire:
+  Enabled: true
+Style/ExplicitBlockArgument:
+  Enabled: true
+Style/GlobalStdStream:
+  Enabled: true
+Style/OptionalBooleanParameter:
+  Enabled: true
+Style/SingleArgumentDig:
+  Enabled: true
+Style/StringConcatenation:
+  Enabled: true
+Style/ClassEqualityComparison:
+  Enabled: true
+Style/CombinableLoops:
+  Enabled: true
+Style/KeywordParametersOrder:
+  Enabled: false
+Style/RedundantSelfAssignment:
+  Enabled: true
+Style/SoleNestedConditional:
+  Enabled: true
 
 # ============================== Lint ==============================
 Lint/DuplicateMethods:
   Enabled: false
 Lint/AmbiguousOperator:
   Enabled: false
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Lint/DuplicateElsifCondition:
+  Enabled: true
+Lint/BinaryOperatorWithIdenticalOperands:
+  Enabled: true
+Lint/DuplicateRescueException:
+  Enabled: true
+Lint/EmptyConditionalBody:
+  Enabled: true
+Lint/FloatComparison:
+  Enabled: true
+Lint/MissingSuper:
+  Enabled: false
+Lint/OutOfRangeRegexpRef:
+  Enabled: true
+Lint/SelfAssignment:
+  Enabled: true
+Lint/TopLevelReturnWithArgument:
+  Enabled: true
+Lint/UnreachableLoop:
+  Enabled: true
+Layout/BeginEndAlignment:
+  Enabled: true
+Lint/ConstantDefinitionInBlock:
+  Enabled: true
+Lint/DuplicateRequire:
+  Enabled: true
+Lint/EmptyFile:
+  Enabled: true
+Lint/HashCompareByIdentity:
+  Enabled: true
+Lint/IdentityComparison:
+  Enabled: true
+Lint/RedundantSafeNavigation:
+  Enabled: true
+Lint/TrailingCommaInAttributeDeclaration:
+  Enabled: true
+Lint/UselessMethodDefinition:
+  Enabled: true
+Lint/UselessTimes:
+  Enabled: true

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+# 1.3.2
+* fix null logger for windows users
+
+# 1.3.1
+* added request [headers](https://github.com/shlima/click_house/pull/8) support
+
+# 1.3.0
+* added support for IPv4/IPv6 types
+
+# 1.2.7
+* rubocop version bump
+
+# 1.2.6
+* Datetime64 field type support [#3](https://github.com/shlima/click_house/pull/3)

data/Gemfile.lock

@@ -1,67 +1,75 @@
 PATH
   remote: .
   specs:
-    click_house (1.2.5)
+    click_house (1.3.2)
       faraday
       faraday_middleware
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    faraday (0.17.0)
+    ast (2.4.1)
+    coderay (1.1.3)
+    diff-lcs (1.4.4)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
-    jaro_winkler (1.5.4)
-    method_source (0.9.2)
+      ruby2_keywords
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    method_source (1.0.0)
     multipart-post (2.1.1)
-    parallel (1.18.0)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.0)
+    rake (13.0.1)
+    regexp_parser (1.8.2)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.76.0)
-      jaro_winkler (~> 1.5.1)
+    rspec-support (3.9.3)
+    rubocop (0.93.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.0)
-      rubocop (>= 0.71.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.8.0)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.8.1)
+      rubocop (>= 0.87.0)
+      rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
+    ruby2_keywords (0.0.2)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler
   click_house!
   pry
-  rake (~> 13.0)
-  rspec (~> 3.0)
+  rake
+  rspec
   rubocop
   rubocop-performance
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/README.md

@@ -7,7 +7,7 @@
 [![Gem Version](https://badge.fury.io/rb/click_house.svg)](https://badge.fury.io/rb/click_house)
 
 ```bash
-# Requires modern Ruby (>= 2.5), tested with Yandex.Clickhouse v 19.16.2.2
+# Requires modern Ruby (>= 2.5), tested with Yandex.Clickhouse v 20.9.3.45
 gem install click_house
 ```
 
@@ -53,6 +53,7 @@ ClickHouse.config do |config|
   config.timeout = 60
   config.open_timeout = 3
   config.ssl_verify = false
+  config.headers = {}
   
   # or provide connection options separately
   config.scheme = 'http' 
@@ -216,7 +217,8 @@ ClickHouse.connection.create_table('visits', if_not_exists: true, engine: 'Merge
   t.Decimal     :money, 5, 4
   t.String      :event
   t.UInt32      :user_id
-  t.UInt32      :Float32
+  t.IPv4        :ipv4
+  t.IPv6        :ipv6
 end
 ```
 
@@ -328,11 +330,11 @@ ClickHouse.add_type('Date', DateType.new)
 Actually `serialize` function is not used for now, but you may use it manually:
 
 ```ruby
-time_type = DateTimeType.new
-string_type = FixedStringType.new 
+time_type = ClickHouse::Type::DateTimeType.new
+string_type = ClickHouse::Type::FixedStringType.new 
 
 ClickHouse.connection.insert('table', columns: %i[name time]) do |buffer|
-  buffer << [string_type.serialize('a' * 1000, 20), time.serialize(Time.current, 'Europe/Moscow')]
+  buffer << [string_type.serialize('a' * 1000, 20), time_type.serialize(Time.current, 'Europe/Moscow')]
 end
 
 ## alternatively
@@ -448,11 +450,6 @@ class CreateAdvertVisits < ActiveRecord::Migration[6.0]
       t.UInt16   :account_id
       t.UInt16   :user_id
       t.Date     :date
-      t.DateTime :time, 'UTC'
-      t.UInt32   :ipv4
-      t.UInt64   :ipv6
-      t.UInt32   :device_type_id
-      t.UInt32   :os_family_id
     end
   end
 

data/click_house.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'faraday'
   spec.add_dependency 'faraday_middleware'
-  spec.add_development_dependency 'bundler', '~> 1.17'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-performance'

data/docker-compose.yml

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

data/lib/click_house.rb

@@ -41,6 +41,11 @@ module ClickHouse
     add_type "Nullable(#{column})", Type::NullableType.new(Type::DateTimeType.new)
   end
 
+  ['DateTime64(%d, %s)'].each do |column|
+    add_type column, Type::DateTime64Type.new
+    add_type "Nullable(#{column})", Type::NullableType.new(Type::DateTime64Type.new)
+  end
+
   ['Decimal(%s, %s)', 'Decimal32(%s)', 'Decimal64(%s)', 'Decimal128(%s)'].each do |column|
     add_type column, Type::DecimalType.new
     add_type "Nullable(#{column})", Type::NullableType.new(Type::DecimalType.new)
@@ -55,4 +60,9 @@ module ClickHouse
     add_type column, Type::FloatType.new
     add_type "Nullable(#{column})", Type::NullableType.new(Type::IntegerType.new)
   end
+
+  %w[IPv4 IPv6].each do |column|
+    add_type column, Type::IPType.new
+    add_type "Nullable(#{column})", Type::NullableType.new(Type::IPType.new)
+  end
 end

data/lib/click_house/config.rb

@@ -18,7 +18,8 @@ module ClickHouse
       password: nil,
       timeout: nil,
       open_timeout: nil,
-      ssl_verify: false
+      ssl_verify: false,
+      headers: {}
     }.freeze
 
     attr_accessor :adapter
@@ -33,6 +34,7 @@ module ClickHouse
     attr_accessor :timeout
     attr_accessor :open_timeout
     attr_accessor :ssl_verify
+    attr_accessor :headers
 
     def initialize(params = {})
       assign(DEFAULTS.merge(params))
@@ -51,7 +53,7 @@ module ClickHouse
     end
 
     def logger!
-      @logger || Logger.new('/dev/null')
+      @logger || Logger.new(IO::NULL)
     end
 
     def url!

data/lib/click_house/connection.rb

@@ -11,6 +11,7 @@ module ClickHouse
 
     attr_reader :config
 
+    # @param [Config]
     def initialize(config)
       @config = config
     end
@@ -31,6 +32,7 @@ module ClickHouse
       @transport ||= Faraday.new(config.url!) do |conn|
         conn.options.timeout = config.timeout
         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.response Middleware::Logging, logger: config.logger!

data/lib/click_house/definition/column.rb

@@ -39,7 +39,7 @@ module ClickHouse
       def extension_type
         extensions.nil? ? type : format(type, *extensions)
       rescue TypeError, ArgumentError
-        raise Exception, "please provide extensions for <#{type}>"
+        raise StandardError, "please provide extensions for <#{type}>"
       end
     end
   end

data/lib/click_house/definition/column_set.rb

@@ -11,7 +11,8 @@ module ClickHouse
         'FixedString(%d)',
         'UUID',
         'Date',
-        "DateTime('%s')"
+        'IPv4', 'IPv6',
+        "DateTime('%s')", "DateTime64(%d, '%s')"
       ].freeze
 
       class << self

data/lib/click_house/extend/connection_inserting.rb

@@ -6,6 +6,15 @@ module ClickHouse
       EMPTY_INSERT = true
 
       # @return [Boolean]
+      #
+      # == Example with a block
+      # insert('rspec', columns: %i[name id]) do |buffer|
+      #   buffer << ['Sun', 1]
+      #   buffer << ['Moon', 2]
+      # end
+      #
+      # == Example with a param
+      # subject.insert('rspec', values: [{ name: 'Sun', id: 1 }, { name: 'Moon', id: 2 }])
       def insert(table, columns: [], values: [])
         yield(values) if block_given?
 

data/lib/click_house/middleware/logging.rb

@@ -26,7 +26,7 @@ module ClickHouse
         logger.level == Logger::DEBUG
       end
 
-      # rubocop:disable Metrics/LineLength
+      # rubocop:disable Layout/LineLength
       def on_complete(env)
         summary = extract_summary(env.response_headers)
         elapsed = duration
@@ -36,7 +36,7 @@ module ClickHouse
         logger.debug(body) if body
         logger.info("\e[1mRead: #{summary.fetch(:read_rows)} rows, #{summary.fetch(:read_bytes)}. Written: #{summary.fetch(:written_rows)}, rows #{summary.fetch(:written_bytes)}\e[0m")
       end
-      # rubocop:enable Metrics/LineLength
+      # rubocop:enable Layout/LineLength
 
       def duration
         timestamp - starting

data/lib/click_house/type.rb

@@ -7,6 +7,7 @@ module ClickHouse
     autoload :UndefinedType, 'click_house/type/undefined_type'
     autoload :DateType, 'click_house/type/date_type'
     autoload :DateTimeType, 'click_house/type/date_time_type'
+    autoload :DateTime64Type, 'click_house/type/date_time64_type'
     autoload :IntegerType, 'click_house/type/integer_type'
     autoload :FloatType, 'click_house/type/float_type'
     autoload :BooleanType, 'click_house/type/boolean_type'
@@ -14,5 +15,6 @@ module ClickHouse
     autoload :FixedStringType, 'click_house/type/fixed_string_type'
     autoload :ArrayType, 'click_house/type/array_type'
     autoload :StringType, 'click_house/type/string_type'
+    autoload :IPType, 'click_house/type/ip_type'
   end
 end

data/lib/click_house/type/date_time64_type.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ClickHouse
+  module Type
+    class DateTime64Type < BaseType
+      def cast(value, _precision = nil, tz = nil)
+        DateTime.parse("#{value} #{tz}")
+      end
+
+      def serialize(value, precision = 3)
+        value.strftime("%Y-%m-%d %H:%M:%S.%#{precision}N")
+      end
+    end
+  end
+end

data/lib/click_house/type/ip_type.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ClickHouse
+  module Type
+    class IPType < BaseType
+      def cast(value)
+        IPAddr.new(value) unless value.nil?
+      end
+
+      def serialize(value)
+        value.to_s unless value.nil?
+      end
+    end
+  end
+end

data/lib/click_house/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: click_house
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.2
 platform: ruby
 authors:
 - Aliaksandr Shylau
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2020-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -42,44 +42,44 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENCE.txt
@@ -173,12 +174,14 @@ files:
 - lib/click_house/type/array_type.rb
 - lib/click_house/type/base_type.rb
 - lib/click_house/type/boolean_type.rb
+- lib/click_house/type/date_time64_type.rb
 - lib/click_house/type/date_time_type.rb
 - lib/click_house/type/date_type.rb
 - lib/click_house/type/decimal_type.rb
 - lib/click_house/type/fixed_string_type.rb
 - lib/click_house/type/float_type.rb
 - lib/click_house/type/integer_type.rb
+- lib/click_house/type/ip_type.rb
 - lib/click_house/type/nullable_type.rb
 - lib/click_house/type/string_type.rb
 - lib/click_house/type/undefined_type.rb
@@ -191,7 +194,7 @@ files:
 homepage: https://github.com/shlima/click_house
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -206,8 +209,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Modern Ruby database driver for ClickHouse
 test_files: []