wallaby-core 0.3.0.beta1 → 0.3.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac0d0b6d6922e91c8efb73f107bd9565911f7484b56f4cf3790d156e2de64ff9
-  data.tar.gz: 1217566eccf96b6d26d4bc52e0a44674d8bf3681f0b5d8a3ca8def1f57377743
+  metadata.gz: 86ff434d6a25fa665cb828cc1a1839166f386a71dff24afacb7a114402a81f50
+  data.tar.gz: 1a923d492ef62f597608a9c49f8a1341fe59687e8c4668749f3ad25d7a1b1c71
 SHA512:
-  metadata.gz: 652027a296d62af1e939591fa866e2fc6fa1a37fc2717e192cf893a02a7ca51ccd862985624fb5d1bedbbc48cfd5e53a9accf491e16b30ea7b09aa2ba2ac1588
-  data.tar.gz: 3457d4933495eb845198f869cd74c32c6deba85c500bb5d0e07bd8159004fda5bbbc0972f008facf5d04c44136f86b2e5ae09c2daec44934c22ba385316515fc
+  metadata.gz: 73183959d1177a5d707baae5c698e57f6e5ca47fe4b248e1014402dbe95c9015418d3d6d46194161c38543745c685a99bfacb73c197a1972e85beec758d8598c
+  data.tar.gz: ffdeeb4e9df6b63f281912c21acb758e0a7bb9d8863d38a5e081b5c81cbfed5bf4942910ebf8d03fcef2c90cb8cd66f3bf0d9763302f59ae084003ea4f82dfb3

data/lib/concerns/wallaby/configurable.rb

@@ -403,7 +403,7 @@ module Wallaby
       # Clear all configurations
       def clear
         ClassMethods.instance_methods.grep(/=/).each do |name|
-          instance_variable_set "@#{name[0...-1]}", nil
+          instance_variable_set :"@#{name[0...-1]}", nil
         end
       end
     end

data/lib/concerns/wallaby/decoratable.rb

@@ -23,11 +23,7 @@ module Wallaby
     # @return [ResourceDecorator] current resource decorator for this request
     def current_decorator
       @current_decorator ||=
-        DecoratorFinder.new(
-          script_name: script_name,
-          model_class: current_model_class,
-          current_controller_class: wallaby_controller
-        ).execute.tap do |decorator|
+        decorator_of(current_model_class).tap do |decorator|
           Logger.debug %(Current decorator: #{decorator}), sourcing: false
         end
     end
@@ -39,6 +35,15 @@ module Wallaby
         current_model_decorator.try(:"#{action_name}_fields")
     end
 
+    # Get the decorator of a klass
+    def decorator_of(klass)
+      DecoratorFinder.new(
+        script_name: script_name,
+        model_class: klass,
+        current_controller_class: wallaby_controller
+      ).execute
+    end
+
     # Wrap resource(s) with decorator(s).
     # @param resource [Object, Enumerable]
     # @return [ResourceDecorator, Enumerable<Wallaby::ResourceDecorator>] decorator(s)

data/lib/decorators/wallaby/resource_decorator.rb

@@ -99,6 +99,13 @@ module Wallaby
         @h ||= superclass.try(:h) || ResourcesController.helpers
       end
 
+      # @!attribute [w] readonly
+      attr_writer :readonly
+
+      def readonly?
+        @readonly
+      end
+
       # Delegate missing method to {.model_decorator}
       def method_missing(method_id, *args, &block)
         return if ModelDecorator::MISSING_METHODS_RELATED_TO_FIELDS.match?(method_id.to_s) && model_decorator.blank?
@@ -179,6 +186,12 @@ module Wallaby
       resource.try(:model_name) || ActiveModel::Name.new(model_class)
     end
 
+    # @see https://github.com/rails/rails/compare/v7.0.2.4..7-0-stable#diff-44b94eca66c7497711821a8e6bcdfde4684bb7b8efa15e64da6532449f03ef0bR441
+    # @note This overwritten method is a response to the above change
+    def to_model
+      self
+    end
+
     # @note this method is for the Rails form helper methods to recognize non-ActiveModel models
     # @return [nil] if no primary key
     # @return [Array<String>] primary key
@@ -187,6 +200,12 @@ module Wallaby
       key ? [key] : nil
     end
 
+    # @return [true, false] if resource responds to method `.readonly?`
+    # @return [false] otherwise
+    def readonly?
+      resource.try(:readonly?) || self.class.try(:readonly?)
+    end
+
     # Delegate missing method to {#resource}
     def method_missing(method_id, *args, &block)
       if resource.respond_to?(method_id)

data/lib/forms/wallaby/form_builder.rb

@@ -20,7 +20,7 @@ module Wallaby
       content_tag :ul, class: 'errors' do
         errors.each do |message|
           concat content_tag :li, content_tag(
-            :small, raw(message)
+            :small, raw(message) # rubocop:disable Rails/OutputSafety
           )
         end
       end

data/lib/helpers/wallaby/links_helper.rb

@@ -15,7 +15,7 @@ module Wallaby
     # @return [String] anchor link to index page for a given model class
     # @return [nil] if user's not authorized
     def index_link(model_class, options: {}, url_params: {}, html_options: {}, &block)
-      return if unauthorized? :index, model_class
+      return if unauthorized?(:index, model_class)
 
       html_options, block = LinkOptionsNormalizer.normalize(
         html_options, block,
@@ -38,7 +38,7 @@ module Wallaby
     # @return [String, nil] anchor element
     # @return [nil] if user's not authorized
     def new_link(model_class, options: {}, url_params: {}, html_options: {}, &block)
-      return if unauthorized? :new, model_class
+      return if unauthorized?(:new, model_class) || decorator_of(model_class).readonly?
 
       html_options, block = LinkOptionsNormalizer.normalize(
         html_options, block,
@@ -73,9 +73,9 @@ module Wallaby
       )
 
       default = (options[:readonly] && block.call) || nil
-      return default if unauthorized? :show, extract(resource)
+      return default if unauthorized?(:show, extract(resource))
 
-      url = options[:url] || show_path(resource, url_params: url_params)
+      url = options[:url] || show_path(resource.itself, url_params: url_params)
       link_to url, html_options, &block
     end
 
@@ -100,9 +100,9 @@ module Wallaby
       )
 
       default = (options[:readonly] && block.call) || nil
-      return default if unauthorized? :edit, extract(resource)
+      return default if unauthorized?(:edit, extract(resource)) || resource.try(:readonly?)
 
-      url = options[:url] || edit_path(resource, url_params: url_params)
+      url = options[:url] || edit_path(resource.itself, url_params: url_params)
       link_to url, html_options, &block
     end
 
@@ -119,7 +119,7 @@ module Wallaby
     # @return [String, nil] anchor element
     # @return [nil] if user's not authorized
     def delete_link(resource, options: {}, url_params: {}, html_options: {}, &block)
-      return if unauthorized? :destroy, extract(resource)
+      return if unauthorized?(:destroy, extract(resource)) || resource.try(:readonly?)
 
       html_options, block = LinkOptionsNormalizer.normalize(
         html_options, block, class: 'resource__destroy', block: -> { wt 'links.delete' }
@@ -128,7 +128,7 @@ module Wallaby
       html_options[:method] ||= :delete
       (html_options[:data] ||= {})[:confirm] ||= wt 'links.confirm.delete'
 
-      url = options[:url] || show_path(resource, url_params: url_params)
+      url = options[:url] || show_path(resource.itself, url_params: url_params)
       link_to url, html_options, &block
     end
 

data/lib/responders/wallaby/resources_responder.rb

@@ -17,7 +17,9 @@ module Wallaby
 
     # @return [String] file name with export timestamp
     def file_name_to_export
-      timestamp = Time.zone.now.to_s(:number)
+      timestamp = Time.zone.now.try do |t|
+        t.respond_to?(:to_fs) ? t.to_fs(:number) : t.to_s(:number)
+      end
       filename =
         (request.params[:resources] || controller.controller_path)
         .gsub(/#{SLASH}|#{COLONS}/o, HYPHEN)

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

@@ -16,7 +16,7 @@ module Wallaby
           next if class_names.blank?
 
           class_names.each_with_object(hash) do |mode_name, map|
-            mode_name.model_finder.new.all.each do |model_class|
+            mode_name.model_finder.new.all.each do |model_class| # rubocop:disable Rails/FindEach
               map[model_class] = mode_name
             end
           end

data/lib/wallaby/core/version.rb

@@ -2,6 +2,6 @@
 
 module Wallaby
   module Core
-    VERSION = '0.3.0.beta1' # :nodoc:
+    VERSION = '0.3.0.beta2' # :nodoc:
   end
 end

data/lib/wallaby/engine.rb

@@ -5,7 +5,7 @@ module Wallaby
   class Engine < ::Rails::Engine
     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/
+      # @see https://rmosolgo.github.io/ruby/rails/2017/04/12/watching-files-during-rails-development.html
       config.to_prepare do
         Map.clear if Rails.env.development? || Rails.configuration.eager_load
       end

data/lib/wallaby/preloader.rb

@@ -15,7 +15,7 @@ module Wallaby
       # Require models under {Configuration#model_paths}
       # @see #model_file_paths
       def require_models
-        new.model_file_paths.each { |path| require_dependency(path) }
+        new.model_file_paths.each { |path| require_dependency(path) } # rubocop:disable Rails/RequireDependency, Lint/RedundantCopDisableDirective
       end
     end
 
@@ -30,7 +30,9 @@ module Wallaby
     # @!attribute [r] eager_load_paths
     # @return [Array<String, Pathname>]
     def eager_load_paths # :nodoc:
-      @eager_load_paths ||= Rails.configuration.eager_load_paths
+      @eager_load_paths ||=
+        Rails.configuration.paths['app'].expanded
+          .concat(Rails.configuration.eager_load_paths)
     end
 
     # @!attribute [w] model_paths

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wallaby-core
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta1
+  version: 0.3.0.beta2
 platform: ruby
 authors:
 - Tian Chen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-22 00:00:00.000000000 Z
+date: 2024-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,40 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -331,7 +325,7 @@ metadata:
   source_code_uri: https://github.com/wallaby-rails/wallaby-core
   changelog_uri: https://github.com/wallaby-rails/wallaby-core/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -342,12 +336,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.25
-signing_key: 
+rubygems_version: 3.5.5
+signing_key:
 specification_version: 4
 summary: The core of Wallaby
 test_files: []