oj 3.17.6 → 3.17.8

data/lib/oj/generic_object.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+# Loaded on first use of JSON::GenericObject so that requiring Oj does not
+# also require ostruct, which is no longer a default gem as of Ruby 4.0.
+begin
+  require 'ostruct'
+rescue LoadError
+  raise LoadError.new("JSON::GenericObject requires 'ostruct'. Add it to your Gemfile or install it with `gem install ostruct`.")
+end
+
+module JSON
+  # Taken directly from the json gem. Shamelessly copied. It is similar in
+  # some ways to the Oj::Bag class or the Oj::EasyHash class.
+  class GenericObject < OpenStruct
+    class << self
+      alias [] new
+
+      def json_creatable?
+        @json_creatable
+      end
+
+      attr_writer :json_creatable
+
+      def json_create(data)
+        data = data.dup
+        data.delete JSON.create_id
+        self[data]
+      end
+
+      def from_hash(object)
+        case
+        when object.respond_to?(:to_hash)
+          result = new
+          object.to_hash.each do |key, value|
+            result[key] = from_hash(value)
+          end
+          result
+        when object.respond_to?(:to_ary)
+          object.to_ary.map { |a| from_hash(a) }
+        else
+          object
+        end
+      end
+
+      def load(source, proc = nil, opts = {})
+        result = ::JSON.load(source, proc, opts.merge(:object_class => self))
+        result.nil? ? new : result
+      end
+
+      def dump(obj, *args)
+        ::JSON.dump(obj, *args)
+      end
+
+    end # self
+
+    self.json_creatable = false
+
+    def to_hash
+      table
+    end
+
+    def [](name)
+      __send__(name)
+    end unless method_defined?(:[])
+
+    def []=(name, value)
+      __send__("#{name}=", value)
+    end unless method_defined?(:[]=)
+
+    def |(other)
+      self.class[other.to_hash.merge(to_hash)]
+    end
+
+    def as_json(*)
+      { JSON.create_id => self.class.name }.merge to_hash
+    end
+
+    def to_json(*a)
+      as_json.to_json(*a)
+    end
+  end
+end # JSON

data/lib/oj/json.rb

@@ -1,4 +1,3 @@
-require 'ostruct'
 require 'oj/state'
 
 if defined?(JSON::PRETTY_STATE_PROTOTYPE)
@@ -113,76 +112,7 @@ unless defined?(JSON::PRETTY_STATE_PROTOTYPE)
     self.parser = ::JSON::Ext::Parser
     self.generator = ::JSON::Ext::Generator
 
-    # Taken directly from the json gem. Shamelessly copied. It is similar in
-    # some ways to the Oj::Bag class or the Oj::EasyHash class.
-    class GenericObject < OpenStruct
-      class << self
-        alias [] new
-
-        def json_creatable?
-          @json_creatable
-        end
-
-        attr_writer :json_creatable
-
-        def json_create(data)
-          data = data.dup
-          data.delete JSON.create_id
-          self[data]
-        end
-
-        def from_hash(object)
-          case
-          when object.respond_to?(:to_hash)
-            result = new
-            object.to_hash.each do |key, value|
-              result[key] = from_hash(value)
-            end
-            result
-          when object.respond_to?(:to_ary)
-            object.to_ary.map { |a| from_hash(a) }
-          else
-            object
-          end
-        end
-
-        def load(source, proc = nil, opts = {})
-          result = ::JSON.load(source, proc, opts.merge(:object_class => self))
-          result.nil? ? new : result
-        end
-
-        def dump(obj, *args)
-          ::JSON.dump(obj, *args)
-        end
-
-      end # self
-
-      self.json_creatable = false
-
-      def to_hash
-        table
-      end
-
-      def [](name)
-        __send__(name)
-      end unless method_defined?(:[])
-
-      def []=(name, value)
-        __send__("#{name}=", value)
-      end unless method_defined?(:[]=)
-
-      def |(other)
-        self.class[other.to_hash.merge(to_hash)]
-      end
-
-      def as_json(*)
-        { JSON.create_id => self.class.name }.merge to_hash
-      end
-
-      def to_json(*a)
-        as_json.to_json(*a)
-      end
-    end
+    autoload :GenericObject, 'oj/generic_object'
 
   end # JSON
 end

data/lib/oj/mimic.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: false
 
 require 'bigdecimal'
-require 'ostruct'
 
 module Oj
 

data/lib/oj/version.rb

@@ -1,4 +1,4 @@
 module Oj
   # Current version of the module.
-  VERSION = '3.17.6'
+  VERSION = '3.17.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.17.6
+  version: 3.17.8
 platform: ruby
 authors:
 - Peter Ohler
@@ -37,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -71,20 +85,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: ostruct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.2'
 description: The fastest JSON parser and object serializer.
 email: peter@ohler.com
 executables: []
@@ -184,6 +184,7 @@ files:
 - lib/oj/bag.rb
 - lib/oj/easy_hash.rb
 - lib/oj/error.rb
+- lib/oj/generic_object.rb
 - lib/oj/json.rb
 - lib/oj/mimic.rb
 - lib/oj/saj.rb