dynamic_scaffold 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0633833664a98487108cfff560746e817b250c06d092274e5bb565a8c35a67b
-  data.tar.gz: e7ca41a6c513b98643955ac02455c59dce62a8a10d3d61a9eba4df0c3926f3e1
+  metadata.gz: 3510af104ad96b427d07fb37304e8ef027ac1304b44690eba6f4396765913dce
+  data.tar.gz: 10d59ca97b95307e52f470ed9b9b4d7d54baa33488f9ffdb07a9f0403ff5cf87
 SHA512:
-  metadata.gz: 0d3a43421c7556e38a551dcca1f2452e05d0186136e8969717b849d2b514a3464c606f912be23e45c801edf8b42cb74fdcfdc10cb3a05511386e5ea8271b5d05
-  data.tar.gz: '03877a49468680288325825e95194d1d9cae3a4611104aa588cb487bdbcddbf1b592e9160f9b25a4f1418145d7aeeba08a0079daba73b5cdf0cbc8f21d24e86e'
+  metadata.gz: e54bbebed15b73ae7f90c3cfcf602e023bdcb6fc0a0aa7ea7594b12770c69db8132465180f51b7278d478e7d3ee91aeff5dcb341b63d8ef9724c5c5d5ac95962
+  data.tar.gz: 65c53fd1541da71f1635fd0741da54148377c9c6566a062e5c5cc759db3da9c1f2979dc59f5d6450b75faeb6130626a13e18dac8bf3c6161fc001892f0f5015d

data/app/assets/stylesheets/dynamic_scaffold/common.scss

@@ -128,3 +128,8 @@
 .dynamicScaffold-confirm-buttons .btn{
   margin-left: 10px;
 }
+
+// Fixed a problem that font-awesome icon and text link do not match in height.
+.page-link{
+  line-height: 1.6;
+}

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

@@ -1 +1 @@
-<%= render 'dynamic_scaffold/bootstrap/form', method: :patch, url: dynamic_scaffold_path(:update) %>
+<%= render 'dynamic_scaffold/bootstrap/form', method: :patch, url: dynamic_scaffold_path(:update, request_queries) %>

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

@@ -4,7 +4,8 @@
       <% if !elem.label? && elem.type?(:hidden_field) %>
         <%= elem.render(self, form) %>
       <% else %>
-        <div class="<%= class_names('form-group', {'has-error': @record.errors[elem.proxy_field.name].any?}) %>">
+        <%- errors = elem.errors(@record) -%>
+        <div class="<%= class_names('form-group', 'has-error': errors.present?) %>">
           <label><%= elem.proxy_field.label %></label>
           <div class="clearfix">
             <%- elem.insert(:before).each do |block| -%>
@@ -45,19 +46,19 @@
                 <%end%>
               </div>
             <% else %>
-              <%= elem.render(self, form, class_names('form-control', {'is-invalid': @record.errors[elem.proxy_field.name].any?})) %>
+              <%= elem.render(self, form, class_names('form-control', {'is-invalid': errors.present?})) %>
             <% end %>
             <%- elem.insert(:after).each do |block| -%>
               <%= self.instance_exec(@record, &block) %>
             <%-end-%>
           </div>
-          <%if @record.errors[elem.proxy_field.name].any?%>
-            <ul class="dynamicScaffold-error-message">
-              <%@record.errors.full_messages_for(elem.proxy_field.name).each do |err|%>
+          <%- if errors.present? -%>
+            <ul class="list-unstyled dynamicScaffold-error-message">
+              <% errors.each do |err|%>
               <li><%= dynamic_scaffold_icon :error %> <%= err %></li>
               <%end%>
             </ul>
-          <%end%>
+          <%- end -%>
           <%if elem.notes?%>
             <div class="form-text text-muted"><%= elem.render_notes(form.object, self) %></div>
           <%end%>
@@ -66,8 +67,7 @@
     <% end %>
   <% end %>
   <div>
-    <% path_options = dynamic_scaffold.list.pagination ? {dynamic_scaffold.list.pagination.param_name => params[:page]} : {}%>
-    <%= link_to dynamic_scaffold_path(:index, path_options), class: 'btn btn-outline-secondary btn-default' do%>
+    <%= link_to dynamic_scaffold_path(:index, request_queries), class: 'btn btn-outline-secondary btn-default back' do%>
       <%= dynamic_scaffold_icon :back %> <%= t('dynamic_scaffold.button.back') %>
     <%end%>
     <button type="submit" class="btn btn-outline-warning btn-warning">

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

@@ -4,9 +4,9 @@
   </div>
 <%end%>
 <input type="hidden" class="authenticity_param_name" value="<%= request_forgery_protection_token %>">
