restme 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cccc4f918f72719fedda5f137e14cdccf49de3931209a7adf2e9f7d7a974068c
-  data.tar.gz: 0e3a7821d6883250e28bb75b5f6ca50841166f6fff2a180740daf8f59dd323df
+  metadata.gz: 0f3c9d79dc88d267a1198ec23b54f05d8af00367125b1cf1f3fcd6c458633b35
+  data.tar.gz: 48c79f664b0fb61dea85fdd4d2d56d63520f7389c6b31adbead1c41a6b945268
 SHA512:
-  metadata.gz: ef683d119c129847df93624eb7f5480db6ec8bb190fe2aff432c59bb228aecec0a699ce1eb9cd91b23e73888fb1d03abe6c01accf1fe278d5ffab57ef51963f3
-  data.tar.gz: bcfefa780c6c4303e47b85492cd80ca51d404c83c8f68976bb0750a949236c0ccc45cd2278a4741747fa877a45b87e418cee46f6675c212e2a80f6572c6ec0bf
+  metadata.gz: 80455f1ab99ddec14145d9ed3229c491abfd48c1d2db0fae6532d56ca3304783749d2cba38216ef6529ed6a2985743ed41c3feb2e3fb72273eb8c1a87eae332a
+  data.tar.gz: e7033c0ded95c20fb3df221af86dff3801a67c80cd7b9f3ac4d070f4f64b979d385e01874bbceccdf0affac556752261ffc24e22acd485651d9163650083f8c8

data/README.md

@@ -215,6 +215,10 @@ module ProductsController::Field
       },
       category: {
         table_name: :categories
+      },
+      producer: { # When a nested field can be nil, Restme will not return the primary model unless a LEFT JOIN is explicitly used.
+        table_name: :producers,
+        join_type: :left_joins  # Use that so Restme will generate a LEFT JOIN instead of an INNER JOIN. This will
       }
     }.freeze
   end

data/lib/restme/scope/field/attachable.rb

@@ -8,19 +8,35 @@ module Restme
         def insert_attachments(scope)
           unallowed_attachment_fields_error
 
-          return scope.uniq if attachment_fields_select.blank?
+          return scope.as_json(json_options) if attachment_fields_select.blank?
 
-          scope = scope.includes(attachment_fields_select_includes).uniq
+          define_attachment_methods
 
-          scope.map do |record|
-            attachment_fields_select.each do |field|
-              @record = record.as_json.merge({ "#{field}": record.send(field).url })
-            end
+          scope.includes(attachment_fields_select_includes)
+               .as_json(json_options)
+        end
+
+        def json_options
+          {
+            include: valid_nested_fields_select,
+            methods: attachment_methods
+          }
+        end
 
-            @record
+        def define_attachment_methods
+          attachment_fields_select.each do |attachment_field_name|
+            klass.class_eval do
+              define_method(:"#{attachment_field_name}_url") do
+                send(attachment_field_name).url
+              end
+            end
           end
         end
 
+        def attachment_methods
+          attachment_fields_select&.map { |field| "#{field}_url" }
+        end
+
         def attachment_fields_select_includes
           attachment_fields_select.map { |field| { "#{field}_attachment": :blob } }
         end

data/lib/restme/scope/field/rules.rb

@@ -22,23 +22,13 @@ module Restme
         end
 
         def select_nested_scope(scoped)
-          scoped.joins(nested_fields_joins)
-                .left_joins(nested_fields_left_joins)
-                .preload(valid_nested_fields_select)
-                .select(nesteds_table)
+          scoped.preload(valid_nested_fields_select)
         end
 
         def select_any_field?
           fields_select || nested_fields_select || attachment_fields_select
         end
 
-        def nesteds_table
-          valid_nested_fields_select&.map do |field|
-            table = nested_selectable_fields_keys.dig(field, :table_name)
-            table.present? ? "#{table}::text AS #{field}" : nil
-          end
-        end
-
         def model_fields_select
           @model_fields_select ||= begin
             fields = fields_select&.split(",")
@@ -51,22 +41,10 @@ module Restme
           @model_attributes ||= klass.new.attributes.keys
         end
 
-        def nested_fields_joins
-          @nested_fields_joins ||= valid_nested_fields_select.select do |field|
-            nested_selectable_fields_keys[field.to_sym][:join_type].blank?
-          end
-        end
-
-        def nested_fields_left_joins
-          @nested_fields_left_joins ||= valid_nested_fields_select.select do |field|
-            nested_selectable_fields_keys[field.to_sym][:join_type] == :left_joins
-          end
-        end
-
         def valid_nested_fields_select
           @valid_nested_fields_select ||=
             nested_fields_select&.split(",")&.select do |field|
-              nested_selectable_fields_keys[field.to_sym].present?
+              nested_selectable_fields_keys.key?(field.to_sym)
             end&.map(&:to_sym)
         end
 

data/lib/restme/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Restme
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restme
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - everson-ever