ree_lib 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73ca3b1fae54a13391bda2954179e4b66a784b170b8461eddb3acb4378f03b24
-  data.tar.gz: 5a3fc79a3201395824ae4575fb7b2ed7bf5ec3e0755db1572b078e34d4a347fa
+  metadata.gz: 1d2bd58c6bd8e2cb3149a2aee091cb78eaabc26926b85f2ff59bffd1d672d227
+  data.tar.gz: 0a7436a5fcf432aa79b93eaa28411749807cd104cbd0a3a19848f77338cca889
 SHA512:
-  metadata.gz: d0b903a2f014d8f9f2473c91df8e0d26c33bda0cbc8eb61dcf9b6d6515498b1693aa3075da58695e71b825792474747bbb54363d081d86d858e00b427c53b350
-  data.tar.gz: 7abbef08143f8bc981a6eabd8934937fd1ec541a52f4a44814fbe18cfdf606d4fc95ec4b28a5febd8ffd7b0842f5e19bbb282f82e00405dd9d4ec50c8b71b416
+  metadata.gz: bdd2465fc1e0113e515c9bb729938623087da55512c29275f85cf7bd11d7fe9bad9cd2a23c036b47d395b16478616d5c3cd10c3d9e6b5ffc451159ae8d9c6ea6
+  data.tar.gz: e0b7d0b4191c9bc0c5dea024937685b8fe9b879cb4d974e16c9a854d3aaaca8ebf26f2d6face2b8ff178643bfdba1244c226d73f7b45e2b70446a5ce12ba014c

data/Gemfile

@@ -5,6 +5,9 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in ree_lib.gemspec
 gemspec
 
+# Use local ree gem for development
+gem "ree", path: "../ree"
+
 gem "rake", "~> 13.0"
 
 group :test do

data/Gemfile.lock

@@ -1,7 +1,15 @@
+PATH
+  remote: ../ree
+  specs:
+    ree (1.2.7)
+      base64
+      commander (~> 5.0.0)
+      logger (~> 1.6.5)
+
 PATH
   remote: .
   specs:
-    ree_lib (1.3.4)
+    ree_lib (1.3.5)
       bigdecimal (~> 3.1.9)
       binding_of_caller (~> 1.0.1)
       i18n (~> 1.14.7)
@@ -17,6 +25,7 @@ GEM
   specs:
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.3.0)
     bigdecimal (3.1.9)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
@@ -58,9 +67,6 @@ GEM
       rack (>= 1.3)
     rainbow (3.1.1)
     rake (13.2.1)
-    ree (1.1.2)
-      commander (~> 5.0.0)
-      logger (~> 1.6.5)
     rexml (3.3.6)
       strscan
     roda (3.88.0)
@@ -108,6 +114,7 @@ DEPENDENCIES
   pg (~> 1.5.9)
   rack-test
   rake (~> 13.0)
+  ree!
   ree_lib!
   roda (~> 3.88.0)
   rollbar (~> 3.6.0)

data/lib/ree_lib/packages/ree_actions/package/ree_actions/dsl.rb

@@ -1,17 +1,20 @@
 # frozen_string_literal: true
 package_require("ree_mapper/errors/type_error")
 package_require("ree_mapper/errors/coercion_error")
+package_require("ree_actions/method_plugin")
 
 module ReeActions
   module DSL
     def self.included(base)
       base.extend(ClassMethods)
+      base.extend(Ree::MethodAddedHook)
       base.include(ReeMapper::DSL)
       base.include(Ree::Inspectable)
     end
 
     def self.extended(base)
       base.extend(ClassMethods)
+      base.extend(Ree::MethodAddedHook)
       base.include(ReeMapper::DSL)
     end
 
@@ -31,39 +34,11 @@ module ReeActions
 
         Ree.container.compile(dsl.package, name)
       end
