yalphabetize 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86d76847f2e23ff6fe3cd5a5e58304236f308cd0541a19bd3ab96f7db10bb601
-  data.tar.gz: 8c00fcc4c33db1396aeae8384d1fc62d12bb27dd5db2ef0e7115c6a1f4ccce09
+  metadata.gz: 9fdf038d72b2c031731160247a71b2b29375360fd23b9099f3ce6cb97f022cbc
+  data.tar.gz: 54906536110194ebccaf0d04137b68d65939a43951d7785aa3eb33938ef6e5d6
 SHA512:
-  metadata.gz: 6e83b56bf3dafb17675575d038cb07fd69c66d7732846eb5ade8379a84d6ac2994471784b2ba6bbdfa306bcbecddcc5d7f175f31c95fd7eaf1b5b509a4d0ba91
-  data.tar.gz: 37c7d42a08c8a1ac39bfc7bdfb4ce65ec9a658884bbc433df5504f636a9797ad1695bffca1847d7a651331b9929f72bf3a2253f258be03383319e67857af0039
+  metadata.gz: 6d9cbba9a9b4775f275e46f85750517a23ecb552b69a0f53993377bdf1e2a4a6a52ea44b89d3ca9fae276330e909be376cea3e10977fb1c26029352bb2b32ef4
+  data.tar.gz: eea1b0ce802afd10154823735d675a1e7427a28bec2611017fec957fbaed28c3eff3a66a62ab6606ee31a398f9d9fbfc23baa09d3d0f217a3578911fb1204abd

data/lib/yalphabetize/alphabetizer.rb

@@ -8,24 +8,17 @@ module Yalphabetize
     end
 
     def call
-      transform(stream_node)
-      alphabetize(stream_node)
-      stream_node
+      stream_node.select(&:mapping?).each do |node|
+        pair_up_children(node)
+        alphabetize_children(node)
+        unpair_children(node)
+      end
     end
 
     private
 
     attr_reader :stream_node, :order_checker_class
 
-    def alphabetize(node)
-      if node.mapping?
-        alphabetize_children(node)
-        unpair_children(node)
-      end
-
-      node.children&.each { |child_node| alphabetize(child_node) }
-    end
-
     def alphabetize_children(node)
       node.children.sort! do |a, b|
         order_checker_class.compare(a.first.value, b.first.value)
@@ -33,20 +26,7 @@ module Yalphabetize
     end
 
     def unpair_children(node)
-      children_clone = node.children.dup
-
-      children_clone.each do |slice|
-        node.children.push(*slice)
-        node.children.shift
-      end
-    end
-
-    def transform(node)
-      node.children&.each(&method(:transform))
-
-      return unless node.mapping?
-
-      pair_up_children(node)
+      node.children.flatten!
     end
 
     def pair_up_children(node)
@@ -54,8 +34,7 @@ module Yalphabetize
 
       children_clone.each_slice(2) do |slice|
         node.children.push(slice)
-        node.children.shift
-        node.children.shift
+        2.times { node.children.shift }
       end
     end
   end

data/lib/yalphabetize/order_checkers/capitalized_first_then_alphabetical.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
+# ABab
 module Yalphabetize
   module OrderCheckers
     class CapitalizedFirstThenAlphabetical < Base
       def self.compare(string, other_string)
-        (string <=> other_string)
+        string <=> other_string
       end
     end
   end

data/lib/yalphabetize/order_checkers/capitalized_last_then_alphabetical.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
+# abAB
 module Yalphabetize
   module OrderCheckers
     class CapitalizedLastThenAlphabetical < Base
       def self.compare(string, other_string)
-        (string.swapcase <=> other_string.swapcase)
+        string.swapcase <=> other_string.swapcase
       end
     end
   end

data/lib/yalphabetize/order_checkers.rb

@@ -2,8 +2,6 @@
 
 module Yalphabetize
   module OrderCheckers
-    DEFAULT = CapitalizedFirstThenAlphabetical
-
     TOKEN_MAPPING = {
       'abAB' => CapitalizedLastThenAlphabetical,
       'aAbB' => AlphabeticalThenCapitalizedLast,

data/lib/yalphabetize/version.rb

@@ -2,6 +2,6 @@
 
 module Yalphabetize
   class Version
-    STRING = '0.4.1'
+    STRING = '0.5.0'
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: yalphabetize
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Sam Jenkins
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: psych
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -94,8 +80,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
-email:
+description: 
+email: 
 executables:
 - yalphabetize
 extensions: []
@@ -124,11 +110,11 @@ files:
 - lib/yalphabetize/writer.rb
 - lib/yalphabetize/yalphabetizer.rb
 - lib/yalphabetize/yaml_finder.rb
-homepage:
+homepage: 
 licenses: []
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -144,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3.1
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Alphabetize your YAML files
 test_files: []