xsdk-scaffold-rails 0.1.4.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8137485ac88425560227d41abc1616a13a7a1868e7b9663ea0b3161f6b6b9e37
-  data.tar.gz: dc8f81e0ea31be00347837417e1ce3ae666a602b83e7f7fb528763cc568fd52f
+  metadata.gz: 108cdf26bc4f923371e65b2a9b9f2a5329e6873cca09ae947060b6937d57bbef
+  data.tar.gz: b2af28bc2f01ff06ba271482a0e62a83ee8f9ff904f2e07e3fa8a792223430c3
 SHA512:
-  metadata.gz: ac50a6a9ef3b080ea7ab2e183645d87a42f2e2573bbe876051e5ae8624d137966405b048b93ce59741aed06d9f9a7e348dd481f3a46545e8cf2a17308f39014f
-  data.tar.gz: 52d2f9c5dcf6da229d90a97f7adf4f720a4f3db3e55d13bcc33585479eef50c490cc0219537f9cf1e584a981042bbd5ef4453257ca062f3c2df02e45c14f6b27
+  metadata.gz: 147f2ddd341e232b7bc2892aec51abec222ffaded11d6557385e202c1983e9d8318236edfde503bae09b620b73d0f43b43d15125d1beba954f1e28a525c80556
+  data.tar.gz: 816c60a6133969e2120ff2c417dee9acd1aeba8060d86a952b3c4b3fc72e6551bc7af1b98bf21616d309765f1c9909f9c200e5c7b8538d943cc86f467eae6e18

data/Gemfile

@@ -1,7 +1,17 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in xsdk-scaffold-rails.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"
+gem 'rake', '~> 12.0'
+gem 'rspec', '~> 3.0'
+
+group :development do
+  gem 'rubocop'
+  gem 'rubocop-gitlab-security'
+  gem 'rubocop-performance'
+  gem 'rubocop-rails'
+  gem 'rubocop-rspec' # or gem 'rubocop-minitest'
+
+  gem 'solargraph'
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xsdk-scaffold-rails (0.1.4.3)
+    xsdk-scaffold-rails (0.1.7)
       activerecord (>= 6.0.0)
       pg (>= 1.1)
 
@@ -20,18 +20,36 @@ GEM
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
     ast (2.4.2)
+    backport (1.1.2)
+    benchmark (0.1.1)
     concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
+    e2mmap (0.1.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
+    kramdown (2.3.1)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    mini_portile2 (2.5.1)
     minitest (5.14.4)
+    nokogiri (1.11.5)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    nokogiri (1.11.5-x86_64-darwin)
+      racc (~> 1.4)
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
     pg (1.2.3)
+    racc (1.5.2)
+    rack (2.2.3)
     rainbow (3.0.0)
     rake (12.3.3)
     regexp_parser (2.1.1)
+    reverse_markdown (2.0.0)
+      nokogiri
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -57,17 +75,40 @@ GEM
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (1.5.0)
       parser (>= 3.0.1.1)
+    rubocop-gitlab-security (0.1.1)
+      rubocop (>= 0.51)
     rubocop-performance (1.9.2)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
     rubocop-rspec (2.0.1)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
+    solargraph (0.40.4)
+      backport (~> 1.1)
+      benchmark
+      bundler (>= 1.17.2)
+      e2mmap
+      jaro_winkler (~> 1.5)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.1)
+      parser (~> 3.0)
+      reverse_markdown (>= 1.0.5, < 3)
+      rubocop (>= 0.52)
+      thor (~> 1.0)
+      tilt (~> 2.0)
+      yard (~> 0.9, >= 0.9.24)
+    thor (1.1.0)
     thread_safe (0.3.6)
+    tilt (2.0.10)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
+    yard (0.9.26)
     zeitwerk (2.4.2)
 
 PLATFORMS
@@ -77,9 +118,12 @@ PLATFORMS
 DEPENDENCIES
   rake (~> 12.0)
   rspec (~> 3.0)
-  rubocop (~> 1.3.1)
-  rubocop-performance (~> 1.9.0)
-  rubocop-rspec (~> 2.0.0)
+  rubocop
+  rubocop-gitlab-security
+  rubocop-performance
+  rubocop-rails
+  rubocop-rspec
+  solargraph
   xsdk-scaffold-rails!
 
 BUNDLED WITH

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

@@ -1,221 +1,282 @@
 module Xsdk
   module Scaffold
     module Rails
-      
-			class BaseDatatable
-
-			  def initialize(params, clazz)
-			    @options = JSON.parse(params[:options]).with_indifferent_access
-			    @clazz = clazz
-			    @foreign_keys = get_foreign_key_map(clazz)
-			  end
-
-			  def as_json(*)
-			    {
-			      rows: paginate(get_data),
-			      total_rows: get_count,
-			      columns: build_headers
-			    }
-			  end
-
-			  # Build rows
-
-			  def paginate(data)
-			    per_page = @options[:itemsPerPage]
-			    page = @options[:page] - 1
-			    data.limit(per_page)
-			        .offset(page * per_page)
-			        .as_json(methods: enum_methods, except: keys_to_exclude, include: has_many_include)
-			  end
-
-			  def keys_to_exclude
-			    []
-			  end
-
-			  def enum_methods
-			    enum_methods = []
-			    @clazz.defined_enums.each do |k, _v|
-			      enum_methods << "#{k}_text"
-			    end
-			    enum_methods
-			  end
-
-			  def get_raw_data
-			  	@clazz.all
-			  end
-
-			  def get_data
-			    data = get_raw_data
-			    associations.reject { |_k, v| v[:association_type] == :has_many }.each do |_, value|
-			      data = data.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
-			    data = data.select("#{@clazz.to_s.underscore.pluralize}.*", *to_select)
-
-			    associations.select { |_k, v| v[:association_type] == :has_many }.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] }
-			  end
-
-			  # Build columns
-			  def build_headers
-			    headers = columns.map do |c|
-			      {
-			        value: c, # warehouse_id
-			        table_value: get_table_value(c),	# "mag1"
-			        text: get_text(c),											# "Identificatore"
-			        type: get_type(c),											# "string"
-			        in_form: form_columns.include?(c),	# true/false
-			        in_table: table_columns.include?(c), # true/false
-			        table: get_table(c),	# warehouses
-			        source: get_source(c),									# identifier
-			        min_search_size: get_min_search_size(c),
-			        enum_cols: get_enum_cols(c),
-			        subschema: get_subschema(c)
-			      }
-			    end
-			    headers << { text: 'Azioni', value: 'actions', type: '', in_form: false, in_table: true }
-			    headers
-			  end
-
-			  def get_subschema(c)
-			    subschema = nil
-			    ax = associations.with_indifferent_access
-			    if ax.key?(c) && (ax[c][:association_type] == :has_many)
-			      empty_options = { options: '{}' }
-			      begin
-			        datatable = "#{ax[c][:clazz]}Datatable".constantize
-			        dt = datatable.new(empty_options)
-			      rescue StandardError
-			        dt = BaseDatatable.new(empty_options, ax[c][:clazz])
-			      end
-			      subschema = dt.build_headers
-			      subschema = subschema.reject { |c| c[:type] == 'foreign_key' && c[:table] == @clazz.table_name }
-			      subschema << { text: 'Elimina', value: '_destroy', type: '', in_form: false, in_table: false }
-			      subschema << { text: 'Uuid', value: '_uuid', type: 'uuid', in_form: false, in_table: false }
-			      subschema.each { |s| s[:is_subschema] = true }
-			    end
-			    subschema
-			  end
-
-			  def get_enum_cols(c)
-			    arr = []
-			    if @clazz.defined_enums.key?(c)
-			      @clazz.defined_enums[c].each do |k, _v|
-			        arr << {
-			          value: k,
-			          text: @clazz.human_attribute_name("#{c}_enum.#{k}")
-			        }
-			      end
-			    end
-			    arr
-			  end
-
-			  def get_min_search_size(c)
-			    ax = associations.with_indifferent_access
-			    if ax.key?(c) && ax[c][:source] == 'id'
-			      ax[c][:min_search_size]
-			    else
-			      3
-			    end
-			  end
-
-			  def columns
-			    @clazz.column_names - %w[created_at updated_at]
-			  end
-
-			  def table_columns
-			    columns
-			  end
-
-			  def form_columns
-			    columns - ['id']
-			  end
-
-			  def get_table(c)
-			    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)
-			      ax[c][:clazz].table_name
-			    else
-			      @clazz.table_name
-			    end
-			  end
-
-			  def get_source(c)
-			    ax = associations.with_indifferent_access
-			    if ax.key?(c) && (ax[c][:association_type] != :has_many)
-			      ax[c][:source]
-			    else
-			      c
-			    end
-			  end
-
-			  def get_text(c)
-			    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)
-			      ax[c][:clazz].model_name.human.capitalize
-			    else
-			      @clazz.human_attribute_name(c).capitalize
-			    end
-			  end
-
-			  def get_type(c)
-			    ax = associations.with_indifferent_access
-			    if @foreign_keys.key?(c)
-			      'foreign_key'
-			    elsif ax.key?(c) && (ax[c][:association_type] == :has_many)
-			      'has_many'
-			    elsif @clazz.defined_enums.key?(c)
-			      'enum'
-			    else
-			      @clazz.type_for_attribute(c).type
-			    end
-			  end
-
-			  def get_table_value(c)
-			    ax = associations.with_indifferent_access
-			    if ax.key?(c)
-			      if ax[c][:association_type] == :has_many
-			        c
-			      else
-			        "#{ax[c][:relation]}_#{ax[c][:source]}"
-			      end
-			    else
-			      c
-			    end
-			  end
-
-			  def get_count
-			    @clazz.count
-			  end
-
-			  def get_foreign_key_map(clazz)
-			    clazz.reflect_on_all_associations.select { |a| a.macro == :belongs_to }
-			         .map { |a| { key: a.foreign_key, class_name: a.class_name } }
-			         .group_by { |a| a[:key] }
-			         .with_indifferent_access
-			  end
-
-			  def associations
-			    {}
-			  end
-			end
+      class BaseDatatable
+        def initialize(params, clazz)
+          @options = JSON.parse(params[:options]).with_indifferent_access
+          @clazz = clazz
+          @foreign_keys = get_foreign_key_map(clazz)
+          @only_schema = @options[:only_schema]
+          @default_values = @options.try(:[], :default) || {}
+        end
 
