active_house 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 460006ab1e148781921648c680e33a79790e35cd
-  data.tar.gz: eb9ee437906deca34b1c6bb3bb172dc4bfcdab7b
+  metadata.gz: 2d60547649c4e0311e6ccc92d5e6ea5c75e71d35
+  data.tar.gz: b6d43bcbdab693c3da2c1bd1eb1b12c7853bdbf6
 SHA512:
-  metadata.gz: 190813fb7b150e48c7c75c1a53ef12e5dc589ab60b109cf65463644ba3e4c17dd0c94b6fd927e778811dd1e631c0163ec5e6ef7fa5b72425aa34fd68eaca89fc
-  data.tar.gz: 16fdecaf5792d2641aca7cd2b3e777d195894cbabe593b2ef1719ad16f83313fc547b3863829bcf764896b75b6721e77f90a08a420574f6d5ca46eb8d7c757f7
+  metadata.gz: 7542b7fcd7e6ec3d77a9e28558c7d4949a422e9a519c85c714ed7cd8db82f518e42a78ece6edbf6ae56a033c388678503346f946f42e4bde65aede08d68beb3e
+  data.tar.gz: 62486d802d065a5ac9c087de59956c85f05eca80f01e217c2be2c81b817d9cf2cb82349b64999b51ac4fb6d1eaf5f050de47f2fe7ea8a9f5a6cbe32f44ee27cb

data/active_house.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activemodel'
   spec.add_dependency 'activesupport'
   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'

data/lib/active_house/model.rb

@@ -11,19 +11,30 @@ require_relative 'logging'
 module ActiveHouse
   class Model
     extend PlainModel::Modeling::Queryable
-    include PlainModel::Modeling::Base
+    include ActiveModel::Model
     include ActiveHouse::Modeling::Scope
     include ActiveHouse::Modeling::Query
     include ActiveHouse::Modeling::Attributes
     include ActiveHouse::Modeling::Connection
     include ActiveHouse::Logging
 
+    Column = Struct.new(:name)
     class_attribute :_table_name, instance_accessor: false
 
     class << self
       def table_name(name)
         self._table_name = name.to_s
       end
+
+      def columns
+        return @columns if defined?(@columns)
+
+        @columns = attribute_types.keys.map { |name| Column.new(name.to_sym) }
+      end
+
+      def column_names
+        columns.map(&:name)
+      end
     end
   end
 end

data/lib/active_house/query_builder.rb

@@ -10,6 +10,7 @@ require_relative 'querying/having'
 require_relative 'querying/limit'
 require_relative 'querying/union'
 require_relative 'querying/array_join'
+require_relative 'querying/page'
 require_relative 'querying/scope'
 require_relative 'querying/collect'
 
@@ -29,8 +30,10 @@ module ActiveHouse
     include ActiveHouse::Querying::Union
     include ActiveHouse::Querying::ArrayJoin
     include ActiveHouse::Querying::Scope
+    include ActiveHouse::Querying::Page
     include ActiveHouse::Querying::Collect
 
+    # allows using query without model_class
     def initialize(model_class = nil)
       super(model_class || ActiveHouse::Model)
     end

data/lib/active_house/querying/collect.rb

@@ -1,6 +1,8 @@
 require 'active_support/concern'
 require 'active_support/core_ext/string/filters'
 require 'active_support/core_ext/module/delegation'
+require_relative '../search'
+require_relative '../search_query'
 
 module ActiveHouse
   module Querying
@@ -9,6 +11,7 @@ module ActiveHouse
 
       included do
         private :collection, :fetch_collection, :query_parts, :build_query
+        instance_delegate [:connection] => :model_class
         instance_delegate [
             :each,
             :size,
@@ -75,6 +78,20 @@ module ActiveHouse
       def build_query
         query_parts.reject(&:nil?).join("\n")
       end
+
+      def klass
+        model_class
+      end
+
+      def group_values
+        values[:group_by].empty? ? nil : values[:group_by]
+      end
+
+      def count(value = 'COUNT() AS cnt')
+        return 0 if group_values
+        except(:select, :limit, :offset, :order).select(value).to_hashes.first.values.first
+      end
+
     end
   end
 end

data/lib/active_house/querying/limit.rb

@@ -9,26 +9,26 @@ module ActiveHouse
 
       def build_limit_query_part
         return if values[:limit].nil?
-        if values[:offset]
-          "LIMIT #{values[:limit]}, #{values[:offset]}"
-        else
-          "LIMIT #{values[:limit]}"
-        end
+
+        parts = ["LIMIT #{values[:limit]}"]
+        parts << "OFFSET #{values[:offset]}" if values[:offset] && values[:offset] != 0
+        parts << "BY #{values[:limit_by]}" if values[:limit_by]
+        parts.join(' ')
       end
 
       def initial_values
-        super.merge offset: nil, limit: nil
-        super
+        super.merge offset: nil, limit: nil, limit_by: nil
       end
 
-      def limit!(limit_value, offset_value = nil)
+      def limit!(limit_value, offset_value = nil, limit_by = nil)
         values[:limit] = limit_value
         values[:offset] = offset_value unless offset_value.nil?
+        values[:limit_by] = limit_by unless limit_by.nil?
         self
       end
 
-      def limit(limit_value, offset_value = nil)
-        dup.limit!(limit_value, offset_value)
+      def limit(limit_value, offset_value = nil, limit_by = nil)
+        dup.limit!(limit_value, offset_value, limit_by)
       end
     end
   end

data/lib/active_house/querying/page.rb

@@ -0,0 +1,35 @@
+module ActiveHouse
+  module Querying
+    module Page
+      extend ActiveSupport::Concern
+
+      def initial_values
+        super.merge page_number: nil
+      end
+
+      def page(page_number)
+        dup.page!(page_number)
+      end
+
+      def page!(page_number)
+        page_number ||= 1
+        raise ArgumentError, 'page_number must be >= 1' if page_number < 1
+
+        values[:page_number] = page_number
+        self
+      end
+
+      def per(page_size)
+        page_number = values[:page_number] || 1
+        raise ArgumentError, 'page_number must be >= 1' if page_number < 1
+        raise ArgumentError, 'page_size must be >= 0' if page_size < 0
+
+        offset = (page_number - 1) * page_size
+        records = limit(page_size, offset).to_a
+        total_count = count
+        Kaminari.paginate_array(records, total_count: total_count).page(page_number).per(page_size)
+      end
+
+    end
+  end
+end

data/lib/active_house/version.rb

@@ -1,3 +1,3 @@
 module ActiveHouse
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

data/lib/active_house.rb

@@ -1,7 +1,7 @@
 require 'active_house/version'
 require 'active_house/configuration'
-require 'active_house/query_builder'
 require 'active_house/model'
+require 'active_house/query_builder'
 
 module ActiveHouse
   def self.configure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_house
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-04 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.10
+- !ruby/object:Gem::Dependency
+  name: kaminari-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: plain_model
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +159,7 @@ files:
 - lib/active_house/querying/having.rb
 - lib/active_house/querying/limit.rb
 - lib/active_house/querying/order_by.rb
+- lib/active_house/querying/page.rb
 - lib/active_house/querying/scope.rb
 - lib/active_house/querying/select.rb
 - lib/active_house/querying/union.rb