dynamic_scaffold 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdb3a98c44a0a9befbe60163b1f6a97f3967fa4db9319126fa0af0ab45abf83d
-  data.tar.gz: 6f2c2dc6e2d603eac29434f034c4ea7debb06ce526cccabc270b885359baaab6
+  metadata.gz: 8a67e9172b0cdb76fbc08a94a0adca5d3d93066bc0437b856001a28dbadf14a5
+  data.tar.gz: ed1bca36c4b1035652f84cedc6c4f06fa5312d7d9adb3804dd51e439253980bb
 SHA512:
-  metadata.gz: 6c0779201e010f34d19c7c164a722977f903a684ea8e59db2fdf21d96ac9bb31d9ddb62745a5565a2e010c394b46da9c13a3cbfa00c08bc02043336f8365f802
-  data.tar.gz: 632c0e51372ef6f949b4efebb239adb50fcc2fc6eee614932923a526c8b93eb0b117ffae24efa766ff76901247440be5aece82ddf0af26f45cfbe898af2a5bfc
+  metadata.gz: 8ed6ef3d6e8e3170a9ed951318eef17dbdfaecd4e3c4a12da788b5e83f27f5b4bf70b978a6cfa9d37111c38a82c725e50387a771211db74496a1be9d82c1c118
+  data.tar.gz: 0f4304a394f9c44e248e4d60a3a1be090d4fd95c47c7c287921e7904cf11a3346d3b6190fe8c3ce36a4e6e6e56b9491b1411b113e5c2b46d84309d2e135bffac

data/README.md

@@ -153,9 +153,15 @@ You can customize the list through the `DynamicScaffold::Config#list` property.
 class ShopController < ApplicationController
   include DynamicScaffold::Controller
   dynamic_scaffold Shop do |config|
-    # You can set each title in the list through title method.
+    # 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|
+      query.where(parent_id: nil)
+    end
+
+    # You can set each title in the list header through title method.
     # Pass the attribute name,
-    # config.list.title(:name)
+    config.list.title(:name)
     # or
     # config.list.title do |record|
     #   record.name
@@ -179,7 +185,7 @@ class ShopController < ApplicationController
 
     # The first argument can also be omitted, to display item that is not model attribute.
     # The block is executed in the context of view, so you can call the method of view.
-    config.list.item do |rec, name|
+    config.list.item do |rec|
       link_to "Show #{rec.name}", controls_master_shops_path
     end
   end
@@ -202,7 +208,7 @@ class ShopController < ApplicationController
     # You can use form helper methods for type,
     # text_field, check_box, radio_button, password_field, hidden_field, file_field, text_area, color_field,
     # collection_check_boxes, collection_radio_buttons, collection_select, grouped_collection_select,
-    # time_select, date_select, datetime_select
+    # time_select, date_select, datetime_select, number_field, telephone_field
 
 
     # Default label is I18n model attribute name.
@@ -388,6 +394,57 @@ class UsersController < ApplicationController
     ...
 ```
 
+The scope can fix value also.
+
+```rb
+# app/controllers/users_controller.rb
+class UsersController < ApplicationController
+  include DynamicScaffold::Controller
+  dynamic_scaffold User do |c|
+    c.scope [{role: :admin}]
+    # or if you use only fixed values, you can use Hash
+    c.scope role: :admin
+    ...
+```
+
+#### Limit count
+
+You can specify the maximum count of registrations.
+
+```rb
+# app/controllers/users_controller.rb
+class UsersController < ApplicationController
+  include DynamicScaffold::Controller
+  dynamic_scaffold User do |c|
+    c.max_count 10
+    ...
+```
+
+If database support lock, you can lock the table before count.
+
+```rb
+# app/controllers/users_controller.rb
+class UsersController < ApplicationController
+  include DynamicScaffold::Controller
+  dynamic_scaffold User do |c|
+    c.max_count 10, lock: true
+    ...
+```
+
+If you want a finer lock control, you can use the block.
+
+```rb
+# app/controllers/users_controller.rb
+class UsersController < ApplicationController
+  include DynamicScaffold::Controller
+  dynamic_scaffold User do |c|
+    c.max_count 10 do |record|
+      ActiveRecord::Base.connection.execute("...")
+    end
+    ...
+```
+
+Please note that the count of records is affected by scope and list.filter.
 
 ### View helper
 
@@ -476,43 +533,6 @@ class ShopController < ApplicationController
 <%= dynamic_scaffold.vars.shop_type.name %>
 ```
 
-### Password Handling Tips
-
-Passwords are not displayed on the editing screen and should be skipped　validation when sent with empty.
-
-You can do it by preparing virtual attributes for the edit action, and switching between edit and new action.
-
-```rb
-class User < ApplicationRecord
-  validates :password, presence: true
-
-  attr_reader :password_edit
-
-  def password_edit=(value)
-    @password_edit = value
-    self.password = value if value.present?
-  end
-end
-```
-
-```rb
-class UsersController < ScaffoldController
-  include DynamicScaffold::Controller
-  dynamic_scaffold User do |config|
-
-    # If the block given to the `if` method returns false, the element is ignored.
-    # The block argument is `params` in controller.
-    config.form.item(:password_field, :password)
-      .if {|p| %w[new create].include? p[:action] }
-
-    # When you call the `proxy` method, the element's error messages and label will be used for the specified attribute.
-    config.form.item(:password_field, :password_edit)
-      .proxy(:password)
-      .if {|p| %w[edit update].include? p[:action] }
-  end
-end
-```
-
 
 ## Contributing
 

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

