like_query 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb533ef11731913bdf3356f5177354cbdc85b4506ba2aae392f7149b7fe7e6d2
-  data.tar.gz: 4b256fb9aa9336559e6a9fc529e7376fae1f6fc09da1cd9b662eb18dd770c5dd
+  metadata.gz: 334fa972fb8d61c1e906bd9dc086e10163b7840dd10fd6a13eed59118841f04c
+  data.tar.gz: 0d76d9085d8e3f65cca59b3cad4abcd798106cf3792a85bf67634a776bf89ae9
 SHA512:
-  metadata.gz: 6fdeaadc79ef10c0690dff7d0213d8241ea0f01679fdb1494d95bb4b9f975813ef5319ae2639a431bb291793ca74ceb1902ca11e9ba5ad9b7423f114c4b3ed0e
-  data.tar.gz: 7d53223f4fe56b448e28aebb46e3db3f400de45b7698a5a3526543612180f4a937951733ade9cff093e177e9d4340fd50b90cc132ea64be811cde32ab2440e7b
+  metadata.gz: cbf4216ef96477617063c1a920b4754706302b6437bde18c303c16a0a2409d6bbb0d340a2674027097f89e47eea66816257f5e63995cc1017782a00b1de2c26e
+  data.tar.gz: cd639637a1835e3e5e67c6c94f1ceb4b01adc9ed5c7f083edd025cd690b86d2d57d754efbb932f1dea34a2ae2e28fad32f637622882138e37d4523ded05d0771

data/lib/like_query/collect.rb

@@ -15,6 +15,7 @@ module LikeQuery
 
       return false if @length >= @limit
       length = 0
+      @image = image.present?
 
       recs = yield
 
@@ -42,12 +43,12 @@ module LikeQuery
 
               if assoc.to_sym == :image
 
-                raise 'Missing input: image column for given key :image' unless cols.present?
-
-                # IMAGE COLUMN
-
-                rec_attr[:image] = get_column_value(r, cols)
-                @image = true
+                # raise 'Missing input: image column for given key :image' unless cols.present?
+                #
+                # # IMAGE COLUMN
+                #
+                # rec_attr[:image] = get_column_value(r, cols)
+                # @image = true
 
               else
 
@@ -58,7 +59,7 @@ module LikeQuery
 
                 _cols = if cols.is_a?(Hash)
                           image_column = cols[:image]
-                          cols[:attributes]
+                          cols[:values]
                         elsif cols.is_a?(Enumerable)
                           cols
                         else
@@ -68,7 +69,7 @@ module LikeQuery
                 (sub_records.is_a?(Enumerable) ? sub_records : [sub_records]).each do |sub_record|
                   sub_attr = []
                   _cols.each do |c|
-                    sub_attr.push([c, sub_record.send(c)])
+                    sub_attr.push(sub_record.send(c))
                   end
 
                   if @length >= @limit || (limit && length >= limit)
@@ -79,7 +80,7 @@ module LikeQuery
                     @sub_records_columns_count = c if c > @sub_records_columns_count
                     rec_attr[:associations] ||= {}
                     rec_attr[:associations][assoc] ||= []
-                    sub_hash = { attributes: sub_attr, id: sub_record.id, model: sub_record.class.to_s.underscore }
+                    sub_hash = { values: sub_attr, id: sub_record.id, model: sub_record.class.to_s.underscore }
                     if image_column
                       sub_hash[:image] = get_column_value(sub_record, image_column)
                       @sub_records_image = true
@@ -95,10 +96,11 @@ module LikeQuery
 
             # MAIN RECORD
 
-            rec_attr[:attributes] ||= []
-            rec_attr[:attributes].push([p, get_column_value(r, p)])
+            rec_attr[:values] ||= []
+            rec_attr[:values].push(get_column_value(r, p))
             rec_attr[:id] = r.id
             rec_attr[:model] = r.class.to_s.underscore
+            rec_attr[:image] = r.send(image) if @image
 
           end
         end
@@ -106,7 +108,7 @@ module LikeQuery
           @overflow = true
           break
         else
-          c = (image ? 1 : 0) + rec_attr[:attributes].length
+          c = (image ? 1 : 0) + rec_attr[:values].length
           @columns_count = c if c > @columns_count
           @data.push(rec_attr)
           @length += 1

data/lib/like_query/version.rb

@@ -1,3 +1,3 @@
 module LikeQuery
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: like_query
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - christian