ree 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b2a4983f915c5d0761d563998b0c5a6fa9bd344d39e61046e47c088b5f53b4d
-  data.tar.gz: 2ec723f70527921b5784989d5f4294a211c5cb5015fe2e16b181990829979dde
+  metadata.gz: a73f9d4ffa414ae499d87732f896c437117f65b52b7675908eb8581d482946f4
+  data.tar.gz: '0328c44c6cb7d7dddae52494fb057e1b88f84a8d2c7f28ea62c202bcb1c74125'
 SHA512:
-  metadata.gz: f86a204bf1134fbc800898d98e4d379bd9b7e9275db0e4ae6aa278142b6e3af3ef7b5f276eb4a301f711b024737c70dcb0d3e251985854747b0042899fea69f0
-  data.tar.gz: 4e20a1cc184a8b94472c707c07512827e5359626ddf5deb1f9e507fd46f37caac565330d526cee852de120585d3d9b949b809820c3492bc25463cafcd2eea919
+  metadata.gz: 367764b547db08f4c975a0ea141c7563e5536612d05bf48388cf8b9100dc381573dcdb9081b6c73a6880ff9bc57fbe45cbda09c51030aa370bd032997a372cd2
+  data.tar.gz: 4177a967cc3fa694fc03b6302fc10de386dea9ec2c328d16fbe53f4a765c1b4e0d25e9817d99ea0100fca3975b470a73192bc848d77684235771524651e06657

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree (1.2.3)
+    ree (1.2.4)
       commander (~> 5.0.0)
       logger (~> 1.6.5)
 

data/lib/ree/benchmark_method_plugin.rb

@@ -12,14 +12,14 @@ class Ree::BenchmarkMethodPlugin
   end
 
   def call
-    config = @target.instance_variable_get(:@__ree_benchmark_config)
+    return unless @method_name == :call && ree_fn?
 
-    if @method_name == :call
-      if config
-        wrap_as_entry_point(config)
-      else
-        wrap_as_collector
-      end
+    config = @target.instance_variable_get(:@__ree_benchmark_config)
+    
+    if config
+      wrap_as_entry_point(config)
+    else
+      wrap_as_collector
     end
   end
 
@@ -41,7 +41,11 @@ class Ree::BenchmarkMethodPlugin
     benchmark_done = false
 
     alias_target.define_method(method_name) do |*args, **kwargs, &block|
-      if once && benchmark_done
+      if Ree::BenchmarkTracer.active?
+        Ree::BenchmarkTracer.collect(benchmark_name) do
+          send(method_alias, *args, **kwargs, &block)
+        end
+      elsif once && benchmark_done
         Ree::BenchmarkTracer.collect(benchmark_name) do
           send(method_alias, *args, **kwargs, &block)
         end
@@ -85,6 +89,17 @@ class Ree::BenchmarkMethodPlugin
     @method_name == :call ? base : "#{base}##{@method_name}"
   end
 
+  def ree_fn?
+    pkg = @target.instance_variable_get(:@__ree_package_name)
+    obj = @target.instance_variable_get(:@__ree_object_name)
+    return false unless pkg && obj
+
+    facade = Ree.container.packages_facade
+    return false unless facade.has_object?(pkg, obj)
+
+    facade.get_object(pkg, obj).fn?
+  end
+
   def eigenclass
     class << @target; self; end
   end

data/lib/ree/benchmark_tracer.rb

@@ -34,6 +34,11 @@ class Ree::BenchmarkTracer
       result
     end
 
+    def active?
+      stack = Thread.current[THREAD_KEY]
+      stack && !stack.empty?
+    end
+
     # Collector trace — only participates if a trace is already active
     def collect(name)
       stack = Thread.current[THREAD_KEY]

data/lib/ree/dsl/object_dsl.rb

@@ -333,6 +333,11 @@ class Ree::ObjectDsl
       .set_package(package.name)
       .set_rpath(object_rpath)
 
+    if mount_as == :fn
+      klass.instance_variable_set(:@__ree_package_name, package.name)
+      klass.instance_variable_set(:@__ree_object_name, object_name)
+    end
+
     package.set_object(object)
     object.set_loaded
 

data/lib/ree/fn_dsl.rb

@@ -21,9 +21,6 @@ module Ree::FnDSL
       dsl.tags(["fn"])
       dsl.object.set_as_compiled(false)
 
-      self.instance_variable_set(:@__ree_package_name, dsl.package.name)
-      self.instance_variable_set(:@__ree_object_name, name)
-
       Ree.container.compile(dsl.package, name)
     end
   end

data/lib/ree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ree
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Ruslan Gatiyatov