-<%= form_with method: :patch, url: dynamic_scaffold_path(:sort) do%>
+<%= form_with method: :patch, url: dynamic_scaffold_path(:sort, request_queries(dynamic_scaffold.list.page_param_name)), local: true do%>
 <div class="dynamicScaffold-row">
-  <%= link_to dynamic_scaffold_path(:new), class: 'btn btn-outline-primary btn-primary btn-sm' do%>
+  <%= link_to dynamic_scaffold_path(:new, request_queries), class: 'btn btn-outline-primary btn-primary btn-sm' do%>
     <%= dynamic_scaffold_icon(:add) %> <%= t('dynamic_scaffold.button.add') %>
   <%end%>
 </div>
@@ -41,8 +41,7 @@
           <div class="resplist-footer clearfix">
             <div class="float-right pull-right">
               <div class="btn-group">
-                <% page_param_name = dynamic_scaffold.list.pagination ? dynamic_scaffold.list.pagination.param_name : nil %>
-                <%= link_to dynamic_scaffold_path(:edit, id: record[record.class.primary_key], page: params[page_param_name]), class: 'btn btn-primary btn-outline-primary btn-sm' do %>
+                <%= link_to dynamic_scaffold_path(:edit, request_queries.merge(id: record[record.class.primary_key])), class: 'btn btn-primary btn-outline-primary btn-sm edit' do %>
                   <%= dynamic_scaffold_icon(:edit) %> <%= t('dynamic_scaffold.button.edit') %>
                 <%end%>
               </div>
@@ -67,7 +66,7 @@
               <% end %>
               <div class="btn-group">
                 <button
-                  data-action="<%= dynamic_scaffold_path(:update, id: record[record.class.primary_key]) %>"
+                  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 dynamicScaffoldJs-destory"
                 >

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

@@ -1 +1 @@
-<%= render 'dynamic_scaffold/bootstrap/form', method: :post, url: dynamic_scaffold_path(:index) %>
+<%= render 'dynamic_scaffold/bootstrap/form', method: :post, url: dynamic_scaffold_path(:index, request_queries) %>

data/config/locales/en.yml

@@ -16,4 +16,5 @@ en:
       confirm_ok: 'OK'
     alert:
       destroy:
-        invalid_foreign_key: 'That item can not be deleted because it has associated record(s).'
+        invalid_foreign_key: 'That item can not be deleted because it has associated record(s).'
+        failed: 'That item can not be deleted'

data/config/locales/ja.yml

@@ -23,6 +23,7 @@ ja:
     alert:
       destroy:
         invalid_foreign_key: '関連づいたレコードがあるので削除できません。'
+        failed: '削除に失敗しました。'
   views:
     pagination:
       truncate: '…'

data/lib/dynamic_scaffold/config.rb

@@ -159,6 +159,10 @@ module DynamicScaffold
       @pagination
     end
 
+    def page_param_name
+      pagination ? pagination.param_name : nil
+    end
+
     def sorter(params = nil)
       @sorter = params if params
       @sorter
@@ -267,7 +271,7 @@ module DynamicScaffold
         :carrierwave_image then
         item = Form::Item::CarrierWaveImage.new(@config, type, *args)
       else
-        raise DynamicScaffold::Error::Config, "Unknown form item type #{type}"
+        raise DynamicScaffold::Error::InvalidParameter, "Unknown form item type #{type}"
       end
       @items << item
       item

data/lib/dynamic_scaffold/controller.rb

@@ -4,7 +4,7 @@ module DynamicScaffold
     include ControllerUtilities
 
     included do
