dynamic_scaffold 1.7.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a42e42644e59b8b8f43dfe73eed5089f76f471c20bbd788c44c2e3eb0ba68ea3
-  data.tar.gz: aaa19ee4e6ff49e27e12c1383f7ec3233ec3dcb436eca830b52c4fe5b2901d85
+  metadata.gz: d2878d75af1c0e57b392261a63012a7e8adaf8b527cc6da8bb7c8ea5f84011a5
+  data.tar.gz: 5a0037e29736c6863901d7f7fdbec3aaeefd0a1ebb746d21f49c3356838cfcf5
 SHA512:
-  metadata.gz: aa010c42fbdbf64be8d31c8eb2323ba27219dd94639ea8d10de646b9b028deef6400b7aba98463e62b2bb98dfe01e9aa2f6a4dcb84ead17e65555af1e79dfd24
-  data.tar.gz: b06d1e642763f3b399a098316bb4de3bc8af90bb3765d3fb22bf13bc525c57115c4a6cbafe25d4b4b9ae941d8ff3bdffeebacf975e2bb977948c0978e9ae2745
+  metadata.gz: 9ef5af49b21cd93f46e1e13138eff64823fe3e5379882bdf0910e8082ecba8d7f9b65dd8c8b6cde8c22fb0fbb7fe5f92ffc1c31e61bfd7fd18a22fbdd8756022
+  data.tar.gz: bb3b7662d02ebda9658ada08ce216e63ac24f4c63d2434757cc924c6e56ae8ab4b3156809b062824b7251d14037791fa00189eeace66498f53117b7fb8d8b44c

data/README.md

@@ -157,6 +157,34 @@ You can customize the list through the `DynamicScaffold::Config#list` property.
 class ShopController < ApplicationController
   include DynamicScaffold::Controller
   dynamic_scaffold Shop do |config|
+    # Add button and new action to disabled, You can still post to create action.
+    config.list.add_button = false
+    # or
+    config.list.add_button do 
+      # This block is called in view scope
+      false if params[:foo] == 1
+    end
+
+    # Edit button and edit action to disabled, You can still post to update action.
+    config.list.edit_buttons = false
+    # or
+    config.list.edit_buttons do |record|
+      # This block is called in view scope
+      # You can disable only specific record's button.
+      false if record.id != 1
+    end
+
+    # Destroy button to disabled, You can still post to destroy action.
+    config.list.destroy_buttons = false
+    # or
+    config.list.destroy_buttons do |record|
+      # This block is called in view scope
+      # You can disable only specific record's button.
+      false if record.id != 1
+    end
+
+
+
     # If you want filtering that can not be handled by `config.scope`, you can use the filter method.
     # Please note that returning nil will be ignored.
     config.list.filter do |query|
@@ -253,6 +281,9 @@ class ShopController < ApplicationController
     config.form.item(:collection_check_boxes, :state_ids, State.all, :id, :name)
     config.form.item(:collection_radio_buttons, :status, Shop.statuses.map{|k, _v| [k, k.titleize]}, :first, :last)
 
+    # If you want to use parameters to get list, Pass Proc or Lambda to argument. It will be called in view scope.
+    config.form.item(:collection_select, :status, -> { Shop.where(area_id: params[:area_id]) }, :first, :last)
+
     # If you want to display more free form field, use block.
     # The block is executed in the context of view, so you can call the method of view.
     config.form.item :block, :free do |form, field|
@@ -364,6 +395,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

@@ -5,16 +5,18 @@
 <%end%>
 <input type="hidden" class="authenticity_param_name" value="<%= request_forgery_protection_token %>">
 <%= form_with method: :patch, url: dynamic_scaffold_path(:sort, request_queries(dynamic_scaffold.list.page_param_name)), local: true do%>
