mime_actor 0.2.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ebd84a2af57785ebac0ce18f1ef7137e50e6c3312c16ddf103b9c112aba7d43
-  data.tar.gz: f7ad301149d348455263ffa0d2ce8457177b91276e930a9852b941d465ebeb9a
+  metadata.gz: 35c75654432a3dd52002da0a92b31560432709c940143b6da12d6c8381298cd5
+  data.tar.gz: 7a412d03ba99cc45ea2aceb4c3741a49b2bcbc53b04f2a627267e415c4e0955a
 SHA512:
-  metadata.gz: '06389feb5335b5445f33c9cfbe25a7982e58df92111c120878d402e03e800d1e5ebeb9e1af5f8de8ff663c001484d5baead8de08b8b8f133acaf142b5d5731e3'
-  data.tar.gz: 13b279b67f62de25fec4628c2e2320ba06a986d56f296b119147cf6e082fb9512ae1f1b38c713c02e4f8fed4740c432beb11d1d195ecaf73694b13300e59f22f
+  metadata.gz: db971845e8bd7544fea9b7bc711c9e290948eaeaf52526b49e72cab85023d6b8087f1f131c4f5f6ed70591ad342bfab94a09e44f3a9f6d250df6bd3c7d30b72e
+  data.tar.gz: 0014236f7f1720f88f6bbb7e807c0d34760786b5febc1037d3f871c0b0f2a67d976c4ccadf58d939bff563b5c214bc25ca2160669590050bf6e0ca14c975ae1e

data/.rubocop.yml

