ree_lib 1.0.32 → 1.0.34

data/lib/ree_lib/packages/ree_object/package/ree_object/functions/to_obj.rb

@@ -1,97 +1,97 @@
-# frozen_string_literal: true
-
-class ReeObject::ToObj
-  include Ree::FnDSL
-
-  fn :to_obj do
-    link :as_json, import: -> { BASIC_TYPES }
-    link :slice, from: :ree_hash
+# frozen_string_literal: true
+
+class ReeObject::ToObj
+  include Ree::FnDSL
+
+  fn :to_obj do
     link :except, from: :ree_hash
+    link :slice, from: :ree_hash
+    link :to_hash, import: -> { BASIC_TYPES }
     link 'ree_hash/contracts/hash_keys_contract', -> { HashKeysContract }
-  end
-
-  contract(
-    Any,
-    Ksplat[
-      include?: HashKeysContract,
-      exclude?: HashKeysContract,
-      global_exclude?: ArrayOf[Symbol]
-    ] => Or[Object, ArrayOf[Object], *BASIC_TYPES]
-  ).throws(ArgumentError)
-  def call(obj, **opts)
-    dump = as_json(obj)
-
-    options = prepare_options(opts)
-
-    if opts[:include]
-      dump = slice(dump, options[:include])
-    end
-
-    if opts[:exclude]
-      dump = except(dump, options[:exclude])
-    end
-
-    if opts[:global_exclude]
-      dump = except(dump, global_except: options[:global_exclude])
-    end
-
-    ancestors = dump.class.ancestors
-    return dump if ancestors.intersection(BASIC_TYPES).size > 0
-      
-    if dump.is_a?(Array)
-      build_array(dump)
-    else
-      recursively_assign(Object.new, dump)
-    end
-  end
-
-  private
-
-  def build_array(array)
-    array.map do |value|
-      if value.is_a?(Array)
-        build_array(value)
-      elsif value.is_a?(Hash)
-        recursively_assign(Object.new, value)
-      else
-        value
-      end
-    end
-  end
-
-  def recursively_assign(obj, hash)
-    hash.each do |key, value|
-      var = :"@#{key}"
-
-      obj.define_singleton_method key do 
-        instance_variable_get(var)
-      end
-
-      if value.is_a?(Array)
-        obj.instance_variable_set(var, build_array(value))
-      elsif value.is_a?(Hash)
-        obj.instance_variable_set(var, recursively_assign(Object.new, value))
-      else
-        obj.instance_variable_set(var, value)
-      end
-    end
-    
-    obj
-  end
-
-  def prepare_options(opts)
-    if opts[:include] && (opts[:exclude] || opts[:global_exclude])
-      intersection = opts_keys(opts[:include]).intersection(opts_keys(opts[:exclude] || opts[:global_exclude]))
-
-      if intersection.length > 0
-        raise ArgumentError, "Exclude and include have the same values: #{intersection}"
-      end
-    end
-
-    opts
-  end
-
-  def opts_keys(arr)
-    arr.reject { |e| e.is_a?(Hash) }
-  end
+  end
+
+  contract(
+    Any,
+    Ksplat[
+      include?: HashKeysContract,
+      exclude?: HashKeysContract,
+      global_exclude?: ArrayOf[Symbol]
+    ] => Or[Object, ArrayOf[Object], *BASIC_TYPES]
+  ).throws(ArgumentError)
+  def call(obj, **opts)
+    dump = to_hash(obj)
+
+    options = prepare_options(opts)
+
+    if opts[:include]
+      dump = slice(dump, options[:include])
+    end
+
+    if opts[:exclude]
+      dump = except(dump, options[:exclude])
+    end
+
+    if opts[:global_exclude]
+      dump = except(dump, global_except: options[:global_exclude])
+    end
+
+    ancestors = dump.class.ancestors
+    return dump if ancestors.intersection(BASIC_TYPES).size > 0
+
+    if dump.is_a?(Array)
+      build_array(dump)
+    else
+      recursively_assign(Object.new, dump)
+    end
+  end
+
+  private
+
+  def build_array(array)
+    array.map do |value|
+      if value.is_a?(Array)
+        build_array(value)
+      elsif value.is_a?(Hash)
+        recursively_assign(Object.new, value)
+      else
+        value
+      end
+    end
+  end
+
+  def recursively_assign(obj, hash)
+    hash.each do |key, value|
+      var = :"@#{key}"
+
+      obj.define_singleton_method key do
+        instance_variable_get(var)
+      end
+
+      if value.is_a?(Array)
+        obj.instance_variable_set(var, build_array(value))
+      elsif value.is_a?(Hash)
+        obj.instance_variable_set(var, recursively_assign(Object.new, value))
+      else
+        obj.instance_variable_set(var, value)
+      end
+    end
+
+    obj
+  end
+
+  def prepare_options(opts)
+    if opts[:include] && (opts[:exclude] || opts[:global_exclude])
+      intersection = opts_keys(opts[:include]).intersection(opts_keys(opts[:exclude] || opts[:global_exclude]))
+
+      if intersection.length > 0
+        raise ArgumentError, "Exclude and include have the same values: #{intersection}"
+      end
+    end
+
+    opts
+  end
+
+  def opts_keys(arr)
+    arr.reject { |e| e.is_a?(Hash) }
+  end
 end

data/lib/ree_lib/packages/ree_object/schemas/ree_object/functions/deep_dup.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "schema_version": "1.0",
+  "schema_version": "1.1",
   "name": "deep_dup",
   "path": "packages/ree_object/package/ree_object/functions/deep_dup.rb",
   "mount_as": "fn",
@@ -16,10 +16,12 @@
       "args": [
         {
           "arg": "obj",
+          "arg_type": "req",
           "type": "Any"
         },
         {
           "arg": "opts",
+          "arg_type": "keyrest",
           "type": "Ksplat[:freeze? => Bool]"
         }
       ]

data/lib/ree_lib/packages/ree_object/schemas/ree_object/functions/deep_freeze.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "schema_version": "1.0",
+  "schema_version": "1.1",
   "name": "deep_freeze",
   "path": "packages/ree_object/package/ree_object/functions/deep_freeze.rb",
   "mount_as": "fn",
@@ -16,6 +16,7 @@
       "args": [
         {
           "arg": "obj",
+          "arg_type": "req",
           "type": "Any"
         }
       ]

data/lib/ree_lib/packages/ree_object/schemas/ree_object/functions/dump_as_json.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "schema_version": "1.0",
+  "schema_version": "1.1",
   "name": "dump_as_json",
   "path": "packages/ree_object/package/ree_object/functions/dump_as_json.rb",
   "mount_as": "fn",
@@ -10,12 +10,13 @@
     {
       "doc": "",
       "throws": [
-        "ReeObject::DumpAsJson::RecursiveObjectErr"
+
       ],
       "return": "Or[Hash, ArrayOf[Any], Date, Time, Numeric, String, FalseClass, TrueClass, NilClass, Symbol, Module, Class]",
       "args": [
         {
           "arg": "obj",
+          "arg_type": "req",
           "type": "Any"
         }
       ]

data/lib/ree_lib/packages/ree_object/schemas/ree_object/functions/is_blank.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "schema_version": "1.0",
+  "schema_version": "1.1",
   "name": "is_blank",
   "path": "packages/ree_object/package/ree_object/functions/is_blank.rb",
   "mount_as": "fn",
@@ -16,6 +16,7 @@
       "args": [
         {
           "arg": "obj",
+          "arg_type": "req",
           "type": "Any"
         }
       ]

data/lib/ree_lib/packages/ree_object/schemas/ree_object/functions/load_json_dump.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "schema_version": "1.0",
+  "schema_version": "1.1",
   "name": "load_json_dump",
   "path": "packages/ree_object/package/ree_object/functions/load_json_dump.rb",
   "mount_as": "fn",
@@ -16,6 +16,7 @@
       "args": [
         {
           "arg": "dump",
+          "arg_type": "req",
           "type": "Hash"
         }
       ]

data/lib/ree_lib/packages/ree_object/schemas/ree_object/functions/not_blank.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "schema_version": "1.0",
+  "schema_version": "1.1",
   "name": "not_blank",
   "path": "packages/ree_object/package/ree_object/functions/not_blank.rb",
   "mount_as": "fn",
@@ -16,6 +16,7 @@
       "args": [
         {
           "arg": "obj",
+          "arg_type": "req",
           "type": "Any"
         }
       ]

data/lib/ree_lib/packages/ree_object/schemas/ree_object/functions/{as_json.schema.json → to_hash.schema.json}

@@ -1,21 +1,22 @@
 {
   "schema_type": "object",
-  "schema_version": "1.0",
-  "name": "as_json",
-  "path": "packages/ree_object/package/ree_object/functions/as_json.rb",
+  "schema_version": "1.1",
+  "name": "to_hash",
+  "path": "packages/ree_object/package/ree_object/functions/to_hash.rb",
   "mount_as": "fn",
-  "class": "ReeObject::AsJson",
+  "class": "ReeObject::ToHash",
   "factory": null,
   "methods": [
     {
       "doc": "",
       "throws": [
-        "ReeObject::AsJson::RecursiveObjectErr"
+        "ReeObject::ToHash::RecursiveObjectErr"
       ],
       "return": "Or[Hash, ArrayOf[Any], Date, Time, Numeric, String, FalseClass, TrueClass, NilClass, Symbol, Module, Class]",
       "args": [
         {
           "arg": "obj",
+          "arg_type": "req",
           "type": "Any"
         }
       ]

data/lib/ree_lib/packages/ree_object/schemas/ree_object/functions/to_obj.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "schema_version": "1.0",
+  "schema_version": "1.1",
   "name": "to_obj",
   "path": "packages/ree_object/package/ree_object/functions/to_obj.rb",
   "mount_as": "fn",
@@ -16,24 +16,18 @@
       "args": [
         {
           "arg": "obj",
+          "arg_type": "req",
           "type": "Any"
         },
         {
           "arg": "opts",
+          "arg_type": "keyrest",
           "type": "Ksplat[:include? => [:key0, .., :keyM => [:keyN, .., :keyZ]], :exclude? => [:key0, .., :keyM => [:keyN, .., :keyZ]], :global_exclude? => ArrayOf[Symbol]]"
         }
       ]
     }
   ],
   "links": [
-    {
-      "target": "as_json",
-      "package_name": "ree_object",
-      "as": "as_json",
-      "imports": [
-        "BASIC_TYPES"
-      ]
-    },
     {
       "target": "except",
       "package_name": "ree_hash",
@@ -49,6 +43,14 @@
       "imports": [
 
       ]
+    },
+    {
+      "target": "to_hash",
+      "package_name": "ree_object",
+      "as": "to_hash",
+      "imports": [
+        "BASIC_TYPES"
+      ]
     }
   ]
 }