ree 1.0.37 → 1.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d501b79e7ddc962cae38fd84b12afe374275742acd074dc88596226e857b36b
-  data.tar.gz: 12f3f11d8e463facc2a0843865ab3e83bbd909e817bbe393142f4000b2ac0d24
+  metadata.gz: 7c82febb352bce1cb674d2b77cac4aeb8f8b1a1fcaa5fa81adae56d2e62bdb20
+  data.tar.gz: d23d1f28309cd3650cd90cd93bb1261011a36359c3fc6096bf8d7945fd9a8598
 SHA512:
-  metadata.gz: cf7fb8c65cdb57adc82bf645800e80e04d60be0f855d182276199b77afd566fad8d2465b74b01f0c1313165abf080b9b9a7e0ff36739fbb089712993d1829214
-  data.tar.gz: 8d6a0861d463fbd37731ddae4a7d603e93e04c3028d9e8af2717e31959067bb3e0328fd5a3112f61eb001ac186f34428d510101ebd0053fd8b4b3daa2a100323
+  metadata.gz: 23819cdc3a1b4d81cbb57baa3946526138baf1662a297522f4ef8e9d4c1377bc311852d1179be445c8cfcea760660e107b97dfffa882b00a70b3b7933e3a5a9e
+  data.tar.gz: ce36b46fbd0fdffc547020e18eb0ee390f6a84f90150ba1bc3c3f80f59bb781d668008f852b7c47830f9a9dcd83ec59407c720024fe47c2ea8638c06b0cd987f

data/Gemfile.lock

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

data/lib/ree/link_dsl.rb

@@ -40,12 +40,16 @@ module Ree::LinkDSL
     # @param [Nilor[Symbol]] as
     # @param [Nilor[Symbol]] from
     # @param [Nilor[Proc]] import
-    def _link_object(object_name, as: nil, from: nil, import: nil)
+    def _link_object(object_name, as: nil, from: nil, target: nil, import: nil)
       check_arg(object_name, :object_name, Symbol)
       check_arg(as, :as, Symbol) if as
       check_arg(from, :from, Symbol) if from
       check_arg(import, :import, Proc) if import
 
+      if target && ![:object, :class, :both].include?(target)
+        raise Ree::Error.new("target should be one of [:object, :class, :both]", :invalid_dsl_usage)
+      end
+
       package_name = Ree::StringUtils.underscore(self.name.split('::').first).to_sym
       link_package_name = from.nil? ? package_name : from
       link_object_name = object_name
@@ -69,22 +73,56 @@ module Ree::LinkDSL
         .packages_facade
         .load_package_object(link_package_name, link_object_name)
 
+      target ||= obj.target
+
+      if target == :both
+        mount_obj(obj, link_as, true)
+        mount_obj(obj, link_as, false)
+      elsif target == :class
+        mount_obj(obj, link_as, true)
+      elsif target == :object
+        mount_obj(obj, link_as, false)
+      end
+    end
+
+    def mount_obj(obj, link_as, mount_self)
       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(
+            #{mount_self ? "class << self" : ""}
+            private def #{link_as}(*args, **kwargs, &block)
+              #{obj.klass}.new.set_caller(self).call(*args, **kwargs, &block)
+            end
+            #{mount_self ? "end" : ""}
+          )
+        else
+          self.class_eval %Q(
+            #{mount_self ? "class << self" : ""}
+            private def #{link_as}(*args, **kwargs, &block)
+              @#{link_as} ||= #{obj.klass}.new
+              @#{link_as}.call(*args, **kwargs, &block)
+            end
+            #{mount_self ? "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(
+            #{mount_self ? "class << self" : ""}
+            private def #{link_as}
+              #{obj.klass}.new.set_caller(self)
+            end
+            #{mount_self ? "end" : ""}
+          )
+        else
+          self.class_eval %Q(
+            #{mount_self ? "class << self" : ""}
+            private def #{link_as}
+              @#{link_as} ||= #{obj.klass}.new
+            end
+            #{mount_self ? "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/version.rb

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

metadata

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