recursive-open-struct 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98947e3672ac602b5065c7cbd9db4712ad76f37f1bd93e7fe5b26bd03d45b868
-  data.tar.gz: 91d09d9bc788f331837fb9edfd5e1d006088becd07770ecea52a5b1dee2f659a
+  metadata.gz: d47dc026bcadbac598558f8734a4bce1cf17312fcbe915925e92b684c41da5b0
+  data.tar.gz: 11603a372dbfc88cfa339b0923be134fea27ee333d22e7181fe5f68ef13c6a72
 SHA512:
-  metadata.gz: e37aaa9409d7cb1bf0b8999603bbaeb7345a2496784127ef2612b49b765a9a745b29fb4d6dcb3f5aee8045a89a2b05370611486db48be3e630cf8f22cfccfca6
-  data.tar.gz: 4d8cc8cd0140f749f7a924c06469a4d1cd1709fa3464cc72cec250c296e29cd1936fbc1dd6e9852c4fb904f6e0c1e65847b9ba311f48d41d75de12097ac2a409
+  metadata.gz: 70fd0af15429eb9d81f09c42c36b81f2befc1068d097bc098054d44bb28dbe0545962cfd2f02398e5125d376f58acf9a3691cf0bfbb710317ad677e8081b00f6
+  data.tar.gz: 6d2088207848433c2c6e640505df65099f85ead90ae8c598dbe020c6c7b4b185f77f347df6d6e87b693f42807d6d835d73012d42dee1ff843bf430e6cfb0b3a3

data/.github/workflows/ruby.yml

@@ -21,8 +21,9 @@ jobs:
 
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        ruby-version: ['3.1', '3.2', '3.3', head, jruby, jruby-head]
+        ruby-version: ['3.2', '3.3', '3.4', head, jruby, jruby-head]
 
     steps:
     - uses: actions/checkout@v4
@@ -30,7 +31,7 @@ jobs:
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):
     # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # 1.177.1
+      uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # 1.268.0
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/AUTHORS.txt

@@ -9,6 +9,7 @@ Recursive-open-struct was written by these fine people:
 * Federico Aloi <federico.aloi@gmail.com>
 * fervic <roberto@runawaybit.com>
 * Hartley McGuire <skipkayhil@gmail.com>
+* Hermann Mayer <hermann.mayer92@gmail.com>
 * Igor Victor <gogainda@yandex.ru>
 * Ilya Umanets <ilya.umanets@sabiogroup.com>
 * Jean Boussier <jean.boussier@gmail.com>
@@ -21,11 +22,12 @@ Recursive-open-struct was written by these fine people:
 * Pedro Sena <sena.pedro@gmail.com>
 * Peter Yeremenko <peter.yeremenko@gmail.com>
 * Pirate Praveen <praveen@debian.org>
-* Richard Degenne <richard.degenne+github@gmail.com>
 * Richard Degenne <richard.degenne@gmail.com>
+* Richard Degenne <richard.degenne+github@gmail.com>
 * Sebastian Gaul <sebastian@mgvmedia.com>
 * Thiago Guimaraes <thiagogsr@gmail.com>
 * Tom Chapin <tchapin@gmail.com>
 * Victor Guzman <victor.guzman@runawaybit.com>
 * William (B.J.) Snow Orvis <aetherknight@gmail.com>
