firm 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 744672f26853b28ea94b9a5cdc57c154784210f5bc845628dcdf874e54712db1
-  data.tar.gz: 759c1c816f8118589c56849a819f550a5b423653c262b7c5d802f7cfbe80065b
+  metadata.gz: 469e6b9c969363f1a02dec82461e0d7f176c6dcb179c69e5d3e49028850ede2f
+  data.tar.gz: c289d16555c8e499ee83045042095b89f038122a9033aa0f74d82d42ccaeefdb
 SHA512:
-  metadata.gz: d4c6b8e5073c818e434e947e915cfb0e02ab5c17606129398968715e0337d710ddcb9ae4f2c4237cb2a7dead4cd73897d7e6fe38e033fccd492fdbe6faa958af
-  data.tar.gz: e4ec51d139746ea55a389de5e9c93cbf16b52e4ae4357599719736613228902530b2a14d54546e5cdd0da3150fe70290184572f1954f8b32c6a1ea566cdae0e3
+  metadata.gz: d949b1da43a928fc2e36ea058cde3b040e3b8e10e8a0ed8d9d3ad2de3053535e5b8616f0e1792c8a7e6d6285573298d2f352b4fc90126b4f2fc85d80258f9fce
+  data.tar.gz: ecb380c724b12eb9dc93a6abb368ad41aeaf6f554a46472f026aa39226dd2d2c8527b351ae628721763a09898ea0ffc38a37853fab45b8efeae1ac6dc341b964

data/lib/firm/serialize/core.rb

@@ -32,11 +32,6 @@ module FIRM
 end
 
 require 'set'
-# from Ruby 3.5.0 OpenStruct will not be available by default anymore
-begin
-  require 'ostruct'
-rescue LoadError
-end
 
 [::Array, ::Hash, ::Struct, ::Range, ::Rational, ::Complex, ::Regexp, ::Set, ::Time, ::Date, ::DateTime].each do |c|
   c.include FIRM::Serializable::CoreExt

data/lib/firm/serializer/json.rb

@@ -14,11 +14,14 @@ require 'json/add/bigdecimal' if ::Object.const_defined?(:BigDecimal)
 require 'json/add/rational'
 require 'json/add/complex'
 require 'json/add/set'
-# from Ruby 3.5.0 OpenStruct will not be available by default anymore
-begin
-  require 'ostruct'
-  require 'json/add/ostruct'
-rescue LoadError
+# from Ruby 3.4.0 OpenStruct will not be available by default anymore
+if defined? RUBY_VERSION and RUBY_VERSION < '3.4.0'
+  begin
+    require 'ostruct'
+    require 'json/add/ostruct'
+  rescue LoadError
+    #
+  end
 end
 
 module FIRM
@@ -29,9 +32,10 @@ module FIRM
 
       CREATE_ID = 'rbklass'.freeze
 
-      # Derived Hash class to use for deserialized JSON object data which
+      # Hash class mixin to use for deserialized JSON object data which
       # supports using Symbol keys.
-      class ObjectHash < ::Hash
+      module ObjectHashPatch
+
         # Returns the object associated with given key.
         # @param [String,Symbol] key key value
         # @return [Object] associated object
@@ -49,6 +53,7 @@ module FIRM
         alias member? include?
         alias has_key? include?
         alias key? include?
+
       end
 
       module ContainerPatch
@@ -192,8 +197,7 @@ module FIRM
           # set custom (more compact) create_id
           ::JSON.create_id = Serializable::JSON::CREATE_ID
           ::JSON.parse!(source,
-                        create_additions: true,
-                        object_class: Serializable::JSON::ObjectHash)
+                        create_additions: true)
         ensure
           # reset safe deserializing
           self.end_safe_deserialize
@@ -208,6 +212,7 @@ module FIRM
 
         def json_create(object)
           data = object['data']
+          data.extend(Serializable::JSON::ObjectHashPatch)
           # deserializing (anchor) object or alias
           if object.has_key?('*id')
             if Serializable::Aliasing.restored?(self, object['*id'])

data/lib/firm/serializer/xml.rb

@@ -3,10 +3,13 @@
 
 
 require 'set'
-# from Ruby 3.5.0 OpenStruct will not be available by default anymore
-begin
-  require 'ostruct'
-rescue LoadError
+# from Ruby 3.4.0 OpenStruct will not be available by default anymore
+if defined? RUBY_VERSION and RUBY_VERSION < '3.4.0'
+  begin
+    require 'ostruct'
+  rescue LoadError
+    #
+  end
 end
 require 'date'
 

data/lib/firm/serializer/yaml.rb

@@ -5,10 +5,13 @@
 require 'yaml'
 require 'date'
 require 'set'
-# from Ruby 3.5.0 OpenStruct will not be available by default anymore
-begin
-  require 'ostruct'
-rescue LoadError
+# from Ruby 3.4.0 OpenStruct will not be available by default anymore
+if defined? RUBY_VERSION and RUBY_VERSION < '3.4.0'
+  begin
+    require 'ostruct'
+  rescue LoadError
+    #
+  end
 end
 
 module FIRM

data/lib/firm/version.rb

@@ -4,6 +4,6 @@
 module FIRM
 
   # FIRM version
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 
 end

metadata

@@ -1,57 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firm
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Martin Corino
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.15'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.15'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
 description: FIRM is a pure Ruby library providing format independent object marshalling
 email: mcorino@m2c-software.nl
 executables: []
@@ -76,10 +33,6 @@ files:
 - rakelib/yard/yard-relative_markdown_links.rb
 - rakelib/yard/yard/relative_markdown_links.rb
 - rakelib/yard/yard/relative_markdown_links/version.rb
-- tests/serializer_tests.rb
-- tests/test_serialize.rb
-- tests/test_serialize_xml.rb
-- tests/test_serialize_yaml.rb
 homepage: https://github.com/mcorino/firm
 licenses:
 - MIT
@@ -88,7 +41,6 @@ metadata:
   source_code_uri: https://github.com/mcorino/firm
   documentation_uri: https://mcorino.github.io/firm
   homepage_uri: https://github.com/mcorino/firm
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -103,8 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Format independent Ruby object marshalling
 test_files: []