wallaby 5.1.4 → 5.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09976f4239802ee3dc2eb137068c2f6289f0cf7a'
-  data.tar.gz: 724958b07b53194c30c6ccc9bf314791ae0c894e
+  metadata.gz: d350fea3b2b5c2c80941c75875aa66a6a660efaa
+  data.tar.gz: ff4f3f8a4edeafa44eb548e6e89a3a1a26a74602
 SHA512:
-  metadata.gz: 2c83059d14238fa032b1a41d44b2809cbbb5b27613335498e8f550296d974a4168697a6b7952f12f6424b7ebbf04f479184911e2c417cc2cbb65c7fc8f2cb914
-  data.tar.gz: 147288bc92b01a8b9a8f98ce3d9f134e57dca63a1fafea891bb0916b6b79d3449cc3d8ac0d9cd3578871fd51d0a6ecb224a167835dd580d8a6dab2fc79984d9a
+  metadata.gz: 630a3c2632aca7189885132b805c6bf6cffd71497ff1562e844040eeab96af18048871c841a359a41fddf6044f8ece6880a185085a9fb0afc118f7b26438a323
+  data.tar.gz: f9f092cc627eb09b631c0ac0bb4394019a5b9ac5c56ebb970c752a8b8845e0819bb9efc4b32875790ea16ff0392b359dd8f0b8859236cc245df5564c5cdc1a14

data/app/controllers/wallaby/abstract_resources_controller.rb

@@ -319,7 +319,7 @@ module Wallaby
       end
     end
 
-    # Get current model decorator so that we could retrive metadata for given
+    # Get current model decorator so that we could retrieve metadata for given
     # model class.
     def current_model_decorator
       @current_model_decorator ||= helpers.model_decorator current_model_class

data/app/views/wallaby/resources/form/_belongs_to.html.erb

@@ -48,6 +48,7 @@ readonly = cannot? :edit, metadata[:class]
     <% end %>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
   <% unless metadata[:is_polymorphic] %>
     <p class="help-block">
       <%= new_link metadata[:class] %>

data/app/views/wallaby/resources/form/_bigint.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_bigserial.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_binary.html.erb

@@ -18,4 +18,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_bit.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_bit_varying.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_blob.html.erb

@@ -18,4 +18,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_boolean.html.erb

@@ -20,4 +20,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_box.html.erb

@@ -15,7 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
-  <p class="help-block">
-    <%= t 'hints.box_html' %>
-  </p>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_cidr.html.erb

@@ -15,7 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
-  <p class="help-block">
-    <%= t 'hints.cidr_html' %>
-  </p>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_circle.html.erb

@@ -15,7 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
-  <p class="help-block">
-    <%= t 'hints.circle_html' %>
-  </p>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_citext.html.erb

@@ -11,6 +11,7 @@ The following params are the variables that can be used in this partial.
   <%= form.label field_name, metadata[:label] %>
   <%= form.text_area field_name, class: 'form-control', data: { init: 'summernote' } %>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @summernote_init %>

data/app/views/wallaby/resources/form/_color.html.erb

@@ -15,6 +15,7 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @colorpicker_init %>

data/app/views/wallaby/resources/form/_date.html.erb

@@ -18,6 +18,7 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @datepicker_init %>

data/app/views/wallaby/resources/form/_daterange.html.erb

@@ -26,6 +26,7 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @datepicker_init %>

data/app/views/wallaby/resources/form/_datetime.html.erb

@@ -18,6 +18,7 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @datetimepicker_init %>

data/app/views/wallaby/resources/form/_decimal.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_dropdown.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_email.html.erb

@@ -11,4 +11,5 @@ The following params are the variables that can be used in this partial.
   <%= form.label field_name, metadata[:label] %>
   <%= form.email_field field_name, class: 'form-control' %>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_file.html.erb

@@ -18,4 +18,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_float.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_has_and_belongs_to_many.html.erb