+        def as_json(*)
+          return { columns: build_headers } if @only_schema
+
+          {
+            rows: paginate(get_data),
+            total_rows: get_count,
+            columns: build_headers
+          }
+        end
+
+        # Build rows
+
+        def paginate(data)
+          per_page = @options[:itemsPerPage]
+          page = @options[:page] - 1
+          sort = @options[:sortBy]
+          direction = @options[:sortDesc]
+          order_string = sort.map.with_index { |k, idx| "#{sorting_map[k.to_sym]} #{direction[idx] ? 'DESC' : 'ASC'}" }
+          data.limit(per_page)
+              .offset(page * per_page)
+              .order(order_string)
+              .as_json(methods: methods + enum_methods, except: keys_to_exclude, include: has_many_include)
+        end
+
+        def keys_to_exclude
+          []
+        end
+
+        def enum_methods
+          enum_methods = []
+          @clazz.defined_enums.each do |k, _v|
+            enum_methods << "#{k}_text"
+          end
+          enum_methods
+        end
+
+        def get_raw_data
+          @clazz.all
+        end
+
+        def get_data
+          data = get_raw_data
+          associations.reject { |_k, v| v[:association_type] == :has_many }.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
+          data = data.select("#{@clazz.to_s.underscore.pluralize}.*", *to_select)
+
+          associations.select { |_k, v| v[:association_type] == :has_many }.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] }
+        end
+
+        def get_if_can_show_new_record(key)
+          key = key.to_sym
+          (associations.select { |k, v| k == key && v[:show_new_record] }).any?
+        end
+
+        def get_entity_name(key)
+          key = key.to_sym
+          assoc = associations[key]
+          return nil if assoc.nil?
+
+          assoc[:relation]
+        end
+
+        # Build columns
+        def build_headers
+          headers = columns.map do |c|
+            {
+              value: c, # warehouse_id
+              table_value: get_table_value(c),	# "mag1"
+              text: get_text(c),											# "Identificatore"
+              type: get_type(c),											# "string"
+              in_form: get_in_form(c),	# true/false
+              in_table: table_columns.include?(c), # true/false
+              table: get_table(c),	# warehouses
+              source: get_source(c),	# identifier
+              in_form_disabled: disabled_form_columns.include?(c),	# true/false
+              min_search_size: get_min_search_size(c),
+              enum_cols: get_enum_cols(c),
+              subschema: get_subschema(c),
+              show_new_record: get_if_can_show_new_record(c),
+              entity_name: get_entity_name(c),
+              default: get_default_value(c)
+            }
+          end
+          headers << { text: 'Azioni', value: 'actions', type: '', in_form: false, in_table: true }
+          headers
+        end
+
+        def get_in_form(key)
+          (@options[:form_columns] || form_columns).include?(key)
+        end
+
+        def get_subschema(c)
+          subschema = nil
+          ax = associations.with_indifferent_access
+          if ax.key?(c) && (ax[c][:association_type] == :has_many)
+            child_options = { options: {}.to_json }
+            child_options = { options: ax[c][:options].to_json } if ax[c][:options].present?
+            begin
+              datatable = "#{ax[c][:clazz]}Datatable".constantize
+              dt = datatable.new(child_options)
+            rescue StandardError
+              dt = BaseDatatable.new(child_options, ax[c][:clazz])
+            end
+            subschema = dt.build_headers
+            subschema = subschema.reject { |sc| sc[:type] == 'foreign_key' && sc[:table] == @clazz.table_name }
+            subschema << { text: 'Elimina', value: '_destroy', type: '', in_form: false, in_table: false }
+            subschema << { text: 'Uuid', value: '_uuid', type: 'uuid', in_form: false, in_table: false }
+            subschema.each { |s| s[:is_subschema] = true }
+          end
+          subschema
+        end
+
+        def get_default_value(c)
+          @default_values[c]
+        end
+
+        def get_enum_cols(c)
+          arr = []
+          if @clazz.defined_enums.key?(c)
+            @clazz.defined_enums[c].each do |k, _v|
+              arr << {
+                value: k,
+                text: @clazz.human_attribute_name("#{c}_enum.#{k}")
+              }
+            end
+          end
+          arr
+        end
+
+        def get_min_search_size(c)
+          ax = associations.with_indifferent_access
+          if ax.key?(c) && ax[c][:source] == 'id'
+            ax[c][:min_search_size]
+          else
+            3
+          end
+        end
+
+        def transient_columns
+          @options[:transient_columns] || {}
+        end
+
+        def columns
+          @clazz.column_names - %w[created_at updated_at] + transient_columns.keys
+        end
+
+        def table_columns
+          columns
+        end
+
+        def form_columns
+          columns - ['id']
+        end
+
+        def disabled_form_columns
+          []
+        end
+
+        def methods
+          []
+        end
+
+        def get_table(c)
+          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)
+            ax[c][:clazz].table_name
+          else
+            @clazz.table_name
+          end
+        end
+
+        def get_source(c)
+          ax = associations.with_indifferent_access
+          if ax.key?(c) && (ax[c][:association_type] != :has_many)
+            ax[c][:source]
+          else
+            c
+          end
+        end
+
+        def get_text(c)
+          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)
+            ax[c][:clazz].model_name.human.capitalize
+          elsif transient_columns.key?(c)
+            transient_columns[c][:text]
+          else
+            @clazz.human_attribute_name(c).capitalize
+          end
+        end
+
+        def get_type(c)
+          ax = associations.with_indifferent_access
+          if @foreign_keys.key?(c)
+            'foreign_key'
+          elsif ax.key?(c) && (ax[c][:association_type] == :has_many)
+            'has_many'
+          elsif @clazz.defined_enums.key?(c)
+            'enum'
+          elsif transient_columns.key?(c)
+            transient_columns[c][:type]
+          else
+            @clazz.type_for_attribute(c).type
+          end
+        end
+
+        def get_table_value(c)
+          ax = associations.with_indifferent_access
+          if ax.key?(c)
+            if ax[c][:association_type] == :has_many
+              c
+            else
+              "#{ax[c][:relation]}_#{ax[c][:source]}"
+            end
+          else
+            c
+          end
+        end
+
+        def get_count
+          @clazz.count
+        end
+
+        def get_foreign_key_map(clazz)
+          clazz.reflect_on_all_associations.select { |a| a.macro == :belongs_to }
+               .map { |a| { key: a.foreign_key, class_name: a.class_name } }
+               .group_by { |a| a[:key] }
+               .with_indifferent_access
+        end
+
+        def associations
+          {}
+        end
+
+        def sorting_map
+          build_headers.map do |h|
+            if h[:type] == 'foreign_key'
+              [h[:value].to_sym, "#{h[:table]}.#{h[:source]}"]
+            elsif h[:type] == 'enum'
+              ["#{h[:value]}_text".to_sym, "#{h[:table]}.#{h[:table_value]}"]
+            elsif h[:type].nil? || h[:value] == 'actions'
+              [nil]
+            else
+              [h[:value].to_sym, "#{h[:table]}.#{h[:table_value]}"]
+            end
+          end.filter { |a| a[0] }.to_h
+        end
+      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Xsdk
   module Scaffold
     module Rails
-      VERSION = "0.1.4.3"
+      VERSION = "0.1.8"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsdk-scaffold-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Davide Croci
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-08-20 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.0.8
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Gem for automatic scaffolding by Ermes-x.