active_house 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1accc2700d5a5f68d28c6ee7a3c61edee951663a
-  data.tar.gz: e3376ff0588800672aa83312f8d648f982bd7684
+  metadata.gz: 85e74ee14ef20d87860ffb175ba8adeef0488777
+  data.tar.gz: 226c0ae19eb0e1c451ac7bcbcfec035bbd602f16
 SHA512:
-  metadata.gz: d75af3bdb4a7330bf48d0002babe1c9e807b4e359129ec9a9ca30557f2761c990d7ada2567fd5b756bd3d7bb1d47f1a11db9a456e73c02eec8d5aac319e96ba6
-  data.tar.gz: 6ab03f7ce71326c65dd3d60173b93c5b02d6e427acd14d277ed0ca768ceb3960ea3edd60b695ae367c359c17fa516114e489197b957fb57468aa99d717da01bd
+  metadata.gz: aa2e80513b87275dd3996c09f6c6e63c7392fa0ab930468f1ec7fc08ae389b71d9be993cff385d1dcb6b5d98f056115dedbf1c0079164fe55dd807f1d0f09842
+  data.tar.gz: 35c22b8dc84e426b967a10169aa707979e3ed6a5ffb472c25c6092f4dccaadd384facc4c09de719e8e9fadafe29bfd3da9c3c7e8d458a06f571045497420d8ce

data/lib/active_house/chainable.rb

@@ -3,6 +3,7 @@ require_relative 'fromable'
 require_relative 'whereable'
 require_relative 'orderable'
 require_relative 'groupable'
+require_relative 'limitable'
 require 'active_support/concern'
 
 module ActiveHouse
@@ -14,6 +15,7 @@ module ActiveHouse
     include ActiveHouse::Whereable
     include ActiveHouse::Orderable
     include ActiveHouse::Groupable
+    include ActiveHouse::Limitable
 
     included do
       protected
@@ -34,7 +36,8 @@ module ActiveHouse
             build_from_query_part,
             build_where_query_part,
             build_group_by_query_part,
-            build_order_by_query_part
+            build_order_by_query_part,
+            build_limit_query_part
         ]
       end
 
@@ -86,7 +89,8 @@ module ActiveHouse
           select: :fields,
           where: :conditions,
           group_by: :grouping,
-          order_by: :ordering
+          order_by: :ordering,
+          limit: :limit
       }
     end
 

data/lib/active_house/collectable.rb

@@ -1,4 +1,5 @@
 require 'active_support/concern'
+require 'active_support/core_ext/string/filters'
 
 module ActiveHouse
   module Collectable

data/lib/active_house/limitable.rb

@@ -0,0 +1,27 @@
+module ActiveHouse
+  module Limitable
+    extend ActiveSupport::Concern
+
+    included do
+      private
+
+      def build_limit_query_part
+        return if @limit.empty?
+        if @limit[1]
+          "LIMIT #{@limit[0]}, #{@limit[1]}"
+        else
+          "LIMIT #{@limit[0]}"
+        end
+      end
+    end
+
+    def initialize(*)
+      @limit = []
+      super
+    end
+
+    def limit(limit_value, offset_value = nil)
+      chain_query limit: (@limit + [limit_value, offset_value]).uniq
+    end
+  end
+end

data/lib/active_house/querying.rb

@@ -11,7 +11,7 @@ module ActiveHouse
     end
 
     class_methods do
-      delegate :to_a, :select, :where, :group_by, to: :all
+      delegate :to_a, :select, :where, :group_by, :limit, to: :all
 
       def all
         _query_class.new(self)

data/lib/active_house/version.rb

@@ -1,3 +1,3 @@
 module ActiveHouse
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_house
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -122,6 +122,7 @@ files:
 - lib/active_house/error.rb
 - lib/active_house/fromable.rb
 - lib/active_house/groupable.rb
+- lib/active_house/limitable.rb
 - lib/active_house/logger.rb
 - lib/active_house/model.rb
 - lib/active_house/modeling.rb