ostruct 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2b9fc88b5467418401b1e0a44f555fd467cf3b90dbcd36db7329830afee1b83
-  data.tar.gz: decc3b34075bc2746bd61fe0498c666dab2154401515fe69a4c1baa0ab2da2a1
+  metadata.gz: 21e6b4898eb983f5662872ec9b061babc748c196756225e561a2606f1be43f92
+  data.tar.gz: ed5975f18423c5db6e0cc0262ce17aa8a625a9488ab8a3a0a556287e71e7881d
 SHA512:
-  metadata.gz: c8166a4d8ec376ec8b8a8fbd7f85e6cc83cb142c06ea9cbb6728011221b2beaa598152f9e9f724d3bf24fb37b89a8261f6728dbeb093b84c8e68887e860824f2
-  data.tar.gz: 49275721136d6546dba4290e3d14df92b82a84de1e2386d13551d481232da7c82987ddde25ea9baa33761689634d18951a15edce19fb57bb2a9c32ddb1cfbd09
+  metadata.gz: d1993c5247e4d0aa91ef62d1cdc943eb7e95b18a74abc0c6739c611ee4676c32a792801bb7b5f2f51c9992799863a5a6aeee66ad7ed69dd0f5b5b6ee0e227a2b
+  data.tar.gz: 119f99ac4213fe46116ffba0c142af7cbba91c7b7e7273ff4fd154585df5f31aa2fdc0048fd4dddc8de21e4ab3e95e1214da40fbb2608126a795f83a2162c628

data/Rakefile

@@ -1,8 +1,8 @@
 task :release do
-  cur = `git branch --show-current`
+  cur = `git branch --show-current`.chomp
   if cur != 'master'
     puts 'Release only from master branch'
-    exit(1)
+    exit(-1)
   end
 end
 
@@ -10,9 +10,16 @@ require "bundler/gem_tasks"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test" << "test/lib"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/test_*.rb']
+  t.libs << "test/lib"
+  t.ruby_opts << "-rhelper"
+  t.test_files = FileList["test/**/test_*.rb"]
+end
+
+task :sync_tool do
+  require 'fileutils'
+  FileUtils.cp "../ruby/tool/lib/core_assertions.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/envutil.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/find_executable.rb", "./test/lib"
 end
 
 task :default => [:test]

data/lib/ostruct.rb

@@ -107,7 +107,7 @@
 # For all these reasons, consider not using OpenStruct at all.
 #
 class OpenStruct
-  VERSION = "0.3.1"
+  VERSION = "0.5.0"
 
   #
   # Creates a new OpenStruct object.  By default, the resulting OpenStruct
@@ -197,7 +197,7 @@ class OpenStruct
   #   data.each_pair.to_a   # => [[:country, "Australia"], [:capital, "Canberra"]]
   #
   def each_pair
-    return to_enum(__method__) { @table.size } unless block_given?
+    return to_enum(__method__) { @table.size } unless block_given!
     @table.each_pair{|p| yield p}
     self
   end
@@ -221,8 +221,14 @@ class OpenStruct
   #
   def new_ostruct_member!(name) # :nodoc:
     unless @table.key?(name) || is_method_protected!(name)
-      define_singleton_method!(name) { @table[name] }
-      define_singleton_method!("#{name}=") {|x| @table[name] = x}
+      getter_proc = Proc.new { @table[name] }
+      setter_proc = Proc.new {|x| @table[name] = x}
+      if defined?(::Ractor)
+        ::Ractor.make_shareable(getter_proc)
+        ::Ractor.make_shareable(setter_proc)
+      end
+      define_singleton_method!(name, &getter_proc)
+      define_singleton_method!("#{name}=", &setter_proc)
     end
   end
   private :new_ostruct_member!
@@ -233,7 +239,15 @@ class OpenStruct
     elsif name.match?(/!$/)
       true
     else
-      method!(name).owner < OpenStruct
+      owner = method!(name).owner
+      if owner.class == ::Class
+        owner < ::OpenStruct
+      else
+        self.class.ancestors.any? do |mod|
+          return false if mod == ::OpenStruct
+          mod == owner
+        end
+      end
     end
   end
 
@@ -250,6 +264,7 @@ class OpenStruct
       end
       set_ostruct_member_value!(mname, args[0])
     elsif len == 0
+      @table[mid]
     else
       begin
         super
@@ -299,7 +314,7 @@ class OpenStruct
   # Finds and returns the object in nested objects
   # that is specified by +name+ and +identifiers+.
   # The nested objects may be instances of various classes.
-  # See {Dig Methods}[rdoc-ref:doc/dig_methods.rdoc].
+  # See {Dig Methods}[rdoc-ref:dig_methods.rdoc].
   #
   # Examples:
   #   require "ostruct"
@@ -317,8 +332,10 @@ class OpenStruct
   end
 
   #
-  # Removes the named field from the object. Returns the value that the field
-  # contained if it was defined.
+  # Removes the named field from the object and returns the value the field
+  # contained if it was defined. You may optionally provide a block.
+  # If the field is not defined, the result of the block is returned,
+  # or a NameError is raised if no block was given.
   #
   #   require "ostruct"
   #
@@ -332,6 +349,10 @@ class OpenStruct
   #   person.pension = nil
   #   person                 # => #<OpenStruct name="John", pension=nil>
   #
+  #   person.delete_field('number')  # => NameError
+  #
+  #   person.delete_field('number') { 8675_309 } # => 8675309
+  #
   def delete_field(name)
     sym = name.to_sym
     begin
@@ -339,6 +360,7 @@ class OpenStruct
     rescue NameError
     end
     @table.delete(sym) do
+      return yield if block_given!
       raise! NameError.new("no field `#{sym}' in #{self}", sym)
     end
   end
@@ -437,5 +459,6 @@ class OpenStruct
   end
   # Other builtin private methods we use:
   alias_method :raise!, :raise
-  private :raise!
+  alias_method :block_given!, :block_given?
+  private :raise!, :block_given!
 end

data/ostruct.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Class to build custom data structures, similar to a Hash.}
   spec.description   = %q{Class to build custom data structures, similar to a Hash.}
   spec.homepage      = "https://github.com/ruby/ostruct"
-  spec.license       = "BSD-2-Clause"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
   spec.required_ruby_version = ">= 2.5.0"
 
   spec.files         = [".gitignore", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "lib/ostruct.rb", "ostruct.gemspec"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ostruct
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Marc-Andre Lafortune
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,6 +56,7 @@ files:
 - ostruct.gemspec
 homepage: https://github.com/ruby/ostruct
 licenses:
+- Ruby
 - BSD-2-Clause
 metadata: {}
 post_install_message:
@@ -73,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: Class to build custom data structures, similar to a Hash.