-
-      def method_added(method_name)
-        return super if method_name != :call
-
-        if @__original_call_defined
-          remove_instance_variable(:@__original_call_defined)
-          return
-        end
-
-        @__original_call_defined = true
-
-        alias_method(:__original_call, :call)
-
-        define_method :call do |user_access, attrs, **opts, &proc|
-          if self.class.const_defined?(:ActionCaster)
-            caster = self.class.const_get(:ActionCaster)
-
-            if !caster.respond_to?(:cast)
-              raise ArgumentError.new("ActionCaster does not respond to `cast` method")
-            end
-
-            attrs = begin
-              caster.cast(attrs)
-            rescue ReeMapper::TypeError, ReeMapper::CoercionError => e
-              raise ReeActions::ParamError, e.message
-            end
-          end
-
-          __original_call(user_access, attrs, **opts, &proc)
-        end
-
-        nil
-      end
     end
   end
+end
+
+# Register the method plugin if the plugin system is available
+if defined?(Ree) && Ree.respond_to?(:register_method_added_plugin)
+  Ree.register_method_added_plugin(ReeActions::MethodPlugin)
 end

data/lib/ree_lib/packages/ree_actions/package/ree_actions/method_plugin.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+class ReeActions::MethodPlugin
+  def self.active?
+    true  # Always active when registered
+  end
+
+  def initialize(method_name, is_class_method, target)
+    @method_name = method_name
+    @is_class_method = is_class_method
+    @target = target
+  end
+
+  def call
+    # Only wrap :call method for classes that include ReeActions::DSL
+    return nil unless @method_name == :call
+    return nil unless ree_actions_class?
+
+    Proc.new do |instance, next_layer, *args, **kwargs, &block|
+      # ReeActions call signature: call(user_access, attrs, **opts, &block)
+      # First arg is user_access, second is attrs (the one to cast)
+      user_access, attrs, *rest_args = args
+
+      if instance.class.const_defined?(:ActionCaster)
+        caster = instance.class.const_get(:ActionCaster)
+
+        unless caster.respond_to?(:cast)
+          raise ArgumentError.new("ActionCaster does not respond to `cast` method")
+        end
+
+        attrs = begin
+          caster.cast(attrs)
+        rescue ReeMapper::TypeError, ReeMapper::CoercionError => e
+          raise ReeActions::ParamError, e.message
+        end
+      end
+
+      # Call next layer with cast attrs
+      next_layer.call(user_access, attrs, *rest_args, **kwargs, &block)
+    end
+  end
+
+  private
+
+  def ree_actions_class?
+    @target.included_modules.any? { |m| m.name == "ReeActions::DSL" }
+  end
+end

data/lib/ree_lib/packages/ree_actions/spec/ree_actions/dsl_spec.rb

@@ -25,11 +25,13 @@ RSpec.describe ReeActions::DSL, type: [:autoclean] do
   end
 
   before do
+    Ree.enable_benchmark_mode
     Ree.enable_irb_mode
   end
 
   after do
     Ree.disable_irb_mode
+    Ree.disable_benchmark_mode
   end
 
   it {
@@ -41,10 +43,24 @@ RSpec.describe ReeActions::DSL, type: [:autoclean] do
         depends_on :ree_dao
       end
 
+      class TestFn
+        include Ree::FnDSL
+
+        fn :test_fn
+
+        contract None = Integer
+        def call
+          1
+        end
+      end
+
       class TestAction
         include ReeActions::DSL
 
-        action :test_action
+        action :test_action do
+          benchmark
+          link :test_fn
+        end
 
         ActionCaster = build_mapper.use(:cast) do
           integer :user_id
@@ -52,6 +68,7 @@ RSpec.describe ReeActions::DSL, type: [:autoclean] do
 
         contract Any, ActionCaster.dto(:cast) => Integer
         def call(user_access, attrs)
+          test_fn
           attrs[:user_id]
         end
       end

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 bindir: exe
 cert_chain: []
-date: 2026-02-03 00:00:00.000000000 Z
+date: 2026-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree
@@ -284,6 +284,7 @@ files:
 - lib/ree_lib/packages/ree_actions/package/ree_actions.rb
 - lib/ree_lib/packages/ree_actions/package/ree_actions/dsl.rb
 - lib/ree_lib/packages/ree_actions/package/ree_actions/errors.rb
+- lib/ree_lib/packages/ree_actions/package/ree_actions/method_plugin.rb
 - lib/ree_lib/packages/ree_actions/spec/ree_actions/dsl_spec.rb
 - lib/ree_lib/packages/ree_actions/spec/spec_helper.rb
 - lib/ree_lib/packages/ree_array/.gitignore