wallaby 5.1.3 → 5.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 918ba41ac5ba7f6971332674647888cc6f989126
-  data.tar.gz: 44c4f9006a6628ea19d26134d1fa9d8acd1e1511
+  metadata.gz: '09976f4239802ee3dc2eb137068c2f6289f0cf7a'
+  data.tar.gz: 724958b07b53194c30c6ccc9bf314791ae0c894e
 SHA512:
-  metadata.gz: dfddc7545545924c353c5c41a000ed5f9a97c986c9713898c13c0e82abbec0df36652445aa38540241ca8c08c7f937c917b6d43449764c99c55639a74fe49465
-  data.tar.gz: 0170cdf8218bb7881a5fa56fb8605520f2e1358b9719e0296825f9f063021af0b9f6c8feb63c2eb8407b203a6a4f0a0ecdd4f7a9554d4d16c368a091744d14a6
+  metadata.gz: 2c83059d14238fa032b1a41d44b2809cbbb5b27613335498e8f550296d974a4168697a6b7952f12f6424b7ebbf04f479184911e2c417cc2cbb65c7fc8f2cb914
+  data.tar.gz: 147288bc92b01a8b9a8f98ce3d9f134e57dca63a1fafea891bb0916b6b79d3449cc3d8ac0d9cd3578871fd51d0a6ecb224a167835dd580d8a6dab2fc79984d9a

data/app/controllers/wallaby/abstract_resources_controller.rb

@@ -286,11 +286,9 @@ module Wallaby
     # given, or requesting HTML response
     # @see Wallaby::ModelServicer#paginate
     def paginate(query)
-      if params[:page] || params[:per] || request.format.symbol == :html
-        current_model_service.paginate(query, params)
-      else
-        query
-      end
+      paginatable =
+        params[:page] || params[:per] || request.format.symbol == :html
+      paginatable ? current_model_service.paginate(query, params) : query
     end
 
     # To whitelist the params for CRUD actions
@@ -311,12 +309,14 @@ module Wallaby
 
     # @return either persisted or unpersisted resource instance
     def resource
-      @resource ||=
+      @resource ||= begin
+        whitelisted = action_name.in?(SAVE_ACTIONS) ? resource_params : {}
         if resource_id.present?
-          current_model_service.find resource_id, resource_params
+          current_model_service.find resource_id, whitelisted
         else
-          current_model_service.new resource_params
+          current_model_service.new whitelisted
         end
+      end
     end
 
     # Get current model decorator so that we could retrive metadata for given

data/app/controllers/wallaby/application_controller.rb

@@ -8,12 +8,10 @@ module Wallaby
 
     ERROR_PATH = ERROR_LAYOUT = 'wallaby/error'.freeze
 
-    # NOTE: we want to see the error blown up in development environment
-    unless Rails.env.development?
-      rescue_from NotFound, with: :not_found
-      rescue_from ::ActionController::ParameterMissing, with: :bad_request
-      rescue_from ::ActiveRecord::StatementInvalid, with: :unprocessable_entity
-    end
+    rescue_from NotFound, with: :not_found
+    rescue_from ::ActionController::ParameterMissing, with: :bad_request
+    rescue_from ::ActiveRecord::StatementInvalid, with: :unprocessable_entity
+    rescue_from UnprocessableEntity, with: :unprocessable_entity
 
     layout 'wallaby/application'
 
@@ -34,6 +32,12 @@ module Wallaby
 
     protected
 
+    # @see https://github.com/rails/rails/blob/5-0-stable/actionpack/lib/action_controller/metal/helpers.rb#L118
+    # `helpers` exists since Rails 5, need to replicate this for Rails 4.2
+    def helpers
+      @helpers ||= defined?(super) ? super : view_context
+    end
+
     def configuration
       ::Wallaby.configuration
     end

data/config/locales/wallaby.en.yml

@@ -24,6 +24,8 @@ en:
     count: 'Count: '
     auto_select_hint: 'Type to select...'
     upload: 'Upload'
+    empty: 'null'
+    na: 'n/a'
 
   buttons:
     save: 'Save'
@@ -60,6 +62,9 @@ en:
       collection: 'Records could not be found. Click + button to add one.'
       model: 'Model %{model} could not be found.'
       resource: 'Record %{resource} could not be found.'
+    unprocessable_entity:
+      keyword_search: 'Unable to perform keyword search when no text fields can be used.'
+      field_colon_search: 'Unable to perform field colon search for %{invalid_fields}.'
 
   pagination:
     prev: 'Prev'

