RubyGems - gettext_i18n_rails_js - Versions diffs - 2.2.0 → 2.2.1 - Mend

Files changed (773) hide show

data/vendor/bundle/ruby/3.4.0/gems/{json-2.13.2 → json-2.14.1}/CHANGES.md RENAMED Viewed

@@ -2,6 +2,28 @@
 ### Unreleased
+### 2025-09-18 (2.14.1)
+* Fix `IndexOutOfBoundsException` in the JRuby extension when encoding shared strings.
+### 2025-09-18 (2.14.0)
+* Add new `allow_duplicate_key` generator options. By default a warning is now emitted when a duplicated key is encountered.
+  In `json 3.0` an error will be raised.
+  ```ruby
+  >> Warning[:deprecated] = true
+  >> puts JSON.generate({ foo: 1, "foo" => 2 })
+  (irb):2: warning: detected duplicate key "foo" in {foo: 1, "foo" => 2}.
+  This will raise an error in json 3.0 unless enabled via `allow_duplicate_key: true`
+  {"foo":1,"foo":2}
+  >> JSON.generate({ foo: 1, "foo" => 2 }, allow_duplicate_key: false)
+  detected duplicate key "foo" in {foo: 1, "foo" => 2} (JSON::GeneratorError)
+  ```
+* Fix `JSON.generate` `strict: true` mode to also restrict hash keys.
+* Fix `JSON::Coder` to also invoke block for hash keys that aren't strings nor symbols.
+* Fix `JSON.unsafe_load` usage with proc
+* Fix the parser to more consistently reject invalid UTF-16 surogate pairs.
 ### 2025-07-28 (2.13.2)
 * Improve duplicate key warning and errors to include the key name and point to the right caller.
@@ -44,7 +66,7 @@
 ### 2025-04-24 (2.11.1)
 * Add back `JSON.restore`, `JSON.unparse`, `JSON.fast_unparse` and `JSON.pretty_unparse`.
-  These were deprecated 16 years ago, but never emited warnings, only undocumented, so are
+  These were deprecated 16 years ago, but never emitted warnings, only undocumented, so are
   still used by a few gems.
 ### 2025-04-24 (2.11.0)
@@ -71,7 +93,7 @@
 ### 2025-03-12 (2.10.2)
 * Fix a potential crash in the C extension parser.
-* Raise a ParserError on all incomplete unicode escape sequence. This was the behavior until `2.10.0` unadvertently changed it.
+* Raise a ParserError on all incomplete unicode escape sequence. This was the behavior until `2.10.0` inadvertently changed it.
 * Ensure document snippets that are included in parser errors don't include truncated multibyte characters.
 * Ensure parser error snippets are valid UTF-8.
 * Fix `JSON::GeneratorError#detailed_message` on Ruby < 3.2
@@ -102,7 +124,7 @@
 ### 2024-11-14 (2.8.2)
-* `JSON.load_file` explictly read the file as UTF-8.
+* `JSON.load_file` explicitly read the file as UTF-8.
 ### 2024-11-06 (2.8.1)
@@ -110,7 +132,7 @@
 ### 2024-11-06 (2.8.0)
-* Emit a deprecation warning when `JSON.load` create custom types without the `create_additions` option being explictly enabled.
+* Emit a deprecation warning when `JSON.load` create custom types without the `create_additions` option being explicitly enabled.
   * Prefer to use `JSON.unsafe_load(string)` or `JSON.load(string, create_additions: true)`.
 * Emit a deprecation warning when serializing valid UTF-8 strings encoded in `ASCII_8BIT` aka `BINARY`.
 * Bump required Ruby version to 2.7.
@@ -118,7 +140,7 @@
   pre-existing support for comments, make it suitable to parse `jsonc` documents.
 * Many performance improvements to `JSON.parse` and `JSON.load`, up to `1.7x` faster on real world documents.
 * Some minor performance improvements to `JSON.dump` and `JSON.generate`.
-* `JSON.pretty_generate` no longer include newline inside empty object and arrays.
+* `JSON.pretty_generate` no longer includes newlines inside empty object and arrays.
 ### 2024-11-04 (2.7.6)
@@ -135,13 +157,13 @@
 * Workaround a bug in 3.4.8 and older https://github.com/rubygems/rubygems/pull/6490.
   This bug would cause some gems with native extension to fail during compilation.
 * Workaround different versions of `json` and `json_pure` being loaded (not officially supported).
-* Make `json_pure` Ractor compatible.
+* Make `json_pure` Ractor compatible.
 ### 2024-10-24 (2.7.3)
 * Numerous performance optimizations in `JSON.generate` and `JSON.dump` (up to 2 times faster).