@@ -41,6 +41,7 @@ readonly = cannot? :edit, metadata[:class]
     <% end %>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
   <p class="help-block">
     <%= new_link metadata[:class] %>
   </p>

data/app/views/wallaby/resources/form/_has_many.html.erb

@@ -40,6 +40,7 @@ readonly = cannot? :edit, metadata[:class]
     <% end %>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
   <p class="help-block">
     <%= new_link metadata[:class] %>
   </p>

data/app/views/wallaby/resources/form/_hstore.html.erb

@@ -11,9 +11,7 @@ The following params are the variables that can be used in this partial.
   <%= form.label field_name, metadata[:label] %>
   <%= form.text_area field_name, value: value.to_s[%r(\A{(.*)}\Z), 1], class: 'form-control', data: { init: 'codemirror', mode: 'ruby' } %>
   <%= form.error_messages field_name %>
-  <p class="help-block">
-    <%= t 'hints.hstore_html' %>
-  </p>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @codemirror_init %>

data/app/views/wallaby/resources/form/_inet.html.erb

@@ -15,7 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
-  <p class="help-block">
-    <%= t 'hints.inet_html' %>
-  </p>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_int4range.html.erb

@@ -24,4 +24,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_int8range.html.erb

@@ -24,4 +24,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_integer.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_json.html.erb

@@ -12,6 +12,7 @@ The following params are the variables that can be used in this partial.
   <%= form.label field_name, metadata[:label] %>
   <%= form.text_area field_name, value: form_value, class: 'form-control', data: { init: 'codemirror', mode: 'javascript' } %>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @codemirror_init %>

data/app/views/wallaby/resources/form/_jsonb.html.erb

@@ -12,6 +12,7 @@ The following params are the variables that can be used in this partial.
   <%= form.label field_name, metadata[:label] %>
   <%= form.text_area field_name, value: form_value, class: 'form-control', data: { init: 'codemirror', mode: 'javascript' } %>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @codemirror_init %>

data/app/views/wallaby/resources/form/_line.html.erb

@@ -15,7 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
-  <p class="help-block">
-    <%= t 'hints.line_html' %>
-  </p>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_longblob.html.erb

@@ -18,4 +18,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_longtext.html.erb

@@ -11,6 +11,7 @@ The following params are the variables that can be used in this partial.
   <%= form.label field_name, metadata[:label] %>
   <%= form.text_area field_name, class: 'form-control', data: { init: 'summernote' } %>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @summernote_init %>

data/app/views/wallaby/resources/form/_lseg.html.erb

@@ -15,7 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
-  <p class="help-block">
-    <%= t 'hints.lseg_html' %>
-  </p>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_ltree.html.erb

@@ -15,7 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
-  <p class="help-block">
-    <%= t 'hints.ltree_html' %>
-  </p>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_macaddr.html.erb

@@ -15,7 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
-  <p class="help-block">
-    <%= t 'hints.macaddr_html' %>
-  </p>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_markdown.html.erb

@@ -11,6 +11,7 @@ The following params are the variables that can be used in this partial.
   <%= form.label field_name, metadata[:label] %>
   <%= form.text_area field_name, class: 'form-control', data: { init: 'codemirror', mode: 'gfm' } %>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @codemirror_init %>

data/app/views/wallaby/resources/form/_mediumblob.html.erb

@@ -18,4 +18,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_mediumtext.html.erb

@@ -11,6 +11,7 @@ The following params are the variables that can be used in this partial.
   <%= form.label field_name, metadata[:label] %>
   <%= form.text_area field_name, class: 'form-control', data: { init: 'summernote' } %>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @summernote_init %>

data/app/views/wallaby/resources/form/_money.html.erb

@@ -18,4 +18,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_numrange.html.erb

@@ -24,4 +24,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_password.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_path.html.erb

@@ -11,7 +11,5 @@ The following params are the variables that can be used in this partial.
   <%= form.label field_name, metadata[:label] %>
   <%= form.text_field field_name, class: 'form-control' %>
   <%= form.error_messages field_name %>
-  <p class="help-block">
-    <%= t 'hints.path_html' %>
-  </p>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_point.html.erb

@@ -24,4 +24,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_polygon.html.erb

@@ -11,7 +11,5 @@ The following params are the variables that can be used in this partial.
   <%= form.label field_name, metadata[:label] %>
   <%= form.text_field field_name, class: 'form-control' %>
   <%= form.error_messages field_name %>
-  <p class="help-block">
-    <%= t 'hints.polygon_html' %>
-  </p>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_serial.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_sti.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_string.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_text.html.erb

@@ -11,6 +11,7 @@ The following params are the variables that can be used in this partial.
   <%= form.label field_name, metadata[:label] %>
   <%= form.text_area field_name, class: 'form-control', data: { init: 'summernote' } %>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @summernote_init %>

data/app/views/wallaby/resources/form/_time.html.erb

@@ -18,6 +18,7 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @timepicker_init %>

data/app/views/wallaby/resources/form/_tinyblob.html.erb

@@ -18,4 +18,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_tinytext.html.erb

@@ -11,6 +11,7 @@ The following params are the variables that can be used in this partial.
   <%= form.label field_name, metadata[:label] %>
   <%= form.text_area field_name, class: 'form-control', data: { init: 'summernote' } %>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @summernote_init %>

data/app/views/wallaby/resources/form/_tsrange.html.erb

@@ -26,6 +26,7 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @datetimepicker_init %>

data/app/views/wallaby/resources/form/_tstzrange.html.erb

@@ -26,6 +26,7 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @datetimepicker_init %>

data/app/views/wallaby/resources/form/_tsvector.html.erb

@@ -11,4 +11,5 @@ The following params are the variables that can be used in this partial.
   <%= form.label field_name, metadata[:label] %>
   <%= form.text_area field_name, class: 'form-control' %>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_unsigned_bigint.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_unsigned_decimal.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_unsigned_float.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_unsigned_integer.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_uuid.html.erb

@@ -15,4 +15,5 @@ The following params are the variables that can be used in this partial.
     </div>
   </div>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>

data/app/views/wallaby/resources/form/_xml.html.erb

@@ -11,6 +11,7 @@ The following params are the variables that can be used in this partial.
   <%= form.label field_name, metadata[:label] %>
   <%= form.text_area field_name, class: 'form-control', data: { init: 'codemirror', mode: 'xml' } %>
   <%= form.error_messages field_name %>
+  <%= hint_of metadata %>
 </div>
 
 <% unless @codemirror_init %>

data/app/views/wallaby/resources/show/_image.html.erb

@@ -2,8 +2,4 @@
 <%# @param field_name [String] name of the field %>
 <%# @param value [Object] value of the field %>
 <%# @param metadata [Hash] metadata of the field %>
-<% if value.nil? %>
-  <%= null %>
-<% else %>
-  <%= image_tag value, (metadata[:options] || {}) %>
-<% end %>
+<%= value ? image_tag(value, metadata[:options].to_h) : null %>

data/lib/adaptors/wallaby/active_record/model_service_provider/querier/transformer.rb

@@ -43,6 +43,7 @@ module Wallaby
           rule left: simple(:left), op: simple(:op), right: simple(:right) do
             oped = op.try :to_str
             operator = SIMPLE_OPERATORS[oped]
+            # skip if the operator is unknown
             next unless operator
             lefted = left.try :to_str
             convert = case oped

data/lib/helpers/wallaby/form_helper.rb

@@ -41,5 +41,20 @@ module Wallaby
       end
       options_for_select options, select_options
     end
