like_query 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12f503e7aa188d223e922496909dabff55b2ff5c843e18ed23ae5525a5190dfa
-  data.tar.gz: fa7edce57c33d96b1c040767f5e41a95d32573b78cbc259ade1411178748a941
+  metadata.gz: '049ab00db40571bcb74c02122aa68da955b145bd808330336ca5405e9b394c28'
+  data.tar.gz: 772e0bc35a1fbb766d2ea2e10fa018bfb9445e2aac5b9fff81aed107b9a43887
 SHA512:
-  metadata.gz: 50b1ff03fd06283c506b70a20867261236cae2e2d12f00732efb3a42da474761d817163c77fa8a6eda205b0a96812bb3d7347b86b4adf4184287f53ee1b7dabb
-  data.tar.gz: 3dd63ff9264451c79616e112885329ddff287ac34abb0dc5df438cba2de4402c8756b30aa65b7ae085c55f0f20e4d1919d02b847032a2b959eee3a55ee38737e
+  metadata.gz: 55ad5c0c0bfb442f48b5a9a05fad45ad3fb066c573799dd498ff55f2fb68b1651cf290bde35861d09f4f70fc6cd7cadf65e2b3cdec63bd41ff26bf2876543b07
+  data.tar.gz: ed8a996db26473442d8ad3e117d387f4c18bef2f13b9d88749ce5ee1ff5ad0f44df0d3506fbc3880ae30b26e7b3c2584f6d96aee9978421ec735a94461ad5f3c

data/README.md

@@ -47,22 +47,24 @@ art1 = Article.create(name: 'first', number: '01', customer: customer)
 
 Article.like('fir', :name).like_result(limit: 10)
 # returns: 
-# { 
-#   :data=>[
-#     {
-#       :attributes=>[[:name, "first"]], 
-#       :id=>1}], 
-#   :length=>1, 
-#   :overflow=>false, 
-#   :columns_count=>1, 
-#   :sub_records_columns_count=>0
-# }
+{ 
+  :data=>[
+    {
+      :attributes=>[[:name, "first"]], 
+      :id=>1}], 
+  :length=>1, 
+  :overflow=>false, 
+  :columns_count=>1, 
+  :sub_records_columns_count=>0
+}
 
 Article.like('fir', :name).like_result( :number, limit: 10)
 # would query like the above example: Search scope is only :name
 # but would return article-number instead of article-name inside the data block
 ```
 
+`#like_result` uses `LikeQuery::Collect`, functionality is the same.
+
 **Class LikeQuery::Collect** 
 
 ```ruby
@@ -80,7 +82,7 @@ c.receive { Customer.like('any-art', :name, image: :image_column, articles: :nam
 # => otherwise it would add Customers to the result hash
 
 c.result
-# => would return anything like:
+# => would return anything like (this output is from different code!!):
 {
   :data=>[
     {:attributes=>[[:name, "Ambühl"]], :id=>1, :image=>"src:customer-image", 

data/lib/like_query/collect.rb

@@ -7,6 +7,8 @@ module LikeQuery
       @overflow = false
       @columns_count = 0
       @sub_records_columns_count = 0
+      @image = false
+      @sub_records_image = false
     end
 
     def receive(*result_pattern, limit: nil, image: nil, &block)
@@ -45,6 +47,7 @@ module LikeQuery
                 # IMAGE COLUMN
 
                 rec_attr[:image] = get_column_value(r, cols)
+                @image = true
 
               else
 
@@ -53,22 +56,19 @@ module LikeQuery
                 sub_records = r.send(assoc)
                 image_column = nil
 
-
                 _cols = if cols.is_a?(Hash)
                           image_column = cols[:image]
-                          cols[:attributes]
+                          cols[:values]
                         elsif cols.is_a?(Enumerable)
                           cols
                         else
                           [cols]
                         end
 
-
-                #_cols = (cols.is_a?(Enumerable) ? cols : [cols])
                 (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,8 +79,11 @@ 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 }
-                    sub_hash[:image] = get_column_value(sub_record, image_column) if image_column
+                    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
+                    end
                     rec_attr[:associations][assoc].push(sub_hash)
                     @length += 1
                     length += 1
@@ -92,16 +95,10 @@ module LikeQuery
 
             # MAIN RECORD
 
-            # v = nil
-            # p.to_s.split('.').each { |_p| v = (v ? v : r).send(_p) }
-            rec_attr[:attributes] ||= []
-            rec_attr[:attributes].push([p, get_column_value(r, p)])
-            # if image
-            #   img = nil
-            #   image.to_s.split('.').each { |i| img = (img ? img : r).send(i) }
-            #   rec_attr[:image] = img
-            # end
+            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
 
           end
         end
@@ -109,7 +106,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
@@ -126,7 +123,9 @@ module LikeQuery
         length: @length,
         overflow: @overflow,
         columns_count: @columns_count,
-        sub_records_columns_count: @sub_records_columns_count
+        sub_records_columns_count: @sub_records_columns_count,
+        image: @image,
+        sub_records_image: @sub_records_image
       }
     end
 

data/lib/like_query/version.rb

@@ -1,3 +1,3 @@
 module LikeQuery
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: like_query
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - christian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-26 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails