mime_actor 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 031455cd4203f02b1760129516e1a8722af2f84d7580cf1799f886d98262cdea
-  data.tar.gz: 78b2841148310600b408fd3d2932741ab61280f24afb28f0b251e62bcba91419
+  metadata.gz: f5a67bb80dd83c069ea2f06a4afea5e241987d8b9a2a30f0a3eb0d01748b3759
+  data.tar.gz: acb0cd8b89e39ea3962c0949bff4666c96c36f6c15eae5a3709775daa5ef2516
 SHA512:
-  metadata.gz: 2852a58bb4dc628d293e6d5974b452144496be454a2a594aec90baaffcf5fbbcdd096745778853f36cc5e8ef4eb577340175bd76533ba2be1852799ddf5cc2a6
-  data.tar.gz: f548c1d8fe2c32a2aba34c4b9189e3e02272fdcfdc850d8b88e6cb6eea54514a1c95cc8ede181656f5ba0e92111f2566db1cbc98b647dd77f0922cd2ff1357be
+  metadata.gz: e64c6a62feb248b76672d75ef4cf9bc0f822b0f2fd57311f879874e910377b80549b133c85b148fd61d44d91259c780299770d7fae4792dbab094c01676df201
+  data.tar.gz: 2577dc3d03d3fa233ba136613e63d0c18a3e59f51bac690b582b18f424cc4ee7e5fee736eafc76393a94af20e3fcf930cd953b4eec07f21282fa9b5dd7be552d

data/COMPARE.md

@@ -27,7 +27,7 @@ class EventsController < ActionController::Base
     before_action only: :index { @events = Event.all }
 
     # dynamically defines the action method according to on: argument
-    act_on_format :html, :json, on: :index 
+    respond_act_to :html, :json, on: :index 
 
     def index_html
         @event_categories = EventCategory.all
@@ -92,7 +92,7 @@ class EventsController < ActionController::Base
     # AbstractController::Callbacks here to load model with params
     before_action only: [:show, :update] { @event = Event.find(params.require(:event_id)) }
 
-    act_on_format :html, :json, on: [:show, :update]
+    respond_act_to :html, :json, on: [:show, :update]
 
     rescue_act_from ActiveRecord::RecordNotFound, format: :json do |ex|
         render status: :bad_request, json: { error: ex.message }

data/README.md

@@ -16,8 +16,8 @@ class EventsController < ActionController::Base
     before_action only: :index { @events = Event.all }
     before_action only: [:show, :update] { @event = Event.find(params.require(:event_id)) }
 
-    act_on_format :html, :json, on: :index
-    act_on_format :html, :json, on: [:show, :update]
+    respond_act_to :html, :json, on: :index
+    respond_act_to :html, :json, on: [:show, :update]
 
     rescue_act_from ActiveRecord::RecordNotFound, format: :json do |ex|
         render status: :bad_request, json: { error: "Resouce not found" }
@@ -99,7 +99,7 @@ Please see [LICENSE](https://github.com/ryancyq/mime_actor/blob/main/LICENSE) fo
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/ryancyq/mime_actor.
+Bug reports and pull requests are welcome on GitHub at [https://github.com/ryancyq/mime_actor](https://github.com/ryancyq/mime_actor).
 
 [rubygems_badge]: https://img.shields.io/gem/v/mime_actor.svg
 [rubygems]: https://rubygems.org/gems/mime_actor

data/codecov.yml

@@ -0,0 +1,18 @@
+codecov:
+  notify:
+    wait_for_ci: false
+  require_ci_to_pass: false
+
+coverage:
+  status:
+    project:
+      default:
+        target: 99%
+        threshold: 1%
+    patch:
+      default:
+        target: 99%
+        threshold: 1%
+
+comment:
+  require_changes: true

data/lib/mime_actor/action.rb

@@ -5,6 +5,7 @@ require "mime_actor/stage"
 require "mime_actor/rescue"
 
 require "active_support/concern"
+require "active_support/core_ext/object/blank"
 require "active_support/lazy_load_hooks"
 require "abstract_controller/rendering"
 require "action_controller/metal/mime_responds"
@@ -44,17 +45,17 @@ module MimeActor
     #
     def start_scene(action)
       action = action&.to_sym
-      formats = acting_scenes.fetch(action, Set.new)
+      formats = acting_scenes.fetch(action, {})
 
       if formats.empty?
-        logger.warn { "format is empty for action :#{action}" }
+        logger.warn { "format is empty for action: #{action.inspect}" }
         return
       end
 
       respond_to do |collector|
-        formats.each do |format|
+        formats.each do |format, actor|
           dispatch = self.class.dispatch_cue(action: action, format: format, context: self) do
-            cue_actor("#{action}_#{format}")
+            cue_actor(actor.presence || "#{action}_#{format}")
           end
           collector.public_send(format, &dispatch)
         end

data/lib/mime_actor/errors.rb

@@ -24,7 +24,7 @@ module MimeActor
 
   class ActorNotFound < ActorError
     def generate_message
-      ":#{actor} not found"
+      "#{actor.inspect} not found"
     end
   end
 
@@ -39,7 +39,7 @@ module MimeActor
 
   class ActionExisted < ActionError
     def generate_message
-      "action :#{action} already existed"
+      "action #{action.inspect} already existed"
     end
   end
 end

data/lib/mime_actor/rescue.rb

@@ -8,6 +8,7 @@ require "mime_actor/validator"
 require "active_support/concern"
 require "active_support/core_ext/array/wrap"
 require "active_support/core_ext/module/attribute_accessors"
+require "active_support/core_ext/object/blank"
 require "active_support/core_ext/string/inflections"
 
 module MimeActor
@@ -28,13 +29,13 @@ module MimeActor
       mattr_accessor :actor_rescuers, instance_writer: false, default: []
     end
 
-    class_methods do
+    module ClassMethods
       # Registers a rescue handler for the given error classes with `action`/`format` filter
       #
       # @param klazzes the error classes to rescue
       # @param action the `action` filter
       # @param format the `format` filter
-      # @param with the rescue hanlder when `block` is not provided
+      # @param with the rescue handler when `block` is not provided
       # @param block the `block` to evaluate when `with` is not provided
       #
       # @example Rescue StandardError when raised for any action with `html` format
@@ -47,9 +48,13 @@ module MimeActor
       #
       def rescue_act_from(*klazzes, action: nil, format: nil, with: nil, &block)
         raise ArgumentError, "error filter is required" if klazzes.empty?
+        raise ArgumentError, "provide either the with: argument or a block" unless with.present? ^ block_given?
 
-        validate!(:with, with, block)
-        with = block if block_given?
+        if block_given?
+          with = block
+        else
+          validate!(:with, with)
+        end
 
         if action.present?
           action.is_a?(Enumerable) ? validate!(:actions, action) : validate!(:action, action)
@@ -96,26 +101,14 @@ module MimeActor
         case rescuer = find_rescuer(error, format:, action:)
         when Symbol
           rescuer_method = context.method(rescuer)
-          case rescuer_method.arity
-          when 0
-            ->(_e, _f, _a) { rescuer_method.call }
-          when 1
-            ->(e, _f, _a) { rescuer_method.call(e) }
-          when 2
-            ->(e, f, _a) { rescuer_method.call(e, f) }
-          else
-            ->(e, f, a) { rescuer_method.call(e, f, a) }
+          lambda do |*args|
+            passable_args = rescuer_method.arity.negative? ? args : args.take(rescuer_method.arity)
+            rescuer_method.call(*passable_args)
           end
         when Proc
-          case rescuer.arity
-          when 0
-            ->(_e, _f, _a) { context.instance_exec(&rescuer) }
-          when 1
-            ->(e, _f, _a) { context.instance_exec(e, &rescuer) }
-          when 2
-            ->(e, f, _a) { context.instance_exec(e, f, &rescuer) }
-          else
-            ->(e, f, a) { context.instance_exec(e, f, a, &rescuer) }
+          lambda do |*args|
+            passable_args = rescuer.arity.negative? ? args : args.take(rescuer.arity)
+            context.instance_exec(*passable_args, &rescuer)
           end
         end
       end

data/lib/mime_actor/scene.rb

@@ -9,6 +9,7 @@ require "active_support/concern"
 require "active_support/core_ext/array/extract_options"
 require "active_support/core_ext/array/wrap"
 require "active_support/core_ext/module/attribute_accessors"
+require "active_support/core_ext/object/blank"
 
 module MimeActor
   # # MimeActor Scene
@@ -16,9 +17,27 @@ module MimeActor
   # Scene provides configuration for `action` + `format` definitions
   #
   # @example register a `html` format on action `index`
-  #     act_on_format :html, on: :index
+  #   respond_act_to :html, on: :index
+  #
+  #   # this method should be defined in the class
+  #   def index_html; end
   # @example register `html`, `json` formats on actions `index`, `show`
-  #     act_on_format :html, :json , on: [:index, :show]
+  #   respond_act_to :html, :json , on: [:index, :show]
+  #
+  #   # these methods should be defined in the class
+  #   def index_html; end
+  #   def index_json; end
+  #   def show_html; end
+  #   def show_json; end
+  # @example register a `html` format on action `index` with respond handler method
+  #   respond_act_to :html, on: :index, with: :render_html
+  #
+  #   # this method should be defined in the class
+  #   def render_html; end
+  # @example register a `html` format on action `index` with respond handler proc
+  #   respond_act_to :html, on: :index do
+  #     render :index
+  #   end
   #
   # NOTE: Calling the same `action`/`format` multiple times will overwrite previous `action` + `format` definitions.
   #
@@ -31,24 +50,50 @@ module MimeActor
       mattr_accessor :acting_scenes, instance_writer: false, default: {}
     end
 
-    class_methods do
+    module ClassMethods
       # Register `action` + `format` definitions.
       #
-      # @param options [Array]
-      # @option options [Array] klazzes the collection of `format`
-      # @option options [Hash] on the collection of `action`
+      # @param formats the collection of `format`
+      # @param on the collection of `action`
+      # @param with the respond handler when `block` is not provided
+      # @param block the `block` to evaluate when `with` is not provided
       #
       # @example register a `html` format on action `index`
-      #   act_on_format :html, on: :index
+      #   respond_act_to :html, on: :index
+      #
+      #   # this method should be defined in the class
+      #   def index_html; end
       # @example register `html`, `json` formats on actions `index`, `show`
-      #   act_on_format :html, :json , on: [:index, :show]
+      #   respond_act_to :html, :json , on: [:index, :show]
+      #
+      #   # these methods should be defined in the class
+      #   def index_html; end
+      #   def index_json; end
+      #   def show_html; end
+      #   def show_json; end
+      # @example register a `html` format on action `index` with respond handler method
+      #   respond_act_to :html, on: :index, with: :render_html
+      #
+      #   # this method should be defined in the class
+      #   def render_html; end
+      # @example register a `html` format on action `index` with respond handler proc
+      #   respond_act_to :html, on: :index do
+      #     render :index
+      #   end
       #
       # For each unique `action` being registered, it will have a corresponding `action` method being defined.
-      def act_on_format(*options)
-        config = options.extract_options!
-        validate!(:formats, options)
+      def respond_act_to(*formats, on: nil, with: nil, &block)
+        validate!(:formats, formats)
+
+        raise ArgumentError, "provide either the with: argument or a block" if with.present? && block_given?
 
-        case actions = config[:on]
+        if block_given?
+          with = block
+        elsif with.present?
+          validate!(:with, with)
+        end
+
+        case actions = on
         when Enumerable
           validate!(:actions, actions)
         when Symbol, String
@@ -58,18 +103,20 @@ module MimeActor
         end
 
         Array.wrap(actions).each do |action|
-          options.each { |format| compose_scene(action, format) }
+          formats.each { |format| compose_scene(action, format, with) }
         end
       end
 
+      alias act_on_format respond_act_to
+
       private
 
-      def compose_scene(action, format)
+      def compose_scene(action, format, actor)
         action_defined = (instance_methods + private_instance_methods).include?(action.to_sym)
         raise MimeActor::ActionExisted, action if !acting_scenes.key?(action) && action_defined
 
-        acting_scenes[action] ||= Set.new
-        acting_scenes[action] |= [format]
+        acting_scenes[action] ||= {}
+        acting_scenes[action][format] = actor
 
         define_scene(action) unless action_defined
       end
@@ -83,7 +130,7 @@ module MimeActor
             def #{action}
               self.respond_to?(:start_scene) && self.start_scene(:#{action})
             end
-        RUBY
+          RUBY
         )
       end
     end

data/lib/mime_actor/stage.rb

@@ -22,7 +22,7 @@ module MimeActor
       mattr_accessor :raise_on_missing_actor, instance_writer: false, default: false
     end
 
-    class_methods do
+    module ClassMethods
       # Determine if the `actor_name` belongs to a public instance method excluding methods inherited from ancestors
       #
       # @param actor_name
@@ -63,25 +63,45 @@ module MimeActor
       end
     end
 
-    # Calls the `actor` method if defined, supports passing arguments to the `actor` method.
-    #
+    # Calls the `actor` and passing arguments to it.
     # If a block is given, the result from the `actor` method will be yieled to the block.
     #
-    # @param actor_name
-    def cue_actor(actor_name, *args)
-      unless self.class.actor?(actor_name)
-        raise MimeActor::ActorNotFound, actor_name if raise_on_missing_actor
-
-        logger.warn { "actor not found, expected :#{actor_name}" }
-        return
-      end
+    # NOTE: method call on actor if it is String or Symbol. Proc#call if actor is Proc
+    #
+    # @param actor either a method name or a block to evaluate
+    def cue_actor(actor, *args)
+      result = case actor
+               when String, Symbol
+                 actor_method_call(actor, *args)
+               when Proc
+                 actor_proc_call(actor, *args)
+               else
+                 raise TypeError, "invalid actor, got: #{actor.inspect}"
+               end
 
-      result = public_send(actor_name, *args)
       if block_given?
         yield result
       else
         result
       end
     end
+
+    private
+
+    def actor_method_call(actor_method, *args)
+      unless self.class.actor?(actor_method)
+        raise MimeActor::ActorNotFound, actor_method if raise_on_missing_actor
+
+        logger.warn { "actor #{actor_method.inspect} not found" }
+        return
+      end
+
+      public_send(actor_method, *args)
+    end
+
+    def actor_proc_call(actor_proc, *args)
+      passable_args = actor_proc.arity.negative? ? args : args.take(actor_proc.arity)
+      instance_exec(*passable_args, &actor_proc)
+    end
   end
 end

data/lib/mime_actor/validator.rb

@@ -3,6 +3,7 @@
 # :markup: markdown
 
 require "active_support/concern"
+require "active_support/core_ext/object/blank"
 require "set" # required by mime_type with ruby <= 3.1
 require "action_dispatch/http/mime_type"
 
@@ -25,13 +26,13 @@ module MimeActor
       mattr_accessor :scene_formats, instance_writer: false, default: Mime::SET.symbols.to_set
     end
 
-    class_methods do
+    module ClassMethods
       # Raise the error returned by validator if any.
       #
       # @param rule the name of validator
       def validate!(rule, *args)
         validator = "validate_#{rule}"
-        raise NameError, "Validator not found, got: #{validator}" unless respond_to?(validator, true)
+        raise NameError, "Validator not found, got: #{validator.inspect}" unless respond_to?(validator, true)
 
         error = send(validator, *args)
         raise error if error
@@ -41,7 +42,7 @@ module MimeActor
       #
       # @param unchecked the `action` to be validated
       def validate_action(unchecked)
-        ArgumentError.new("action must be a Symbol") unless unchecked.is_a?(Symbol)
+        TypeError.new("action must be a Symbol") unless unchecked.is_a?(Symbol)
       end
 
       # Validate `actions` must be a collection of Symbol
@@ -49,16 +50,16 @@ module MimeActor
       # @param unchecked the `actions` to be validated
       def validate_actions(unchecked)
         rejected = unchecked.reject { |action| action.is_a?(Symbol) }
-        NameError.new("invalid actions, got: #{rejected.join(", ")}") if rejected.size.positive?
+        NameError.new("invalid actions, got: #{rejected.map(&:inspect).join(", ")}") if rejected.size.positive?
       end
 
       # Validate `format` must be a Symbol and a valid MIME type
       #
       # @param unchecked the `format` to be validated
       def validate_format(unchecked)
-        return ArgumentError.new("format must be a Symbol") unless unchecked.is_a?(Symbol)
+        return TypeError.new("format must be a Symbol") unless unchecked.is_a?(Symbol)
 
-        NameError.new("invalid format, got: #{unchecked}") unless scene_formats.include?(unchecked)
+        NameError.new("invalid format, got: #{unchecked.inspect}") unless scene_formats.include?(unchecked)
       end
 
       # Validate `formats` must be an collection of Symbol which each of them is a valid MIME type
@@ -69,7 +70,7 @@ module MimeActor
         filtered = unfiltered & scene_formats
         rejected = unfiltered - filtered
 
-        NameError.new("invalid formats, got: #{rejected.join(", ")}") if rejected.size.positive?
+        NameError.new("invalid formats, got: #{rejected.map(&:inspect).join(", ")}") if rejected.size.positive?
       end
 
       # Validate `klazz` must be a Class/Module or a String referencing a Class/Module
@@ -78,23 +79,16 @@ module MimeActor
       def validate_klazz(unchecked)
         return if unchecked.is_a?(Module) || unchecked.is_a?(String)
 
-        ArgumentError.new("#{unchecked.inspect} must be a Class/Module or a String referencing a Class/Module")
+        TypeError.new("#{unchecked.inspect} must be a Class/Module or a String referencing a Class/Module")
       end
 
-      # Validate `with` or `block` must be provided and if `with` is provided, it must be a Symbol or Proc
+      # Validate `with` must be a Symbol or Proc
       #
       # @param unchecked the `with` to be validated
-      # @param block the `block` to be valiated
-      def validate_with(unchecked, block)
-        if unchecked.present? && block.present?
-          return ArgumentError.new("provide either the with: keyword argument or a block")
-        end
-        unless unchecked.present? || block.present?
-          return ArgumentError.new("provide the with: keyword argument or a block")
-        end
-        return if block.present? || unchecked.is_a?(Proc) || unchecked.is_a?(Symbol)
-
-        ArgumentError.new("with handler must be a Symbol or Proc, got: #{unchecked.inspect}")
+      def validate_with(unchecked)
+        return if unchecked.is_a?(Proc) || unchecked.is_a?(Symbol)
+
+        TypeError.new("with handler must be a Symbol or Proc, got: #{unchecked.inspect}")
       end
     end
   end

data/lib/mime_actor/version.rb

@@ -12,7 +12,7 @@ module MimeActor
   module VERSION
     MAJOR = 0
     MINOR = 6
-    BUILD = 0
+    BUILD = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, BUILD, PRE].compact.join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mime_actor
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ryan Chang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-01 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -68,6 +68,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- codecov.yml
 - lib/mime_actor.rb
 - lib/mime_actor/action.rb
 - lib/mime_actor/errors.rb