hanami-utils 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e8362df57ad7209539ecd8383ee1f1b60ea68e
-  data.tar.gz: 854db004fcc6912bef61404d58feda11e6589d2e
+  metadata.gz: 147943727aa2419fd62308b8e482f1386f9790f8
+  data.tar.gz: 9a2db890e7da1a930a3adb14cffac52ff9affa33
 SHA512:
-  metadata.gz: f30cb4ccc8c96a99808534957ec785f8036cd1baf9362bca8e9f8f15cfad044406c5bb34820b6c6b64faf4cc20e3cbd6ef36e08193754adf2c6980ef9a6f5862
-  data.tar.gz: 734d3c0994e2ccba6e9176c497c17c8093693da2b434dbd2476383128a57f83819c7f63382ba39a22057cbd6b72361dd6ec9e51a4989d0c5d070d3c2837f7b1c
+  metadata.gz: 423676170211e4a123007b863e15393de3ca0e603113160a12d8e39143b08cd49a6d68a0089a20f100a83108a280ed466e1008cae601e0a2d99312e33b2487fa
+  data.tar.gz: 1c81a606b3bfbee8d3426f36db95662563861c693d5075928a2c12eae1f736dba65bafdf27b441f8963d4ef3f195d157dd615a4a27aae750dccaf830b079d0d9

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Hanami::Utils
 Ruby core extentions and class utilities for Hanami
 
+## v0.9.1 - 2016-11-18
+### Added
+- [Luca Guidi] Introduced `Utils::Json.parse` and `.generate`
+
+### Fixed
+- [Luca Guidi] Ensure `Utils::Json` parsing to not eval untrusted input
+
+### Changed
+- [Luca Guidi] Deprecated `Utils::Json.load` in favor of `.parse`
+- [Luca Guidi] Deprecated `Utils::Json.dump` in favor of `.generate`
+
 ## v0.9.0 - 2016-11-15
 ### Added
 – [Luca Guidi] Introduced `Utils.require!` to recursively require Ruby files with an order that is consistent across platforms

data/lib/hanami/utils/json.rb

@@ -4,6 +4,8 @@ rescue LoadError
   require 'json'
 end
 
+require 'hanami/utils/deprecation'
+
 module Hanami
   module Utils
     # JSON wrapper
@@ -13,9 +15,41 @@ module Hanami
     #
     # @since 0.8.0
     module Json
+      # MultiJson adapter
+      #
+      # @since 0.9.1
+      # @api private
+      class MultiJsonAdapter
+        # @since 0.9.1
+        # @api private
+        def parse(payload)
+          MultiJson.load(payload)
+        end
+
+        # FIXME: remove this alias, when Hanami::Utils::Json.load will be removed
+        #
+        # @since 0.9.1
+        # @api private
+        alias load parse
+
+        # FIXME: remove this method, when Hanami::Utils::Json.dump will be removed
+        #
+        # @since 0.9.1
+        # @api private
+        def dump(object)
+          generate(object)
+        end
+
+        # @since 0.9.1
+        # @api private
+        def generate(object)
+          MultiJson.dump(object)
+        end
+      end
+
       # rubocop:disable Style/ClassVars
       if defined?(MultiJson)
-        @@engine    = MultiJson
+        @@engine    = MultiJsonAdapter.new
         ParserError = MultiJson::ParseError
       else
         @@engine    = ::JSON
@@ -32,10 +66,26 @@ module Hanami
       # @raise [Hanami::Utils::Json::ParserError] if the paylod is invalid
       #
       # @since 0.8.0
+      #
+      # @deprecated Use {.parse} instead
       def self.load(payload)
+        Hanami::Utils::Deprecation.new("`Hanami::Utils::Json.load' is deprecated, please use `Hanami::Utils::Json.parse'")
         @@engine.load(payload)
       end
 
+      # Parse the given JSON paylod
+      #
+      # @param payload [String] a JSON payload
+      #
+      # @return [Object] the result of the loading process
+      #
+      # @raise [Hanami::Utils::Json::ParserError] if the paylod is invalid
+      #
+      # @since 0.9.1
+      def self.parse(payload)
+        @@engine.parse(payload)
+      end
+
       # Dump the given object into a JSON payload
       #
       # @param object [Object] any object
@@ -43,9 +93,23 @@ module Hanami
       # @return [String] the result of the dumping process
       #
       # @since 0.8.0
+      #
+      # @deprecated Use {.generate} instead
       def self.dump(object)
+        Hanami::Utils::Deprecation.new("`Hanami::Utils::Json.dump' is deprecated, please use `Hanami::Utils::Json.generate'")
         @@engine.dump(object)
       end
+
+      # Generate a JSON document from the given object
+      #
+      # @param object [Object] any object
+      #
+      # @return [String] the result of the dumping process
+      #
+      # @since 0.9.1
+      def self.generate(object)
+        @@engine.generate(object)
+      end
     end
   end
 end

data/lib/hanami/utils/version.rb

@@ -3,6 +3,6 @@ module Hanami
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '0.9.0'.freeze
+    VERSION = '0.9.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-utils
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby core extentions and Hanami utilities