quick_and_ruby 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c0817c5dc3e4a34622553992b9ff3158e437d9df32915d2cf4307fceb841229
-  data.tar.gz: 7c7bc9b6cda4974e464f8232616da0f58064b53ce494436ce3242991ec03ae54
+  metadata.gz: c685bd6937aa82ca104aa4d885bb6cb150e465d61dafe2fc4c5bcd18f2a19cc5
+  data.tar.gz: c6e90670c6447c6261fb3c25be94d7617c0c4a4042da22cd302f5c9a9c906481
 SHA512:
-  metadata.gz: 9c4fe131c66dcbc054838b5b7f84f983656d188158f7b2552a0d6791f28851d91e400ef7fab68425cec1a64030f35ca025c95df555c12860ab6e1a449bb3ddb9
-  data.tar.gz: 12c49deb386a0241060d6e01e5f5d4df0317c1d0c3eae65f9f56065c41d9939cbd1273c962de7ab7c424cb82053f719c47f16ccc333463d366d8237a1b1c9374
+  metadata.gz: '03189ba3378295c3358c4449d30d6c2c6075f1c292f83b6f5db7f4cedcac775e3bc6cfd0d639cb50d54fcbe56f77aa70df2eaad3fe17263286bb968f34097933'
+  data.tar.gz: 00b294e7bc307dbb19947dfc48dd49cdd0b803fc5c69258ddcf6d5596b2df9923fb2be3e86921b3784ccef348d78f2d5865fe13c3a3cba15c5927e42b7f8278d

data/.rubocop.yml

@@ -6,6 +6,9 @@ AllCops:
   NewCops: enable
   TargetRubyVersion: 2.7
 
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
 Layout/LineLength:
   Max: 100
 
@@ -14,21 +17,29 @@ Metrics/BlockLength:
     - quick_and_ruby.gemspec
     - spec/**/*.rb
 
+Metrics/ClassLength:
+  Exclude:
+    - test/**/*.rb
+
+Metrics/CyclomaticComplexity:
+  Max: 10
+
 Metrics/MethodLength:
   Max: 25
 
+Style/Documentation:
+  Enabled: false
+
 # Style/StringLiterals:
 #   Enabled: true
 #   EnforcedStyle: double_quotes
 
-Style/Documentation:
-  Enabled: false
-
-Style/StringLiteralsInInterpolation:
-  Enabled: true
-  EnforcedStyle: double_quotes
+# Style/StringLiteralsInInterpolation:
+#   Enabled: true
+#   EnforcedStyle: double_quotes
 
-# RSpec
+RSpec/ExampleLength:
+  Max: 10
 
 RSpec/MultipleExpectations:
   Max: 2

data/bin/datetime

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "quick_and_ruby/date"
+require 'quick_and_ruby/date'
 
 QuickAndRuby::Date::DateTimeCli.new(ARGV).run

data/bin/distinguished_name

@@ -20,15 +20,15 @@ end
 
 option_parser.parse!(argv)
 if argv.empty?
-  STDERR.puts 'error: you must supply a distinguished_name'
-  STDERR.puts
-  STDERR.puts option_parser.help
+  warn 'error: you must supply a distinguished_name'
+  $stderr.puts
+  warn option_parser.help
   exit 2
 else
-  distinguished_name = argv.clone.join(" ")
+  distinguished_name = argv.clone.join(' ')
 end
 
-dn = QuickAndRuby::DistinguishedName.from_string(distinguished_name)
+dn = QuickAndRuby::DistinguishedName.from_s(distinguished_name)
 dn = dn.reverse if options[:reverse]
 
 puts dn.to_s

data/bin/json2yaml

@@ -10,7 +10,7 @@ end
 
 from = ARGV[0]
 if from && File.exist?(from)
-  to = ARGV[1] || "#{from.chomp(".json")}.yaml"
+  to = ARGV[1] || "#{from.chomp('.json')}.yaml"
 
   File.write(to, json2yaml(File.read(from)))
 elsif from

data/bin/proxy

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # -*- mode: Ruby -*-
 
 require 'quick_and_ruby'

data/bin/yaml2json

@@ -5,12 +5,12 @@ require 'json'
 require 'yaml'
 
 def yaml2json(str)
