oj_windows 3.16.15 → 3.17.2.1

metadata

@@ -1,9 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: oj_windows
 version: !ruby/object:Gem::Version
-  version: 3.16.15
+  version: 3.17.2.1
 platform: ruby
 authors:
+- Peter Ohler
 - tigel
 bindir: bin
 cert_chain: []
@@ -85,9 +86,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: oj_windows is a Windows-exclusive fork of the Oj gem, optimized for Ruby
-  compiled with MSVC (Visual Studio). Provides fast JSON parsing/serialization with
-  full Rails and JSON gem compatibility. Requires Ruby 3.4+ built with MSVC toolchain.
+description: 'oj_windows is a fork of Oj (https://github.com/ohler55/oj) by Peter
+  Ohler, adapted to build with the MSVC (mswin) Ruby toolchain: pthread mutexes replaced
+  with Windows primitives, POSIX headers guarded, and SIMD string scanning enabled
+  under MSVC. It provides the full Oj API (module Oj) and JSON-gem compatibility.
+  Because it defines the same Oj module, it is a replacement for - and cannot be installed
+  alongside - the upstream oj gem. Requires Ruby 3.4+ built with the MSVC toolchain
+  (RubyInstaller/MinGW users should use the upstream oj gem instead).'
 email: tigel-agm@tigel.com
 executables: []
 extensions:
@@ -157,6 +162,8 @@ files:
 - ext/oj_windows/resolve.h
 - ext/oj_windows/rxclass.c
 - ext/oj_windows/rxclass.h
+- ext/oj_windows/safe.c
+- ext/oj_windows/safe.h
 - ext/oj_windows/saj.c
 - ext/oj_windows/saj2.c
 - ext/oj_windows/saj2.h
@@ -176,16 +183,6 @@ files:
 - ext/oj_windows/val_stack.h
 - ext/oj_windows/validate.c
 - ext/oj_windows/wab.c
-- lib/oj/active_support_helper.rb
-- lib/oj/bag.rb
-- lib/oj/easy_hash.rb
-- lib/oj/error.rb
-- lib/oj/json.rb
-- lib/oj/mimic.rb
-- lib/oj/saj.rb
-- lib/oj/schandler.rb
-- lib/oj/state.rb
-- lib/oj/version.rb
 - lib/oj_windows.rb
 - lib/oj_windows/active_support_helper.rb
 - lib/oj_windows/bag.rb
@@ -238,5 +235,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.9
 specification_version: 4
-summary: High-performance JSON parser for Windows MSVC Ruby
+summary: A build of the Oj JSON parser for Ruby compiled with the MSVC (mswin) toolchain
 test_files: []

data/lib/oj/active_support_helper.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/time'
-
-module Oj
-  # Exists only to handle the ActiveSupport::TimeWithZone.
-  class ActiveSupportHelper
-    def self.createTimeWithZone(utc, zone)
-      ActiveSupport::TimeWithZone.new(utc - utc.gmt_offset, ActiveSupport::TimeZone[zone])
-    end
-  end
-end
-
-Oj.register_odd(ActiveSupport::TimeWithZone, Oj::ActiveSupportHelper, :createTimeWithZone, :utc, 'time_zone.name')
-
-# This is a hack to work around an oddness with DateTime and the ActiveSupport
-# that causes a hang when some methods are called from C. Hour, min(ute),
-# sec(ond) and other methods are special but they can be called from C until
-# activesupport/time is required. After that they can not be even though
-# resond_to? returns true. By defining methods to call super the problem goes
-# away. There is obviously some magic going on under the covers that I don't
-# understand.
-class DateTime
-  def hour()
-    super
-  end
-  def min()
-    super
-  end
-  def sec()
-    super
-  end
-  def sec_fraction()
-    super
-  end
-  def offset()
-    super
-  end
-end

data/lib/oj/bag.rb