+* Wynn (B.J.) Snow Orvis <aetherkn@aedifice.org>
 * Wynn (B.J.) Snow Orvis <aetherknight@gmail.com>

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+2.1.0 / 2025/12/05
+==================
+
+* [#80](https://github.com/aetherknight/recursive-open-struct/pull/80): Hermann
+  Mayer: Added a safety guard for double wrapping.
+* FIX: Avoid loading `ostruct` when processing the gemspec, since it is a
+  dependency and it may not be installed/available yet.
+
 2.0.0 / 2024/10/03
 ==================
 

data/lib/recursive_open_struct/version.rb

@@ -3,5 +3,5 @@
 require 'ostruct'
 
 class RecursiveOpenStruct < OpenStruct
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/lib/recursive_open_struct.rb

@@ -29,6 +29,7 @@ class RecursiveOpenStruct < OpenStruct
   end
 
   def initialize(hash=nil, passed_options={})
+    hash = hash.to_h if [hash.is_a?(RecursiveOpenStruct), hash.is_a?(OpenStruct)].any?
     hash ||= {}
 
     @options = self.class.default_options.merge!(passed_options).freeze

data/recursive-open-struct.gemspec

@@ -1,10 +1,12 @@
 # -*- encoding: utf-8 -*-
-
-require './lib/recursive_open_struct/version'
+name = "recursive-open-struct"
+version = File.foreach(File.join(__dir__, "lib", "recursive_open_struct", "version.rb")) do |line|
+  /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+end
 
 Gem::Specification.new do |s|
-  s.name = "recursive-open-struct"
-  s.version = RecursiveOpenStruct::VERSION
+  s.name = name
+  s.version = version
   s.authors = ["William (B.J.) Snow Orvis"]
   s.email = "aetherknight@gmail.com"
   s.date = Time.now.utc.strftime("%Y-%m-%d")

data/spec/recursive_open_struct/wrapping_spec.rb

@@ -0,0 +1,70 @@
+require_relative '../spec_helper'
+require 'recursive_open_struct'
+
+describe RecursiveOpenStruct do
+  describe 'wrapping RecursiveOpenStruct' do
+    let(:h) { { :blah => { :another => 'value' } } }
+    subject(:ros) { RecursiveOpenStruct.new(RecursiveOpenStruct.new(h)) }
+
+    it 'can convert the entire hash tree back into a hash' do
+      expect(ros.to_h).to eq h
+    end
+
+    it 'can access the flat keys' do
+      expect(ros.blah).to be_a(RecursiveOpenStruct)
+    end
+
+    it 'can access the nested keys' do
+      expect(ros.blah.another).to eql('value')
+    end
+
+    it 'can be inspected' do
+      expect(ros.inspect).to \
+        match(/#<RecursiveOpenStruct blah={:?another(: |=>)"value"}>/)
+    end
+  end
+
+  describe 'wrapping OpenStruct' do
+    let(:h) { { :blah => { :another => 'value' } } }
+    subject(:ros) { RecursiveOpenStruct.new(OpenStruct.new(h)) }
+
+    it 'can convert the entire hash tree back into a hash' do
+      expect(ros.to_h).to eq h
+    end
+
+    it 'can access the flat keys' do
+      expect(ros.blah).to be_a(RecursiveOpenStruct)
+    end
+
+    it 'can access the nested keys' do
+      expect(ros.blah.another).to eql('value')
+    end
+
+    it 'can be inspected' do
+      expect(ros.inspect).to \
+        match(/#<RecursiveOpenStruct blah={:?another(: |=>)"value"}>/)
+    end
+  end
+
+  describe 'wrapping a subclass' do
+    let(:h) { { :blah => { :another => 'value' } } }
+    let(:subclass) { Class.new(RecursiveOpenStruct) }
+    subject(:ros) { subclass.new(subclass.new(h)) }
+
+    it 'can convert the entire hash tree back into a hash' do
+      expect(ros.to_h).to eq h
+    end
+
+    it 'can access the flat keys' do
+      expect(ros.blah).to be_a(RecursiveOpenStruct)
+    end
+
+    it 'can access the nested keys' do
+      expect(ros.blah.another).to eql('value')
+    end
+
+    it 'can be inspected' do
+      expect(ros.inspect).to match(/ blah={:?another(: |=>)"value"}>$/)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recursive-open-struct
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - William (B.J.) Snow Orvis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-04 00:00:00.000000000 Z
+date: 2025-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,6 +153,7 @@ files:
 - spec/recursive_open_struct/ostruct_2_3_0_spec.rb
 - spec/recursive_open_struct/recursion_and_subclassing_spec.rb
 - spec/recursive_open_struct/recursion_spec.rb
+- spec/recursive_open_struct/wrapping_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/aetherknight/recursive-open-struct
 licenses:
@@ -185,4 +186,5 @@ test_files:
 - spec/recursive_open_struct/ostruct_2_3_0_spec.rb
 - spec/recursive_open_struct/recursion_and_subclassing_spec.rb
 - spec/recursive_open_struct/recursion_spec.rb
+- spec/recursive_open_struct/wrapping_spec.rb
 - spec/spec_helper.rb