-  JSON.pretty_generate(YAML.safe_load(str))
+  JSON.pretty_generate(YAML.safe_load(str, aliases: true))
 end
 
 from = ARGV[0]
 if from && File.exist?(from)
-  to = ARGV[1] || "#{from.chomp(".yaml").chomp(".yml")}.json"
+  to = ARGV[1] || "#{from.chomp('.yaml').chomp('.yml')}.json"
 
   File.write(to, yaml2json(File.read(from)))
 elsif from

data/lib/quick_and_ruby/distinguished_name/attribute.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module QuickAndRuby
+  class DistinguishedName
+    class Attribute
+      # DC  domainComponent
+      # CN  commonName
+      # OU  organizationalUnitName
+      # O   organizationName
+      # STREET  streetAddress
+      # L   localityName
+      # ST  stateOrProvinceName
+      # C   countryName
+      # UID userid
+
+      SPLIT_RE = /^(\w+)=((?:\\.|[^\\])+)$/.freeze
+
+      attr_reader :name, :value
+
+      def initialize(name, value)
+        @name = name
+        @value = value
+      end
+
+      def to_s(escaper: nil)
+        escaped_value = value
+        escaped_value = escaper.call(escaped_value) if escaper
+
+        "#{name}=#{escaped_value}"
+      end
+
+      def self.from_s(part, unescaper: nil)
+        unless (match = SPLIT_RE.match(part))
+          raise "Invalid DN part: '#{part}'"
+        end
+
+        key = match[1].strip
+        value = match[2].strip
+        unescaped_value = value
+        unescaped_value = unescaper.call(unescaped_value) if unescaper
+        new(key, unescaped_value)
+      end
+    end
+  end
+end

data/lib/quick_and_ruby/distinguished_name/openssl_format.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require_relative 'attribute'
+
+module QuickAndRuby
+  class DistinguishedName
+    class OpensslFormat
+      LABEL = :openssl
+      SEPARATOR = '/'
+      SPLIT_RE = %r{(?<!\\)/}.freeze
+
+      def escape(value)
+        value.gsub(%r{([/\\])}, '\\\\\1')
+      end
+
+      def unescape(value)
+        value.gsub(%r{\\([/\\])}, '\1')
+      end
+
+      def recognize?(dn_str)
+        return true if !dn_str || dn_str.empty?
+        return true if dn_str.start_with?(SEPARATOR)
+
+        false
+      end
+
+      def split(dn_str)
+        dn_str = dn_str[1..] if dn_str.start_with?(SEPARATOR)
+
+        parts = dn_str.split(SPLIT_RE)
+        parts.map do |part|
+          part = part.strip if part
+          next if !part || part.empty?
+
+          Attribute.from_s(part, unescaper: method(:unescape))
+        end.compact
+      end
+
+      def join(attributes)
+        SEPARATOR + attributes.map do |attribute|
+          attribute.to_s(escaper: method(:escape))
+        end.join(SEPARATOR)
+      end
+    end
+  end
+end

data/lib/quick_and_ruby/distinguished_name/rfc_format.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require_relative 'attribute'
+
+module QuickAndRuby
+  class DistinguishedName
+    class RfcFormat
+      LABEL = :rfc
+      SEPARATOR = ','
+      SPLIT_RE = /(?<!\\),/.freeze
+
+      UNESCAPE_ALL_RE = /\\(.)/.freeze
+
+      def escape(value)
+        # value.gsub(/([,\\+<>;"= ])/, '\\\1')
+        value.gsub(/([,\\+<>;"=])/, '\\\\\1')
+      end
+
+      def unescape(value)
+        # .gsub(UNESCAPE_ALL_RE, '\1')
+        value.gsub(/\\([,\\+<>;"= ])/, '\1')
+      end
+
+      def recognize?(dn_str)
+        return true if !dn_str || dn_str.empty?
+
+        true
+      end
+
+      def split(dn_str)
+        parts = dn_str.split(SPLIT_RE)
+        parts.map do |part|
+          part = part.strip if part
+          next if !part || part.empty?
+
+          Attribute.from_s(part, unescaper: method(:unescape))
+        end.compact
+      end
+
+      def join(attributes)
+        attributes.map do |attribute|
+          attribute.to_s(escaper: method(:escape))
+        end.join(SEPARATOR)
+      end
+    end
+  end
+end

data/lib/quick_and_ruby/distinguished_name.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require_relative 'distinguished_name/attribute'
+require_relative 'distinguished_name/rfc_format'
+require_relative 'distinguished_name/openssl_format'
+
 module QuickAndRuby
   class DistinguishedName
     attr_reader :attributes
@@ -8,51 +12,54 @@ module QuickAndRuby
       @attributes = attributes
     end
 
-    def to_s
-      attributes.map(&:to_s).join(',')
+    def to_s(format: :rfc)
+      formatter = get_format(format)
+      formatter.join(attributes)
+    end
+
+    def reverse
+      self.class.new(attributes.reverse)
     end
 
     def size
-      @attributes.size
+      attributes.size
     end
     alias length size
 
-    def reverse
-      self.class.new(attributes.reverse)
+    def get_format(label = :rfc)
+      self.class.get_format(label)
     end
 
-    def self.from_string(dn_str)
-      attributes = dn_str.split(/(?<!\\),/).map do |dn_component|
-        unless (match = /^([^=]+)=(.*)$/.match(dn_component.strip))
-          raise "#{dn_component} is not a valid DistinguishedName component"
-        end
+    class << self
+      def from_s(dn_str, format: nil)
+        return new if !dn_str || dn_str.empty?
+
+        formatter ||= get_format(format) if format
+        formatter ||= openssl_format if openssl_format.recognize?(dn_str)
+        formatter ||= rfc_format
+
+        attributes = formatter.split(dn_str)
 
-        Attribute.new(*match.captures)
+        new(attributes)
       end
 
-      new(attributes)
-    end
+      def rfc_format
+        get_format(:rfc)
+      end
 
-    class Attribute
-      # DC 	domainComponent
-      # CN 	commonName
-      # OU 	organizationalUnitName
-      # O 	organizationName
-      # STREET 	streetAddress
-      # L 	localityName
-      # ST 	stateOrProvinceName
-      # C 	countryName
-      # UID 	userid
-
-      attr_reader :attribute, :value
-
-      def initialize(attribute, value)
-        @attribute = attribute
-        @value = value
+      def openssl_format
+        get_format(:openssl)
       end
 
-      def to_s
-        "#{attribute}=#{value}"
+      def get_format(label = :rfc)
+        case label.to_sym
+        when :rfc
+          RfcFormat.new
+        when :openssl
+          OpensslFormat.new
+        else
+          raise ArgumentError, "Unsupported format #{label}"
+        end
       end
     end
   end

data/lib/quick_and_ruby/string/case.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module QuickAndRuby
+  module String
+    module Case
+      def snakecase
+        gsub(/\s+/, '_').gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
+      end
+
+      # def snakecase2
+      #   return downcase if match(/\A[A-Z]+\z/)
+      #   gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+      #     gsub(/([a-z])([A-Z])/, '\1_\2').
+      #     downcase
+      # end
+    end
+  end
+end

data/lib/quick_and_ruby/string.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require_relative 'string/case'
+
+String.include QuickAndRuby::String::Case

data/lib/quick_and_ruby/version.rb

@@ -1,3 +1,3 @@
 module QuickAndRuby
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

data/scripts/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'quick_and_ruby'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quick_and_ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - ttych
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -207,9 +207,14 @@ files:
 - lib/quick_and_ruby/date/date_time_args.rb
 - lib/quick_and_ruby/date/date_time_cli.rb
 - lib/quick_and_ruby/distinguished_name.rb
+- lib/quick_and_ruby/distinguished_name/attribute.rb
+- lib/quick_and_ruby/distinguished_name/openssl_format.rb
+- lib/quick_and_ruby/distinguished_name/rfc_format.rb
 - lib/quick_and_ruby/proxy/arg_parser.rb
 - lib/quick_and_ruby/proxy/env_parser.rb
 - lib/quick_and_ruby/proxy/proxy.rb
+- lib/quick_and_ruby/string.rb
+- lib/quick_and_ruby/string/case.rb
 - lib/quick_and_ruby/version.rb
 - man/distinguished_name.1.ronn
 - quick_and_ruby.gemspec