-* Limit the size of ParserError exception messages, only include up to 32 bytes of the unparseable source.
-* Fix json-pure's `Object#to_json` to accept non state arguments
+* Limit the size of ParserError exception messages, only include up to 32 bytes of the unparsable source.
+* Fix json-pure's `Object#to_json` to accept non-state arguments.
 * Fix multiline comment support in `json-pure`.
 * Fix `JSON.parse` to no longer mutate the argument encoding when passed an ASCII-8BIT string.
 * Fix `String#to_json` to raise on invalid encoding in `json-pure`.
@@ -286,6 +308,7 @@
 ## 2015-09-11 (2.0.0)
   * Now complies to newest JSON RFC 7159.
   * Implements compatibility to ruby 2.4 integer unification.
+  * Removed support for `quirks_mode` option.
   * Drops support for old rubies whose life has ended, that is rubies < 2.0.
     Also see https://www.ruby-lang.org/en/news/2014/07/01/eol-for-1-8-7-and-1-9-2/
   * There were still some mentions of dual GPL licensing in the source, but JSON

@@ -13,12 +13,12 @@ NULLCMD = :
 #### Start of system configuration section. ####
 srcdir = .
-topdir = /opt/hostedtoolcache/Ruby/3.4.5/x64/include/ruby-3.4.0
+topdir = /opt/hostedtoolcache/Ruby/3.4.6/x64/include/ruby-3.4.0
 hdrdir = $(topdir)
-arch_hdrdir = /opt/hostedtoolcache/Ruby/3.4.5/x64/include/ruby-3.4.0/x86_64-linux
+arch_hdrdir = /opt/hostedtoolcache/Ruby/3.4.6/x64/include/ruby-3.4.0/x86_64-linux
 PATH_SEPARATOR = :
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)/opt/hostedtoolcache/Ruby/3.4.5/x64
+prefix = $(DESTDIR)/opt/hostedtoolcache/Ruby/3.4.6/x64
 rubysitearchprefix = $(rubylibprefix)/$(sitearch)
 rubyarchprefix = $(rubylibprefix)/$(arch)
 rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)

@@ -1,3 +1,9 @@
+v1.2.1 09/17/25
+===============
+add color output support for github actions
+fix most lints
 v1.2.0 08/08/25
 ===============

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'formatador'
-  s.version           = '1.2.0'
-  s.date              = '2025-08-08'
+  s.version           = '1.2.1'
+  s.date              = '2025-09-17'
   ## Make sure your summary is short. The description may be as long
   ## as you like.

