yalphabetize 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fdf038d72b2c031731160247a71b2b29375360fd23b9099f3ce6cb97f022cbc
-  data.tar.gz: 54906536110194ebccaf0d04137b68d65939a43951d7785aa3eb33938ef6e5d6
+  metadata.gz: b8a46ac2b83620bfb782115c3619f6db45dc085ac588bf3911a9c5c0380ac27e
+  data.tar.gz: 76a8548aee15525a38afa21d1f21958184f8b77346778626a06c0323dd62fee5
 SHA512:
-  metadata.gz: 6d9cbba9a9b4775f275e46f85750517a23ecb552b69a0f53993377bdf1e2a4a6a52ea44b89d3ca9fae276330e909be376cea3e10977fb1c26029352bb2b32ef4
-  data.tar.gz: eea1b0ce802afd10154823735d675a1e7427a28bec2611017fec957fbaed28c3eff3a66a62ab6606ee31a398f9d9fbfc23baa09d3d0f217a3578911fb1204abd
+  metadata.gz: 24727bad57547da439e2c63d17be8469c8f605bcfd1dcee96685e274b89933e716a07f3cbd84ff9e8f1c88c37561efe82ec11a477758614e7e75351cd5ffd61d
+  data.tar.gz: f841fe74158715af2a2836b8637d9363e9b7371cb77ddd0ac43d109712a9832dd04b5bb81b741218e30f76bbb56b77b6c90b1a6560913ad8d5e5114cfaabb2ea

data/lib/yalphabetize/alphabetizer.rb

@@ -9,8 +9,9 @@ module Yalphabetize
 
     def call
       stream_node.select(&:mapping?).each do |node|
+        order_checker = order_checker_class.new_for(node)
         pair_up_children(node)
-        alphabetize_children(node)
+        alphabetize_children(node, order_checker)
         unpair_children(node)
       end
     end
@@ -19,9 +20,9 @@ module Yalphabetize
 
     attr_reader :stream_node, :order_checker_class
 
-    def alphabetize_children(node)
+    def alphabetize_children(node, order_checker)
       node.children.sort! do |a, b|
-        order_checker_class.compare(a.first.value, b.first.value)
+        order_checker.compare(a.first.value, b.first.value)
       end
     end
 

data/lib/yalphabetize/file_yalphabetizer.rb

@@ -47,7 +47,7 @@ module Yalphabetize
     end
 
     def rewrite_yml_file
-      writer_class.new(stream_node, file_path, interpolations_mapping).call
+      writer_class.new(stream_node, file_path).call
     end
 
     def print_to_log
@@ -61,9 +61,5 @@ module Yalphabetize
     def stream_node
       @_stream_node ||= reader.to_ast
     end
-
-    def interpolations_mapping
-      reader.interpolations_mapping
-    end
   end
 end

data/lib/yalphabetize/offence_detector.rb

@@ -26,8 +26,10 @@ module Yalphabetize
     end
 
     def alphabetized_children?(node)
+      order_checker = order_checker_class.new_for(node)
+
       node.children.each_slice(2).each_cons(2).all? do |a, b|
-        order_checker_class.ordered?(a.first.value, b.first.value)
+        order_checker.ordered?(a.first.value, b.first.value)
       end
     end
 

data/lib/yalphabetize/order_checkers/alphabetical_then_capitalized_first.rb

@@ -4,7 +4,7 @@
 module Yalphabetize
   module OrderCheckers
     class AlphabeticalThenCapitalizedFirst < Base
-      def self.compare(string, other_string)
+      def compare(string, other_string)
         alphabetical_comparison(string, other_string).nonzero? || string <=> other_string
       end
     end

data/lib/yalphabetize/order_checkers/alphabetical_then_capitalized_last.rb

@@ -4,7 +4,7 @@
 module Yalphabetize
   module OrderCheckers
     class AlphabeticalThenCapitalizedLast < Base
-      def self.compare(string, other_string)
+      def compare(string, other_string)
         alphabetical_comparison(string, other_string).nonzero? || string.swapcase <=> other_string.swapcase
       end
     end

data/lib/yalphabetize/order_checkers/base.rb

@@ -3,11 +3,25 @@
 module Yalphabetize
   module OrderCheckers
     class Base
