xsdk-scaffold-rails 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28851d6c097ba72105793a5a26aed4eedd9ae413da24c802d02af1afbafa428b
-  data.tar.gz: a5ffc5bc72948b77f3c0758b0cfe4b66520d1f429c3463d29067a79e2b469107
+  metadata.gz: 0773c986b92038986abeaf84a68311fe5a48aebdde49c00d768bfc1cc21a642d
+  data.tar.gz: 2f47f3fe4105bad3d02d505766a80ed024fc14ba2c623606fab5e773c2eb83c6
 SHA512:
-  metadata.gz: db15834104004ab36312f8a547fd147dc81d825f65df98e6cb7301d3b20e5a9bb65aafd9624cbf2f7b967b7837184e2476c7340ddba1b1219aea3d37952082ae
-  data.tar.gz: 037ec03650a94222c3a9f6ab003f63ce9168c6497018e50bc566ae7fe024c65b8a1cb8cd306fe106d3449cf715f0430ab1bc9eabaca64f0f570a6c5e42a44460
+  metadata.gz: 5a844c4703046e60dd417fe92e0188095789e045d11e006be79ed6342e096b54146e29f22ca2c324ac4ac7471878f01eae592da802255640d4a66ab477dc6420
+  data.tar.gz: '098c71e282d0920f48d24da5b7551fc9c1e79ac65a5a5e54f83d5eb69d7103fd51d60d082828f205e441f23d1b5507d48ee89f7f6a8f9db2fb831ca327cf214b'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xsdk-scaffold-rails (0.1.12)
+    xsdk-scaffold-rails (0.1.13)
       activerecord (>= 6.0.0)
       pg (>= 1.1)
 
@@ -42,7 +42,7 @@ GEM
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
-    pg (1.3.5)
+    pg (1.4.6)
     racc (1.5.2)
     rack (2.2.3)
     rainbow (3.0.0)

data/lib/xsdk/scaffold/rails/base_datatable.rb

@@ -36,7 +36,7 @@ module Xsdk
           data.order(order_string).as_json(
             methods: methods + enum_methods,
             except: keys_to_exclude,
-            include: has_many_include
+            include: associations_include
           )
         end
 
@@ -56,28 +56,33 @@ module Xsdk
           @clazz.all
         end
 
+        def association_is_has_many_or_one?(v)
+          v[:association_type] == :has_many || v[:association_type] == :has_one
+        end
+
         def get_data
           data = get_raw_data
-          associations.reject { |_k, v| v[:association_type] == :has_many }.each do |_, value|
+          associations.reject { |_k, v| association_is_has_many_or_one?(v) }.each do |_, value|
             data = data.send(value[:join_type] || :joins, value[:relation])
           end
-          to_select = associations.reject do |_k, v|
-                        v[:association_type] == :has_many
-                      end.reject { |_k, v| v[:source] == 'id' }.map do |key, value|
-            table_name = @foreign_keys[key][0][:class_name].constantize.table_name
-            "#{table_name}.#{value[:source]} AS #{value[:relation]}_#{value[:source]}"
-          end
+          to_select = associations.reject{ |_k, v| association_is_has_many_or_one?(v) }
+            .reject { |_k, v| v[:source] == 'id' }
+            .map do |key, value|
+              table_name = @foreign_keys[key][0][:class_name].constantize.table_name
+              "#{table_name}.#{value[:source]} AS #{value[:relation]}_#{value[:source]}"
+            end
+
           data = data.select("#{@clazz.table_name}.*", *to_select)
 
-          associations.select { |_k, v| v[:association_type] == :has_many }.each do |_, v|
+          associations.select { |_k, v| association_is_has_many_or_one?(v) }.each do |_, v|
             data = data.includes(v[:join]).references(v[:join])
           end
 
           data
         end
 
-        def has_many_include
-          associations.select { |_, v| v[:association_type] == :has_many }.map { |_, v| v[:include] }
+        def associations_include
+          associations.select{ |_, v| association_is_has_many_or_one?(v) }.map { |_, v| v[:include] }
         end
 
         def get_if_can_show_new_record(key)
@@ -125,7 +130,7 @@ module Xsdk
         def get_subschema(c)
           subschema = nil
           ax = associations.with_indifferent_access
-          if ax.key?(c) && (ax[c][:association_type] == :has_many)
+          if ax.key?(c) && association_is_has_many_or_one?(ax[c])
             child_options = { options: {}.to_json }
             child_options = { options: ax[c][:options].to_json } if ax[c][:options].present?
             begin
@@ -205,7 +210,7 @@ module Xsdk
           ax = associations.with_indifferent_access
           if @foreign_keys.key?(c)
             @foreign_keys[c][0][:class_name].constantize.table_name
-          elsif ax.key?(c) && (ax[c][:association_type] == :has_many)
+          elsif ax.key?(c) && association_is_has_many_or_one?(ax[c])
             ax[c][:clazz].table_name
           else
             @clazz.table_name
@@ -214,7 +219,7 @@ module Xsdk
 
         def get_source(c)
           ax = associations.with_indifferent_access
-          if ax.key?(c) && (ax[c][:association_type] != :has_many)
+          if ax.key?(c) && !association_is_has_many_or_one?(ax[c])
             ax[c][:source]
           else
             c
@@ -225,7 +230,7 @@ module Xsdk
           ax = associations.with_indifferent_access
           if @foreign_keys.key?(c)
             @foreign_keys[c][0][:class_name].constantize.model_name.human.capitalize
-          elsif ax.key?(c) && (ax[c][:association_type] == :has_many)
+          elsif ax.key?(c) && association_is_has_many_or_one?(ax[c])
             ax[c][:clazz].model_name.human.capitalize
           elsif transient_columns.key?(c)
             transient_columns[c][:text]
@@ -240,6 +245,8 @@ module Xsdk
             'foreign_key'
           elsif ax.key?(c) && (ax[c][:association_type] == :has_many)
             'has_many'
+          elsif ax.key?(c) && (ax[c][:association_type] == :has_one)
+            'has_one'
           elsif @clazz.defined_enums.key?(c)
             'enum'
           elsif transient_columns.key?(c)
@@ -252,7 +259,7 @@ module Xsdk
         def get_table_value(c)
           ax = associations.with_indifferent_access
           if ax.key?(c)
-            if ax[c][:association_type] == :has_many
+            if association_is_has_many_or_one?(ax[c])
               c
             else
               "#{ax[c][:relation]}_#{ax[c][:source]}"

data/lib/xsdk/scaffold/rails/version.rb

@@ -1,7 +1,7 @@
 module Xsdk
   module Scaffold
     module Rails
-      VERSION = "0.1.12"
+      VERSION = "0.1.13"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsdk-scaffold-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Davide Croci
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2023-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Gem for automatic scaffolding by Ermes-x.