ree 1.0.34 → 1.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e99db4aa81882cc0db13252390f2a7e50b734ebd6e13ba78f13fdfe80a89684
-  data.tar.gz: 556285d5ced07101cb736d8e855abea3ff5e60a56dd4c95342dc82e4d4f3514a
+  metadata.gz: 40269b8b520f835a14d0b155cfb25408dfa0ec06bcdb48aaac552e96283cf76b
+  data.tar.gz: 58f6c405a3ab08def9dc2899a94c07cdf8cf0d7cf0fe051cfad6a13e77d81fbf
 SHA512:
-  metadata.gz: bf697e027c817282f59f6533cc35aa244aa92942cc3d60be24ac4558db94e4c525509e22e20835dc573e7f0f8532f42acd6c3a618d97a9df75b4f61989234fe6
-  data.tar.gz: 76aa018f20cead0705951697da550ac225f681aa50fb39c7bafff17f8c00384d72dcfc483a2d98804621dd2ffd221d22976c6bf45c0cf4e56aa4a15ac3e1919a
+  metadata.gz: 7b0dc9c0d912356c0bed577496d4af90714142d9774cfa3c093fc66f7937e3c04936ca8daed5ec3d796d9880db744f7ac11d7d1a91e33110a9959428e8ae02a1
+  data.tar.gz: 236477089e9ca29534fec178dd1d33181c1f8482c18fe8bddecd821787e55d69eacf8f51ee952a7070842ddb474d120f0760956d4749021e4c25557978fc3dc2

data/Gemfile.lock

@@ -1,40 +1,44 @@
 PATH
   remote: .
   specs:
