ree_lib 1.0.10 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44e1a436822756b530e7f11947c68f43377096b4b15d8c6d60880a8f2116d1b2
-  data.tar.gz: cea2b849ec06361e461b282c93632cbcc2131bedfcbf260c87fcca56dfb53539
+  metadata.gz: 03420b754f18500299e45b5b611cb72b44693075ec9a93d46481cf891321f69f
+  data.tar.gz: 0b58f43befc8d14d5165b91d741f25fff71965940c735e91ef8440b362d864eb
 SHA512:
-  metadata.gz: 53f014bef46e41b7f1826ef4487ff0fce03c66b4578a7d6ddd65a37aaa94989aef52523dd368514f1e533b141aac9e9fedc341e4cc14b69dc4a1528482c53ed1
-  data.tar.gz: fe75d4036275c8a4013fbb064ced2f61b014c7ccccb5e48b7966e83f22f44adbc47345b37c01c2498f6f1d1dc035a21bf3ffa6a86a9aca0ac85665d8a13ac74b
+  metadata.gz: 5ce6ccf2789d46751b5ba170fa413c0d0ccc4648c4db7cea76e929ea28123bff3dfc427350631432c0297a43d474d79de69e71b6b076861a137b794b6b9f8c6f
+  data.tar.gz: 2cc846873cbc183a9afa1587dff954e2c41fd75a7edbb19929ff2528e18b48c2d74613e482dbf3f80522eccb9a499ef00b094f9a73e368757b27fa9e599938bb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.10)
+    ree_lib (1.0.13)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -36,17 +36,15 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     msgpack (1.5.4)
-    nokogiri (1.13.8-x86_64-darwin)
-      racc (~> 1.4)
     nokogiri (1.13.8-x86_64-linux)
       racc (~> 1.4)
-    oj (3.13.20)
+    oj (3.13.21)
     pg (1.4.2)
     public_suffix (4.0.7)
     racc (1.6.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    ree (1.0.3)
+    ree (1.0.4)
       commander (~> 4.6.0)
     rexml (3.2.5)
     rollbar (3.3.1)

data/lib/ree_lib/packages/ree_json/package/ree_json/functions/from_json.rb

@@ -7,6 +7,8 @@ class ReeJson::FromJson
     }
   end
 
+  ParseJsonError = Class.new(StandardError)
+
   contract(
     Any,
     Kwargs[
@@ -16,7 +18,7 @@ class ReeJson::FromJson
       symbol_keys?: Bool,
       RestKeys => Any
     ] => Hash
-  ).throws(ArgumentError)
+  ).throws(ParseJsonError)
   def call(object, mode: :rails, **opts)
     options = DEFAULT_OPTIONS
       .dup
@@ -25,5 +27,7 @@ class ReeJson::FromJson
       )
 
     Oj.load(object, options)
+  rescue ArgumentError, EncodingError
+    raise ParseJsonError.new
   end
 end

data/lib/ree_lib/packages/ree_json/schemas/ree_json/functions/from_json.schema.json

@@ -10,7 +10,7 @@
     {
       "doc": "",
       "throws": [
-        "ArgumentError"
+        "ReeJson::FromJson::ParseJsonError"
       ],
       "return": "Hash",
       "args": [

data/lib/ree_lib/packages/ree_json/spec/ree_json/functions/from_json_spec.rb

@@ -11,4 +11,8 @@ RSpec.describe :from_json do
     result = from_json("{\":id\":{\"^o\":\"Object\"}}", mode: :object)
     expect(result[:id]).to be_a(Object)
   }
+
+  it {
+    expect{from_json("{213: \"123\"}")}.to raise_error(ReeJson::FromJson::ParseJsonError)
+  }
 end

data/lib/ree_lib/packages/ree_object/Package.schema.json

@@ -27,10 +27,18 @@
       "name": "deep_freeze",
       "schema": "packages/ree_object/schemas/ree_object/functions/deep_freeze.schema.json"
     },