@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-module Oj
-
-  # A generic class that is used only for storing attributes. It is the base
-  # Class for auto-generated classes in the storage system. Instance variables
-  # are added using the instance_variable_set() method. All instance variables
-  # can be accessed using the variable name (without the @ prefix). No setters
-  # are provided as the Class is intended for reading only.
-  class Bag
-
-    # The initializer can take multiple arguments in the form of key values
-    # where the key is the variable name and the value is the variable
-    # value. This is intended for testing purposes only.
-    # @example Oj::Bag.new(:@x => 42, :@y => 57)
-    # @param [Hash] args instance variable symbols and their values
-    def initialize(args = {})
-      args.each do |k, v|
-        self.instance_variable_set(k, v)
-      end
-    end
-
-    # Replaces the Object.respond_to?() method.
-    # @param [Symbol] m method symbol
-    # @return [Boolean] true for any method that matches an instance
-    #                   variable reader, otherwise false.
-    def respond_to?(m)
-      return true if super
-
-      instance_variables.include?(:"@#{m}")
-    end
-
-    # Handles requests for variable values. Others cause an Exception to be
-    # raised.
-    # @param [Symbol] m method symbol
-    # @return [Boolean] the value of the specified instance variable.
-    # @raise [ArgumentError] if an argument is given. Zero arguments expected.
-    # @raise [NoMethodError] if the instance variable is not defined.
-    def method_missing(m, *args, &block)
-      raise ArgumentError.new("wrong number of arguments (#{args.size} for 0) to method #{m}") unless args.nil? or args.empty?
-
-      at_m = :"@#{m}"
-      raise NoMethodError.new("undefined method #{m}", m) unless instance_variable_defined?(at_m)
-
-      instance_variable_get(at_m)
-    end
-
-    # Replaces eql?() with something more reasonable for this Class.
-    # @param [Object] other Object to compare self to
-    # @return [Boolean] true if each variable and value are the same, otherwise false.
-    def eql?(other)
-      return false if (other.nil? or self.class != other.class)
-
-      ova = other.instance_variables
-      iv = instance_variables
-      return false if ova.size != iv.size
-
-      iv.all? { |vid| instance_variable_get(vid) != other.instance_variable_get(vid) }
-    end
-    alias == eql?
-
-    # Define a new class based on the Oj::Bag class. This is used internally in
-    # the Oj module and is available to service wrappers that receive XML
-    # requests that include Objects of Classes not defined in the storage
-    # process.
-    # @param [String] classname Class name or symbol that includes Module names.
-    # @return [Object] an instance of the specified Class.
-    # @raise [NameError] if the classname is invalid.
-    def self.define_class(classname)
-      classname = classname.to_s unless classname.is_a?(String)
-      tokens = classname.split('::').map(&:to_sym)
-      raise NameError.new("Invalid classname '#{classname}") if tokens.empty?
-
-      m = Object
-      tokens[0..-2].each do |sym|
-        if m.const_defined?(sym)
-          m = m.const_get(sym)
-        else
-          c = Module.new
-          m.const_set(sym, c)
-          m = c
-        end
-      end
-      sym = tokens[-1]
-      if m.const_defined?(sym)
-        c = m.const_get(sym)
-      else
-        c = Class.new(Oj::Bag)
-        m.const_set(sym, c)
-      end
-      c
-    end
-
-  end # Bag
-end # Oj

data/lib/oj/easy_hash.rb

@@ -1,52 +0,0 @@
-module Oj
-
-  # A Hash subclass that normalizes the hash keys to allow lookup by the
-  # key.to_s or key.to_sym. It also supports looking up hash values by methods
-  # that match the keys.
-  class EasyHash < Hash
-
-    # Replaces the Object.respond_to?() method.
-    # @param [Symbol] m method symbol
-    # @param [Boolean] include_all whether to include private and protected methods in the search
-    # @return [Boolean] true for any method that matches an instance
-    #                   variable reader, otherwise false.
-    def respond_to?(m, include_all = false)
-      return true if super
-      return true if has_key?(m)
-      return true if has_key?(m.to_s)
-
-      has_key?(m.to_sym)
-    end
-
-    def [](key)
-      return fetch(key, nil) if has_key?(key)
-      return fetch(key.to_s, nil) if has_key?(key.to_s)
-
-      fetch(key.to_sym, nil)
-    end
-
-    # Handles requests for Hash values. Others cause an Exception to be raised.
-    # @param [Symbol|String] m method symbol
-    # @return [Boolean] the value of the specified instance variable.
-    # @raise [ArgumentError] if an argument is given. Zero arguments expected.
-    # @raise [NoMethodError] if the instance variable is not defined.
-    def method_missing(m, *args, &block)
-      if m.to_s.end_with?('=')
-        raise ArgumentError.new("wrong number of arguments (#{args.size} for 1 with #{m}) to method #{m}") if args.nil? or 1 != args.length
-
-        m = m[0..-2]
-        return store(m.to_s, args[0]) if has_key?(m.to_s)
-        return store(m.to_sym, args[0]) if has_key?(m.to_sym)
-
-        return store(m, args[0])
-      else
-        raise ArgumentError.new("wrong number of arguments (#{args.size} for 0 with #{m}) to method #{m}") unless args.nil? or args.empty?
-        return fetch(m, nil) if has_key?(m)
-        return fetch(m.to_s, nil) if has_key?(m.to_s)
-        return fetch(m.to_sym, nil) if has_key?(m.to_sym)
-      end
-      raise NoMethodError.new("undefined method #{m}", m)
-    end
-
-  end # EasyHash
-end # Oj