+
+    # To fetch the hints from the following keys:
+    # - hints.#{type}_html
+    # - hints.#{type}
+    # @param metadata [Hash]
+    # @return [String, nil] HTML
+    def hint_of(metadata)
+      type = metadata[:type]
+      hint = metadata[:hint]
+      # @see http://guides.rubyonrails.org/i18n.html#using-safe-html-translations
+      hint ||= type && t("hints.#{type}_html", default: '').presence
+      hint ||= type && t("hints.#{type}", default: '').presence
+      return unless hint
+      content_tag :p, hint, class: 'help-block'
+    end
   end
 end

data/lib/interfaces/wallaby/model_decorator.rb

@@ -1,9 +1,11 @@
 module Wallaby
   # Model Decorator interface, designed to maintain metadata information for all
   # the fields coming from data source (database/api)
-  # @see Wallaby::ResourceDecorator for more information on how to customise
+  # @see Wallaby::ResourceDecorator for more information on how to customize
   #   metadata information
   class ModelDecorator
+    include FieldHelpers
+
     attr_reader :model_class
     attr_writer \
       :field_names, :index_field_names, :show_field_names, :form_field_names
@@ -117,8 +119,8 @@ module Wallaby
     # Ensure type is present
     # @param type [String, Symbol, nil] type of a field
     # @return [String, Symbol] type name
-    def validate_presence_of(type)
-      type || raise(::ArgumentError, 'Type is required.')
+    def validate_presence_of(field_name, type)
+      type || raise(::ArgumentError, "Type is required for #{field_name}.")
     end
   end
 end

data/lib/interfaces/wallaby/model_decorator/field_helpers.rb

@@ -16,7 +16,7 @@ module Wallaby
 
       # @return [String, Symbol] type for a given field
       def type_of(field_name)
-        validate_presence_of metadata_of(field_name)[:type]
+        validate_presence_of field_name, metadata_of(field_name)[:type]
       end
 
       # @return [Hash] index metadata information for a given field
@@ -31,7 +31,7 @@ module Wallaby
 
       # @return [String, Symbol] index type for a given field
       def index_type_of(field_name)
-        validate_presence_of index_metadata_of(field_name)[:type]
+        validate_presence_of field_name, index_metadata_of(field_name)[:type]
       end
 
       # @return [Hash] show metadata information for a given field
@@ -46,7 +46,7 @@ module Wallaby
 
       # @return [String, Symbol] show type for a given field
       def show_type_of(field_name)
-        validate_presence_of show_metadata_of(field_name)[:type]
+        validate_presence_of field_name, show_metadata_of(field_name)[:type]
       end
 
       # @return [Hash] form metadata information for a given field
@@ -61,10 +61,8 @@ module Wallaby
 
       # @return [String, Symbol] form type for a given field
       def form_type_of(field_name)
-        validate_presence_of form_metadata_of(field_name)[:type]
+        validate_presence_of field_name, form_metadata_of(field_name)[:type]
       end
     end
-
-    include FieldHelpers
   end
 end

data/{app → lib}/routes/wallaby/resources_router.rb

@@ -1,4 +1,5 @@
 module Wallaby
+  # @private
   # This is the core of wallaby that dynamically dispatches request to
   # appropriate controller and action.
   class ResourcesRouter
@@ -32,16 +33,3 @@ module Wallaby
     end
   end
 end
-
-# NOTE: please keep this block at the end.
-# otherwise, it might go into a endless reloading loop
-# NOTE: Rails reload! will hit here
-if Rails.env.development?
-  puts <<-DEBUG
-  [ WALLABY ] reload! triggered
-    1. Clear all the maps
-    2. Preload all files under folder `app` (instead of eager load)
-  DEBUG
-  Wallaby::Map.clear
-  Wallaby::Utils.preload_all
-end

data/lib/utils/wallaby/utils.rb

@@ -67,7 +67,7 @@ module Wallaby
           class_name = name.classify
           class_name.constantize unless Module.const_defined? class_name
         rescue NameError, LoadError => e
-          Rails.logger.debug ">>>>>>>>> PRELOAD ERROR: #{e.message}"
+          Rails.logger.debug "  [WALLABY] Preload warning: #{e.message}"
           Rails.logger.debug e.backtrace.slice(0, 5)
         end
       end

data/lib/wallaby/engine.rb

@@ -23,17 +23,15 @@ require 'csv'
 require 'securerandom'
 
 module Wallaby
-  # Rails engine
+  # @private
   class Engine < ::Rails::Engine
-    # isolate_namespace Wallaby
-
-    initializer 'wallaby.deflate' do |app|
+    initializer 'wallaby.deflate' do |_|
       # default to Gzip HTML
-      app.config.middleware.use Rack::Deflater
+      config.middleware.use Rack::Deflater
     end
 
-    initializer 'wallaby.assets.precompile' do |app|
-      app.config.assets.precompile +=
+    initializer 'wallaby.assets.precompile' do |_|
+      config.assets.precompile +=
         %w(
           codemirror* codemirror/**/*
           wallaby/404.png wallaby/422.png wallaby/500.png
@@ -41,13 +39,28 @@ module Wallaby
         )
     end
 
+    initializer 'wallaby.development.reload' do |_|
+      # NOTE: Rails reload! will hit here
+      # @see http://rmosolgo.github.io/blog/2017/04/12/watching-files-during-rails-development/
+      config.to_prepare do
+        if Rails.env.development? || Rails.configuration.eager_load
+          Rails.logger.debug '  [WALLABY] Reloading...'
+          ::Wallaby::Map.clear
+          ::Wallaby::Utils.preload_all
+        end
+      end
+    end
+
     config.before_eager_load do
       # We need to ensure that the core models are loaded before anything else
+      Rails.logger.debug '  [WALLABY] Preload all model files.'
       ::Wallaby::Utils.preload 'app/models/**/*.rb'
     end
 
     config.after_initialize do
+      # Preload the rest files
       unless Rails.env.development? || Rails.configuration.eager_load
+        Rails.logger.debug '  [WALLABY] Preload files after initialize.'
         ::Wallaby::Utils.preload_all
       end
     end
@@ -62,11 +75,12 @@ require 'wallaby/configuration/pagination'
 require 'wallaby/configuration/features'
 
 require 'utils/wallaby/utils'
+require 'routes/wallaby/resources_router'
 require 'tree/wallaby/node'
 
 require 'interfaces/wallaby/mode'
-require 'interfaces/wallaby/model_decorator'
 require 'interfaces/wallaby/model_decorator/field_helpers'
+require 'interfaces/wallaby/model_decorator'
 require 'interfaces/wallaby/model_finder'
 require 'interfaces/wallaby/model_service_provider'
 require 'interfaces/wallaby/model_pagination_provider'

data/lib/wallaby/version.rb

@@ -1,3 +1,3 @@
 module Wallaby
-  VERSION = '5.1.4'.freeze
+  VERSION = '5.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wallaby
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.1.5
 platform: ruby
 authors:
 - Tianwen Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-21 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
@@ -70,16 +70,16 @@ dependencies:
   name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +276,6 @@ files:
 - app/controllers/wallaby/base_controller.rb
 - app/controllers/wallaby/resources_controller.rb
 - app/controllers/wallaby/secure_controller.rb
-- app/routes/wallaby/resources_router.rb
 - app/security/ability.rb
 - app/views/layouts/wallaby/application.html.erb
 - app/views/layouts/wallaby/error.html.erb
@@ -540,6 +539,7 @@ files:
 - lib/parsers/wallaby/parser.rb
 - lib/responders/wallaby/abstract_responder.rb
 - lib/responders/wallaby/resources_responder.rb
+- lib/routes/wallaby/resources_router.rb
 - lib/servicers/wallaby/abstract_model_servicer.rb
 - lib/servicers/wallaby/model_servicer.rb
 - lib/services/wallaby/link_options_normalizer.rb