@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+require File.join(File.dirname(__FILE__), 'formatador', 'table')
+require File.join(File.dirname(__FILE__), 'formatador', 'progressbar')
+require 'reline' # for table char width calculations
+class Formatador
+  VERSION = '1.2.1'
+  STYLES = {
+    "\/": '0',
+    reset: '0',
+    bold: '1',
+    underline: '4',
+    blink_slow: '5',
+    blink_fast: '6',
+    negative: '7', # invert color/color
+    normal: '22',
+    underline_none: '24',
+    blink_off: '25',
+    positive: '27', # revert color/color
+    _black_: '40',
+    _red_: '41',
+    _green_: '42',
+    _yellow_: '43',
+    _blue_: '44',
+    _magenta_: '45',
+    _purple_: '45',
+    _cyan_: '46',
+    _white_: '47',
+    _light_black_: '100',
+    _light_red_: '101',
+    _light_green_: '102',
+    _light_yellow_: '103',
+    _light_blue_: '104',
+    _light_magenta_: '105',
+    _light_purple_: '105',
+    _light_cyan_: '106',
+    black: '30',
+    red: '31',
+    green: '32',
+    yellow: '33',
+    blue: '34',
+    magenta: '35',
+    purple: '35',
+    cyan: '36',
+    white: '37',
+    light_black: '90',
+    light_red: '91',
+    light_green: '92',
+    light_yellow: '93',
+    light_blue: '94',
+    light_magenta: '95',
+    light_purple: '95',
+    light_cyan: '96'
+  }.freeze
+  PARSE_REGEX  = /\[(#{STYLES.keys.join('|')})\]/ix.freeze
+  INDENT_REGEX = /\[indent\]/ix.freeze
+  def initialize
+    @indent = 1
+  end
+  def display(string = '')
+    print(parse("[indent]#{string}"))
+    $stdout.flush
+    nil
+  end
+  def display_line(string = '')
+    display(string)
+    new_line
+    nil
+  end
+  def display_lines(lines = [])
+    [*lines].each do |line|
+      display_line(line)
+    end
+    nil
+  end
+  def parse(string)
+    if color_support
+      string.gsub(PARSE_REGEX) { "\e[#{STYLES[::Regexp.last_match(1).to_sym]}m" }.gsub(INDENT_REGEX) { indentation }
+    else
+      strip(string)
+    end
+  end
+  def indent
+    @indent += 1
+    yield
+  ensure
+    @indent -= 1
+  end
+  def indentation
+    '  ' * @indent
+  end
+  def redisplay(string = '', width = 120)
+    print("\r#{' ' * width}\r")
+    display(string.to_s)
+    nil
+  end
+  def redisplay_line(string = '', width = 120)
+    redisplay(string, width)
+    new_line
+    nil
+  end
+  def new_line
+    print("\n")
+    nil
+  end
+  def strip(string)
+    string.gsub(PARSE_REGEX, '').gsub(INDENT_REGEX) { indentation }
+  end
+  %w[display display_line display_lines indent parse redisplay redisplay_line new_line redisplay_progressbar].each do |method|
+    eval <<-DEF
+      def self.#{method}(*args, &block)
+        Thread.current[:formatador] ||= new
+        Thread.current[:formatador].#{method}(*args, &block)
+      end
+    DEF
+  end
+  %w[display_table display_compact_table].each do |method|
+    eval <<-DEF
+      def self.#{method}(*args, **kwargs, &block)
+        Thread.current[:formatador] ||= new
+        Thread.current[:formatador].#{method}(*args, **kwargs, &block)
+      end
+    DEF
+  end
+  private
+  def color_support
+    @color_support ||= $stdout.tty? || ENV['GITHUB_ACTIONS'] == 'true'
+  end
+end

@@ -10,7 +10,15 @@ module ActiveModel
       if attribute.end_with?('_id')
         humanize_class_name(attribute)
       else
-        "#{inheritance_tree_root(self)}|#{attribute.split('.').map! {|a| a.humanize }.join('|')}"
+        attribute_key = attribute.split('.').map! {|a| a.humanize }.join('|')
+        root = inheritance_tree_root(self).to_s
+        # in case of STI or no inheritance, first attempt retrieving the key for the current class
+        sti_key = "#{to_s}|#{attribute_key}"
+        return sti_key if to_s == root || FastGettext.cached_find(sti_key)
+        # fallback to lookup for the root class
+        return "#{root}|#{attribute_key}"
       end
     end

@@ -18,6 +18,7 @@ module GettextI18nRails
           end
         end
         f.puts "#DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!"
+        f.puts "{}"
       end
     rescue
       puts "[Error] Attribute extraction failed. Removing incomplete file (#{file})"

@@ -0,0 +1,3 @@
+module GettextI18nRails
+  Version = VERSION = '2.0.0'
+end

@@ -24,6 +24,14 @@ typedef unsigned char _Bool;
 #endif
 #endif
+#ifndef NOINLINE
+#if defined(__has_attribute) && __has_attribute(noinline)
+#define NOINLINE() __attribute__((noinline))
+#else
+#define NOINLINE()
+#endif
+#endif
 #ifndef RB_UNLIKELY
 #define RB_UNLIKELY(expr) expr
 #endif
@@ -169,12 +177,17 @@ static inline void fbuffer_inc_capa(FBuffer *fb, unsigned long requested)
     }
 }
-static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len)
+static inline void fbuffer_append_reserved(FBuffer *fb, const char *newstr, unsigned long len)
+{
+    MEMCPY(fb->ptr + fb->len, newstr, char, len);
+    fbuffer_consumed(fb, len);
+}
+static inline void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len)
 {
     if (len > 0) {
         fbuffer_inc_capa(fb, len);
-        MEMCPY(fb->ptr + fb->len, newstr, char, len);
-        fbuffer_consumed(fb, len);
+        fbuffer_append_reserved(fb, newstr, len);
     }
 }
@@ -197,11 +210,24 @@ static void fbuffer_append_str(FBuffer *fb, VALUE str)
     const char *newstr = StringValuePtr(str);
     unsigned long len = RSTRING_LEN(str);
-    RB_GC_GUARD(str);
     fbuffer_append(fb, newstr, len);
 }
+static void fbuffer_append_str_repeat(FBuffer *fb, VALUE str, size_t repeat)
+{
+    const char *newstr = StringValuePtr(str);
+    unsigned long len = RSTRING_LEN(str);
+    fbuffer_inc_capa(fb, repeat * len);
+    while (repeat) {
+#ifdef JSON_DEBUG
+        fb->requested = len;
+#endif
+        fbuffer_append_reserved(fb, newstr, len);
+        repeat--;
+    }
+}
 static inline void fbuffer_append_char(FBuffer *fb, char newchr)
 {
     fbuffer_inc_capa(fb, 1);

gettext_i18n_rails_js 2.2.0 → 2.2.1