dynamic_scaffold 1.12.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c42e88067995f3753891fcc0e2a29aa8a8b8fd7ff9b093780f20455db67eb731
-  data.tar.gz: 1872ac09ed02e4a0524e7bc0d26900d1e493596bcafe47b177bfda380e741d9a
+  metadata.gz: 457314cf971c919f920535659152e9062cd0f095c51d3f4626fb12f956bda42e
+  data.tar.gz: a9fe3e3a6041b2dc15d305f291f63d07447427e673988c5acd68313d8f643351
 SHA512:
-  metadata.gz: 9f893ff9dbb40db07c63c6929c11ccae374ac17e82621bf8f878325b7b2393da1f7ffc12e354ccac152579b8f888d2c66780179c015be4cb361bfa9e7837835b
-  data.tar.gz: d2ce03bded48b344d364a737b38bed3a4aa4129b431189fcb213092c5385652cb148513aaef7bb4070ee62b53d3edd42225405335d1357947ddec65a7a374c42
+  metadata.gz: 525cf1961b472037098f5d1425ae9177b2b175712c6c353a2f80692fc630dfa93d082d4d95977a3d2e3f7fc0004053e068ee5481dfd65e34802550482662542f
+  data.tar.gz: 79896456eaaff29d55b69fad3eb63508fe6ceb199f49fdab356f4b76db9373401cb3b4becee9cd682492713c4211616964753ce42df0f6ed9d47eda7ac9e729c

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError

data/app/assets/javascripts/dynamic_scaffold/auto_width.js

@@ -1,5 +1,8 @@
 var calcWidth = function(){
   var firstRow = document.querySelector('.js-ds-list-row:first-child')
+  if(!firstRow){
+    return
+  }
 
   var wrapperWidth = firstRow.clientWidth
 

data/app/helpers/dynamic_scaffold_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffoldHelper
   def render_form_errors(errors)
     return '' if errors.blank?

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

@@ -1,4 +1,4 @@
-<%= form_with method: method, model: @record, url: url, local: true, class: 'ds-form' do |form| %>
+<%= form_with method: method, model: @record, scope: dynamic_scaffold.model.name.underscore, url: url, local: true, class: 'ds-form' do |form| %>
   <%-dynamic_scaffold.form.items.each do |elem|-%>
     <%= render 'dynamic_scaffold/bootstrap/form/row', form: form, elem: elem, depth: 0 %>
   <% end %>

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

@@ -1,5 +1,5 @@
 <%if dynamic_scaffold.list.pagination %>
   <div class="ds-row">
-    <%= paginate @records, {views_prefix: 'dynamic_scaffold/bootstrap'}.merge(dynamic_scaffold.list.pagination.kaminari_options) %>
+    <%= paginate @records, **{views_prefix: 'dynamic_scaffold/bootstrap'}.merge(dynamic_scaffold.list.pagination.kaminari_options) %>
   </div>
 <%end%>

data/config/locales/en.yml

@@ -9,12 +9,22 @@ en:
         index: 'List'
         edit: 'Edit'
         new: 'Create'
+    button:
+      add: 'Add'
+      edit: 'Edit'
+      save_order: 'Sort'
+      save: 'Save'
+      back: 'Back'
     message:
       no_records: '%{model} was not found.'
       destroy_confirm: 'Are you sure you want to delete this?'
       confirm_cancel: 'Cancel'
       confirm_ok: 'OK'
+      sort_error: 'The sort has been failed, because the following record failed to save.'
     alert:
       destroy:
         invalid_foreign_key: 'That item can not be deleted because it has associated record(s).'
-        failed: 'That item can not be deleted'
+        failed: 'That item can not be deleted'
+  views:
+    pagination:
+      truncate: '…'

data/config/locales/ja.yml

@@ -20,6 +20,7 @@ ja:
       destroy_confirm: '削除します。よろしいですか？'
       confirm_cancel: 'キャンセル'
       confirm_ok: 'OK'
+      sort_error: '下記のレコードの保存に失敗したため、ソートを完了できませんでした。'
     alert:
       destroy:
         invalid_foreign_key: '関連づいたレコードがあるので削除できません。'

data/config/routes.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
 end

data/config/spring.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 Spring.application_root = './spec/dummy'

data/lib/dynamic_scaffold/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   class Config
     attr_reader(

data/lib/dynamic_scaffold/controller.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
-  module Controller
+  module Controller # rubocop:disable Metrics/ModuleLength
     extend ActiveSupport::Concern
     include ControllerUtilities
 
@@ -135,18 +137,26 @@ module DynamicScaffold
       redirect_to dynamic_scaffold_path(:index, request_queries)
     end
 
-    def sort
+    def sort # rubocop:disable Metrics/AbcSize
       pkeys_list = sort_params
       reset_sequence(pkeys_list.size)
-      dynamic_scaffold.model.transaction do
-        pkeys_list.each do |pkeys|
-          rec = find_record(pkeys.to_hash)
-          next_sec = next_sequence!
-          rec[dynamic_scaffold.list.sorter_attribute] = next_sec
-          yield(rec) if block_given?
-          rec.save!
+
+      begin
+        dynamic_scaffold.model.transaction do
+          pkeys_list.each do |pkeys|
+            rec = find_record(pkeys.to_hash)
+            next_sec = next_sequence!
+            rec[dynamic_scaffold.list.sorter_attribute] = next_sec
+            yield(rec) if block_given?
+            rec.save!
+          end
         end
+      rescue ActiveRecord::RecordInvalid => e
+        messages = [I18n.t('dynamic_scaffold.message.sort_error'), '', sort_validation_error_title(e.record)]
+        messages.concat(e.record.errors.full_messages)
+        flash[:dynamic_scaffold_danger] = messages.join('<br>')
       end
+
       redirect_to dynamic_scaffold_path(:index, request_queries)
     end
   end

data/lib/dynamic_scaffold/controller_utilities.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module ControllerUtilities
     private
@@ -7,7 +9,7 @@ module DynamicScaffold
         return {} if dynamic_scaffold.scope.nil?
 
         case dynamic_scaffold.scope
-        when Array then
+        when Array
           dynamic_scaffold.scope.each_with_object({}) do |val, res|
             if val.is_a? Hash
               val.each {|k, v| res[k] = v }
@@ -15,7 +17,7 @@ module DynamicScaffold
               res[val] = params[val]
             end
           end
-        when Hash then
+        when Hash
           dynamic_scaffold.scope
         end
       end
@@ -110,7 +112,7 @@ module DynamicScaffold
 
         if route.nil?
           raise DynamicScaffold::Error::RouteNotFound,
-            "Missing controller#action #{params[:controller]}##{action}"
+                "Missing controller#action #{params[:controller]}##{action}"
         end
 
         options.merge!(scope_params)
@@ -145,5 +147,9 @@ module DynamicScaffold
           .page(params[dynamic_scaffold.list.pagination.param_name])
           .per(dynamic_scaffold.list.pagination.per_page)
       end
+
+      def sort_validation_error_title(record)
+        "ID: #{record.id}"
+      end
   end
 end

data/lib/dynamic_scaffold/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'classnames-rails-view'
 module DynamicScaffold
   class Engine < ::Rails::Engine

data/lib/dynamic_scaffold/error/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Error
     class Base < StandardError

data/lib/dynamic_scaffold/error/invalid_icon.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Error
     class InvalidIcon < Base

data/lib/dynamic_scaffold/error/invalid_operation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Error
     class InvalidOperation < Base

data/lib/dynamic_scaffold/error/invalid_parameter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Error
     class InvalidParameter < Base

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Form
     module Item
@@ -102,8 +104,7 @@ module DynamicScaffold
           #   )
           #   return label unless label.nil?
           # end
-
-          view.tag.label(proxy_field.label, label_attrs) if proxy_field.label.present?
+          view.tag.label(proxy_field.label, **label_attrs) if proxy_field.label.present?
         end
 
         def extract_parameters(permitting)
@@ -171,7 +172,7 @@ module DynamicScaffold
         def errors(form)
           msg = form.object.errors.full_messages_for(proxy_field.name)
           rel = @config.model.reflect_on_all_associations.find {|r| r.foreign_key.to_s == name.to_s }
-          msg.concat(form.object.errors.full_messages_for(rel.name)) if rel.present?
+          msg = msg.dup.concat(form.object.errors.full_messages_for(rel.name)) if rel.present?
           msg
         end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Form
     module Item

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Form
     module Item

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Form
     module Item

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Form
     module Item

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Form
     module Item

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Form
     module Item

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Form
     module Item

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Form
     module Item

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Form
     module Item

data/lib/dynamic_scaffold/form_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   class FormBuilder
     attr_accessor :parent_item
@@ -12,7 +14,7 @@ module DynamicScaffold
       if @items.empty?
         @config.model.column_names.each do |column|
           type = :text_field
-          type = :hidden_field if @config.scope && @config.scope.include?(column.to_sym)
+          type = :hidden_field if @config.scope&.include?(column.to_sym)
           item = Form::Item::SingleOption.new(@config, type, column)
           item.parent_item = parent_item
           @items << item

data/lib/dynamic_scaffold/icons/fontawesome.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Fontawesome
     def self.inline_svg(path)
@@ -13,35 +15,35 @@ Rails.application.config.dynamic_scaffold.icons = proc do |name|
   # This function is called in view scope.
   # https://github.com/gomo/dynamic_scaffold/blob/b4066bbd40cd6e7307ce283d5a9bd526ae124e00/lib/dynamic_scaffold/controller_utilities.rb#L104-L106
   case name
-  when :up then
+  when :up
     DynamicScaffold::Fontawesome.inline_svg('chevron-up.svg')
-  when :down then
+  when :down
     DynamicScaffold::Fontawesome.inline_svg('chevron-down.svg')
-  when :delete then
+  when :delete
     DynamicScaffold::Fontawesome.inline_svg('times.svg')
-  when :edit then
+  when :edit
     DynamicScaffold::Fontawesome.inline_svg('pencil-alt.svg')
-  when :add then
+  when :add
     DynamicScaffold::Fontawesome.inline_svg('plus.svg')
-  when :save then
+  when :save
     DynamicScaffold::Fontawesome.inline_svg('hdd.svg')
-  when :back then
+  when :back
     DynamicScaffold::Fontawesome.inline_svg('chevron-left.svg')
-  when :error then
+  when :error
     DynamicScaffold::Fontawesome.inline_svg('exclamation-circle.svg')
-  when :first then
+  when :first
     DynamicScaffold::Fontawesome.inline_svg('step-backward.svg')
-  when :last then
+  when :last
     DynamicScaffold::Fontawesome.inline_svg('step-forward.svg')
-  when :next then
+  when :next
     DynamicScaffold::Fontawesome.inline_svg('chevron-right.svg')
-  when :prev then
+  when :prev
     DynamicScaffold::Fontawesome.inline_svg('chevron-left.svg')
-  when :top then
+  when :top
     DynamicScaffold::Fontawesome.inline_svg('angle-double-up.svg')
-  when :bottom then
+  when :bottom
     DynamicScaffold::Fontawesome.inline_svg('angle-double-down.svg')
-  when :times then
+  when :times
     DynamicScaffold::Fontawesome.inline_svg('times.svg')
   else
     raise DynamicScaffold::Error::InvalidIcon, "Unknown icon type #{name} specified."

data/lib/dynamic_scaffold/json_object/attribute.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module JSONObject
     module Attribute

data/lib/dynamic_scaffold/json_object/model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module JSONObject
     module Model
@@ -6,7 +8,7 @@ module DynamicScaffold
       module ClassMethods
         def  dump(obj)
           obj = obj.attributes if obj.is_a? ActiveModel::Attributes
-          obj.to_json if obj
+          obj&.to_json
         end
 
         def load(source)

data/lib/dynamic_scaffold/list/item.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module List
     class Item

data/lib/dynamic_scaffold/list/pagination.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module List
     class Pagination

data/lib/dynamic_scaffold/list_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   class ListBuilder
     attr_writer :add_button, :edit_buttons, :destroy_buttons

data/lib/dynamic_scaffold/monkeypatch/action_view/helpers/form_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     class FormBuilder

data/lib/dynamic_scaffold/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   module Routes
     extend ActiveSupport::Concern
@@ -20,4 +22,4 @@ module DynamicScaffold
   end
 end
 
-::ActionDispatch::Routing::Mapper.send :include, DynamicScaffold::Routes
+::ActionDispatch::Routing::Mapper.include DynamicScaffold::Routes

data/lib/dynamic_scaffold/title.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   class Title
     attr_writer :name

data/lib/dynamic_scaffold/vars.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
   class Vars
     def initialize(config)

data/lib/dynamic_scaffold/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamicScaffold
-  VERSION = '1.12.0'.freeze
+  VERSION = '2.0.1'
 end

data/lib/dynamic_scaffold.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dynamic_scaffold/version'
 require 'dynamic_scaffold/engine'
 require 'dynamic_scaffold/monkeypatch/action_view/helpers/form_builder'

data/lib/generators/dynamic_scaffold/dynamic_scaffold_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DynamicScaffoldGenerator < Rails::Generators::Base
   source_root File.expand_path('templates', __dir__)
 

data/lib/tasks/dynamic_scaffold_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :dynamic_scaffold do
 #   # Task goes here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_scaffold
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Masamoto Miyata
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2022-01-10 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.1'
+        version: 6.1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '5.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 6.1.4.4
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -118,100 +118,128 @@ dependencies:
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: 0.75.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: 0.75.0
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -324,7 +352,7 @@ homepage: https://github.com/gomo/dynamic_scaffold
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -332,15 +360,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: The Scaffold system which dynamically generates CRUD and sort functions.
 test_files: []