ree_lib 1.0.65 → 1.0.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6a080727db9b2998d5e983aa2e024fd73833e6b98deb2f75eb8ac8309af1c6b
-  data.tar.gz: b96cc24d1df8586e8159e96c7545017ecab7009a01bd5b9a2b9c759fb1beeddd
+  metadata.gz: adfdcee3c81364ab7af1c22fb56bd6b2d2f823b78f67264effce6b7e2af35852
+  data.tar.gz: 2991aa1e88c979c3b714bbf1da5facc68b52582a84001d43b8e1b304768125fb
 SHA512:
-  metadata.gz: c1a8e3c1d0471a58cb3dd4602a83a8da2f30498e4af39f9ade709a256592d8f3a6ef6c58a14a8fff1c3f865d9508c49e5673d4bbbe8d0ddbe95fa5dd37074695
-  data.tar.gz: 34e1a0221ad4040a469082111c63687903e6e5d6a89d25c8ada10f742efbd6774e0e8bc729c251670a5ef293b4917dfebe3c701be6155f84241a4a651d952b9c
+  metadata.gz: e9d848d9321212758be3e7051b408eedef55bcfb3d712e647f598f9e82510ea1b09275e4944fe89e8e83bce4650b36c2f02b59fdfe01e37bf7e8703911102ac3
+  data.tar.gz: 3c62a965cd9c5aeb588b984d3e2b9d93ef80698fe24fc7dafa0595a214443ec5d29e2ba91d7f8a424ee6410f3921dda339eefbeb2a4510c3999bc13532662f5f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.65)
+    ree_lib (1.0.67)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -38,9 +38,9 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     msgpack (1.6.0)
-    nokogiri (1.15.3-x86_64-darwin)
+    nokogiri (1.15.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.3-x86_64-linux)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
     oj (3.13.23)
     pg (1.4.6)

data/lib/ree_lib/packages/ree_dao/package/ree_dao/functions/build_connection.rb

@@ -68,7 +68,7 @@ class ReeDao::BuildConnection
     end
 
     if opts[:sql_log_level]
-      connection.sql_log_level = opts[:sql_log_level] 
+      connection.sql_log_level = opts[:sql_log_level]
     end
 
     Timeout::timeout(timeout) do

data/lib/ree_lib/packages/ree_http/package/ree_http/constants.rb

@@ -5,8 +5,8 @@ module ReeHttp
     DEFAULT_TIMEOUT = 60
     DEFAULT_WRITE_TIMEOUT = 30
     DEFAULT_FORCE_SSL = false
-    HTTPS = 'https'
-    HTTP = 'http'
+    HTTPS_STR = 'https'
+    HTTP_STR = 'http'
     HTTPS_PORT = 443
     HTTP_PORT = 80
   end

data/lib/ree_lib/packages/ree_http/package/ree_http/functions/build_request.rb

@@ -7,7 +7,7 @@ class ReeHttp::BuildRequest
     link :not_blank, from: :ree_object
     link :to_json, from: :ree_json
     link 'ree_http/constants', -> {
-      HTTPS & HTTP & HTTPS_PORT & HTTP_PORT & DEFAULT_FORCE_SSL
+      HTTPS_STR & HTTP_STR & HTTPS_PORT & HTTP_PORT & DEFAULT_FORCE_SSL
     }
   end
 
@@ -49,7 +49,7 @@ class ReeHttp::BuildRequest
     opts = DEFAULTS.merge(opts)
     uri = URI(url)
 
-    uri.scheme = opts[:force_ssl] ? HTTPS : uri.scheme
+    uri.scheme = opts[:force_ssl] ? HTTPS_STR : uri.scheme
 
     if DEFAULT_PROTOCOL_PORTS.include?(uri.port)
       uri.port = opts[:force_ssl] ? HTTPS_PORT : uri.port

data/lib/ree_lib/packages/ree_http/package/ree_http/functions/build_request_executor.rb

@@ -5,7 +5,7 @@ class ReeHttp::BuildRequestExecutor
 
   fn :build_request_executor do
     link 'ree_http/constants', -> {
-      HTTPS & DEFAULT_TIMEOUT & DEFAULT_WRITE_TIMEOUT & DEFAULT_FORCE_SSL
+      HTTPS_STR & DEFAULT_TIMEOUT & DEFAULT_WRITE_TIMEOUT & DEFAULT_FORCE_SSL
     }
   end
 
@@ -47,7 +47,7 @@ class ReeHttp::BuildRequestExecutor
     request_executor.write_timeout = opts[:write_timeout]
     request_executor.read_timeout = opts[:timeout]
 
-    request_executor.use_ssl = opts[:force_ssl] || uri.scheme == HTTPS
+    request_executor.use_ssl = opts[:force_ssl] || uri.scheme == HTTPS_STR
 
 
     if opts[:ca_certs?]

data/lib/ree_lib/packages/ree_json/package/ree_json/constants.rb

@@ -11,7 +11,7 @@ class ReeJson::Constants
     :object,
     :custom,
     :wab,
-  ]
+  ].freeze
 
   ESCAPE_MODES = [
     :newline, # allows unescaped newlines in the output.
@@ -19,12 +19,13 @@ class ReeJson::Constants
     :xss_safe, # escapes HTML and XML characters such as & and <.
     :ascii, # escapes all non-ascii or characters with the hi-bit set.
     :unicode_xss, # escapes a special unicodes and is xss safe.
-  ]
+  ].freeze
 
-  TIME_FORMATS = []
+  TIME_FORMATS = [].freeze
 
   DEFAULT_OPTIONS = {
     time_format: :xmlschema,
-    use_as_json: true
+    use_as_json: true,
+    mode: :rails,
   }.freeze
 end

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