-      def self.ordered?(string, other_string)
+      def self.new_for(node)
+        node_keys = node.children.select.each_with_index do |_, i|
+          i.even?
+        end.map(&:value)
+
+        matched_allowed_order = Yalphabetize.config['allowed_orders']&.find do |allowed_order|
+          (node_keys - allowed_order).empty?
+        end
+
+        matched_allowed_order ? Custom.new(matched_allowed_order) : new
+      end
+
+      def ordered?(string, other_string)
         !compare(string, other_string).positive?
       end
 
-      private_class_method def self.alphabetical_comparison(string, other_string)
+      private
+
+      def alphabetical_comparison(string, other_string)
         string.downcase <=> other_string.downcase
       end
     end

data/lib/yalphabetize/order_checkers/capitalized_first_then_alphabetical.rb

@@ -4,7 +4,7 @@
 module Yalphabetize
   module OrderCheckers
     class CapitalizedFirstThenAlphabetical < Base
-      def self.compare(string, other_string)
+      def compare(string, other_string)
         string <=> other_string
       end
     end

data/lib/yalphabetize/order_checkers/capitalized_last_then_alphabetical.rb

@@ -4,7 +4,7 @@
 module Yalphabetize
   module OrderCheckers
     class CapitalizedLastThenAlphabetical < Base
-      def self.compare(string, other_string)
+      def compare(string, other_string)
         string.swapcase <=> other_string.swapcase
       end
     end

data/lib/yalphabetize/order_checkers/custom.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Yalphabetize
+  module OrderCheckers
+    class Custom < Base
+      def initialize(allowed_order)
+        super()
+        @allowed_order = allowed_order
+      end
+
+      def compare(string, other_string)
+        allowed_order.index(string) <=> allowed_order.index(other_string)
+      end
+
+      private
+
+      attr_reader :allowed_order
+    end
+  end
+end

data/lib/yalphabetize/reader.rb

@@ -1,37 +1,21 @@
 # frozen_string_literal: true
 
 require 'psych'
-require 'securerandom'
 
 module Yalphabetize
   class Reader
     def initialize(path)
       @path = path
-      @interpolations_mapping = {}
     end
 
     def to_ast
-      substitute_interpolations
       stream_node
     end
 
-    attr_reader :interpolations_mapping
-
     private
 
     attr_reader :path
 
-    def substitute_interpolations
-      erb_compiler = Yalphabetize::ErbCompiler.new
-      erb_compiler.compile(file)
-
-      erb_compiler.content.each do |interpolation|
-        uuid = SecureRandom.uuid
-        file.sub!(interpolation, uuid)
-        interpolations_mapping[uuid] = interpolation
-      end
-    end
-
     def file
       @_file ||= File.read(path)
     end

data/lib/yalphabetize/version.rb

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

data/lib/yalphabetize/writer.rb

@@ -4,35 +4,25 @@ module Yalphabetize
   class Writer
     MAX_LINE_WIDTH = -1
 
-    def initialize(stream_node, path, interpolations_mapping)
+    def initialize(stream_node, path)
       @stream_node = stream_node
       @path = path
-      @interpolations_mapping = interpolations_mapping
     end
 
     def call
       indent_sequences
-      replace_interpolations
 
-      File.open(path, 'w') do |file|
-        file.write new_file_content
-      end
+      File.write(path, new_file_content)
     end
 
     private
 
-    attr_reader :stream_node, :path, :interpolations_mapping
+    attr_reader :stream_node, :path
 
     def new_file_content
       @_new_file_content ||= stream_node.to_yaml(nil, line_width: MAX_LINE_WIDTH)
     end
 
-    def replace_interpolations
-      interpolations_mapping.each do |uuid, interpolation|
-        new_file_content.sub!(uuid, interpolation)
-      end
-    end
-
     def indent_sequences
       @_new_file_content = SequenceIndenter.call(new_file_content)
     end

data/lib/yalphabetize/yalphabetizer.rb

@@ -26,7 +26,7 @@ module Yalphabetize
     end
 
     def process_files
-      file_paths.each(&method(:process_file))
+      file_paths.each { |file_path| process_file(file_path) }
     end
 
     def process_file(file_path)

data/lib/yalphabetize/yaml_finder.rb

@@ -25,7 +25,7 @@ module Yalphabetize
         process_paths(paths)
       end
 
