jazzy 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4e56611ebbc1fd23b15eb87740d56ca89523b6d98a9d1c7a8219fdc62e8b3d4
-  data.tar.gz: d3ffb914f1df703944287fa69b00e4c68b734076eeb825a2ab59857f27d28f6d
+  metadata.gz: 233b49769d27b199b20651cff4041041fda0c9506945290fea84937ee5f1723f
+  data.tar.gz: 55148a0bff106913b60dd295851d069a8aa344a21c2b52e3453d1bbeebd2a8ad
 SHA512:
-  metadata.gz: c3418c7fe4eb7f9d1a83316fc3df22d0e7c87f42487f74ab62cc94e3b47e6e6c644327ef59ea5e4abae9a074b8adcf63da3c757df421a888220cdd4b039c6e5c
-  data.tar.gz: 2c28f8a6b6b8f4537cf35b30bfb89690ac5efd9b492a420b1bd1bb7184e8a665c91ae6ca31e473cce386bee30c1001cc4d90900a5b914b6da0aa6cc8072668e7
+  metadata.gz: f093b513515728c93ffce07528fe6042d05063b8b9b78e4283f89f9e41632a06509434bc3f533f2b4e1d9f30619cde090acff726a1463ea61669091f56734f41
+  data.tar.gz: 36ba08e16c04d207568ce01f1e864bee4d495197cdf14bbc643d714e3ea85aeff2c9c102e4baa7122916f49dbf2d3e77dcf59ecebfd4a9c1839b5eb9bf18e08d

data/.rubocop.yml

@@ -10,6 +10,8 @@ AllCops:
 
 #- Pending Cops as of 1.56.3 ---------------------------------------------#
 
+
+
 Gemspec/DeprecatedAttributeAssignment: # new in 1.30
   Enabled: true
 Gemspec/DevelopmentDependencies: # new in 1.44
@@ -200,10 +202,14 @@ Style/ReturnNilInPredicateMethodDefinition: # new in 1.53
   Enabled: true
 Style/SelectByRegexp: # new in 1.22
   Enabled: true
+Style/SendWithLiteralMethodName: # new in 1.64
+  Enabled: true
 Style/SingleLineDoEndBlock: # new in 1.57
   Enabled: true
 Style/StringChars: # (new in 1.12)
   Enabled: true
+Style/SuperArguments: # new in 1.64
+  Enabled: true
 Style/SuperWithArgsParentheses: # new in 1.58
   Enabled: true
 Style/SwapValues: # (new in 1.1)

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.15.1
+
+##### Breaking
+
+* None.
+
+##### Enhancements
+
+* None.
+
+##### Bug Fixes
+
+* Restore compatibility with Ruby 2.6  
+  [John Fairhurst](https://github.com/johnfairh)
+  [#1388](https://github.com/realm/jazzy/issues/1388)
+
 ## 0.15.0
 
 ##### Breaking

data/Gemfile.lock

@@ -9,12 +9,12 @@ GIT
 PATH
   remote: .
   specs:
-    jazzy (0.15.0)
+    jazzy (0.15.1)
       cocoapods (~> 1.5)
       mustache (~> 1.1)
       open4 (~> 1.3)
       redcarpet (~> 3.4)
-      rexml (~> 3.2)
+      rexml (>= 3.2.7, < 4.0)
       rouge (>= 2.0.6, < 5.0)
       sassc (~> 2.1)
       sqlite3 (~> 1.3)
@@ -27,7 +27,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.1.3.2)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -46,7 +46,7 @@ GEM
     atomos (0.1.3)
     bacon (1.2.0)
     base64 (0.2.0)
-    bigdecimal (3.1.7)
+    bigdecimal (3.1.8)
     claide (1.1.0)
     claide-plugins (0.9.2)
       cork
@@ -90,7 +90,7 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.2)
     connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
@@ -115,13 +115,13 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    faraday (2.9.0)
+    faraday (2.9.1)
       faraday-net_http (>= 2.0, < 3.2)
     faraday-http-cache (2.5.1)
       faraday (>= 0.8)
     faraday-net_http (3.1.0)
       net-http
-    ffi (1.16.3)
+    ffi (1.17.0)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -130,7 +130,7 @@ GEM
       rchardet (~> 1.8)
     hashdiff (1.1.0)
     httpclient (2.8.3)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     json (2.7.2)
     kramdown (2.4.0)
@@ -139,9 +139,9 @@ GEM
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
     liferaft (0.0.6)
-    mini_portile2 (2.8.6)
-    minitest (5.22.3)
-    mocha (2.2.0)
+    mini_portile2 (2.8.7)
+    minitest (5.23.1)
+    mocha (2.3.0)
       ruby2_keywords (>= 0.0.5)
     mocha-on-bacon (0.2.3)
       mocha (>= 0.13.0)
@@ -161,21 +161,22 @@ GEM
       sawyer (~> 0.9)
     open4 (1.3.4)
     parallel (1.24.0)
-    parser (3.3.1.0)
+    parser (3.3.2.0)
       ast (~> 2.4.1)
       racc
     prettybacon (0.0.2)
       bacon (~> 1.2)
     public_suffix (4.0.7)
-    racc (1.7.3)
+    racc (1.8.0)
     rainbow (3.1.1)
     rake (13.2.1)
     rchardet (1.8.0)
     redcarpet (3.6.0)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
+    regexp_parser (2.9.2)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (4.2.1)
-    rubocop (1.63.4)
+    rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -198,6 +199,7 @@ GEM
       faraday (>= 0.17.3, < 3)
     sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