-      helper_method :dynamic_scaffold_path, :dynamic_scaffold_icon, :dynamic_scaffold, :primary_key_value
+      helper_method :dynamic_scaffold_path, :dynamic_scaffold_icon, :dynamic_scaffold, :primary_key_value, :request_queries
       attr_reader :dynamic_scaffold
       before_action lambda {
         @dynamic_scaffold = Config.new(self.class.dynamic_scaffold_model, self)
@@ -25,7 +25,7 @@ module DynamicScaffold
 
     def index # rubocop:disable Metrics/AbcSize
       @records = dynamic_scaffold.model.all
-      raise Error::Controller, 'You must return ActiveRecord::Relation' unless @records.is_a? ::ActiveRecord::Relation
+      raise Error::InvalidOperation, 'You must return ActiveRecord::Relation' unless @records.is_a? ::ActiveRecord::Relation
 
       if dynamic_scaffold.list.pagination
         @records = @records
@@ -38,7 +38,7 @@ module DynamicScaffold
       @records = @records.order(*dynamic_scaffold.list.order) unless dynamic_scaffold.list.order.empty?
 
       @records = yield(@records) if block_given?
-      raise Error::Controller, 'You must return ActiveRecord::Relation' if @records.nil?
+      raise Error::InvalidOperation, 'You must return ActiveRecord::Relation' if @records.nil?
       @records
     end
 
@@ -63,7 +63,7 @@ module DynamicScaffold
       dynamic_scaffold.model.transaction do
         yield(@record) if block_given?
         if @record.save
-          redirect_to dynamic_scaffold_path(:index)
+          redirect_to dynamic_scaffold_path(:index, request_queries)
         else
           render "#{params[:controller]}/new"
         end
@@ -78,7 +78,7 @@ module DynamicScaffold
       dynamic_scaffold.model.transaction do
         yield(@record, prev_attribute) if block_given?
         if @record.save
-          redirect_to dynamic_scaffold_path(:index)
+          redirect_to dynamic_scaffold_path(:index, request_queries)
         else
           render "#{params[:controller]}/edit"
         end
@@ -94,8 +94,11 @@ module DynamicScaffold
         end
       rescue ::ActiveRecord::InvalidForeignKey => _error
         flash[:dynamic_scaffold_danger] = I18n.t('dynamic_scaffold.alert.destroy.invalid_foreign_key')
+      rescue => error
+        flash[:dynamic_scaffold_danger] = I18n.t('dynamic_scaffold.alert.destroy.failed')
+        logger.error(error)
       end
-      redirect_to dynamic_scaffold_path(:index)
+      redirect_to dynamic_scaffold_path(:index, request_queries)
     end
 
     def sort
@@ -109,7 +112,7 @@ module DynamicScaffold
           rec.save
         end
       end
-      redirect_to dynamic_scaffold_path(:index)
+      redirect_to dynamic_scaffold_path(:index, request_queries)
     end
   end
 end

data/lib/dynamic_scaffold/controller_utilities.rb

@@ -39,7 +39,7 @@ module DynamicScaffold
                    .permit(*permitting)
 
         if dynamic_scaffold.scope && !valid_for_scope?(values)
-          raise DynamicScaffold::Error::Controller, "You can update only to #{scope_params} on this scope"
+          raise DynamicScaffold::Error::InvalidOperation, "You can update only to #{scope_params} on this scope"
         end
 
         values
@@ -110,5 +110,9 @@ module DynamicScaffold
         value = dynamic_scaffold.model.maximum(attr)
         record[attr] = value ? value + 1 : 0
       end
+
+      def request_queries(*except)
+        request.query_parameters.to_hash.delete_if{|k, v| except.select(&:present?).include?(k.to_sym)}
+      end
   end
 end

data/lib/dynamic_scaffold/error/{config.rb → invalid_operation.rb}

@@ -1,6 +1,6 @@
 module DynamicScaffold
   module Error
-    class Config < Base
+    class InvalidOperation < Base
     end
   end
 end

data/lib/dynamic_scaffold/error/{controller.rb → invalid_parameter.rb}

@@ -1,6 +1,6 @@
 module DynamicScaffold
   module Error
-    class Controller < Base
+    class InvalidParameter < Base
     end
   end
 end

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

@@ -104,6 +104,13 @@ module DynamicScaffold
           end
         end
 
+        def errors(record)
+          msg = record.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(record.errors.full_messages_for(rel.name)) if rel.present?
+          msg
+        end
+
         protected
 
           def build_html_attributes(classnames)

data/lib/dynamic_scaffold/version.rb

@@ -1,3 +1,3 @@
 module DynamicScaffold
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/lib/dynamic_scaffold.rb

@@ -7,10 +7,10 @@ require 'dynamic_scaffold/config'
 
 module DynamicScaffold
   module Error
-    autoload :Base,           'dynamic_scaffold/error/base'
-    autoload :InvalidIcon,    'dynamic_scaffold/error/invalid_icon'
-    autoload :Controller,     'dynamic_scaffold/error/controller'
-    autoload :Config,         'dynamic_scaffold/error/config'
+    autoload :Base,             'dynamic_scaffold/error/base'
+    autoload :InvalidIcon,      'dynamic_scaffold/error/invalid_icon'
+    autoload :InvalidParameter, 'dynamic_scaffold/error/invalid_parameter'
+    autoload :InvalidOperation, 'dynamic_scaffold/error/invalid_operation'
   end
 
   module List

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Masamoto Miyata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: classnames-rails-view
@@ -255,9 +255,9 @@ files:
 - lib/dynamic_scaffold/controller_utilities.rb
 - lib/dynamic_scaffold/engine.rb
 - lib/dynamic_scaffold/error/base.rb
-- lib/dynamic_scaffold/error/config.rb
-- lib/dynamic_scaffold/error/controller.rb
 - lib/dynamic_scaffold/error/invalid_icon.rb
+- lib/dynamic_scaffold/error/invalid_operation.rb
+- lib/dynamic_scaffold/error/invalid_parameter.rb
 - lib/dynamic_scaffold/form/item/base.rb
 - lib/dynamic_scaffold/form/item/block.rb
 - lib/dynamic_scaffold/form/item/carrier_wave_image.rb