ree_lib 1.0.9 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 756ef68a2b67f69d7b39d4877f51bebef0bf9f16c2d826f75a66fa43784ac779
-  data.tar.gz: f9668ac762030ae0b4e0d53d9edafd7751396b30e4b1f4ae67188b889aef6360
+  metadata.gz: 5642d84c9a164bab7fd9b03ba1e34ab6f50a56001e0d0f5c03bfeb329891c2bf
+  data.tar.gz: 1ef62cc8d2db588c1f1b91a7d6899e7e1f96df2039c6fb833a77d6f3af35ee17
 SHA512:
-  metadata.gz: 7f0f85267b26e8249d4c8c9d46532717acc53a4378e19e20e5f07e2431b751cee6591ac97677ffc528b651fef7428f868a73e9d87ef44103f94a21b412ff5f6d
-  data.tar.gz: c31dd2b537126f8590b656002f169fbce184448bedc79d4c0c58b7de769a940e5f780a7d73e70595a68966bafda85a13ef73031da79df69808d3eea5fb224352
+  metadata.gz: 81a32a78567d690bbeef04c74d4636bfe7ba3e9096870be936cae4420ce3371bb74f8d237545dd7a73dc543b147a952aeed85eaff180a1ea07222bc4eb3fbb7b
+  data.tar.gz: a7e6e807ec71aec8275dd753abb1f491adfc75228051b65059fd1eb55e4816696f0d95e2550be78535fca6e8b5daec4c864eb395a5037619e41715e2ed7d9b8c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.9)
+    ree_lib (1.0.12)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -36,8 +36,6 @@ 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)

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' => obj.class,
+        'value' => obj.map { recursively_convert(_1, cache) }
+      }
+    elsif obj.is_a?(Hash)
+      {
+        'type' => HASH,
+        'class' => obj.class,
+        '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/package/ree_swagger/dto/endpoint_dto.rb

@@ -13,6 +13,7 @@ class ReeSwagger::EndpointDto
     path: String,
     caster: Nilor[ReeMapper::Mapper],
     serializer: Nilor[ReeMapper::Mapper],
+    authenticate: Bool,
     summary: Nilor[String],
     description: Nilor[String],
     response_status: Integer,

data/lib/ree_lib/packages/ree_swagger/package/ree_swagger/functions/build_endpoint_schema.rb

@@ -112,6 +112,7 @@ class ReeSwagger::BuildEndpointSchema
 
     method_schema[:parameters]  = parameters   if parameters
     method_schema[:requestBody] = request_body if request_body
+    method_schema[:security] = [{ ApiKeyAuth: [] }] if endpoint.authenticate
 
     schema = {endpoint.method => method_schema}
 

data/lib/ree_lib/packages/ree_swagger/package/ree_swagger/functions/build_request_body_schema.rb

@@ -38,10 +38,11 @@ class ReeSwagger::BuildRequestBodySchema
 
     return if properties.empty?
 
-    {
+    obj = {
       type: 'object',
       properties: properties,
-      required: required_fields
     }
+    obj[:required] = required_fields if required_fields.size != 0
+    obj
   end
 end

data/lib/ree_lib/packages/ree_swagger/package/ree_swagger/functions/build_schema.rb

@@ -8,8 +8,8 @@ class ReeSwagger::BuildSchema
     link 'ree_swagger/dto/endpoint_dto', -> { EndpointDto }
   end
 
-  contract(String, String, String, ArrayOf[EndpointDto] => Hash)
-  def call(title:, description:, version:, endpoints:)
+  contract(String, String, String, String, ArrayOf[EndpointDto] => Hash)
+  def call(title:, description:, version:, api_url:, endpoints:)
     {
       openapi: "3.0.0",
       info: {
@@ -17,6 +17,16 @@ class ReeSwagger::BuildSchema
         description: description,
         version:     version
       },
+      components: {
+        securitySchemes: {
+          ApiKeyAuth: {
+            type: 'apiKey',
+            in: 'header',
+            name: 'Authorization'
+          }
+        }
+      },
+      servers: [{ url: api_url }],
       paths: endpoints.each_with_object(Hash.new { _1[_2] = {} }) {
         path_dto = build_endpoint_schema(_1)
         _2[path_dto.path].merge!(path_dto.schema)

data/lib/ree_lib/packages/ree_swagger/schemas/ree_swagger/functions/build_schema.schema.json

@@ -26,6 +26,10 @@
           "arg": "version",
           "type": "String"
         },
+        {
+          "arg": "api_url",
+          "type": "String"
+        },
         {
           "arg": "endpoints",
           "type": "ArrayOf[ReeSwagger::EndpointDto]"

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

@@ -71,6 +71,7 @@ RSpec.describe :build_endpoint_schema do
     schema = build_endpoint_schema(ReeSwagger::EndpointDto.new(
       method:          :post,
       respond_to:      :json,
+      authenticate:    false,
       path:            '/versions/:id',
       sections:        ["versions"],
       caster:          caster,
@@ -97,6 +98,7 @@ RSpec.describe :build_endpoint_schema do
     csv_schema = build_endpoint_schema(ReeSwagger::EndpointDto.new(
       method:          :get,
       respond_to:      :csv,
+      authenticate:    false,
       path:            '/files/:id',
       sections:        ["files"],
       caster:          file_caster,
@@ -226,6 +228,7 @@ RSpec.describe :build_endpoint_schema do
       path:            '/versions/:id',
       caster:          caster,
       respond_to:      :json,
+      authenticate:    false,
       serializer:      nil,
       response_status: 200,
       description:     nil,
@@ -288,6 +291,7 @@ RSpec.describe :build_endpoint_schema do
         method:          :get,
         path:            '/versions/:id',
         respond_to:      :json,
+        authenticate:    false,
         caster:          nil,
         serializer:      nil,
         response_status: 200,
@@ -311,6 +315,7 @@ RSpec.describe :build_endpoint_schema do
         method:          :get,
         path:            '/versions/:id',
         respond_to:      :json,
+        authenticate:    false,
         caster:          caster,
         serializer:      nil,
         response_status: 200,

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

@@ -6,8 +6,10 @@ RSpec.describe :build_schema do
       title: 'Sample API',
       description: 'Sample API description',
       version: '0.0.1',
+      api_url: 'https://some-api.com/api/v1',
       endpoints: [ReeSwagger::EndpointDto.new(
         method:          :get,
+        authenticate:    true,
         path:            '/version',
         respond_to:      :json,
         caster:          nil,
@@ -27,9 +29,24 @@ RSpec.describe :build_schema do
           description: 'Sample API description',
           version: '0.0.1'
         },
+        components: {
+          securitySchemes: {
+            ApiKeyAuth: {
+              in: "header",
+              name: "Authorization",
+              type: "apiKey",
+            }
+          }
+        },
+        servers: [
+          { url: 'https://some-api.com/api/v1' }
+        ],
         paths: {
           '/version' => {
             get: {
+              security: [
+                {ApiKeyAuth: []}
+              ],
               responses: {
                 200 => {
                   description: ''

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.12
 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