data/lib/adaptors/wallaby/active_record/model_decorator/fields_builder.rb

@@ -12,8 +12,7 @@ module Wallaby
             metadata = {
               name: column.name,
               type: column.type.to_s.freeze,
-              label: @model_class.human_attribute_name(column.name),
-              is_origin: true
+              label: @model_class.human_attribute_name(column.name)
             }
             sti_builder.update(metadata, column)
             fields[column.name] = metadata
@@ -24,8 +23,7 @@ module Wallaby
           @model_class.reflections.each_with_object({}) do |(name, ref), fields|
             metadata = {
               name: name, type: ref.macro.to_s,
-              label: @model_class.human_attribute_name(name),
-              is_origin: true
+              label: @model_class.human_attribute_name(name)
             }
             association_builder.update(metadata, ref)
             polymorphic_builder.update(metadata, ref)

data/lib/adaptors/wallaby/active_record/model_decorator.rb

@@ -15,13 +15,12 @@ module Wallaby
       #   example:
       #     {
       #       # general field
-      #       id: { name: 'id', type: 'integer', label: 'Id', is_origin: true },
+      #       id: { name: 'id', type: 'integer', label: 'Id' },
       #       # association field
       #       category: {
       #         'name' => 'category',
       #         'type' => 'belongs_to',
       #         'label' => 'Category',
-      #         'is_origin' => true,
       #         'is_association' => true,
       #         'is_through' => false,
       #         'has_scope' => false,

data/lib/adaptors/wallaby/active_record/model_service_provider/normalizer.rb

@@ -9,10 +9,10 @@ module Wallaby
 
         def normalize(params)
           params.each do |field_name, values|
-            metadata = @model_decorator.fields[field_name] || EMPTY_HASH
-            type = (metadata[:type] || EMPTY_STRING)[/range|point|binary/]
+            type = @model_decorator.metadata_of(field_name)[:type]
+                                   .try(:[], /range|point|binary/)
             next unless type
-            send "normalize_#{type}_values", params, field_name, values
+            public_send "normalize_#{type}_values", params, field_name, values
           end
         end
 

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

@@ -3,7 +3,7 @@ module Wallaby
     class ModelServiceProvider
       # Query builder
       class Querier
-        TEXT_FIELDS = %w(string text citext).freeze
+        TEXT_FIELDS = %w(string text citext longtext tinytext mediumtext).freeze
 
         def initialize(model_decorator)
           @model_decorator = model_decorator
@@ -68,7 +68,7 @@ module Wallaby
         end
 
         def text_search(keywords, query = nil)
-          return query if keywords.blank?
+          return query unless keywords_check? keywords
           text_fields.each do |field_name|
             sub_query = nil
             keywords.each do |keyword|
@@ -81,8 +81,8 @@ module Wallaby
         end
 
         def field_search(field_queries, query)
+          return query unless field_check? field_queries
           field_queries.each do |exp|
-            next unless @model_decorator.fields[exp[:left]]
             sub_query = table[exp[:left]].public_send(exp[:op], exp[:right])
             query = query.try(:and, sub_query) || sub_query
           end
@@ -90,11 +90,30 @@ module Wallaby
         end
 
         def text_fields
-          index_field_names = @model_decorator.index_field_names.map(&:to_s)
-          @model_decorator.fields.select do |field_name, metadata|
-            index_field_names.include?(field_name) &&
-              TEXT_FIELDS.include?(metadata[:type].to_s)
-          end.keys
+          @text_fields ||= begin
+            index_field_names = @model_decorator.index_field_names.map(&:to_s)
+            @model_decorator.fields.select do |field_name, metadata|
+              index_field_names.include?(field_name) &&
+                TEXT_FIELDS.include?(metadata[:type].to_s)
+            end.keys
+          end
+        end
+
+        def keywords_check?(keywords)
+          return false if keywords.blank?
+          return true if text_fields.present?
+          message = I18n.t 'errors.unprocessable_entity.keyword_search'
+          raise UnprocessableEntity, message
+        end
+
+        def field_check?(field_queries)
+          return false if field_queries.blank?
+          fields = field_queries.map { |exp| exp[:left] }
+          invalid_fields = fields - @model_decorator.fields.keys
+          return true if invalid_fields.blank?
+          message = I18n.t 'errors.unprocessable_entity.field_colon_search',
+                           invalid_fields: invalid_fields.to_sentence
+          raise UnprocessableEntity, message
         end
       end
     end

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

@@ -5,9 +5,7 @@ module Wallaby
     class ModelServiceProvider < ::Wallaby::ModelServiceProvider
       # @see Wallaby::ModelServiceProvider#permit
       def permit(params)
-        return {} if params[param_key].blank?
-        # using fetch could avoid ActionController::ParameterMissing
-        params.fetch(param_key, {}).permit permitted_fields
+        params.require(param_key).permit permitted_fields
       end
 
       # @see Wallaby::ModelServiceProvider#collection

data/lib/errors/wallaby/invalid_error.rb

@@ -1,4 +1,4 @@
 module Wallaby
-  class InvalidError < ::StandardError
+  class InvalidError < GeneralError
   end
 end

data/lib/errors/wallaby/unprocessable_entity.rb

@@ -0,0 +1,4 @@
+module Wallaby
+  class UnprocessableEntity < GeneralError
+  end
+end

data/lib/helpers/wallaby/secure_helper.rb

@@ -5,9 +5,11 @@ module Wallaby
     # @param user [Object]
     # @return [String] IMG or I element
     def user_portrait(user = current_user)
-      if user.respond_to? :email
+      email_method = Wallaby.configuration.security.email_method || :email
+      email = user.respond_to?(email_method) && user.public_send(email_method)
+      if email.present?
         https = "http#{request.ssl? ? 's' : EMPTY_STRING}"
-        email_md5 = Digest::MD5.hexdigest user.email.downcase
+        email_md5 = ::Digest::MD5.hexdigest email.downcase
         image_source = "#{https}://www.gravatar.com/avatar/#{email_md5}"
         image_tag image_source, class: 'hidden-xs user-portrait'
       else
@@ -20,23 +22,23 @@ module Wallaby
     # @param app [Object]
     # @return [String] HTML anchor element
     def logout_path(user = current_user, app = main_app)
-      # TODO: use authenticater
-      path =
-        if defined? ::Devise
-          scope = ::Devise::Mapping.find_scope! user
-          "destroy_#{scope}_session_path"
-        else
-          'logout_path'
-        end
-      app.public_send path if app.respond_to? path
+      path = Wallaby.configuration.security.logout_path
+      path ||= if defined? ::Devise
+                 scope = ::Devise::Mapping.find_scope! user
+                 "destroy_#{scope}_session_path"
+               end
+      app.public_send path if path && app.respond_to?(path)
     end
 
-    # Logout method
+    # Logout method for given user
     # @return [String, Symbol]
-    def logout_method
-      # TODO: use authenticater
-      method = Array(Devise.sign_out_via).first if defined? Devise
-      method || :delete
+    def logout_method(user = current_user)
+      http_method = Wallaby.configuration.security.logout_method
+      http_method || if defined? ::Devise
+                       scope = ::Devise::Mapping.find_scope! user
+                       mapping = ::Devise.mappings[scope]
+                       mapping.sign_out_via
+                     end
     end
   end
 end

data/lib/helpers/wallaby/styling_helper.rb

@@ -48,12 +48,12 @@ module Wallaby
 
     # @return [String] grey null
     def null
-      muted 'null'
+      muted t 'labels.empty'
     end
 
     # @return [String] grey N/A
     def na
-      muted 'n/a'
+      muted t 'labels.na'
     end
 
     # Grey text

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

@@ -0,0 +1,70 @@
+module Wallaby
+  # @private
+  class ModelDecorator
+    # @private
+    # Field helper for model decorator
+    module FieldHelpers
+      # @return [Hash] metadata information for a given field
+      def metadata_of(field_name)
+        fields[field_name] || {}
+      end
+
+      # @return [String] label for a given field
+      def label_of(field_name)
+        metadata_of(field_name)[:label]
+      end
+
+      # @return [String, Symbol] type for a given field
+      def type_of(field_name)
+        validate_presence_of metadata_of(field_name)[:type]
+      end
+
+      # @return [Hash] index metadata information for a given field
+      def index_metadata_of(field_name)
+        index_fields[field_name] || {}
+      end
+
+      # @return [String] index label for a given field
+      def index_label_of(field_name)
+        index_metadata_of(field_name)[:label]
+      end
+
+      # @return [String, Symbol] index type for a given field
+      def index_type_of(field_name)
+        validate_presence_of index_metadata_of(field_name)[:type]
+      end
+
+      # @return [Hash] show metadata information for a given field
+      def show_metadata_of(field_name)
+        show_fields[field_name] || {}
+      end
+
+      # @return [String] show label for a given field
+      def show_label_of(field_name)
+        show_metadata_of(field_name)[:label]
+      end
+
+      # @return [String, Symbol] show type for a given field
+      def show_type_of(field_name)
+        validate_presence_of show_metadata_of(field_name)[:type]
+      end
+
+      # @return [Hash] form metadata information for a given field
+      def form_metadata_of(field_name)
+        form_fields[field_name] || {}
+      end
+
+      # @return [String] form label for a given field
+      def form_label_of(field_name)
+        form_metadata_of(field_name)[:label]
+      end
+
+      # @return [String, Symbol] form type for a given field
+      def form_type_of(field_name)
+        validate_presence_of form_metadata_of(field_name)[:type]
+      end
+    end
+
+    include FieldHelpers
+  end
+end

