ree 1.0.36 → 1.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40269b8b520f835a14d0b155cfb25408dfa0ec06bcdb48aaac552e96283cf76b
-  data.tar.gz: 58f6c405a3ab08def9dc2899a94c07cdf8cf0d7cf0fe051cfad6a13e77d81fbf
+  metadata.gz: 35a162c69a00597f108ee30e405a86ec0d5758e94d7110b3f904b5b3b7b7970c
+  data.tar.gz: 5a33fe4850f595f0ad3da5e10acea452d3ca515d47b82003f45e2365f5b5e7b2
 SHA512:
-  metadata.gz: 7b0dc9c0d912356c0bed577496d4af90714142d9774cfa3c093fc66f7937e3c04936ca8daed5ec3d796d9880db744f7ac11d7d1a91e33110a9959428e8ae02a1
-  data.tar.gz: 236477089e9ca29534fec178dd1d33181c1f8482c18fe8bddecd821787e55d69eacf8f51ee952a7070842ddb474d120f0760956d4749021e4c25557978fc3dc2
+  metadata.gz: 4cf7b6cb449a213fbbce8498702a79349133744e91be63de7e171696319d26565e9ec292a3b4403e765ce18cd326a86f1241f41602feb14b80025da24c76f91b
+  data.tar.gz: aa570fbba3f9f361d81196252b969a35b9ed359a5ff400bdc31cb316de9af17e394312f445f8c9922fffa2983454c4cc3a8ace6cd14d70c3f06a63fb29cff41d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree (1.0.36)
+    ree (1.0.38)
       commander (~> 5.0.0)
 
 GEM

data/lib/ree/link_dsl.rb

@@ -70,21 +70,34 @@ module Ree::LinkDSL
         .load_package_object(link_package_name, link_object_name)
 
       if obj.fn?
-        self.class_eval %Q(
-          private def _#{link_as}
-            @#{link_as} ||= #{obj.klass}.new
-          end
-
-          private def #{link_as}(*args, **kwargs, &block)
-            _#{link_as}.call(*args, **kwargs, &block)
-          end
-        )
+        if obj.with_caller?
+          self.class_eval %Q(
+            private def #{link_as}(*args, **kwargs, &block)
+              #{obj.klass}.new.set_caller(self).call(*args, **kwargs, &block)
+            end
+          )
+        else
+          self.class_eval %Q(
+            private def #{link_as}(*args, **kwargs, &block)
+              @#{link_as} ||= #{obj.klass}.new
+              @#{link_as}.call(*args, **kwargs, &block)
+            end
+          )
+        end
       else
-        self.class_eval %Q(
-          private def #{link_as}
-            @#{link_as} ||= #{obj.klass}.new
-          end
-        )
+        if obj.with_caller?
+          self.class_eval %Q(
+            private def #{link_as}
+              #{obj.klass}.new.set_caller(self)
+            end
+          )
+        else
+          self.class_eval %Q(
+            private def #{link_as}
+              @#{link_as} ||= #{obj.klass}.new
+            end
+          )
+        end
       end
     end
 

data/lib/ree/object_compiler.rb

@@ -205,7 +205,7 @@ class Ree::ObjectCompiler
       if obj.with_caller?
         eval_list.push(indent + "private def #{object_link.as}")
         indent = inc_indent(indent)
-        eval_list.push(indent + "@#{object_link.as}")
+        eval_list.push(indent + "#{obj.klass}.new.set_caller(self)")
         indent = dec_indent(indent)
         eval_list.push(indent + "end")
       else

data/lib/ree/rspec_link_dsl.rb

@@ -11,19 +11,28 @@ module Ree::RSpecLinkDSL
 
       define_method as do |*args, **kwargs, &proc|
         if obj.object?
-          obj.klass.new
+          if obj.with_caller?
+            obj.klass.new.set_caller(self)
+          else
+            obj.klass.new
+          end
         else
-          obj.klass.new.call(*args, **kwargs, &proc)
+          if obj.with_caller?
+            obj.klass.new.set_caller(self).call(*args, **kwargs, &proc)
+          else
+            obj.klass.new.call(*args, **kwargs, &proc)
+          end
         end
       end
     elsif obj_name.is_a?(String)
       const_list = link_file(from, obj_name, import_proc)
+
       const_list.each do |const|
         Object.const_set(const.name, self.const_get(const.name))
       end
     else
       raise Ree::Error.new("Invalid link DSL usage. Args should be Hash or String")
-    end  
+    end
   end
 
   private

data/lib/ree/version.rb

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

metadata

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