Merge pull request #80 from belousovAV/fix_from_json_contract

Fix from_json contract

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

@@ -11,20 +11,21 @@ class ReeJson::Constants
     :object,
     :custom,
     :wab,
-  ]
+  ].freeze
 
   ESCAPE_MODES = [
     :newline, # allows unescaped newlines in the output.
     :json, # follows the JSON specification. This is the default mode.
     :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

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

@@ -3,31 +3,26 @@ 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
 
   ParseJsonError = Class.new(StandardError)
 
   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

ree_lib/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

ree_lib/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]"
         }
       ]
     }

ree_lib/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]"
         }
       ]
     }

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

@@ -12,7 +12,39 @@
     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