active_house 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d444148c72cbef93a8a193e8c73079791e77ecc4
-  data.tar.gz: 9fbcef6e31a2627dbc822dddc64d72b1dcb1a3ec
+  metadata.gz: e8604e8b710205124b594cb7f226fbc04f444875
+  data.tar.gz: 4130c550f2386afe4cd26953e219fadbff652b98
 SHA512:
-  metadata.gz: 92e3a2d335222804ef4f09ce2ed8037ffee60b496d6a3d70e1dabfeb86fa87242900a91b72f538c227eb30c9a4241e4707ef92fa5bfd95d9455a835b409bd660
-  data.tar.gz: 1e744dc7fa583e5d1861bf8561b4a7165f3624369af37110f05b493825dff5b5d9778c4ab0b5468838647875960e9b70705d57548af4d93db8d68bc59bd20c14
+  metadata.gz: fe1797a3645326c8cd9e8e0ab90e570b4d4e00722fd2aad537706a474391d7702e3d8c3846b428f493c738da63b929c3227e6cd0a1a70c23c46983de4184b617
+  data.tar.gz: f699b40bfcda2ea589d047cb3624261bb1bde8024f5e0a047b4221d4a56513befa7e22a85a64c74da33aaeced0151d5e0670d0e1341aa1ae398ca60d3f6f371a

data/lib/active_house/array_joinable.rb

@@ -0,0 +1,33 @@
+module ActiveHouse
+  module ArrayJoinable
+    extend ActiveSupport::Concern
+
+    included do
+      private
+
+      def build_array_join_query_part
+        unless @array_joins.empty?
+          "ARRAY JOIN #{@array_joins.join(', ')}"
+        end
+      end
+    end
+
+    def initialize(*)
+      @array_joins = []
+      super
+    end
+
+    def array_join(*fields)
+      raise ArgumentError, 'wrong number of arguments' if fields.empty?
+      formatted_fields = fields.map do |field|
+        if field.is_a?(Symbol) && model_class._attribute_opts.key?(field)
+          opts = model_class._attribute_opts.fetch(field)
+          opts.key?(:select) ? "#{opts[:select]} AS #{field}" : field.to_s
+        else
+          field.to_s
+        end
+      end
+      chain_query array_joins: (@array_joins + formatted_fields).uniq
+    end
+  end
+end

data/lib/active_house/chainable.rb

@@ -6,6 +6,7 @@ require_relative 'groupable'
 require_relative 'limitable'
 require_relative 'havingable'
 require_relative 'unionable'
+require_relative 'array_joinable'
 require 'active_support/concern'
 
 module ActiveHouse
@@ -20,6 +21,7 @@ module ActiveHouse
     include ActiveHouse::Havingable
     include ActiveHouse::Limitable
     include ActiveHouse::Unionable
+    include ActiveHouse::ArrayJoinable
 
     included do
       protected
@@ -39,6 +41,7 @@ module ActiveHouse
         [
             build_select_query_part,
             build_from_query_part,
+            build_array_join_query_part,
             build_where_query_part,
             build_group_by_query_part,
             build_having_query_part,
@@ -100,10 +103,13 @@ module ActiveHouse
           limit: :limit,
           having: :having,
           union: :unions,
-          from: :subquery
+          from: :subquery,
+          array_join: :array_joins
       }
     end
 
+    # key - instance variable name that which store values
+    # value - default value for the variable
     def chain_defaults
       {
           fields: [],
@@ -114,6 +120,7 @@ module ActiveHouse
           having: [],
           union: {},
           subquery: nil,
+          array_joins: []
       }
     end
 

data/lib/active_house/collectable.rb

@@ -22,13 +22,18 @@ module ActiveHouse
       !@collection.nil?
     end
 
+    def to_hashes
+      connection.select_rows(to_query.squish)
+    end
+
+    private
+
     def collection
       @collection ||= fetch_collection
     end
 
     def fetch_collection
-      result = connection.select_rows(to_query.squish)
-      result.map { |row| model_class.load!(row) }
+      to_hash.map { |row| model_class.load!(row) }
     end
   end
 end

data/lib/active_house/version.rb

@@ -1,3 +1,3 @@
 module ActiveHouse
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_house
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -113,6 +113,7 @@ files:
 - bin/console
 - bin/setup
 - lib/active_house.rb
+- lib/active_house/array_joinable.rb
 - lib/active_house/chainable.rb
 - lib/active_house/collectable.rb
 - lib/active_house/configuration.rb