-    ree (1.0.34)
+    ree (1.0.36)
       commander (~> 5.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    abbrev (0.1.2)
     commander (5.0.0)
       highline (~> 3.0.0)
-    debug (1.6.2)
-      irb (>= 1.3.6)
-      reline (>= 0.3.1)
+    debug (1.9.1)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
     diff-lcs (1.5.0)
-    highline (3.0.0)
-      abbrev
-    io-console (0.5.11)
-    irb (1.4.2)
-      reline (>= 0.3.0)
-    rake (13.0.6)
-    reline (0.3.1)
+    highline (3.0.1)
+    io-console (0.7.2)
+    irb (1.11.1)
+      rdoc
+      reline (>= 0.4.2)
+    psych (5.1.2)
+      stringio
+    rake (13.1.0)
+    rdoc (6.6.2)
+      psych (>= 4.0.0)
+    reline (0.4.2)
       io-console (~> 0.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    stringio (3.1.0)
 
 PLATFORMS
   arm64-darwin-21

data/lib/ree/bean_dsl.rb

@@ -3,6 +3,7 @@
 module Ree::BeanDSL
   def self.included(base)
     base.extend(ClassMethods)
+    base.include(Ree::Inspectable)
   end
 
   def self.extended(base)

data/lib/ree/core/object.rb

@@ -5,7 +5,7 @@ class Ree::Object
               :package_name, :factory, :after_init,
               :class_name, :links, :mount_as, :freeze,
               :errors, :linked_const_list, :compiled_frozen,
-              :singleton, :tags
+              :singleton, :tags, :target, :with_caller
 
   # @param [Symbol] name Object name
   # @param [String] schema_rpath Object schema path relative to project root dir
@@ -16,10 +16,12 @@ class Ree::Object
     @rpath = rpath
     @links = []
     @errors = []
+    @target = :object
     @loaded = false
     @freeze = true
     @compiled = false
     @singleton = false
+    @with_caller = false
     @compiled_frozen = @freeze
     @linked_const_list = []
     @tags = []
@@ -28,6 +30,8 @@ class Ree::Object
   def reset
     @compiled = false
     @singleton = false
+    @with_caller = false
+    @target = :object
     @loaded = false
     @factory = nil
     @after_init = nil
@@ -55,6 +59,10 @@ class Ree::Object
     @compiled_frozen = @freeze
   end
 
+  def with_caller?
+    @with_caller
+  end
+
   def compiled?
     @compiled
   end
@@ -79,6 +87,15 @@ class Ree::Object
     @freeze
   end
 
+  def singleton?
+    @singleton
+  end
+
+  # @param [Symbol] val Object linking target (:object, :class, :both)
+  def set_target(val)
+    @target = val; self
+  end
+
   # @param [Symbol] val Object mount as type (:fn or :bean)
   def set_mount_as(val)
     @mount_as = val; self
@@ -93,6 +110,11 @@ class Ree::Object
     @singleton = true; self
   end
 
+
+  def set_as_with_caller
+    @with_caller = true; self
+  end
+
   def object?
     @mount_as == :object
   end

data/lib/ree/core/object_link.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
 class Ree::ObjectLink
-  attr_reader :object_name, :package_name, :as, :constants
+  attr_reader :object_name, :package_name, :as, :constants, :target
 
   # @param [Symbol] object_name Linked object name
   # @param [Symbol] package_name Linked object package
   # @param [Symbol] as Linked object alias name
-  def initialize(object_name, package_name, as)
+  # @param Nilor[Symbol] target Linked object target
+  def initialize(object_name, package_name, as, target)
     @object_name = object_name
     @package_name = package_name
     @as = as
+    @target = target
     @constants = []
   end
 

data/lib/ree/dsl/object_dsl.rb

@@ -45,11 +45,13 @@ class Ree::ObjectDsl
   # @param [Nilor[Symbol]] as
   # @param [Nilor[Symbol]] from
   # @param [Nilor[Proc]] import
-  def link_object(object_name, as: nil, from: nil, import: nil)
+  # @param [Or[:object, :class, :both]] import
+  def link_object(object_name, as: nil, from: nil, import: nil, target: 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
+    check_target(target) if target
 
     link_package_name = from.nil? ? @object.package_name : from
     link_object_name = object_name
@@ -69,7 +71,7 @@ class Ree::ObjectDsl
     end
 
     link = Ree::ObjectLink.new(
-      link_object_name, link_package_name, link_as
+      link_object_name, link_package_name, link_as, target
     )
 
     if const_list
@@ -83,6 +85,28 @@ class Ree::ObjectDsl
     @packages_facade.load_package_object(link_package_name, link_object_name)
   end
 
+  # @param [Symbol] target (:object, :class, :both, default: :object)
+  def target(val)
+    check_arg(val, :target, Symbol)
+    check_target(val)
+
+    @object.set_target(val)
+  end
+
+  def with_caller
+    @object.set_freeze(false)
+
+    if @object.singleton?
+      raise_error("`with_caller` is not available for singletons")
+    end
+
+    if @object.factory?
+      raise_error("`with_caller` is not available for factory beans")
+    end
+
+    @object.set_as_with_caller
+  end
+
   # @param [Symbol] method_name
   def factory(method_name)
     if !@object.object?
@@ -93,11 +117,19 @@ class Ree::ObjectDsl
       raise_error("Factory beans do not support after_init DSL")
     end
 
+    if @object.with_caller?
+      raise_error("Factory beans do not support with_caller DSL")
+    end
+
     check_arg(method_name, :method_name, Symbol)
     @object.set_factory(method_name)
   end
 
   def singleton
+    if @object.with_caller?
+      raise_error("`singleton` should not be combined with `with_caller`")
+    end
+
     @object.set_as_singleton
   end
 
@@ -113,6 +145,10 @@ class Ree::ObjectDsl
 
   # @param [Bool] flag
   def freeze(flag)
+    if @object.with_caller? && flag
+      raise_error("`freeze` should not be combined with `with_caller`")
+    end
+
     check_bool(flag, :flag)
     @object.set_freeze(flag)
   end
@@ -277,6 +313,12 @@ class Ree::ObjectDsl
     end
   end
 
+  def check_target(val)
+    if ![:object, :class, :both].include?(val)
+      raise Ree::Error.new("target should be one of [:object, :class, :both]", :invalid_dsl_usage)
+    end
+  end
+
   def raise_error(text, code = :invalid_dsl_usage)
     msg = <<~DOC
       object: :#{@object.name}

data/lib/ree/fn_dsl.rb

@@ -3,6 +3,7 @@
 module Ree::FnDSL
   def self.included(base)
     base.extend(ClassMethods)
+    base.include(Ree::Inspectable)
   end
 
   def self.extended(base)

data/lib/ree/inspectable.rb

@@ -0,0 +1,10 @@
+require "json"
+require "objspace"
+
+module Ree::Inspectable
+  def inspect
+    object_internals_json = ObjectSpace.dump(self)
+    address = JSON.parse(object_internals_json)["address"]
+    "#<#{self.class.name}:#{address}>"
+  end
+end

data/lib/ree/object_compiler.rb

@@ -18,13 +18,57 @@ class Ree::ObjectCompiler
 
     klass = object.klass
     links = object.links
+
+    links.each do |_|
+      @link_validator.call(object, _)
+      pckg = @packages_facade.get_loaded_package(_.package_name)
+      obj = pckg.get_object(_.object_name)
+      @packages_facade.load_package_object(pckg.name, obj.name)
+    end
+
     eval_list = []
 
     eval_list.push("\n# #{object.klass}")
     indent = ""
 
+    if object.with_caller?
+      eval_list.push("def get_caller = @caller")
+      eval_list.push("\n")
+      eval_list.push("def set_caller(c)")
+      indent = inc_indent(indent)
+      eval_list.push("@caller = c")
+      eval_list.push("self")
+      indent = dec_indent(indent)
+      eval_list.push("end")
+    end
+
+    class_links = []
+    object_links = []
+
     links.each do |_|
-      eval_list.push(indent + "private attr_reader :#{_.as}")
+      pckg = @packages_facade.get_loaded_package(_.package_name)
+      obj = pckg.get_object(_.object_name)
+
+      if [:class, :both].include?(_.target || obj.target)
+        class_links << _
+      end
+
+      if [:object, :both].include?(_.target || obj.target)
+        object_links << _
+      end
+    end
+
+    if !class_links.empty?
+      class_links.each do |_|
+        pckg = @packages_facade.get_loaded_package(_.package_name)
+        obj = pckg.get_object(_.object_name)
+
+        if !obj.with_caller?
+          eval_list.push(indent + "@#{_.as} = #{obj.klass}.new")
+        end
+      end
+
+      eval_list.push("\n")
     end
 
     eval_list.push("\n")
@@ -97,23 +141,26 @@ class Ree::ObjectCompiler
 
     eval_list.push(indent + 'end')
 
-    links.each do |_|
-      pckg = @packages_facade.get_loaded_package(_.package_name)
-      obj = pckg.get_object(_.object_name)
+    if !class_links.empty?
+      eval_list.push("\n")
+      eval_list.push("class << self")
+      indent = inc_indent(indent)
 
-      if obj.fn?
-        eval_list.push(indent + "\nprivate def #{_.as}(*args, **kwargs, &block)")
-        indent = inc_indent(indent)
-        eval_list.push(indent + "@#{_.as}.call(*args, **kwargs, &block)")
-        indent = dec_indent(indent)
-        eval_list.push(indent + "end")
-      else
-        eval_list.push(indent + "\nprivate def #{_.as}")
-        indent = inc_indent(indent)
-        eval_list.push(indent + "@#{_.as}")
-        indent = dec_indent(indent)
-        eval_list.push(indent + "end")
+      class_links.each do |_|
+        pckg = @packages_facade.get_loaded_package(_.package_name)
+        obj = pckg.get_object(_.object_name)
+        mount_fn(eval_list, obj, indent, _)
       end
+
+      indent = dec_indent(indent)
+      eval_list.push("end")
+      eval_list.push("\n")
+    end
+
+    object_links.each do |_|
+      pckg = @packages_facade.get_loaded_package(_.package_name)
+      obj = pckg.get_object(_.object_name)
+      mount_fn(eval_list, obj, indent, _)
     end
 
     indent = dec_indent(indent)
@@ -139,6 +186,38 @@ class Ree::ObjectCompiler
 
   private
 
+  def mount_fn(eval_list, obj, indent, object_link)
+    if obj.fn?
+      if obj.with_caller?
+        eval_list.push(indent + "private def #{object_link.as}(*args, **kwargs, &block)")
+        indent = inc_indent(indent)
+        eval_list.push(indent + "#{obj.klass}.new.set_caller(self).call(*args, **kwargs, &block)")
+        indent = dec_indent(indent)
+        eval_list.push(indent + "end")
+      else
+        eval_list.push(indent + "private def #{object_link.as}(*args, **kwargs, &block)")
+        indent = inc_indent(indent)
+        eval_list.push(indent + "@#{object_link.as}.call(*args, **kwargs, &block)")
+        indent = dec_indent(indent)
+        eval_list.push(indent + "end")
+      end
+    else
+      if obj.with_caller?
+        eval_list.push(indent + "private def #{object_link.as}")
+        indent = inc_indent(indent)
+        eval_list.push(indent + "@#{object_link.as}")
+        indent = dec_indent(indent)
+        eval_list.push(indent + "end")
+      else
+        eval_list.push(indent + "private def #{object_link.as}")
+        indent = inc_indent(indent)
+        eval_list.push(indent + "@#{object_link.as}")
+        indent = dec_indent(indent)
+        eval_list.push(indent + "end")
+      end
+    end
+  end
+
   def inc_indent(indent)
     indent += "  "
   end

data/lib/ree/version.rb

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

data/lib/ree.rb

@@ -17,6 +17,7 @@ module Ree
   autoload :FnDSL, 'ree/fn_dsl'
   autoload :Gen, 'ree/gen'
   autoload :ImportDsl, 'ree/dsl/import_dsl'
+  autoload :Inspectable, 'ree/inspectable'
   autoload :LinkDSL, 'ree/link_dsl'
   autoload :LinkImportBuilder, 'ree/dsl/link_import_builder'
   autoload :LinkValidator, 'ree/core/link_validator'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.0.34
+  version: 1.0.36
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-18 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -156,6 +156,7 @@ files:
 - lib/ree/gen/init.rb
 - lib/ree/gen/package.rb
 - lib/ree/handlers/template_handler.rb
+- lib/ree/inspectable.rb
 - lib/ree/link_dsl.rb
 - lib/ree/object_compiler.rb
 - lib/ree/package_dsl.rb