+    {
+      "name": "dump_as_json",
+      "schema": "packages/ree_object/schemas/ree_object/functions/dump_as_json.schema.json"
+    },
     {
       "name": "is_blank",
       "schema": "packages/ree_object/schemas/ree_object/functions/is_blank.schema.json"
     },
+    {
+      "name": "load_json_dump",
+      "schema": "packages/ree_object/schemas/ree_object/functions/load_json_dump.schema.json"
+    },
     {
       "name": "not_blank",
       "schema": "packages/ree_object/schemas/ree_object/functions/not_blank.schema.json"

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

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require 'set'
+
+class ReeObject::DumpAsJson
+  include Ree::FnDSL
+
+  fn :dump_as_json do
+    def_error { RecursiveObjectErr }
+  end
+
+  ARRAY = 'array'
+  HASH = 'hash'
+  PRIMITIVE = 'primitive'
+  OBJECT = 'object'
+
+  BASIC_TYPES = [
+    Date, Time, Numeric, String, FalseClass, TrueClass, NilClass, Symbol,
+    Module, Class
+  ].freeze
+
+  contract(
+    Any => Or[Hash, ArrayOf[Any], *BASIC_TYPES]
+  ).throws(RecursiveObjectErr)
+  def call(obj)
+    recursively_convert(obj, {})
+  end
+
+  private
+
+  def recursively_convert(obj, cache)
+    ancestors = obj.class.ancestors
+
+    if ancestors.intersection(BASIC_TYPES).size > 0
+      {
+        'type' => PRIMITIVE,
+        'class' => obj.class.name,
+        'value' => dump_primitive(obj)
+      }
+    elsif obj.is_a?(Array)
+      {
+        'type' => ARRAY,
+        'class' => 'Array',
+        'value' => obj.map { recursively_convert(_1, cache) }
+      }
+    elsif obj.is_a?(Hash)
+      {
+        'type' => HASH,
+        'class' => 'Hash',
+        'value' => convert_hash(obj, cache)
+      }
+    elsif obj.is_a?(Proc)
+      raise ArgumentError, "procs are not supported"
+    else
+      {
+        'type' => OBJECT,
+        'class' => obj.class.name || (raise ArgumentError.new("anonymous classes are not supported")),
+        'value' => convert_object(obj, cache)
+      }
+    end
+  end
+
+  PRIMITIVE_SET = Set.new([Symbol, Date, Time, DateTime, Module, Class])
+
+  def dump_primitive(val)
+    if PRIMITIVE_SET.include?(val.class)
+      val.to_s
+    else
+      val
+    end
+  end
+
+  def convert_hash(obj, cache)
+    result = []
+
+    obj.each do |k, v|
+      result << [
+        recursively_convert(k, cache),
+        recursively_convert(v, cache),
+      ]
+    end
+
+    result
+  end
+
+  def convert_object(obj, cache)
+    if cache.key?(obj.object_id)
+      raise RecursiveObjectErr, "Recursive object found: #{obj}"
+    end
+
+    cache[obj.object_id] = true
+    result = []
+
+    obj.instance_variables.each do |var|
+      result << [
+        recursively_convert(var, cache),
+        recursively_convert(obj.instance_variable_get(var), cache),
+      ]
+    end
+
+    result
+  end
+end

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

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+class ReeObject::LoadJsonDump
+  include Ree::FnDSL
+
+  fn :load_json_dump
+
+  ARRAY = 'array'
+  HASH = 'hash'
+  PRIMITIVE = 'primitive'
+  OBJECT = 'object'
+
+  contract(Hash => Any)
+  def call(dump)
+    recursively_load(dump)
+  end
+
+  private
+
+  def recursively_load(dump)
+    case dump['type']
+    when ARRAY
+      dump['value'].map { recursively_load(_1)}
+    when HASH
+      result = {}
+
+      dump['value'].map do |v|
+        result[recursively_load(v[0])] = recursively_load(v[1])
+      end
+
+      result
+    when PRIMITIVE
+      load_primitive(dump['class'], dump['value'])
+    when OBJECT
+      load_object(dump['class'], dump['value'])
+    else
+      raise NotImplementedError, "unsupported type provider '#{dump['type']}'"
+    end
+  end
+
+  private
+
+  def load_primitive(class_str, val)
+    if class_str == 'Class' || class_str == 'Module'
+      return Object.const_get(val)
+    end
+
+    klass = Object.const_get(class_str)
+
+    if klass == Symbol
+      val.to_sym
+    elsif klass == Date
+      Date.parse(val)
+    elsif klass == Time
+      Time.parse(val)
+    elsif klass == DateTime
+      DateTime.parse(val)
+    elsif klass == Module || klass == Class
+      klass
+    else
+      val
+    end
+  end
+
+  def load_object(class_str, val)
+    klass = Object.const_get(class_str)
+    obj = klass.allocate
+
+    val.each do |v|
+      var = recursively_load(v[0])
+      value = recursively_load(v[1])
+      obj.instance_variable_set(var, value)
+    end
+
+    obj
+  end
+end

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

@@ -0,0 +1,27 @@
+{
+  "schema_type": "object",
+  "schema_version": "1.0",
+  "name": "dump_as_json",
+  "path": "packages/ree_object/package/ree_object/functions/dump_as_json.rb",
+  "mount_as": "fn",
+  "class": "ReeObject::DumpAsJson",
+  "factory": null,
+  "methods": [
+    {
+      "doc": "",
+      "throws": [
+        "ReeObject::DumpAsJson::RecursiveObjectErr"
+      ],
+      "return": "Or[Hash, ArrayOf[Any], Date, Time, Numeric, String, FalseClass, TrueClass, NilClass, Symbol, Module, Class]",
+      "args": [
+        {
+          "arg": "obj",
+          "type": "Any"
+        }
+      ]
+    }
+  ],
+  "links": [
+
+  ]
+}

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

@@ -0,0 +1,27 @@
+{
+  "schema_type": "object",
+  "schema_version": "1.0",
+  "name": "load_json_dump",
+  "path": "packages/ree_object/package/ree_object/functions/load_json_dump.rb",
+  "mount_as": "fn",
+  "class": "ReeObject::LoadJsonDump",
+  "factory": null,
+  "methods": [
+    {
+      "doc": "",
+      "throws": [
+
+      ],
+      "return": "Any",
+      "args": [
+        {
+          "arg": "dump",
+          "type": "Hash"
+        }
+      ]
+    }
+  ],
+  "links": [
+
+  ]
+}

data/lib/ree_lib/packages/ree_object/spec/ree_object/functions/dump_as_json_spec.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal = true
+
+RSpec.describe :dump_as_json do
+  link :dump_as_json, from: :ree_object
+  link :load_json_dump, from: :ree_object
+
+  let(:klass) {
+    class TestObjCLass
+      attr_reader :integer, :string, :array, :hash, :object, :klass, :module
+
+      def initialize
+        @integer = 1
+        @string = 'string'
+        @array = [1, 'string', 3, { 'name' => 'John'}]
+
+        @hash = {
+          id: 1,
+          'test' => 2,
+          nested: {
+            some_value: 1,
+            another_value: 2
+          },
+          name: 'name'
+        }
+
+        @object = Object.new
+        @klass = Object
+        @module = Module
+
+        @object.instance_exec do
+          @name = 'John'
+          @last_name = 'Doe'
+        end
+      end
+    end
+
+    TestObjCLass
+  }
+
+  context "object" do
+    it {
+      orig_obj = klass.new
+      result = dump_as_json([orig_obj])
+      obj = load_json_dump(result).first
+
+      expect(obj.integer).to eq(orig_obj.integer)
+      expect(obj.string).to eq(orig_obj.string)
+      expect(obj.array).to eq(orig_obj.array)
+      expect(obj.hash).to eq(orig_obj.hash)
+      expect(obj.klass).to eq(orig_obj.klass)
+      expect(obj.module).to eq(orig_obj.module)
+      expect(obj.object.instance_variable_get(:@name)).to eq(orig_obj.object.instance_variable_get(:@name))
+      expect(obj.object.instance_variable_get(:@last_name)).to eq(orig_obj.object.instance_variable_get(:@last_name))
+    }
+  end
+end

data/lib/ree_lib/packages/ree_swagger/spec/functions/build_schema_spec.rb

@@ -31,10 +31,10 @@ RSpec.describe :build_schema do
         },
         components: {
           securitySchemes: {
-            bearerAuth: {
-              type: 'http',
-              scheme: 'bearer',
-              bearerFormat: 'JWT'
+            ApiKeyAuth: {
+              in: "header",
+              name: "Authorization",
+              type: "apiKey",
             }
           }
         },
@@ -45,7 +45,7 @@ RSpec.describe :build_schema do
           '/version' => {
             get: {
               security: [
-                {bearerAuth: []}
+                {ApiKeyAuth: []}
               ],
               responses: {
                 200 => {

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.0.10"
+  VERSION = "1.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.13
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree
@@ -1035,13 +1035,17 @@ files:
 - lib/ree_lib/packages/ree_object/package/ree_object/functions/as_json.rb
 - lib/ree_lib/packages/ree_object/package/ree_object/functions/deep_dup.rb
 - lib/ree_lib/packages/ree_object/package/ree_object/functions/deep_freeze.rb
+- lib/ree_lib/packages/ree_object/package/ree_object/functions/dump_as_json.rb
 - lib/ree_lib/packages/ree_object/package/ree_object/functions/is_blank.rb
+- lib/ree_lib/packages/ree_object/package/ree_object/functions/load_json_dump.rb
 - lib/ree_lib/packages/ree_object/package/ree_object/functions/not_blank.rb
 - lib/ree_lib/packages/ree_object/package/ree_object/functions/to_obj.rb
 - lib/ree_lib/packages/ree_object/schemas/ree_object/functions/as_json.schema.json
 - lib/ree_lib/packages/ree_object/schemas/ree_object/functions/deep_dup.schema.json
 - lib/ree_lib/packages/ree_object/schemas/ree_object/functions/deep_freeze.schema.json
+- lib/ree_lib/packages/ree_object/schemas/ree_object/functions/dump_as_json.schema.json
 - lib/ree_lib/packages/ree_object/schemas/ree_object/functions/is_blank.schema.json
+- lib/ree_lib/packages/ree_object/schemas/ree_object/functions/load_json_dump.schema.json
 - lib/ree_lib/packages/ree_object/schemas/ree_object/functions/not_blank.schema.json
 - lib/ree_lib/packages/ree_object/schemas/ree_object/functions/to_hash.schema.json
 - lib/ree_lib/packages/ree_object/schemas/ree_object/functions/to_obj.schema.json
@@ -1049,6 +1053,7 @@ files:
 - lib/ree_lib/packages/ree_object/spec/ree_object/functions/as_json_spec.rb
 - lib/ree_lib/packages/ree_object/spec/ree_object/functions/deep_dup_spec.rb
 - lib/ree_lib/packages/ree_object/spec/ree_object/functions/deep_freeze_spec.rb
+- lib/ree_lib/packages/ree_object/spec/ree_object/functions/dump_as_json_spec.rb
 - lib/ree_lib/packages/ree_object/spec/ree_object/functions/is_blank_spec.rb
 - lib/ree_lib/packages/ree_object/spec/ree_object/functions/not_blank_spec.rb
 - lib/ree_lib/packages/ree_object/spec/ree_object/functions/to_obj_spec.rb