@@ -60,23 +60,23 @@ window.DynamicScaffold.createElement = function(tagName, attributes, style, inne
 //confirm
 ;(function(){  
   window.DynamicScaffold.confirm = function(options){
-    const exists = document.querySelector('.dynamicScaffold-overlay')
+    const exists = document.querySelector('.ds-overlay')
     if(exists){
       return
     }
   
-    const overlay = DynamicScaffold.createElement('div', {class: 'dynamicScaffold-overlay'})
-    const confirm = DynamicScaffold.createElement('div', {class: 'dynamicScaffold-confirm'})
-    const inner = DynamicScaffold.createElement('div', {class: 'dynamicScaffold-confirm-inner'})
+    const overlay = DynamicScaffold.createElement('div', {class: 'ds-overlay'})
+    const confirm = DynamicScaffold.createElement('div', {class: 'ds-confirm'})
+    const inner = DynamicScaffold.createElement('div', {class: 'ds-confirm-inner'})
     overlay.appendChild(confirm)
     confirm.appendChild(inner)
   
-    const message = DynamicScaffold.createElement('div', {class: 'dynamicScaffold-confirm-message'}, null, options.message)
+    const message = DynamicScaffold.createElement('div', {class: 'ds-confirm-message'}, null, options.message)
     inner.appendChild(message)
     
     const ok = DynamicScaffold.createElement('button', {class: options.ok.class}, {}, options.ok.text)
     const cancel = DynamicScaffold.createElement('button', {class: options.cancel.class}, {}, options.cancel.text)
-    const buttons = DynamicScaffold.createElement('div', {class: 'dynamicScaffold-confirm-buttons'})
+    const buttons = DynamicScaffold.createElement('div', {class: 'ds-confirm-buttons'})
     buttons.appendChild(cancel)
     buttons.appendChild(ok)
     inner.appendChild(buttons)

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

@@ -26,15 +26,15 @@ document.addEventListener('dynamic_scaffold:load', function (){
     form.submit()
   }
 
-  const buttons = document.querySelectorAll('.dynamicScaffoldJs-destory')
+  const buttons = document.querySelectorAll('.js-ds-destory')
   if(buttons.length === 0) return
   
-  const wrapper = buttons[0].closest('.dynamicScaffoldJs-item-wrapper')
+  const wrapper = buttons[0].closest('.js-ds-item-wrapper')
   Array.prototype.forEach.call(buttons, function(button){
-    const row = button.closest('.dynamicScaffoldJs-item-row')
+    const row = button.closest('.js-ds-list-row')
     button.addEventListener('click', function(e){
       e.preventDefault()
-      row.classList.add('dynamicScaffold-destorying')
+      row.classList.add('ds-destorying')
       DynamicScaffold.confirm({
         message: button.getAttribute('data-confirm-message'),
         ok: {
@@ -48,7 +48,7 @@ document.addEventListener('dynamic_scaffold:load', function (){
           text: wrapper.getAttribute('data-confirm-cancel'),
           class: wrapper.getAttribute('data-confirm-cancel-class'),
           action: function(){
-            row.classList.remove("dynamicScaffold-destorying")
+            row.classList.remove("ds-destorying")
           }
         }
       })

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

@@ -1,9 +1,9 @@
 document.addEventListener('dynamic_scaffold:load', function (){
-  const inputs = document.querySelectorAll('.dynamicScaffoldJs-image')
+  const inputs = document.querySelectorAll('.js-ds-image')
   Array.prototype.forEach.call(inputs, function(input){
     // initialize
-    const wrapper = input.closest('.dynamicScaffoldJs-image-wrapper')
-    const preview = wrapper.querySelector('.dynamicScaffoldJs-image-preview')
+    const wrapper = input.closest('.js-ds-image-wrapper')
+    const preview = wrapper.querySelector('.js-ds-image-preview')
     const img = preview.querySelector('img')
 
     // init preview display
@@ -15,11 +15,11 @@ document.addEventListener('dynamic_scaffold:load', function (){
     }
 
     // delete event
-    const button = preview.querySelector('.dynamicScaffoldJs-image-remove')
+    const button = preview.querySelector('.js-ds-image-remove')
     let flag
     if(button)
     {
-      flag = wrapper.querySelector('.dynamicScaffoldJs-image-remove-flag')
+      flag = wrapper.querySelector('.js-ds-image-remove-flag')
       button.addEventListener('click', function(e){
         preview.style.display = 'none'
         flag.disabled = false

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

@@ -2,7 +2,7 @@ document.addEventListener('dynamic_scaffold:load', function(){
   function handlePagination(pagination){
     const itemCount = pagination.children.lenth
     const items = Array.prototype.filter.call(pagination.children, function(li){
-      return li.classList.contains('dynamicScaffoldJs-page-item')
+      return li.classList.contains('js-ds-page-item')
     })
     
     const currentIndex = items.findIndex(function(li){
@@ -20,7 +20,7 @@ document.addEventListener('dynamic_scaffold:load', function(){
     })
   }
 
-  Array.prototype.forEach.call(document.querySelectorAll('.dynamicScaffoldJs-pagination'), function(pagination){
+  Array.prototype.forEach.call(document.querySelectorAll('.js-ds-pagination'), function(pagination){
     handlePagination(pagination)
   })
 })

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

@@ -41,7 +41,7 @@ document.addEventListener('dynamic_scaffold:load', function(){
         // Ignore while animating
         if(promises.length) return
 
-        const source = button.closest('.dynamicScaffoldJs-item-row')
+        const source = button.closest('.js-ds-list-row')
         source.style.position = 'relative'
         source.style.zIndex = 1000
 
@@ -93,33 +93,33 @@ document.addEventListener('dynamic_scaffold:load', function(){
   }
 
   // Register `transitionend` event in all the rows.
-  Array.prototype.forEach.call(document.querySelectorAll('.dynamicScaffoldJs-item-row'), function(row){
+  Array.prototype.forEach.call(document.querySelectorAll('.js-ds-list-row'), function(row){
     row.addEventListener('transitionend', function(e){
       if(e.target == row) row.dynamicScaffoldSortingResolver(row)
     })
   })
 
   // Register events on each button.
-  addClickEvent(document.querySelectorAll('.dynamicScaffoldJs-sorter-top'), function(source){
-    return document.querySelector('.dynamicScaffoldJs-item-row:first-child')
+  addClickEvent(document.querySelectorAll('.js-ds-sorter-top'), function(source){
+    return document.querySelector('.js-ds-list-row:first-child')
   }, otherSideAnimationForUp, function(source, target){
     source.parentNode.insertBefore(source, target)
   })
 
-  addClickEvent(document.querySelectorAll('.dynamicScaffoldJs-sorter-up'), function(source){
+  addClickEvent(document.querySelectorAll('.js-ds-sorter-up'), function(source){
     return source.previousElementSibling
   }, otherSideAnimationForUp, function(source, target){
     source.parentNode.insertBefore(source, target)
   })
 
-  addClickEvent(document.querySelectorAll('.dynamicScaffoldJs-sorter-down'), function(source){
+  addClickEvent(document.querySelectorAll('.js-ds-sorter-down'), function(source){
     return source.nextElementSibling
   }, otherSideAnimationForDown, function(source, target){
     source.parentNode.insertBefore(target, source)
   })
 
-  addClickEvent(document.querySelectorAll('.dynamicScaffoldJs-sorter-bottom'), function(source){
-    return document.querySelector('.dynamicScaffoldJs-item-row:last-child')
+  addClickEvent(document.querySelectorAll('.js-ds-sorter-bottom'), function(source){
+    return document.querySelector('.js-ds-list-row:last-child')
   }, otherSideAnimationForDown, function(source, target){
     source.parentNode.insertBefore(source, null)
   })

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

@@ -48,4 +48,8 @@ $dynamic_scaffold_danger: #dc3545 !default;
 
 .page-item.disabled .page-link path{
   fill: $dynamic_scaffold_secondary;
+}
+
+.btn-outline-primary.disabled, .btn-outline-primary:disabled{
+  background-color: transparent;
 }

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

@@ -1,22 +1,22 @@
-.dynamicScaffold-row{
+.ds-row{
   margin-bottom: 10px
 }
 
-.dynamicScaffold-error-message{
+.ds-error-message{
   color: #dc3545;
   
 }
 
-.dynamicScaffold-error-message path{
+.ds-error-message path{
   fill: #dc3545;
 }
 
-.dynamicScaffold-destorying{
+.ds-destorying{
   background-color: #fdd8df !important;
   opacity: 0.6;
 }
 
-.dynamicScaffold-svg-icon{
+.ds-svg-icon{
   width: 15px;
   height: 15px;
   vertical-align: baseline;
@@ -88,7 +88,7 @@
   fill: #fff;
 }
 
-.dynamicScaffold-overlay{
+.ds-overlay{
   position: fixed;
   top: 0;
   left: 0;
@@ -98,13 +98,13 @@
   background-color: rgba(0,0,0,0.2);
 }
 
-.dynamicScaffold-confirm{
+.ds-confirm{
   position: fixed;
   top: 40px;
   width: 100%;
 }
 
-.dynamicScaffold-confirm-inner{
+.ds-confirm-inner{
   background-color: #fff;
   border-radius: 10px;
   box-shadow: 3px 3px 3px rgba(0,0,0,0.3);
@@ -116,16 +116,16 @@
   margin: 0 auto;
 }
 
-.dynamicScaffold-confirm-message{
+.ds-confirm-message{
   height: 68px;
   font-size: 16px;
 }
 
-.dynamicScaffold-confirm-buttons{
+.ds-confirm-buttons{
   text-align: right;
 }
 
-.dynamicScaffold-confirm-buttons .btn{
+.ds-confirm-buttons .btn{
   margin-left: 10px;
 }
 

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

@@ -1,30 +1,30 @@
 @charset "UTF-8";
-/*<ul id="access-list" class="resplist resplist-striped">
-  <li class="resplist-row">
-    <div class="resplist-heading">Some Title</div>
-    <div class="resplist-items">
-      <div class="resplist-item resplist-item-xs">
-        <div class="resplist-label">ID</div>
-        <div class="resplist-value">1</div>
+/*<ul id="access-list" class="ds-list ds-list-striped">
+  <li class="ds-list-row">
+    <div class="ds-list-heading">Some Title</div>
+    <div class="ds-list-items">
+      <div class="ds-list-item ds-list-item-xs">
+        <div class="ds-list-label">ID</div>
+        <div class="ds-list-value">1</div>
       </div>
-      <div class="resplist-item resplist-item-md">
-        <div class="resplist-label">Name</div>
-        <div class="resplist-value">Micheal Jackson</div>
+      <div class="ds-list-item ds-list-item-md">
+        <div class="ds-list-label">Name</div>
+        <div class="ds-list-value">Micheal Jackson</div>
       </div>
-      <div class="resplist-item resplist-item-md">
-        <div class="resplist-label">Born</div>
-        <div class="resplist-value">1958/8/29</div>
+      <div class="ds-list-item ds-list-item-md">
+        <div class="ds-list-label">Born</div>
+        <div class="ds-list-value">1958/8/29</div>
       </div>
-      <div class="resplist-item resplist-item-md">
-        <div class="resplist-label">Died</div>
-        <div class="resplist-value">2009/6/25</div>
+      <div class="ds-list-item ds-list-item-md">
+        <div class="ds-list-label">Died</div>
+        <div class="ds-list-value">2009/6/25</div>
       </div>
-      <div class="resplist-item resplist-item-md">
-        <div class="resplist-label">Occupations</div>
-        <div class="resplist-value">Musician, singer-songwriter, arranger, dancer, entertainer, choreographer, actor, businessman, philanthropist</div>
+      <div class="ds-list-item ds-list-item-md">
+        <div class="ds-list-label">Occupations</div>
+        <div class="ds-list-value">Musician, singer-songwriter, arranger, dancer, entertainer, choreographer, actor, businessman, philanthropist</div>
       </div>
-      <div class="resplist-item pull-right">
-        <div class="resplist-value">
+      <div class="ds-list-item pull-right">
+        <div class="ds-list-value">
           <div class="btn-group">
             <a href="#" class="btn btn-primary">編集</a>
           </div>
@@ -38,18 +38,18 @@
         </div>
       </div>
     </div>
-    <div class="resplist-footer">Some Footer</div>
+    <div class="ds-list-footer">Some Footer</div>
   </li>
 </ul>*/
-.resplist-items:before, .resplist-item:before, .resplist-row:before, .resplist-items:after, .resplist-item:after, .resplist-row:after {
+.ds-list-items:before, .ds-list-item:before, .ds-list-row:before, .ds-list-items:after, .ds-list-item:after, .ds-list-row:after {
   content: " ";
   display: table;
 }
-.resplist-items:after, .resplist-item:after, .resplist-row:after {
+.ds-list-items:after, .ds-list-item:after, .ds-list-row:after {
   clear: both;
 }
 
-.resplist {
+.ds-list {
   list-style: none;
   padding: 0;
   border-collapse: separate;
@@ -57,11 +57,11 @@
   flex-wrap: wrap;
 }
 
-.resplist-striped .resplist-row:nth-child(odd) {
+.ds-list-striped .ds-list-row:nth-child(odd) {
   background-color: #f9f9f9;
 }
 
-.resplist-heading {
+.ds-list-heading {
   font-weight: bold;
   padding: 8px 20px;
   overflow: hidden;
@@ -70,11 +70,11 @@
   max-width: 100%;
 }
 
-.resplist-footer {
+.ds-list-footer {
   padding: 8px 20px;
 }
 
-.resplist-label {
+.ds-list-label {
   overflow: hidden;
   white-space: nowrap;
   font-size: 11px;
@@ -85,11 +85,11 @@
   line-height: 15px;
 }
 
-.resplist-label-hidden {
+.ds-list-label-hidden {
   background-color: transparent;
 }
 
-.resplist-value {
+.ds-list-value {
   overflow: hidden;
   white-space: nowrap;
   font-size: 14px;
@@ -99,12 +99,12 @@
   vertical-align: middle;
 }
 
-.resplist-label + .resplist-value {
+.ds-list-label + .ds-list-value {
   height: 22px;
   line-height: 22px;
 }
 
-.resplist-item {
+.ds-list-item {
   float: left;
   max-width: 100%;
   margin: 8px 0;
@@ -112,47 +112,47 @@
   overflow: hidden;
 }
 
-.resplist-row {
+.ds-list-row {
   background-color: #fff;
   border-top: 1px solid #dddddd;
   padding: 0;
   width: 100%;
 }
 
-.resplist-item-xs {
+.ds-list-item-xs {
   width: 60px;
 }
 
-.resplist-item-sm {
+.ds-list-item-sm {
   width: 120px;
 }
 
-.resplist-item-md {
+.ds-list-item-md {
   width: 180px;
 }
 
-.resplist-item-lg {
+.ds-list-item-lg {
   width: 240px;
 }
 
 @media (max-width: 768px) {
-  .resplist-heading {
+  .ds-list-heading {
     padding: 8px 12px;
   }
 
-  .resplist-footer {
+  .ds-list-footer {
     padding: 8px 12px;
   }
 
-  .resplist-item {
+  .ds-list-item {
     margin: 4px 0;
   }
 
-  .resplist-label {
+  .ds-list-label {
     padding: 0 12px;
   }
 
-  .resplist-value {
+  .ds-list-value {
     padding: 0 12px;
   }
 }

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

@@ -29,11 +29,11 @@
               <%end%>
             <% elsif elem.type? :carrierwave_image %>
               <%- image = form.object.public_send(elem.name) -%>
-              <div class="dynamicScaffoldJs-image-wrapper">
-                <div class="dynamicScaffoldJs-image-preview panel panel-default card mb-1">
+              <div class="js-ds-image-wrapper">
+                <div class="js-ds-image-preview panel panel-default card mb-1">
                   <% if elem.options[:removable] %>
                   <div class="text-right panel-heading card-header">
-                    <button type="button" class="btn btn-outline-danger btn-danger btn-sm dynamicScaffoldJs-image-remove">
+                    <button type="button" class="btn btn-outline-danger btn-danger btn-sm js-ds-image-remove">
                       <%= dynamic_scaffold_icon :times %>
                     </button>
                   </div>
@@ -44,8 +44,8 @@
                     </div>
                   </div>
                 </div>
-                <%= form.hidden_field "remove_#{elem.name}", value: "1", disabled:"disabled", class: 'dynamicScaffoldJs-image-remove-flag' if elem.options[:removable]%>
-                <%= elem.render(self, form, 'form-control-file dynamicScaffoldJs-image') do |attr|%>
+                <%= form.hidden_field "remove_#{elem.name}", value: "1", disabled:"disabled", class: 'js-ds-image-remove-flag' if elem.options[:removable]%>
+                <%= elem.render(self, form, 'form-control-file js-ds-image') do |attr|%>
                   <%= form.file_field(elem.name, attr) %>
                 <%end%>
                 <%= form.hidden_field "#{elem.name}_cache" %>
@@ -58,7 +58,7 @@
             <%-end-%>
           </div>
           <%- if errors.present? -%>
-            <ul class="list-unstyled dynamicScaffold-error-message">
+            <ul class="list-unstyled ds-error-message">
               <% errors.each do |err|%>
               <li><%= dynamic_scaffold_icon :error %> <%= err %></li>
               <%end%>

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

@@ -5,43 +5,48 @@
 <%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="dynamicScaffold-row">
-  <%= link_to dynamic_scaffold_path(:new, request_queries), class: 'btn btn-outline-primary btn-primary btn-sm' 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>
 <%= render 'dynamic_scaffold/bootstrap/pagination' %>
-<div class="dynamicScaffold-row">
+<div class="ds-row">
   <%= render 'dynamic_scaffold/bootstrap/save_order'%>
 </div>
-<div class="dynamicScaffold-row">
+<div class="ds-row">
   <% if @records.empty? %>
     <p class="lead"><%= t('dynamic_scaffold.message.no_records', model: dynamic_scaffold.title.name) %></p>
   <% else %>
     <ul
-      class="resplist resplist-striped dynamicScaffoldJs-item-wrapper"
+      class="ds-list ds-list-striped js-ds-item-wrapper"
       data-confirm-ok="<%= t('dynamic_scaffold.message.confirm_ok') %>"
       data-confirm-ok-class="btn btn-danger btn-sm"
       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="resplist-row dynamicScaffoldJs-item-row">
+        <li class="ds-list-row js-ds-list-row">
           <% if dynamic_scaffold.list.title? %>
-            <div class="resplist-heading"><%= dynamic_scaffold.list.title(record) %></div>
+            <div class="ds-list-heading"><%= dynamic_scaffold.list.title(record) %></div>
           <% end %>
-          <div class="resplist-items">
+          <div class="ds-list-items">
           <%dynamic_scaffold.list.items.each do |disp|%>
-            <%= content_tag :div, class: class_names('resplist-item', disp.classnames), **disp.html_attributes do%>
-              <div class="resplist-label"><%= disp.label %></div>
-              <div class="resplist-value"><%= disp.value self, record %></div>
+            <%= content_tag :div, class: class_names('ds-list-item', disp.classnames), **disp.html_attributes do%>
+              <div class="ds-list-label"><%= disp.label %></div>
+              <div class="ds-list-value"><%= disp.value self, record %></div>
             <%end%>
           <%end%>
           </div>
-          <div class="resplist-footer clearfix">
+          <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 edit' 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 spec-ds-edit' do %>
                   <%= dynamic_scaffold_icon(:edit) %> <%= t('dynamic_scaffold.button.edit') %>
                 <%end%>
               </div>
@@ -50,16 +55,16 @@
                 <input type="hidden" name="pkeys[][<%=pkey%>]" value="<%= record[pkey] %>">
               <%end%>
               <div class="btn-group">
-                <button class="btn btn-outline-secondary btn-default btn-sm dynamicScaffoldJs-sorter-top">
+                <button class="btn btn-outline-secondary btn-default btn-sm js-ds-sorter-top">
                   <%= dynamic_scaffold_icon(:top) %>
                 </button>
-                <button class="btn btn-outline-secondary btn-default btn-sm dynamicScaffoldJs-sorter-up">
+                <button class="btn btn-outline-secondary btn-default btn-sm js-ds-sorter-up">
                   <%= dynamic_scaffold_icon(:up) %>
                 </button>
-                <button class="btn btn-outline-secondary btn-default btn-sm dynamicScaffoldJs-sorter-down">
+                <button class="btn btn-outline-secondary btn-default btn-sm js-ds-sorter-down">
                   <%= dynamic_scaffold_icon(:down) %>
                 </button>
-                <button class="btn btn-outline-secondary btn-default btn-sm dynamicScaffoldJs-sorter-bottom">
+                <button class="btn btn-outline-secondary btn-default btn-sm js-ds-sorter-bottom">
                   <%= dynamic_scaffold_icon(:bottom) %>
                 </button>
               </div>
@@ -68,7 +73,7 @@
                 <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 dynamicScaffoldJs-destory"
+                  class="btn btn-danger btn-sm js-ds-destory"
                 >
                   <%= dynamic_scaffold_icon(:delete) %>
                 </button>
@@ -80,7 +85,7 @@
     </ul>
   <% end %>
 </div>
-<div class="dynamicScaffold-row">
+<div class="ds-row">
   <%= render 'dynamic_scaffold/bootstrap/save_order'%>
 </div>
 <%= render 'dynamic_scaffold/bootstrap/pagination' %>

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

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

data/app/views/dynamic_scaffold/bootstrap/kaminari/_gap.html.erb

@@ -1,3 +1,3 @@
-<li class='page-item disabled gap dynamicScaffoldJs-page-item'>
+<li class='page-item disabled gap js-ds-page-item'>
   <%= link_to raw(t 'views.pagination.truncate'), '#', class: 'page-link' %>
 </li>

data/app/views/dynamic_scaffold/bootstrap/kaminari/_page.html.erb

@@ -1,9 +1,9 @@
 <% if page.current? %>
-  <li class="<%= class_names 'page-item current dynamicScaffoldJs-page-item', {'active': dynamic_scaffold.list.pagination.highlight_current} %>">
+  <li class="<%= class_names 'page-item current js-ds-page-item', {'active': dynamic_scaffold.list.pagination.highlight_current} %>">
     <%= content_tag :a, dynamic_scaffold.list.pagination.page_number(page, @records), remote: remote, rel: (page.next? ? 'next' : (page.prev? ? 'prev' : nil)), class: 'page-link' %>
   </li>
 <% else %>
-  <li class="<%= class_names('page-item dynamicScaffoldJs-page-item', dynamic_scaffold.list.pagination.page_class(page, @records)) %>">
+  <li class="<%= class_names('page-item js-ds-page-item', dynamic_scaffold.list.pagination.page_class(page, @records)) %>">
     <%= link_to page, url, remote: remote, rel: (page.next? ? 'next' : (page.prev? ? 'prev' : nil)), class: 'page-link' %>
   </li>
 <% end %>

data/app/views/dynamic_scaffold/bootstrap/kaminari/_paginator.html.erb

@@ -1,6 +1,6 @@
 <%= paginator.render do %>
   <nav class="text-center text-xs-center">
-    <ul class="pagination justify-content-center dynamicScaffoldJs-pagination">
+    <ul class="pagination justify-content-center js-ds-pagination">
       <%= first_page_tag if dynamic_scaffold.list.pagination.end_buttons %>
       <%= prev_page_tag if dynamic_scaffold.list.pagination.neighbor_buttons %>
       <% each_page do |page| %>

data/lib/dynamic_scaffold/config.rb

@@ -119,7 +119,7 @@ module DynamicScaffold
   end
 
   class Config
-    attr_reader :model, :form, :list, :title, :controller
+    attr_reader :model, :form, :list, :title, :controller, :lock_before_count, :max_count_options
     def initialize(model, controller)
       @model = model
       @controller = controller
@@ -127,6 +127,7 @@ module DynamicScaffold
       @list = ListBuilder.new(self)
       @title = Title.new(self)
       @vars = Vars.new(self)
+      @max_count_options = {}
     end
 
     def vars(name = nil, &block)
@@ -138,10 +139,22 @@ module DynamicScaffold
       end
     end
 
-    def scope(parameter_names = nil)
-      @scope = parameter_names unless parameter_names.nil?
+    def scope(scopes = nil)
+      @scope = scopes unless scopes.nil?
       @scope
     end
+
+    def max_count(count = nil, options = nil, &block)
+      @max_count = count unless count.nil?
+      @max_count_options = options unless options.nil?
+      @lock_before_count = block if block_given?
+      @max_count
+    end
+
+    def max_count?(count)
+      return false if max_count.nil?
+      count >= max_count
+    end
   end
 
   class ListBuilder
@@ -151,6 +164,7 @@ module DynamicScaffold
       @sorter = nil
       @order = []
       @title = nil
+      @filter = nil
     end
 
     def pagination(options = nil)
@@ -212,6 +226,25 @@ module DynamicScaffold
     def title?
       @title.present?
     end
+
+    def build_sql(scope_params)
+      sql = @config.model.all
+      sql = sql.where scope_params
+      ret = @config.controller.instance_exec(sql, &@filter) unless @filter.nil?
+      sql = ret unless ret.nil?
+      unless sql.is_a? ::ActiveRecord::Relation
+        raise(
+          Error::InvalidOperation,
+          'You must return ActiveRecord::Relation from filter block'
+        )
+      end
+      sql
+    end
+
+    def filter(&block)
+      @filter = block if block_given?
+      @filter
+    end
   end
 
   class FormBuilder
@@ -251,7 +284,9 @@ module DynamicScaffold
         :password_field,
         :hidden_field,
         :file_field,
-        :color_field then
+        :color_field,
+        :number_field,
+        :telephone_field then
         item = Form::Item::SingleOption.new(@config, type, *args)
       when
         :time_select,

data/lib/dynamic_scaffold/controller.rb

@@ -24,25 +24,30 @@ module DynamicScaffold
     # Actions
 
     def index # rubocop:disable Metrics/AbcSize
-      @records = dynamic_scaffold.model.all
-      raise Error::InvalidOperation, 'You must return ActiveRecord::Relation' unless @records.is_a? ::ActiveRecord::Relation
-
-      if dynamic_scaffold.list.pagination
-        @records = @records
-                     .page(params[dynamic_scaffold.list.pagination.param_name])
-                     .per(dynamic_scaffold.list.pagination.per_page)
-      end
-
-      @records = @records.where scope_params
+      @records = dynamic_scaffold.list.build_sql(scope_params)
+      @count = @records.count unless dynamic_scaffold.max_count.nil?
+      @records = handle_pagination(@records)
       @records = @records.order dynamic_scaffold.list.sorter if dynamic_scaffold.list.sorter
       @records = @records.order(*dynamic_scaffold.list.order) unless dynamic_scaffold.list.order.empty?
 
-      @records = yield(@records) if block_given?
-      raise Error::InvalidOperation, 'You must return ActiveRecord::Relation' if @records.nil?
+      ret = yield(@records) if block_given?
+      @records = ret unless ret.nil?
+      unless @records.is_a? ::ActiveRecord::Relation
+        raise(
+          Error::InvalidOperation,
+          'You must return ActiveRecord::Relation from super block'
+        )
+      end
+
       @records
     end
 
-    def new
+    def new # rubocop:disable Metrics/AbcSize
+      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)
+      end
+
       @record = dynamic_scaffold.model.new
 
       defaults = dynamic_scaffold.form.items.each_with_object({}) do |item, memo|
@@ -61,6 +66,7 @@ module DynamicScaffold
       @record.attributes = update_values
       bind_sorter_value(@record) if dynamic_scaffold.list.sorter
       dynamic_scaffold.model.transaction do
+        check_max_count!
         yield(@record) if block_given?
         if @record.save
           redirect_to dynamic_scaffold_path(:index, request_queries)
@@ -94,7 +100,7 @@ module DynamicScaffold
         end
       rescue ::ActiveRecord::InvalidForeignKey => _error
         flash[:dynamic_scaffold_danger] = I18n.t('dynamic_scaffold.alert.destroy.invalid_foreign_key')
-      rescue => error
+      rescue StandardError => error
         flash[:dynamic_scaffold_danger] = I18n.t('dynamic_scaffold.alert.destroy.failed')
         logger.error(error)
       end

data/lib/dynamic_scaffold/controller_utilities.rb

@@ -5,7 +5,18 @@ module DynamicScaffold
       # Get the hash of the key and value specified for the scope.
       def scope_params
         return {} if dynamic_scaffold.scope.nil?
-        dynamic_scaffold.scope.each_with_object({}) {|attr, res| res[attr] = params[attr] }
+        case dynamic_scaffold.scope
+        when Array then
+          dynamic_scaffold.scope.each_with_object({}) do |val, res|
+            if val.is_a? Hash
+              val.each {|k, v| res[k] = v }
+            else
+              res[val] = params[val]
+            end
+          end
+        when Hash then
+          dynamic_scaffold.scope
+        end
       end
 
       # Convert pkey_string value to hash.
@@ -112,7 +123,23 @@ module DynamicScaffold
       end
 
       def request_queries(*except)
-        request.query_parameters.to_hash.delete_if{|k, v| except.select(&:present?).include?(k.to_sym)}
+        request.query_parameters.to_hash.delete_if {|k, _v| except.select(&:present?).include?(k.to_sym) }
+      end
+
+      def check_max_count!
+        return if dynamic_scaffold.max_count.nil?
+        instance_exec(@record, &dynamic_scaffold.lock_before_count) if dynamic_scaffold.lock_before_count
+        count_query = dynamic_scaffold.list.build_sql(scope_params)
+        count_query = count_query.lock if dynamic_scaffold.max_count_options[:lock]
+        count = count_query.count
+        raise Error::InvalidOperation, 'You can not add any more.' if dynamic_scaffold.max_count?(count)
+      end
+
+      def handle_pagination(query)
+        return query unless dynamic_scaffold.list.pagination
+        query
+          .page(params[dynamic_scaffold.list.pagination.param_name])
+          .per(dynamic_scaffold.list.pagination.per_page)
       end
   end
 end

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

@@ -13,10 +13,7 @@ module DynamicScaffold
           @classnames_list.push(classnames) if classnames
           @notes = []
           @multiple = type == :collection_check_boxes || html_attributes[:multiple]
-          @inserts = {
-            before: [],
-            after: []
-          }
+          @inserts = { before: [], after: [] }
         end
 
         def notes?
@@ -106,7 +103,7 @@ module DynamicScaffold
 
         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}
+          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

data/lib/dynamic_scaffold/icons/fontawesome.rb

@@ -4,7 +4,7 @@ module DynamicScaffold
       Rails.cache.fetch "dynamic_scaffold/fontawesome/icons/#{path}" do
         full_path = DynamicScaffold::Engine.root.join('app', 'assets', 'images', 'dynamic_scaffold', 'fontawesome', path)
         file = File.open(full_path)
-        file.read.gsub!('<svg ', '<svg class="dynamicScaffold-svg-icon" ').html_safe # rubocop:disable Rails/OutputSafety, Metrics/LineLength
+        file.read.gsub!('<svg ', '<svg class="ds-svg-icon" ').html_safe # rubocop:disable Rails/OutputSafety
       end
     end
   end

data/lib/dynamic_scaffold/version.rb

@@ -1,3 +1,3 @@
 module DynamicScaffold
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.7.0'.freeze
 end

data/lib/dynamic_scaffold.rb

@@ -14,7 +14,7 @@ module DynamicScaffold
   end
 
   module List
-    autoload :Item,           'dynamic_scaffold/list/item'
+    autoload :Item, 'dynamic_scaffold/list/item'
   end
 
   module Form

data/lib/generators/dynamic_scaffold/templates/controller.erb

@@ -16,6 +16,14 @@ class <%= @class_scope.present? ? "#{@class_scope}::" : '' %><%= @plural_model_n
     # Please see https://github.com/gomo/dynamic_scaffold#view-helper for details.
     # config.title.name = 'Model'
 
+    # To enable scoping, call scope with parameter names you want.
+    # Please see https://github.com/gomo/dynamic_scaffold#scoping for details.
+    # config.scope([role])
+
+    # You can specify the maximum count of registrations.
+    # Please see https://github.com/gomo/dynamic_scaffold#limit-count for details.
+    # config.max_count 10
+
     # When you want a simple sort on the column of record, please call order.
     # config.list.order created_at: :desc
 
@@ -37,14 +45,12 @@ class <%= @class_scope.present? ? "#{@class_scope}::" : '' %><%= @plural_model_n
     #   highlight_current: false, # Whether to highlight the current page.
     # )
 
-    # To enable scoping, call scope with parameter names you want.
-    # Please see https://github.com/gomo/dynamic_scaffold#scoping for details.
-    # config.scope([role])
-
-    # You can change the items displayed in the list through the `config.list.item`.
-    # Please see https://github.com/gomo/dynamic_scaffold#customize-list for details.
+    # If you want filtering that can not be handled by `config.scope`, you can use the filter method.
+    # config.list.filter do |query|
+    #   query.where(parent_id: nil)
+    # end
 
-    # You can set each title in the list through title method.
+    # You can set each title in the list header through title method.
     # Pass the attribute name,
     # config.list.title(:name)
     # or
@@ -52,6 +58,9 @@ class <%= @class_scope.present? ? "#{@class_scope}::" : '' %><%= @plural_model_n
     #   record.name
     # end
 
+    # You can change the items displayed in the list through the `config.list.item`.
+    # Please see https://github.com/gomo/dynamic_scaffold#customize-list for details.
+
   <%- @model.column_names.each do |column| -%>
     config.list.item(:<%= column %>, style: 'width: 120px;')
   <%- end -%>
@@ -65,8 +74,9 @@ class <%= @class_scope.present? ? "#{@class_scope}::" : '' %><%= @plural_model_n
   
   # def index
   #   super do |query|
-  #     # If you want append database queries, Write here.
-  #     # Do not forget to return query.
+  #     # If you want to add a search to the page, please add it to the query here.
+  #     # The condition added here does not affect max_count.
+  #     # Please note that returning nil will be ignored.
   #   end
   # end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Masamoto Miyata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: classnames-rails-view
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: The Scaffold system which dynamically generates CRUD and sort functions.