-<div class="ds-row">
-  <%= link_to dynamic_scaffold_path(:new, request_queries), class: class_names('btn btn-outline-primary btn-primary btn-sm spec-ds-add', 'disabled': dynamic_scaffold.max_count?(@count)) do%>
-    <%= dynamic_scaffold_icon(:add) %> <%= t('dynamic_scaffold.button.add') %>
-    <%- unless dynamic_scaffold.max_count.nil? -%>
-      &nbsp;<span class="badge badge-light">
-        <%= @count %>&nbsp;/&nbsp;<%= dynamic_scaffold.max_count%>
-      </span>
-    <% end %>
-  <%end%>
-</div>
+<%- if dynamic_scaffold.list.add_button -%>
+  <div class="ds-row">
+    <%= link_to dynamic_scaffold_path(:new, request_queries), class: class_names('btn btn-outline-primary btn-primary btn-sm spec-ds-add', 'disabled': dynamic_scaffold.max_count?(@count)) do%>
+      <%= dynamic_scaffold_icon(:add) %> <%= t('dynamic_scaffold.button.add') %>
+      <%- unless dynamic_scaffold.max_count.nil? -%>
+        &nbsp;<span class="badge badge-light">
+          <%= @count %>&nbsp;/&nbsp;<%= dynamic_scaffold.max_count%>
+        </span>
+      <% end %>
+    <%end%>
+  </div>
+<%- end -%>
 <%= render 'dynamic_scaffold/bootstrap/pagination' %>
 <div class="ds-row">
   <%= render 'dynamic_scaffold/bootstrap/save_order'%>
@@ -47,11 +49,13 @@
           </div>
           <div class="ds-list-footer clearfix">
             <div class="float-right pull-right">
-              <div class="btn-group">
-                <%= link_to dynamic_scaffold_path(:edit, request_queries.merge(id: record[record.class.primary_key])), class: 'btn btn-primary btn-outline-primary btn-sm spec-ds-edit' do %>
-                  <%= dynamic_scaffold_icon(:edit) %> <%= t('dynamic_scaffold.button.edit') %>
-                <%end%>
-              </div>
+              <%- if dynamic_scaffold.list.edit_buttons(record) -%>
+                <div class="btn-group">
+                  <%= link_to dynamic_scaffold_path(:edit, request_queries.merge(id: record[record.class.primary_key])), class: 'btn btn-primary btn-outline-primary btn-sm spec-ds-edit' do %>
+                    <%= dynamic_scaffold_icon(:edit) %> <%= t('dynamic_scaffold.button.edit') %>
+                  <%end%>
+                </div>
+              <%- end -%>
               <% if dynamic_scaffold.list.sorter %>
               <%[*dynamic_scaffold.model.primary_key].each do |pkey|%>
                 <input type="hidden" name="pkeys[][<%=pkey%>]" value="<%= record[pkey] %>">
@@ -71,15 +75,17 @@
                 </button>
               </div>
               <% end %>
-              <div class="btn-group">
-                <button
-                  data-action="<%= dynamic_scaffold_path(:update, request_queries(dynamic_scaffold.list.page_param_name).merge(id: record[record.class.primary_key])) %>"
-                  data-confirm-message="<%= t('dynamic_scaffold.message.destroy_confirm') %>"
-                  class="btn btn-danger btn-sm js-ds-destory"
-                >
-                  <%= dynamic_scaffold_icon(:delete) %>
-                </button>
-              </div>
+              <%- if dynamic_scaffold.list.destroy_buttons(record) -%>
+                <div class="btn-group">
+                  <button
+                    data-action="<%= dynamic_scaffold_path(:update, request_queries(dynamic_scaffold.list.page_param_name).merge(id: record[record.class.primary_key])) %>"
+                    data-confirm-message="<%= t('dynamic_scaffold.message.destroy_confirm') %>"
+                    class="btn btn-danger btn-sm js-ds-destory spec-ds-destroy"
+                  >
+                    <%= dynamic_scaffold_icon(:delete) %>
+                  </button>
+                </div>
+              <%- end -%>
             </div>
           </div>
         </li>

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

@@ -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

@@ -44,6 +44,8 @@ module DynamicScaffold
     end
 
     def new # rubocop:disable Metrics/AbcSize
+      raise ActionController::RoutingError, '`Add Button` is disabled.' unless dynamic_scaffold.list.add_button
+
       unless dynamic_scaffold.max_count.nil?
         count = dynamic_scaffold.list.build_sql(scope_params).count
         raise Error::InvalidOperation, 'You can not add any more.' if dynamic_scaffold.max_count?(count)
@@ -60,6 +62,8 @@ module DynamicScaffold
 
     def edit
       @record = find_record(edit_params)
+
+      raise ActionController::RoutingError, '`Edit Button` is disabled.' unless dynamic_scaffold.list.edit_buttons(@record)
     end
 
     def create
@@ -77,7 +81,7 @@ module DynamicScaffold
       end
     end
 
-    def update # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    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 +97,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
 

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