-      files.flatten.select(&method(:valid?)).map { |f| File.expand_path(f) }.uniq
+      files.flatten.select { |file| valid?(file) }.map { |f| File.expand_path(f) }.uniq
     end
 
     private

data/lib/yalphabetize.rb

@@ -3,7 +3,6 @@
 require_relative 'yalphabetize/aliaser'
 require_relative 'yalphabetize/alphabetizer'
 require_relative 'yalphabetize/cli'
-require_relative 'yalphabetize/erb_compiler'
 require_relative 'yalphabetize/file_yalphabetizer'
 require_relative 'yalphabetize/logger'
 require_relative 'yalphabetize/offence_detector'
@@ -13,6 +12,7 @@ require_relative 'yalphabetize/order_checkers/alphabetical_then_capitalized_firs
 require_relative 'yalphabetize/order_checkers/alphabetical_then_capitalized_last'
 require_relative 'yalphabetize/order_checkers/capitalized_last_then_alphabetical'
 require_relative 'yalphabetize/order_checkers/capitalized_first_then_alphabetical'
+require_relative 'yalphabetize/order_checkers/custom'
 require_relative 'yalphabetize/order_checkers'
 require_relative 'yalphabetize/parsing_error'
 require_relative 'yalphabetize/reader'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yalphabetize
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Sam Jenkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_bot
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +120,6 @@ files:
 - lib/yalphabetize/aliaser.rb
 - lib/yalphabetize/alphabetizer.rb
 - lib/yalphabetize/cli.rb
-- lib/yalphabetize/erb_compiler.rb
 - lib/yalphabetize/file_yalphabetizer.rb
 - lib/yalphabetize/logger.rb
 - lib/yalphabetize/offence_detector.rb
@@ -103,6 +130,7 @@ files:
 - lib/yalphabetize/order_checkers/base.rb
 - lib/yalphabetize/order_checkers/capitalized_first_then_alphabetical.rb
 - lib/yalphabetize/order_checkers/capitalized_last_then_alphabetical.rb
+- lib/yalphabetize/order_checkers/custom.rb
 - lib/yalphabetize/parsing_error.rb
 - lib/yalphabetize/reader.rb
 - lib/yalphabetize/sequence_indenter.rb

data/lib/yalphabetize/erb_compiler.rb

@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-# Inspired by ERB::Compiler (https://github.com/ruby/erb/blob/b58b188028fbb403f75d48d62717373fc0908f7a/lib/erb.rb)
-
-module Yalphabetize
-  class ErbCompiler
-    DEFAULT_STAGS = ['<%%', '<%=', '<%#', '<%', '%{', '{{'].freeze
-    DEFAULT_ETAGS = ['%%>', '%>', '}}', '}'].freeze
-
-    class Scanner
-      STAG_REG = /(.*?)(#{DEFAULT_STAGS.join('|')}|\z)/m.freeze
-      ETAG_REG = /(.*?)(#{DEFAULT_ETAGS.join('|')}|\z)/m.freeze
-
-      def initialize(src)
-        @src = src
-        @stag = nil
-      end
-
-      def scan
-        until scanner.eos?
-          scanner.scan(stag ? ETAG_REG : STAG_REG)
-          yield(scanner[1])
-          yield(scanner[2])
-        end
-      end
-
-      attr_accessor :stag
-
-      private
-
-      attr_reader :src
-
-      def scanner
-        @_scanner ||= StringScanner.new(src)
-      end
-    end
-
-    def initialize
-      @buffer = []
-      @content = []
-    end
-
-    def compile(string)
-      scanner = Scanner.new(string)
-      scanner.scan do |token|
-        next if token.nil?
-        next if token == ''
-
-        if scanner.stag.nil?
-          compile_stag(token, scanner)
-        else
-          compile_etag(token, scanner)
-        end
-      end
-    end
-
-    def compile_stag(stag, scanner)
-      case stag
-      when *DEFAULT_STAGS
-        scanner.stag = stag
-        buffer << stag
-      end
-    end
-
-    def compile_etag(etag, scanner)
-      buffer << etag
-
-      case etag
-      when *DEFAULT_ETAGS
-        content << buffer.join
-        self.buffer = []
-        scanner.stag = nil
-      end
-    end
-
-    attr_reader :content
-
-    private
-
-    attr_accessor :buffer
-  end
-end