data/lib/oj/error.rb

@@ -1,21 +0,0 @@
-module Oj
-
-  # Inherit Error class from StandardError.
-  Error = Class.new(StandardError)
-
-  # Following classes inherit from the Error class.
-  # -----------------------------------------------
-
-  # An Exception that is raised as a result of a parse error while parsing a JSON document.
-  ParseError = Class.new(Error)
-
-  # An Exception that is raised as a result of a path being too deep.
-  DepthError = Class.new(Error)
-
-  # An Exception that is raised if a file fails to load.
-  LoadError = Class.new(Error)
-
-  # An Exception that is raised if there is a conflict with mimicking JSON
-  MimicError = Class.new(Error)
-
-end # Oj

data/lib/oj/json.rb

@@ -1,188 +0,0 @@
-require 'ostruct'
-require 'oj_windows/state'
-
-if defined?(JSON::PRETTY_STATE_PROTOTYPE)
-  # There are enough people that try to use both the json gen and oj in mimic
-  # mode so don't display the warning.
-
-  # warn "WARNING: oj_windows/json is a compatability shim used by Oj. Requiring the file explicitly is not recommended."
-end
-
-unless defined?(JSON::PRETTY_STATE_PROTOTYPE)
-  module JSON
-    NaN = 0.0/0.0 unless defined?(::JSON::NaN)
-    Infinity = 1.0/0.0 unless defined?(::JSON::Infinity)
-    MinusInfinity = -1.0/0.0 unless defined?(::JSON::MinusInfinity)
-    # Taken from the unit test. Note that items like check_circular? are not
-    # present.
-    PRETTY_STATE_PROTOTYPE = Ext::Generator::State.from_state({
-                                                                :allow_nan             => false,
-                                                                :array_nl              => "\n",
-                                                                :ascii_only            => false,
-                                                                :buffer_initial_length => 1024,
-                                                                :depth                 => 0,
-                                                                :indent                => "  ",
-                                                                :max_nesting           => 100,
-                                                                :object_nl             => "\n",
-                                                                :space                 => " ",
-                                                                :space_before          => "",
-                                                              }) unless defined?(::JSON::PRETTY_STATE_PROTOTYPE)
-    SAFE_STATE_PROTOTYPE = Ext::Generator::State.from_state({
-                                                              :allow_nan             => false,
-                                                              :array_nl              => "",
-                                                              :ascii_only            => false,
-                                                              :buffer_initial_length => 1024,
-                                                              :depth                 => 0,
-                                                              :indent                => "",
-                                                              :max_nesting           => 100,
-                                                              :object_nl             => "",
-                                                              :space                 => "",
-                                                              :space_before          => "",
-                                                            }) unless defined?(::JSON::SAFE_STATE_PROTOTYPE)
-    FAST_STATE_PROTOTYPE = Ext::Generator::State.from_state({
-                                                              :allow_nan             => false,
-                                                              :array_nl              => "",
-                                                              :ascii_only            => false,
-                                                              :buffer_initial_length => 1024,
-                                                              :depth                 => 0,
-                                                              :indent                => "",
-                                                              :max_nesting           => 0,
-                                                              :object_nl             => "",
-                                                              :space                 => "",
-                                                              :space_before          => "",
-                                                            }) unless defined?(::JSON::FAST_STATE_PROTOTYPE)
-
-    def self.dump_default_options
-      Oj::MimicDumpOption.new
-    end
-
-    def self.dump_default_options=(h)
-      m = Oj::MimicDumpOption.new
-      h.each do |k, v|
-        m[k] = v
-      end
-    end
-
-    def self.parser=(p)
-      @@parser = p
-    end
-
-    def self.parser()
-      @@parser
-    end
-
-    def self.generator=(g)
-      @@generator = g
-    end
-
-    def self.generator()
-      @@generator
-    end
-
-    module Ext
-      class Parser
-        def initialize(src)
-          raise TypeError.new("already initialized") unless @source.nil?
-
-          @source = src
-        end
-
-        def source()
-          raise TypeError.new("already initialized") if @source.nil?
-
-          @source
-        end
-
-        def parse()
-          raise TypeError.new("already initialized") if @source.nil?
-
-          JSON.parse(@source)
-        end
-
-      end # Parser
-    end # Ext
-
-    State = ::JSON::Ext::Generator::State unless defined?(::JSON::State)
-
-    begin
-      send(:remove_const, :Parser)
-    rescue
-      # ignore and move on
-    end
-    Parser = ::JSON::Ext::Parser unless defined?(::JSON::Parser)
-    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
-
-  end # JSON
-end