@@ -15,7 +15,8 @@ module DynamicScaffold
           end
         end
 
-        attr_reader :name
+        attr_accessor :parent_item
+        attr_reader :name, :multiple
         def initialize(config, type, name, html_attributes = {})
           @config = config
           @name = name
@@ -32,7 +33,10 @@ module DynamicScaffold
         end
 
         def unique_name
-          "#{@config.model.table_name}_#{name}"
+          results = [@config.model.table_name]
+          results << parent_item.name if parent_item.present?
+          results << name
+          results.join('_')
         end
 
         def notes?
@@ -180,6 +184,14 @@ module DynamicScaffold
             options[:class] = classnames_list.join(' ') unless classnames_list.empty?
             options
           end
+
+          def build_args(view, args)
+            args.map do |arg|
+              next arg unless arg.is_a? Proc
+
+              view.instance_exec(&arg)
+            end
+          end
       end
     end
   end

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

@@ -2,8 +2,8 @@ module DynamicScaffold
   module Form
     module Item
       class Block < Base
-        def initialize(config, type, name, &block)
-          super(config, type, name, {})
+        def initialize(config, type, name, options = {}, &block)
+          super(config, type, name, options)
           @block = block
         end
 

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/single_option.rb

@@ -9,11 +9,11 @@ module DynamicScaffold
           super(config, type, name, html_attributes)
         end
 
-        def render(_view, form, classnames = nil)
+        def render(view, form, classnames = nil)
           html_attributes = build_html_attributes(classnames)
           # Retain the value of the password field on error.
           html_attributes[:value] = form.object.public_send(@name) if @type == :password_field
-          form.public_send(@type, @name, *@args, html_attributes)
+          form.public_send(@type, @name, *build_args(view, @args), html_attributes)
         end
       end
     end

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

@@ -18,9 +18,9 @@ module DynamicScaffold
           super(config, type, name, html_attributes)
         end
 
-        def render(_view, form, classnames = nil)
+        def render(view, form, classnames = nil)
           html_attributes = build_html_attributes(classnames)
-          form.public_send(@type, @name, *@args, @options, html_attributes)
+          form.public_send(@type, @name, *build_args(view, @args), @options, html_attributes)
         end
       end
     end

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

@@ -2,11 +2,11 @@ module DynamicScaffold
   module Form
     module Item
       class TwoOptionsWithBlock < TwoOptions
-        def render(_view, form, classnames = nil)
+        def render(view, form, classnames = nil)
           form.public_send(
             @type,
             @name,
-            *@args,
+            *build_args(view, @args),
             @options,
             build_html_attributes(classnames)
           ) do |builder|

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

@@ -1,5 +1,7 @@
 module DynamicScaffold
   class ListBuilder
+    attr_writer :add_button, :edit_buttons, :destroy_buttons
+
     def initialize(config)
       @config = config
       @items = []
@@ -8,6 +10,9 @@ module DynamicScaffold
       @title = nil
       @filter = nil
       @row_class_block = nil
+      @add_button = true
+      @edit_buttons = true
+      @destroy_buttons = true
     end
 
     def pagination(options = nil)
@@ -97,5 +102,35 @@ module DynamicScaffold
         @config.controller.view_context.instance_exec(record, &@row_class_block)
       end
     end
+
+    def add_button(&block)
+      if block_given?
+        @add_button_block = block
+      elsif @add_button_block
+        @config.controller.view_context.instance_exec(&@add_button_block)
+      else
+        @add_button
+      end
+    end
+
+    def edit_buttons(record = nil, &block)
+      if block_given?
+        @edit_buttons_block = block
+      elsif record.present? && @edit_buttons_block
+        @config.controller.view_context.instance_exec(record, &@edit_buttons_block)
+      else
+        @edit_buttons
+      end
+    end
+
+    def destroy_buttons(record = nil, &block)
+      if block_given?
+        @destroy_buttons_block = block
+      elsif record.present? && @destroy_buttons_block
+        @config.controller.view_context.instance_exec(record, &@destroy_buttons_block)
+      else
+        @destroy_buttons
+      end
+    end
   end
 end

data/lib/dynamic_scaffold/version.rb

@@ -1,3 +1,3 @@
 module DynamicScaffold
-  VERSION = '1.7.1'.freeze
+  VERSION = '1.10.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_scaffold
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Masamoto Miyata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-30 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: classnames-rails-view
@@ -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