@@ -1,8 +1,38 @@
+require:
+  - rubocop-rake
+  - rubocop-rspec
+
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
+  NewCops: enable
+  Exclude:
+    - bin/*
+
+Style/Documentation:
+  Enabled: false
+
+Style/BlockComments:
+  Exclude:
+    - spec/*_helper.rb
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
+
+Style/HashSyntax:
+  EnforcedShorthandSyntax: consistent
+
+Layout/FirstHashElementIndentation:
+  EnforcedStyle: consistent
+
+Layout/HashAlignment:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Enabled: false

data/Rakefile

@@ -5,5 +5,5 @@ require "bundler/gem_tasks"
 require "rubocop/rake_task"
 RuboCop::RakeTask.new
 
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)

data/lib/mime_actor/act.rb

@@ -1,32 +1,29 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
-require 'active_support/configurable'
-require "active_support/core_ext/module/attribute_accessors"
-require 'abstract_controller/logger'
-require 'abstract_controller/rendering'
-require 'action_controller/metal/mime_responds'
+require "mime_actor/scene"
+require "mime_actor/stage"
+require "mime_actor/rescue"
+
+require "active_support/concern"
+require "abstract_controller/rendering"
+require "action_controller/metal/mime_responds"
 
 module MimeActor
   module Act
     extend ActiveSupport::Concern
-    include ActiveSupport::Configurable
-    include AbstractController::Logger
+
     include AbstractController::Rendering # required by MimeResponds
     include ActionController::MimeResponds
     include Scene
+    include Stage
     include Rescue
 
-    included do
-      mattr_accessor :raise_on_missing_actor, instance_writer: false, default: false
-    end
-
     module ClassMethods
       def dispatch_act(action: nil, format: nil, context: self, &block)
         lambda do
           context.instance_exec(&block)
-        rescue Exception => ex
-          respond_to?(:rescue_actor) && public_send(:rescue_actor, ex, action:, format:, context:) || raise
+        rescue StandardError => e
+          (respond_to?(:rescue_actor) && rescue_actor(e, action:, format:, context:)) || raise
         end
       end
     end
@@ -40,11 +37,11 @@ module MimeActor
       mime_types = acting_scenes.fetch(action, Set.new)
       respond_to do |collector|
         mime_types.each do |mime_type|
-          next unless actor = find_actor(action, mime_type)
+          next unless (actor = find_actor("#{action}_#{mime_type}"))
 
           dispatch = self.class.dispatch_act(
-            action: action, 
-            format: mime_type,
+            action:  action,
+            format:  mime_type,
             context: self,
             &actor
           )
@@ -52,21 +49,5 @@ module MimeActor
         end
       end
     end
-
-    def find_actor(action, mime_type)
-      actor_name = "#{action}_#{mime_type}"
-      
-      if respond_to?(:action_methods) && public_send(:action_methods).include?(actor_name)
-        return self.method(actor_name)
-      end
-
-      error = MimeActor::ActorNotFound.new(action, mime_type) 
-      unless self.raise_on_missing_actor
-        logger.warn { "Actor not found: #{error.inspect}" }
-        return
-      end
-
-      raise error
-    end
   end
-end
+end

data/lib/mime_actor/errors.rb

@@ -5,18 +5,16 @@ module MimeActor
   end
 
   class ActorNotFound < Error
-    attr_reader :actor, :action, :format
+    attr_reader :actor
 
-    def initialize(action, format)
-      @action = action
-      @format = format
-      @actor = "#{action}_#{format}"
+    def initialize(actor)
+      @actor = actor
 
       super(":#{actor} not found")
     end
 
     def inspect
-      "<#{self.class.name}> actor:#{actor} not found for action:#{action}, format:#{format}"
+      "<#{self.class.name}> #{message}"
     end
   end
-end
+end

data/lib/mime_actor/rescue.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
+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"
+require "set" # remove when ruby > 3,1
 require "action_dispatch/http/mime_type"
 
 module MimeActor
@@ -32,7 +33,7 @@ module MimeActor
             unfiltered = format.to_set
             filtered = unfiltered & Mime::SET.symbols.to_set
             rejected = unfiltered - filtered
-            raise ArgumentError, "Unsupported formats: #{rejected.join(', ')}" if rejected.size.positive?
+            raise ArgumentError, "Unsupported formats: #{rejected.join(", ")}" if rejected.size.positive?
           else
             raise ArgumentError, "Format filter can only be Symbol/Enumerable"
           end
@@ -44,25 +45,26 @@ module MimeActor
 
         klazzes.each do |klazz|
           error = if klazz.is_a?(Module)
-            klazz.name
-          elsif klazz.is_a?(String)
-            klazz
-          else
-            raise ArgumentError, "#{klazz.inspect} must be a class/module or a String referencing a class/module"
-          end
+                    klazz.name
+                  elsif klazz.is_a?(String)
+                    klazz
+                  else
+                    raise ArgumentError,
+                          "#{klazz.inspect} must be a class/module or a String referencing a class/module"
+                  end
 
           # append at the end because strategies are read in reverse.
-          self.actor_rescuers << [error, format, action, with]
+          actor_rescuers << [error, format, action, with]
         end
       end
 
       def rescue_actor(error, action: nil, format: nil, context: self, visited: [])
         visited << error
 
-        if rescuer = dispatch_rescuer(error, format:, action:, context:)
+        if (rescuer = dispatch_rescuer(error, format:, action:, context:))
           rescuer.call(error, format, action)
           error
-        elsif error && error.cause && !visited.include?(error.cause)
+        elsif error&.cause && !visited.include?(error.cause)
           rescue_actor(error.cause, format:, action:, context:, visited:)
         end
       end
@@ -75,24 +77,24 @@ module MimeActor
           rescuer_method = context.method(rescuer)
           case rescuer_method.arity
           when 0
-            -> e,f,a { rescuer_method.call }
+            ->(_e, _f, _a) { rescuer_method.call }
           when 1
-            -> e,f,a { rescuer_method.call(e) }
+            ->(e, _f, _a) { rescuer_method.call(e) }
           when 2
-            -> e,f,a { rescuer_method.call(e,f) }
+            ->(e, f, _a) { rescuer_method.call(e, f) }
           else
-            -> e,f,a { rescuer_method.call(e,f,a) }
+            ->(e, f, a) { rescuer_method.call(e, f, a) }
           end
         when Proc
           case rescuer.arity
           when 0
-            -> e,f,a { context.instance_exec(&rescuer) }
+            ->(_e, _f, _a) { context.instance_exec(&rescuer) }
           when 1
-            -> e,f,a { context.instance_exec(e, &rescuer) }
+            ->(e, _f, _a) { context.instance_exec(e, &rescuer) }
           when 2
-            -> e,f,a { context.instance_exec(e, f, &rescuer) }
+            ->(e, f, _a) { context.instance_exec(e, f, &rescuer) }
           else
-            -> e,f,a { context.instance_exec(e, f, a, &rescuer) }
+            ->(e, f, a) { context.instance_exec(e, f, a, &rescuer) }
           end
         end
       end
@@ -103,9 +105,9 @@ module MimeActor
         *_, rescuer = actor_rescuers.reverse_each.detect do |rescuee, format_filter, action_filter|
           next if action_filter.present? && !Array.wrap(action_filter).include?(action)
           next if format_filter.present? && !Array.wrap(format_filter).include?(format)
-          next unless klazz = constantize_rescuee(rescuee)
+          next unless (klazz = constantize_rescuee(rescuee))
 
-          klazz === error # klazz is a member of error
+          error.is_a?(klazz)
         end
         rescuer
       end
@@ -124,4 +126,4 @@ module MimeActor
       end
     end
   end
-end
+end

data/lib/mime_actor/scene.rb

@@ -1,16 +1,21 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
+require "mime_actor/stage"
+
+require "active_support/concern"
 require "active_support/core_ext/array/extract_options"
 require "active_support/core_ext/array/wrap"
 require "active_support/core_ext/hash/indifferent_access"
 require "active_support/core_ext/module/attribute_accessors"
+require "set" # remove when ruby > 3,1
 require "action_dispatch/http/mime_type"
 
 module MimeActor
   module Scene
     extend ActiveSupport::Concern
 
+    include Stage
+
     included do
       mattr_accessor :acting_scenes, instance_writer: false, default: ActiveSupport::HashWithIndifferentAccess.new
     end
@@ -20,32 +25,31 @@ module MimeActor
         config = options.extract_options!
         actions = Array.wrap(config[:on])
 
-        if actions.empty?
-          raise ArgumentError, "Action name can't be empty, e.g. on: :create"
-        end
+        raise ArgumentError, "Action name can't be empty, e.g. on: :create" if actions.empty?
 
         options.each do |mime_type|
-          unless Mime::SET.symbols.include?(mime_type.to_sym)
-            raise ArgumentError, "Unsupported format: #{mime_type}"
-          end
+          raise ArgumentError, "Unsupported format: #{mime_type}" unless Mime::SET.symbols.include?(mime_type.to_sym)
 
           actions.each do |action|
-            unless acting_scenes.key?(action)
-              if respond_to?(:action_methods) && public_send(:action_methods).include?(action.to_s)
-                raise ArgumentError, "Action method already defined: #{action}"
-              end
+            if !acting_scenes.key?(action) && actor?(action)
+              raise ArgumentError, "Action method already defined: #{action}"
             end
 
             acting_scenes[action] ||= Set.new
             acting_scenes[action] |= [mime_type.to_sym]
 
-            unless self.instance_methods.include?(action)
-              class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            next if actor?(action)
+
+            class_eval(
+              # def index
+              #   self.cue_actor(:play_scene, :index)
+              # end
+              <<-RUBY, __FILE__, __LINE__ + 1
                 def #{action}
-                  respond_to?(:play_scene) && public_send(:play_scene, :#{action})
+                  self.cue_actor(:play_scene, :#{action})
                 end
               RUBY
-            end
+            )
           end
         end
       end

data/lib/mime_actor/stage.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "mime_actor/errors"
+
+require "active_support/concern"
+require "active_support/configurable"
+require "active_support/core_ext/module/attribute_accessors"
+require "abstract_controller/logger"
+
+module MimeActor
+  module Stage
+    extend ActiveSupport::Concern
+
+    include ActiveSupport::Configurable
+    include AbstractController::Logger
+
+    included do
+      mattr_accessor :raise_on_missing_actor, instance_writer: false, default: false
+    end
+
+    module ClassMethods
+      def actor?(actor_name)
+        return action_methods.include?(actor_name.to_s) if singleton_methods.include?(:action_methods)
+
+        instance_methods.include?(actor_name.to_sym)
+      end
+    end
+
+    def actor?(actor_name)
+      return action_methods.include?(actor_name.to_s) if respond_to?(:action_methods)
+
+      methods.include?(actor_name.to_sym)
+    end
+
+    def find_actor(actor_name)
+      return method(actor_name) if actor?(actor_name)
+
+      error = MimeActor::ActorNotFound.new(actor_name)
+      raise error if raise_on_missing_actor
+
+      logger.warn { "Actor not found: #{error.inspect}" }
+    end
+
+    def cue_actor(actor_name, *args)
+      return unless actor?(actor_name)
+
+      result = public_send(actor_name, *args)
+      if block_given?
+        yield result
+      else
+        result
+      end
+    end
+  end
+end

data/lib/mime_actor/version.rb

@@ -11,8 +11,8 @@ module MimeActor
 
   module VERSION
     MAJOR = 0
-    MINOR = 2
-    BUILD = 1
+    MINOR = 3
+    BUILD = 3
     PRE   = nil
 
     STRING = [MAJOR, MINOR, BUILD, PRE].compact.join(".")

data/lib/mime_actor.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
-require_relative "mime_actor/version"
-require_relative "mime_actor/errors"
+require "mime_actor/version"
+require "mime_actor/errors"
 
-require 'active_support/dependencies/autoload'
+require "active_support/dependencies/autoload"
 
 module MimeActor
   extend ActiveSupport::Autoload
 
   autoload :Act
   autoload :Scene
+  autoload :Stage
   autoload :Rescue
 end

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: mime_actor
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Ryan Chang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-23 00:00:00.000000000 Z
+date: 2024-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '11.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '11.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,33 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '11.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 description: ''
 email:
 - ryancyq@gmail.com
@@ -98,12 +70,14 @@ files:
 - lib/mime_actor/errors.rb
 - lib/mime_actor/rescue.rb
 - lib/mime_actor/scene.rb
+- lib/mime_actor/stage.rb
 - lib/mime_actor/version.rb
 - sig/mime_actor.rbs
 homepage: https://github.com/ryancyq/mime_actor
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/ryancyq/mime_actor
   source_code_uri: https://github.com/ryancyq/mime_actor