@@ -3,7 +3,7 @@ class ReeJson::FromJson
 
   fn :from_json do
     link 'ree_json/constants', -> {
-      DEFAULT_OPTIONS & MODES  & ESCAPE_MODES & TIME_FORMATS
+      DEFAULT_OPTIONS & MODES & ESCAPE_MODES & TIME_FORMATS
     }
   end
 
@@ -11,23 +11,18 @@ class ReeJson::FromJson
 
   contract(
     Any,
-    Kwargs[
-      mode: Or[*MODES]
-    ],
     Ksplat[
+      mode?: Or[*MODES],
       symbol_keys?: Bool,
       RestKeys => Any
-    ] => Hash
+    ] => Any
   ).throws(ParseJsonError)
-  def call(object, mode: :rails, **opts)
+  def call(object, **opts)
     options = DEFAULT_OPTIONS
-      .dup
-      .merge(
-        opts.merge(mode: mode)
-      )
+      .merge(opts)
 
     Oj.load(object, options)
-  rescue ArgumentError, EncodingError
+  rescue ArgumentError, EncodingError, TypeError
     raise ParseJsonError.new
   end
 end

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

@@ -18,10 +18,8 @@ class ReeJson::ToJson
 
   contract(
     Any,
-    Kwargs[
-      mode: Or[*MODES]
-    ],
     Ksplat[
+      mode?: Or[*MODES],
       escape_mode?: Or[*ESCAPE_MODES],
       float_precision?: Integer,
       time_format?: Or[*TIME_FORMATS],
@@ -31,13 +29,10 @@ class ReeJson::ToJson
       use_to_json?: Bool,
       RestKeys => Any
     ] => String
-    ).throws(ArgumentError)
-  def call(object, mode: :rails, **opts)
+  ).throws(ArgumentError, TypeError)
+  def call(object, **opts)
     options = DEFAULT_OPTIONS
-      .dup
-      .merge(
-        opts.merge(mode: mode)
-      )
+      .merge(opts)
 
     Oj.dump(object, options)
   end

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

@@ -12,22 +12,17 @@
       "throws": [
         "ReeJson::FromJson::ParseJsonError"
       ],
-      "return": "Hash",
+      "return": "Any",
       "args": [
         {
           "arg": "object",
           "arg_type": "req",
           "type": "Any"
         },
-        {
-          "arg": "mode",
-          "arg_type": "key",
-          "type": "Or[strict, null, compat, json, rails, object, custom, wab]"
-        },
         {
           "arg": "opts",
           "arg_type": "keyrest",
-          "type": "Ksplat[:symbol_keys? => Bool, \"RestKeys\" => Any]"
+          "type": "Ksplat[:mode? => Or[strict, null, compat, json, rails, object, custom, wab], :symbol_keys? => Bool, \"RestKeys\" => Any]"
         }
       ]
     }

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

@@ -10,7 +10,8 @@
     {
       "doc": "Dumps arbitrary object to json using specific dump mode.\n  to_json({id: 1}) # => \"{\"id\":1}\"\n  to_json({id: 1}, mode: :object) # => \"{\":id\":{\"^o\":\"Object\"}}\"\n\nList of all available Ksplat options could be found here:\nhttps://github.com/ohler55/oj/blob/develop/pages/Modes.md",
       "throws": [
-        "ArgumentError"
+        "ArgumentError",
+        "TypeError"
       ],
       "return": "String",
       "args": [
@@ -19,15 +20,10 @@
           "arg_type": "req",
           "type": "Any"
         },
-        {
-          "arg": "mode",
-          "arg_type": "key",
-          "type": "Or[strict, null, compat, json, rails, object, custom, wab]"
-        },
         {
           "arg": "opts",
           "arg_type": "keyrest",
-          "type": "Ksplat[:escape_mode? => Or[newline, json, xss_safe, ascii, unicode_xss...], :float_precision? => Integer, :time_format? => Or[], :use_as_json? => Bool, :use_raw_json? => Bool, :use_to_hash? => Bool, :use_to_json? => Bool, \"RestKeys\" => Any]"
+          "type": "Ksplat[:mode? => Or[strict, null, compat, json, rails, object, custom, wab], :escape_mode? => Or[newline, json, xss_safe, ascii, unicode_xss...], :float_precision? => Integer, :time_format? => Or[], :use_as_json? => Bool, :use_raw_json? => Bool, :use_to_hash? => Bool, :use_to_json? => Bool, \"RestKeys\" => Any]"
         }
       ]
     }

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

@@ -12,7 +12,39 @@ RSpec.describe :from_json do
     expect(result[:id]).to be_a(Object)
   }
 
+  it {
+    expect(from_json("null")).to eq(nil)
+  }
+
+  it {
+    expect(from_json("true")).to eq(true)
+  }
+
+  it {
+    expect(from_json('"hello"')).to eq("hello")
+  }
+
+  it {
+    expect(from_json("123")).to eq(123)
+  }
+
+  it {
+    expect(from_json("123.456")).to eq(123.456)
+  }
+
+  it {
+    expect(from_json("[1,true,\"hello\"]")).to eq([1, true, "hello"])
+  }
+
+  it {
+    expect(from_json("{\"^o\":\"Object\"}", mode: :object)).to be_a(Object)
+  }
+
   it {
     expect{from_json("{213: \"123\"}")}.to raise_error(ReeJson::FromJson::ParseJsonError)
   }
+
+  it {
+    expect { from_json(nil, mode: :strict) }.to raise_error(ReeJson::FromJson::ParseJsonError)
+  }
 end

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.65
+  version: 1.0.67
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2023-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree