dynamic_scaffold 1.4.3 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c78d85fe028cf2f3a8d6dbb2535c1763cb44af9dbd23e8f2c209900cb697c5b
-  data.tar.gz: ba48a0bb59375db1313e69510a300df75b2e219df6da94a19033e122742b9644
+  metadata.gz: 83178747c82566649957d2845a6e425dd16b320b8fe8ef3954432981c941aa16
+  data.tar.gz: c8e689ee3fd60cb006f29cf053009de07799b45542c6187f91332eca005d2046
 SHA512:
-  metadata.gz: 0bb514fae7e68f907888a1e0d3642cb1b2991f66c5ed4be7397180e6cc58b8e82bf4e37cc16400eb6f0201ad216fb9a7e5e6dc7a9d5bd94959b82dc6b96c7551
-  data.tar.gz: 6b2d83755e283de98609d4ec9bf25a8dde3a8fc5a2160a9c6770b2673eec0c15d01022138e8f38daf5601a4cebff8cce5dce5bcc9e1be89987f402daa7d9bc0c
+  metadata.gz: b4fb71172557f91a3241555f6469ec2bb9c8aa7f264b0c284a134c05f4392f8b362c46dcf53a9447ba4efb91188939f066337286bca694f55fb6b71025cc16c7
+  data.tar.gz: 3fc6eadf855760330b0840a4148f18a37a42a4aa2d37e433b5c9c09a9293a4d1571f8adb80e0ee70932be77903dab830dcc324080b1d7196604961d5009f77f3

data/README.md

@@ -170,6 +170,11 @@ class ShopController < ApplicationController
     # config.list.title do |record|
     #   record.name
     # end
+
+    # You can add class to list page's each row.
+    config.list.row_class do |record|
+      'disabled' unless record.active?
+    end
   
     # First arg is attribute name of model.
     # Last hash arg is given to HTML attributes options.
@@ -359,6 +364,12 @@ We support [cocoon](https://github.com/nathanvda/cocoon).
   end
 ```
 
+##### json_object
+
+You can save json object string in a column using each form items and validations.
+Check this [wiki](https://github.com/gomo/dynamic_scaffold/wiki/Handling-json-object-string-column)
+
+
 #### Overwrite actions
 
 You can pass the block to super in index/create/update actions.

data/app/views/dynamic_scaffold/bootstrap/_list.html.erb

@@ -1,6 +1,6 @@
 <%unless flash[:dynamic_scaffold_danger].nil? -%>
   <div class="alert alert-danger" role="alert">
-    <%= flash[:dynamic_scaffold_danger] %>
+    <%== flash[:dynamic_scaffold_danger] %>
   </div>
 <%end%>
 <input type="hidden" class="authenticity_param_name" value="<%= request_forgery_protection_token %>">
@@ -30,8 +30,8 @@
       data-confirm-cancel="<%= t('dynamic_scaffold.message.confirm_cancel') %>"
       data-confirm-cancel-class="btn btn-outline-secondary btn-default btn-sm"
     >
-      <%@records.each do |record|%>
-        <li class="ds-list-row js-ds-list-row">
+      <%@records.each_with_index do |record, index|%>
+        <li class="<%= class_names('ds-list-row js-ds-list-row', dynamic_scaffold.list.row_class(record)) %>">
           <% if dynamic_scaffold.list.title? %>
             <div class="ds-list-heading"><%= dynamic_scaffold.list.title(record) %></div>
           <% end %>

data/app/views/dynamic_scaffold/bootstrap/form/_row.html.erb

@@ -3,9 +3,9 @@
     <%= elem.render(self, form) %>
   <% else %>
     <%- errors = elem.errors(form) -%>
-    <div class="<%= class_names('form-group', 'has-error': errors.present?) %>">
+    <div class="<%= class_names('form-group', 'has-error': errors.present?) %>" data-name="<%= elem.unique_name %>">
       <%= elem.render_label(self, depth) %>
-      <div>
+      <div class="ds-form-item">
         <%- elem.insert(:before).each do |block| -%>
           <%= self.instance_exec(@record, &block) %>
         <%-end-%>
@@ -68,7 +68,7 @@
             <%end%>
           <% end %>
         <% elsif elem.type? :cocoon %>
-          <%= form.fields_for elem.name, elem.build_children(@record) do |child_form| %>
+          <%= form.fields_for(elem.name, elem.build_children(@record)) do |child_form| %>
             <%= render 'dynamic_scaffold/bootstrap/form/cocoon', f: child_form, items: elem.form.items, depth: depth %>
           <% end %>
           <%= link_to_add_association(
@@ -86,6 +86,12 @@
               .gsub(/ : /, '<span class="mr-2" style="display: inline-block;">:</span>')
             %>
           </div>
+        <% elsif elem.type?(:json_object) %>
+          <%= form.fields_for(elem.name, @record.public_send(elem.name)) do |child_form| %>
+            <%- elem.form.items.each do |child_elem|-%>
+              <%= render 'dynamic_scaffold/bootstrap/form/row', form: child_form, elem: child_elem, depth: depth %>
+            <% end %>
+          <% end %>
         <% else %>
           <%= elem.render(self, form, class_names('form-control', {'is-invalid': errors.present?})) %>
         <% end %>

data/lib/dynamic_scaffold.rb

@@ -32,8 +32,14 @@ module DynamicScaffold
       autoload :SingleOption,         'dynamic_scaffold/form/item/single_option'
       autoload :TwoOptionsWithBlock,  'dynamic_scaffold/form/item/two_options_with_block'
       autoload :TwoOptions,           'dynamic_scaffold/form/item/two_options'
-      autoload :GlobalizeFields, 'dynamic_scaffold/form/item/globalize_fields'
-      autoload :Cocoon, 'dynamic_scaffold/form/item/cocoon'
+      autoload :GlobalizeFields,      'dynamic_scaffold/form/item/globalize_fields'
+      autoload :Cocoon,               'dynamic_scaffold/form/item/cocoon'
+      autoload :JSONObject,           'dynamic_scaffold/form/item/json_object'
     end
   end
+
+  module JSONObject
+    autoload :Attribute,              'dynamic_scaffold/json_object/attribute'
+    autoload :Model,                  'dynamic_scaffold/json_object/model'
+  end
 end

data/lib/dynamic_scaffold/controller.rb

@@ -77,7 +77,7 @@ module DynamicScaffold
       end
     end
 
-    def update # rubocop:disable Metrics/AbcSize
+    def update # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
       values = update_values
       @record = find_record(dynamic_scaffold.model.primary_key => params['id'])
       datetime_select_keys = []
@@ -93,6 +93,9 @@ module DynamicScaffold
         # globalize
         next [:translations_attributes, @record.translations] if k == 'translations_attributes'
 
+        # skip nested_attributes
+        next unless @record.respond_to? k
+
         [k, @record.public_send(k)]
       end.compact.to_h.with_indifferent_access
 
@@ -107,7 +110,7 @@ module DynamicScaffold
       end
     end
 
-    def destroy
+    def destroy # rubocop:disable Metrics/AbcSize
       # `Destroy` also does not support multiple primary keys too.
       record = find_record(dynamic_scaffold.model.primary_key => params['id'])
       begin
@@ -122,6 +125,9 @@ module DynamicScaffold
         flash[:dynamic_scaffold_danger] = I18n.t('dynamic_scaffold.alert.destroy.failed')
         logger.error(e)
       end
+
+      flash[:dynamic_scaffold_danger] = record.errors[:base].join('<br>') if record.errors[:base].any?
+
       redirect_to dynamic_scaffold_path(:index, request_queries)
     end
 

data/lib/dynamic_scaffold/form/item/base.rb

@@ -15,6 +15,7 @@ module DynamicScaffold
           end
         end
 
+        attr_accessor :parent_item
         attr_reader :name
         def initialize(config, type, name, html_attributes = {})
           @config = config
@@ -31,6 +32,13 @@ module DynamicScaffold
           @label_block = nil
         end
 
+        def unique_name
+          results = [@config.model.table_name]
+          results << parent_item.name if parent_item.present?
+          results << name
+          results.join('_')
+        end
+
         def notes?
           !@notes.empty?
         end
@@ -95,7 +103,7 @@ module DynamicScaffold
           #   return label unless label.nil?
           # end
 
-          view.tag.label(proxy_field.label, label_attrs)
+          view.tag.label(proxy_field.label, label_attrs) if proxy_field.label.present?
         end
 
         def extract_parameters(permitting)

data/lib/dynamic_scaffold/form/item/cocoon.rb

@@ -7,6 +7,7 @@ module DynamicScaffold
           super
           @options = options
           @form = FormBuilder.new(config)
+          @form.parent_item = self
           yield(@form)
         end
 

data/lib/dynamic_scaffold/form/item/json_object.rb

@@ -0,0 +1,32 @@
+module DynamicScaffold
+  module Form
+    module Item
+      class JSONObject < Base
+        attr_reader :form
+        def initialize(config, type, name, options = {})
+          super
+          @options = options
+          @form = FormBuilder.new(config)
+          @form.parent_item = self
+          yield(@form)
+        end
+
+        # the lable is always empty.
+        def render_label(_view, _depth)
+          ''
+        end
+
+        def extract_parameters(permitting)
+          hash = permitting.find {|e| e.is_a?(Hash) && e.key?(name) }
+          if hash.nil?
+            hash = {}
+            hash[name] = form.items.map(&:name)
+            permitting << hash
+          else
+            hash[name].concat(form.items.map(&:name))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dynamic_scaffold/form/item/type.rb

@@ -30,7 +30,9 @@ module DynamicScaffold
 
           globalize_fields: Form::Item::GlobalizeFields,
 
-          cocoon: Form::Item::Cocoon
+          cocoon: Form::Item::Cocoon,
+
+          json_object: Form::Item::JSONObject
         }.freeze
       end
     end

data/lib/dynamic_scaffold/form_builder.rb

@@ -1,5 +1,7 @@
 module DynamicScaffold
   class FormBuilder
+    attr_accessor :parent_item
+
     def initialize(config)
       @config = config
       @items = []
@@ -11,7 +13,9 @@ module DynamicScaffold
         @config.model.column_names.each do |column|
           type = :text_field
           type = :hidden_field if @config.scope && @config.scope.include?(column.to_sym)
-          @items << Form::Item::SingleOption.new(@config, type, column)
+          item = Form::Item::SingleOption.new(@config, type, column)
+          item.parent_item = parent_item
+          @items << item
         end
       end
       @items
@@ -28,6 +32,7 @@ module DynamicScaffold
 
     def item(type, *args, &block)
       item = Form::Item::Base.create(@config, type, *args, &block)
+      item.parent_item = parent_item
       @items << item
       item
     end

data/lib/dynamic_scaffold/json_object/attribute.rb

@@ -0,0 +1,24 @@
+module DynamicScaffold
+  module JSONObject
+    module Attribute
+      extend ActiveSupport::Concern
+
+      included do
+        @json_object_attribute_names ||= []
+
+        define_method :valid? do |context = nil|
+          result = super(context)
+          json_object_attribute_names = self.class.instance_variable_get(:@json_object_attribute_names)
+          json_object_attribute_names.all? {|method| public_send(method).valid?(context) } && result
+        end
+      end
+
+      module ClassMethods
+        def json_object_attributte(attribute_name, model)
+          @json_object_attribute_names << attribute_name
+          serialize attribute_name, model
+        end
+      end
+    end
+  end
+end

data/lib/dynamic_scaffold/json_object/model.rb

@@ -0,0 +1,18 @@
+module DynamicScaffold
+  module JSONObject
+    module Model
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def  dump(obj)
+          obj = obj.attributes if obj.is_a? ActiveModel::Attributes
+          obj.to_json if obj
+        end
+
+        def load(source)
+          new(source ? JSON.parse(source) : {})
+        end
+      end
+    end
+  end
+end

data/lib/dynamic_scaffold/list_builder.rb

@@ -7,6 +7,7 @@ module DynamicScaffold
       @order = []
       @title = nil
       @filter = nil
+      @row_class_block = nil
     end
 
     def pagination(options = nil)
@@ -88,5 +89,13 @@ module DynamicScaffold
       @filter = block if block_given?
       @filter
     end
+
+    def row_class(record = nil, &block)
+      if block_given?
+        @row_class_block = block
+      elsif record.present? && @row_class_block
+        @config.controller.view_context.instance_exec(record, &@row_class_block)
+      end
+    end
   end
 end

data/lib/dynamic_scaffold/version.rb

@@ -1,3 +1,3 @@
 module DynamicScaffold
-  VERSION = '1.4.3'.freeze
+  VERSION = '1.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_scaffold
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.8.0
 platform: ruby
 authors:
 - Masamoto Miyata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-05 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: classnames-rails-view
@@ -47,7 +47,7 @@ dependencies:
         version: '5.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '5.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -295,12 +295,15 @@ files:
 - lib/dynamic_scaffold/form/item/carrier_wave_image.rb
 - lib/dynamic_scaffold/form/item/cocoon.rb
 - lib/dynamic_scaffold/form/item/globalize_fields.rb
+- lib/dynamic_scaffold/form/item/json_object.rb
 - lib/dynamic_scaffold/form/item/single_option.rb
 - lib/dynamic_scaffold/form/item/two_options.rb
 - lib/dynamic_scaffold/form/item/two_options_with_block.rb
 - lib/dynamic_scaffold/form/item/type.rb
 - lib/dynamic_scaffold/form_builder.rb
 - lib/dynamic_scaffold/icons/fontawesome.rb
+- lib/dynamic_scaffold/json_object/attribute.rb
+- lib/dynamic_scaffold/json_object/model.rb
 - lib/dynamic_scaffold/list/item.rb
 - lib/dynamic_scaffold/list/pagination.rb
 - lib/dynamic_scaffold/list_builder.rb