data/lib/interfaces/wallaby/model_decorator.rb

@@ -28,21 +28,6 @@ module Wallaby
       @field_names ||= reposition fields.keys, primary_key
     end
 
-    # @return [Hash] metadata information for a given field
-    def metadata_of(field_name)
-      fields[field_name] || {}
-    end
-
-    # @return [String] label for a given field
-    def label_of(field_name)
-      metadata_of(field_name)[:label]
-    end
-
-    # @return [String, Symbol] type for a given field
-    def type_of(field_name)
-      validate_presence_of metadata_of(field_name)[:type]
-    end
-
     # @return [Hash] metadata information for all fields that would be used on
     #   index page
     def index_fields
@@ -60,21 +45,6 @@ module Wallaby
       @index_field_names ||= reposition index_fields.keys, primary_key
     end
 
-    # @return [Hash] index metadata information for a given field
-    def index_metadata_of(field_name)
-      index_fields[field_name] || {}
-    end
-
-    # @return [String] index label for a given field
-    def index_label_of(field_name)
-      index_metadata_of(field_name)[:label]
-    end
-
-    # @return [String, Symbol] index type for a given field
-    def index_type_of(field_name)
-      validate_presence_of index_metadata_of(field_name)[:type]
-    end
-
     # @return [Hash] metadata information for all fields that would be used on
     #   show page
     def show_fields
@@ -92,21 +62,6 @@ module Wallaby
       @show_field_names ||= reposition show_fields.keys, primary_key
     end
 
-    # @return [Hash] show metadata information for a given field
-    def show_metadata_of(field_name)
-      show_fields[field_name] || {}
-    end
-
-    # @return [String] show label for a given field
-    def show_label_of(field_name)
-      show_metadata_of(field_name)[:label]
-    end
-
-    # @return [String, Symbol] show type for a given field
-    def show_type_of(field_name)
-      validate_presence_of show_metadata_of(field_name)[:type]
-    end
-
     # @return [Hash] metadata information for all fields that would be used on
     #   form page
     def form_fields
@@ -124,21 +79,6 @@ module Wallaby
       @form_field_names ||= reposition form_fields.keys, primary_key
     end
 
-    # @return [Hash] form metadata information for a given field
-    def form_metadata_of(field_name)
-      form_fields[field_name] || {}
-    end
-
-    # @return [String] form label for a given field
-    def form_label_of(field_name)
-      form_metadata_of(field_name)[:label]
-    end
-
-    # @return [String, Symbol] form type for a given field
-    def form_type_of(field_name)
-      validate_presence_of form_metadata_of(field_name)[:type]
-    end
-
     # @return [Hash] custom filters
     def filters
       @filters ||= ::ActiveSupport::HashWithIndifferentAccess.new

data/lib/services/wallaby/map/model_class_mapper.rb

@@ -2,15 +2,17 @@ module Wallaby
   class Map
     # To map model class to a klass
     class ModelClassMapper
+      DEFAULT_BLOCK = ->(same) { same }.freeze
+
       def initialize(base_class)
         @base_class = base_class
       end
 
-      def map
-        (@base_class.try(:subclasses) || EMPTY_HASH)
-          .each_with_object({}) do |klass, map|
+      def map(&block)
+        block ||= DEFAULT_BLOCK
+        classes_array.each_with_object({}) do |klass, map|
           next if anonymous? klass
-          map[klass.model_class] = block_given? ? yield(klass) : klass
+          map[klass.model_class] = block.call klass
         end
       end
 
@@ -19,6 +21,10 @@ module Wallaby
       def anonymous?(klass)
         klass.name.blank?
       end
+
+      def classes_array
+        @base_class.try(:descendants) || EMPTY_ARRAY
+      end
     end
   end
 end

data/lib/services/wallaby/map.rb

@@ -3,7 +3,7 @@ module Wallaby
   class Map
     # { model => mode }
     def self.mode_map
-      @mode_map ||= ModeMapper.new(Mode.subclasses).map.freeze
+      @mode_map ||= ModeMapper.new(Mode.descendants).map.freeze
     end
 
     # [ model classes ]

data/lib/services/wallaby/sorting/link_builder.rb

@@ -22,7 +22,7 @@ module Wallaby
       def build(field_name)
         metadata = @model_decorator.index_metadata_of field_name
         label = Utils.to_field_label field_name, metadata
-        return label unless sortable? metadata
+        return label unless sortable? field_name, metadata
         sort_field_name = metadata[:sort_field_name] || field_name
         url_params = next_builder.next_params sort_field_name
         @helper.index_link(model_class, url_params: url_params) { label }
@@ -36,8 +36,8 @@ module Wallaby
       end
 
       # If it's non-association field or custom sorting field
-      def sortable?(metadata)
-        metadata[:is_origin] && !metadata[:is_association] \
+      def sortable?(field_name, metadata)
+        @model_decorator.fields[field_name] && !metadata[:is_association] \
           || metadata[:sort_field_name]
       end
     end

data/lib/wallaby/configuration/security.rb

@@ -2,10 +2,11 @@ module Wallaby
   class Configuration
     # Security configuration
     class Security
+      attr_accessor :logout_path, :logout_method, :email_method
       # by default, current_user returns nil
-      DEFAULT_CURRENT_USER  = -> { nil }
+      DEFAULT_CURRENT_USER = -> { nil }
       # by default, not to stop the before_action chain
-      DEFAULT_AUTHENTICATE  = -> { true }
+      DEFAULT_AUTHENTICATE = -> { true }
 
       # Configure how to get the current user. All application controller
       # methods will be available.

data/lib/wallaby/engine.rb

@@ -66,6 +66,7 @@ require 'tree/wallaby/node'
 
 require 'interfaces/wallaby/mode'
 require 'interfaces/wallaby/model_decorator'
+require 'interfaces/wallaby/model_decorator/field_helpers'
 require 'interfaces/wallaby/model_finder'
 require 'interfaces/wallaby/model_service_provider'
 require 'interfaces/wallaby/model_pagination_provider'
@@ -77,6 +78,7 @@ require 'errors/wallaby/model_not_found'
 require 'errors/wallaby/not_authenticated'
 require 'errors/wallaby/not_implemented'
 require 'errors/wallaby/resource_not_found'
+require 'errors/wallaby/unprocessable_entity'
 
 require 'parsers/wallaby/parser'
 

data/lib/wallaby/version.rb

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

data/lib/wallaby.rb

@@ -1,6 +1,7 @@
 module Wallaby
   EMPTY_STRING = ''.freeze
   EMPTY_HASH = {}.freeze
+  EMPTY_ARRAY = [].freeze
   SPACE = ' '.freeze
   SLASH = '/'.freeze
   COLONS = '::'.freeze
@@ -19,6 +20,7 @@ module Wallaby
   ).freeze
   WILDCARD = 'QUERY'.freeze
   FORM_ACTIONS = %w(new create edit update).freeze
+  SAVE_ACTIONS = %w(create update).freeze
 end
 
 require 'wallaby/engine'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wallaby
 version: !ruby/object:Gem::Version
-  version: 5.1.3
+  version: 5.1.4
 platform: ruby
 authors:
 - Tianwen Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-13 00:00:00.000000000 Z
+date: 2018-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -519,6 +519,7 @@ files:
 - lib/errors/wallaby/not_found.rb
 - lib/errors/wallaby/not_implemented.rb
 - lib/errors/wallaby/resource_not_found.rb
+- lib/errors/wallaby/unprocessable_entity.rb
 - lib/forms/wallaby/form_builder.rb
 - lib/helpers/wallaby/application_helper.rb
 - lib/helpers/wallaby/base_helper.rb
@@ -530,6 +531,7 @@ files:
 - lib/helpers/wallaby/styling_helper.rb
 - lib/interfaces/wallaby/mode.rb
 - lib/interfaces/wallaby/model_decorator.rb
+- lib/interfaces/wallaby/model_decorator/field_helpers.rb
 - lib/interfaces/wallaby/model_finder.rb
 - lib/interfaces/wallaby/model_pagination_provider.rb
 - lib/interfaces/wallaby/model_service_provider.rb
@@ -584,9 +586,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Rails way database admin interface
 test_files: []
-has_rdoc: