active_house 0.6.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aef56e2b59c4b55300d5f8757223ca0828211077
-  data.tar.gz: 7cd17faa5e1c2cda1b13c99a586db4a6702e2713
+SHA256:
+  metadata.gz: 37ab26790fba1015a2f2ac44b0ddf9005522cd7ac95c4d23bb14e53f3150e056
+  data.tar.gz: 4e2019851cac1a421b271affce47ebd307ae359b91065221865fbd58bda4c30a
 SHA512:
-  metadata.gz: a8c2732364f3273985ce411a1c217b7e0f49465adf1ae965a38e0dc44de190a48479e4163ac68bdc72b7f350b6da9142160807a043bd40676bd7e278e6318bb2
-  data.tar.gz: 050af80a79b2d04da52a9fae8a38a65d1888f70eab423c64e1c79f1bbe8bd705212921d32778b8499b27e1e1173feb37d9835393dd877c1a49d330bfa56b27b9
+  metadata.gz: 60710bbb58d4a18f03ba694ca0030824be1cf380b2ea2ac47f8d63121d854c2d87a9a791773bff413fe8ffb039defe3929b12eafb8a478e2672a1e5e7db99e40
+  data.tar.gz: 5e8dcb184f5a032d35bfeb2304c54ec150a8a4b3fabe1ef6d0e0e69dbc059cf628f9fb14644cf53515be329fc2c277ce79e48baf2e70b1485cf265a61825295b

data/.github/workflows/tests.yml

@@ -0,0 +1,27 @@
+name: Tests
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7' ]
+        rails: [ '~> 5.0', '~> 6.0' ]
+    name: Tests with Ruby ${{ matrix.ruby }} Activemodel/Activesupport ${{ matrix.rails }}
+    env:
+      RAILS_VERSION: ${{ matrix.rails }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Run tests
+        run: |
+          gem install bundler
+          bundle install
+          bundle exec rake

data/Gemfile

@@ -5,6 +5,12 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in active_house.gemspec
 gemspec
 
+gem 'activemodel', ENV['RAILS_VERSION'], require: false
+gem 'activesupport', ENV['RAILS_VERSION'], require: false
+
 group :test do
+  gem 'minitest', '~> 5.0', require: false
+  gem 'rake', '~> 10.0', require: false
   gem 'rubocop', '0.58.1', require: false
+  gem 'webmock', require: false
 end

data/README.md

@@ -2,6 +2,8 @@
 
 # ActiveHouse
 
+[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://vshymanskyy.github.io/StandWithUkraine)
+
 ClickHouse ORM and Query DSL
 
 ## Installation

data/active_house.gemspec

@@ -27,8 +27,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'clickhouse', '~> 0.1.10'
   spec.add_dependency 'kaminari-core', '~> 1.1'
   spec.add_dependency 'plain_model', '~> 0.2'
-
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
 end

data/lib/active_house/configuration.rb

@@ -9,7 +9,7 @@ module ActiveHouse
 
     MAIN_NAME = :main
     CONNECTION_KEYS = [
-        :url, :urls, :host, :port, :scheme, :database
+        :url, :urls, :host, :port, :scheme, :database, :username, :password
     ].freeze
 
     class << self

data/lib/active_house/connection.rb

@@ -21,7 +21,7 @@ module ActiveHouse
 
     def select_all(sql, *bindings)
       prepared_sql = prepared_statement(sql, *bindings)
-      connection.query(prepared_sql)
+      connection.post_query(prepared_sql)
     end
 
     def select_values(sql, *bindings)

data/lib/active_house/model.rb

@@ -1,4 +1,5 @@
 require 'active_model/conversion'
+require 'active_support/core_ext/module/delegation'
 require 'active_model/naming'
 require 'plain_model/modeling/base'
 require 'plain_model/modeling/queryable'

data/lib/active_house/modeling/attributes.rb

@@ -97,6 +97,14 @@ module ActiveHouse
           super
         end
       end
+
+      def ==(other)
+        other.class == self.class && other._attributes == _attributes
+      end
+
+      protected
+
+      attr_reader :_attributes
     end
   end
 end

data/lib/active_house/version.rb

@@ -1,3 +1,3 @@
 module ActiveHouse
-  VERSION = '0.6.6'.freeze
+  VERSION = '0.8.0'.freeze
 end

data/lib/active_house.rb

@@ -3,6 +3,9 @@ require 'active_house/configuration'
 require 'active_house/model'
 require 'active_house/query_builder'
 
+require 'clickhouse/connection/post_query'
+Clickhouse::Connection.include Clickhouse::Connection::PostQuery
+
 module ActiveHouse
   def self.configure
     yield configuration

data/lib/clickhouse/connection/post_query.rb

@@ -0,0 +1,47 @@
+module Clickhouse
+  class Connection
+    # By default Clickhouse uses GET request for query, but it has limitation for length on server side.
+    # So we will allow to use POST request with query in a body.
+    module PostQuery
+
+      def post_query(query)
+        query = Utils.extract_format(query)[0]
+        query += ' FORMAT JSONCompact'
+        parse_data post(nil, query)
+      end
+
+      def select_rows(options)
+        post_query to_select_query(options)
+      end
+
+      def request(method, query, body = nil)
+        raise ArgumentError, 'when query is omitted body must be passed' if query.nil? && body.nil?
+
+        connect!
+        body = body.strip unless body.nil?
+        query = query.strip unless query.nil?
+
+        start = Time.now
+
+        headers = { 'Content-Type' => 'text/plain' }
+        response = client.send(method, path(query), body, headers)
+        status = response.status
+        duration = Time.now - start
+        if query.nil?
+          query, format = Utils.extract_format(body)
+        else
+          query, format = Utils.extract_format(query)
+        end
+        response = parse_body(format, response.body)
+        stats = parse_stats(response)
+
+        write_log duration, query, stats
+        raise QueryError, "Got status #{status} (expected 200): #{response}" unless status == 200
+        response
+      rescue Faraday::Error => e
+        raise ConnectionError, e.message
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_house
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.8.0
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2023-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -80,48 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 description: ORM and Query DSL for ClickHouse
 email:
 - senid231@gmail.com
@@ -129,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -166,6 +125,7 @@ files:
 - lib/active_house/querying/union.rb
 - lib/active_house/querying/where.rb
 - lib/active_house/version.rb
+- lib/clickhouse/connection/post_query.rb
 homepage: https://github.com/senid231/active_house
 licenses:
 - MIT
@@ -185,8 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: ORM and Query DSL for ClickHouse