+    strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     typhoeus (1.4.1)
@@ -206,7 +208,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     uri (0.13.0)
-    webmock (3.23.0)
+    webmock (3.23.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

data/jazzy.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'mustache', '~> 1.1'
   spec.add_runtime_dependency 'open4', '~> 1.3'
   spec.add_runtime_dependency 'redcarpet', '~> 3.4'
-  spec.add_runtime_dependency 'rexml', '~> 3.2'
+  spec.add_runtime_dependency 'rexml', ['>= 3.2.7', '< 4.0']
   spec.add_runtime_dependency 'rouge', ['>= 2.0.6', '< 5.0']
   spec.add_runtime_dependency 'sassc', '~> 2.1'
   spec.add_runtime_dependency 'sqlite3', '~> 1.3'

data/lib/jazzy/config.rb

@@ -717,12 +717,12 @@ module Jazzy
 
       if modules.first.is_a?(String)
         # Massage format (2) into (3)
-        self.modules = modules.map { { 'module' => _1 } }
+        self.modules = modules.map { |mod| { 'module' => mod } }
       end
 
       # Allow per-module overrides of only some config options
       attrs_by_conf_key, attrs_by_name =
-        grouped_attributes { _1.select(&:per_module) }
+        grouped_attributes { |attr| attr.select(&:per_module) }
 
       modules.map do |module_hash|
         mod_name = module_hash['module'] || ''

data/lib/jazzy/gem_version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jazzy
-  VERSION = '0.15.0' unless defined? Jazzy::VERSION
+  VERSION = '0.15.1' unless defined? Jazzy::VERSION
 end

data/lib/jazzy/grouper.rb

@@ -24,7 +24,7 @@ module Jazzy
     # Group root-level docs by type
     def self.group_docs_by_type(docs, type_category_prefix)
       type_groups = SourceDeclaration::Type.all.map do |type|
-        children, docs = docs.partition { _1.type == type }
+        children, docs = docs.partition { |doc| doc.type == type }
         make_type_group(children, type, type_category_prefix)
       end
       merge_categories(type_groups.compact) + docs
@@ -49,7 +49,7 @@ module Jazzy
 
     def self.group_custom_categories(docs, doc_index)
       group = config.custom_categories.map do |category|
-        children = category['children'].filter_map do |name|
+        children = category['children'].map do |name|
           unless doc = doc_index.lookup(name)
             warn 'WARNING: No documented top-level declarations match ' \
               "name \"#{name}\" specified in categories file"
@@ -64,7 +64,7 @@ module Jazzy
           end
 
           docs.delete(doc)
-        end
+        end.compact
         # Category config overrides alphabetization
         children.each.with_index { |child, i| child.nav_order = i }
         make_group(children, category['name'], '')
@@ -73,7 +73,7 @@ module Jazzy
     end
 
     def self.group_guides(docs, prefix)
-      guides, others = docs.partition { _1.type.markdown? }
+      guides, others = docs.partition { |doc| doc.type.markdown? }
       return [[], others] unless guides.any?
 
       [[make_type_group(guides, guides.first.type, prefix)], others]
@@ -92,7 +92,7 @@ module Jazzy
     def self.merge_categories(categories)
       merged = []
       categories.each do |new_category|
-        if existing = merged.find { _1.name == new_category.name }
+        if existing = merged.find { |cat| cat.name == new_category.name }
           existing.children += new_category.children
         else
           merged.append(new_category)
@@ -102,7 +102,7 @@ module Jazzy
     end
 
     def self.make_group(group, name, abstract, url_name = nil)
-      group.reject! { _1.name.empty? }
+      group.reject! { |decl| decl.name.empty? }
       unless group.empty?
         SourceDeclaration.new.tap do |sd|
           sd.type     = SourceDeclaration::Type.overview

data/lib/jazzy/sourcekitten.rb

@@ -692,7 +692,7 @@ module Jazzy
       decl.type.objc_class? ||
         (decl.type.objc_category? &&
           (category_classname = decl.objc_category_name[0]) &&
-          root_decls.any? { _1.name == category_classname })
+          root_decls.any? { |d| d.name == category_classname })
     end
 
     # Returns if a Swift declaration is mergeable.
@@ -919,7 +919,9 @@ module Jazzy
 
     # Grab all the extensions from the same doc module
     def self.next_doc_module_group(decls)
-      decls.partition { _1.doc_module_name == decls.first.doc_module_name }
+      decls.partition do |decl|
+        decl.doc_module_name == decls.first.doc_module_name
+      end
     end
 
     # Does this extension/type need a note explaining which doc module it is from?
@@ -1055,12 +1057,12 @@ module Jazzy
     # Remove top-level enum cases because it means they have an ACL lower
     # than min_acl
     def self.reject_swift_types(docs)
-      docs.reject { _1.type.swift_enum_element? }
+      docs.reject { |doc| doc.type.swift_enum_element? }
     end
 
     # Spot and mark any categories on classes not declared in these docs
     def self.mark_objc_external_categories(docs)
-      class_names = docs.select { _1.type.objc_class? }.to_set(&:name)
+      class_names = docs.select { |doc| doc.type.objc_class? }.to_set(&:name)
 
       docs.map do |doc|
         if (names = doc.objc_category_name) && !class_names.include?(names.first)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jazzy
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - JP Simard
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-04 00:00:00.000000000 Z
+date: 2024-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -73,16 +73,22 @@ dependencies:
   name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.7
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.7
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -376,7 +382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Soulful docs for Swift & Objective-C.