ldif_parser 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fc3525380089bfb196bb002b639e05b016bf6edba911653805c4085b10fbb56
-  data.tar.gz: 5de5352b732b3a8095ea7937a31488bf3b4549f46ff8f6a2fa815d9a4cf65993
+  metadata.gz: 86f7b2757e53b3856dee02c28b75d3007ee67efcb016ad6186392d1b286a9015
+  data.tar.gz: 9e34979e64fbd4c6ba5ea5e08762941c4b136825312a9746d4ee4521cd46b381
 SHA512:
-  metadata.gz: e3d31431f1bc6126d4108acca74be1040d2c4a3e2929f090a1210888d6b9740be21c61d981096033025086e67d8061425b3583e638fe6ae028769f020539fad7
-  data.tar.gz: c08b135902b32c456a6d70261a3d732a66ec7d64cb47846fc48a1c6c34e90b222264cf7f72aba0e1891fb8dcb4790f21408e1df8a9ae6f4b06b6181bb85a986b
+  metadata.gz: 48ab36890e5d8aaa380d809f3f1e8a812f46fc5f01a455c926a21ee4de6746ed17f5c6d37b4649f35170abf46eee798973c0424d27fc6d585ddf6d6b6f39d4fe
+  data.tar.gz: 04fc17e10e1d27487d228d96307acece582f74cb86cdd9ba1159a3c68f026146af5d9ff0beb2f3ff0ef6911be5e09e287881d2475686cbc5c8c064402d805667

data/README.md

@@ -5,7 +5,7 @@
 require 'ldif_parser'
 
 ldif_path = '/tmp/ldap.bak'
-result = LdifParser.parse_file(ldif_path, only: %w[displayName zimbraMailQuota mail])
+result = LdifParser.parse_file(ldif_path, only: %w[displayName givenName sn mail])
 
 result.each do |res|
   p res

data/lib/entry_maker.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'hash_insensitive'
 require 'base64'
 
 class LdifParser
@@ -25,6 +26,7 @@ class LdifParser
 
     def make
       hash = lines_decoded_to_h
+      hash.extend(HashInsensitive)
       hash.default = []
       hash
     end
@@ -39,11 +41,15 @@ class LdifParser
 
     def lines_decoded_to_h
       lines_decoded.each_with_object({}) do |(k, v), h|
-        (h[k] ||= [])
+        init_hash(h, k)
         h[k].push(v)
       end
     end
 
+    def init_hash(h, k)
+      h[k] ||= []
+    end
+
     def lines_decoded
       lines.map do |line|
         line_decoder(line)
@@ -53,7 +59,7 @@ class LdifParser
     def line_decoder(line)
       parts = line.scan(R_LINE_SPLIT).first
       parts[0] = parts[0].to_sym
-      parts[2] = Base64.decode64(parts[2]).force_encoding('UTF-8') if BASE64_SEPARATOR == parts[1]
+      parts[2] = Base64.decode64(parts[2]).force_encoding('UTF-8') if parts[1] == BASE64_SEPARATOR
       parts.delete_at(1)
       parts
     end

data/lib/hash_insensitive.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module HashInsensitive
+  def dn
+    @dn ||= self['dn'].first
+  end
+
+  def insensitive_origin_keys
+    keys.select { |key| key.respond_to?(:to_s) }
+  end
+
+  def insensitive_keys
+    insensitive_origin_keys.map(&:to_s).map(&:downcase)
+  end
+
+  def default=(obj)
+    @default = obj
+  end
+
+  def default(key)
+    return @default unless key.respond_to?(:to_s)
+
+    tmp_key = key.to_s.downcase
+    tmp_index = insensitive_keys.index(tmp_key)
+    return @default if tmp_index.nil?
+
+    insensitive_origin_key = insensitive_origin_keys.at(tmp_index)
+
+    self[insensitive_origin_key]
+  end
+end

data/lib/ldif_parser.rb

@@ -4,7 +4,9 @@ require_relative 'entry_maker'
 require_relative 'version'
 
 class LdifParser
-  NEW_LDIF_OBJECT_PATTERN = 'dn:'
+  NEW_LDIF_OBJECT_PATTERN = 'dn'
+  SPACE = ' '
+  DOUBLE_POINT = ':'
 
   class << self
     def parse_file(ldif_path, minimized: false, only: [], except: [])
@@ -19,11 +21,11 @@ class LdifParser
     end
 
     def included_pattern(patterns)
-      @included_patterns = patterns.map { |pattern| "#{pattern}:" }
+      @included_patterns = patterns.map(&:downcase)
     end
 
     def excluded_pattern(patterns)
-      @excluded_patterns = patterns.map { |pattern| "#{pattern}:" }
+      @excluded_patterns = patterns.map(&:downcase)
     end
 
     attr_reader :included_patterns, :excluded_patterns
@@ -48,16 +50,24 @@ class LdifParser
   def str_parts
     parts = []
     str = ''.dup
+    previous_key = nil
 
     @str.each_line do |line|
-      next if line_has_to_be_excluded?(line)
+      line_key = get_line_key(line, previous_key)
+      next if line_key.nil?
 
-      if line.start_with?(NEW_LDIF_OBJECT_PATTERN) && !str.empty?
+      if line_has_to_be_excluded?(line_key)
+        previous_key = line_key
+        next
+      end
+
+      if new_ldif_object?(line_key, str, line)
         parts << str
         str = ''.dup
       end
 
       str << line
+      previous_key = line_key
     end
 
     parts << str
@@ -67,9 +77,19 @@ class LdifParser
     parts
   end
 
-  def line_has_to_be_excluded?(line)
-    return false if line.start_with?(NEW_LDIF_OBJECT_PATTERN)
+  def new_ldif_object?(line_key, str, line)
+    line_key == NEW_LDIF_OBJECT_PATTERN && !str.empty? && !line.start_with?(SPACE)
+  end
+
+  def get_line_key(line, previous_key)
+    return previous_key if line.start_with?(SPACE)
+
+    line.split(DOUBLE_POINT).first&.downcase || previous_key
+  end
+
+  def line_has_to_be_excluded?(line_key)
+    return false if line_key == NEW_LDIF_OBJECT_PATTERN
 
-    line.start_with?(*self.class.excluded_patterns) || (!self.class.included_patterns.empty? && !line.start_with?(*self.class.included_patterns))
+    self.class.excluded_patterns.include?(line_key) || (!self.class.included_patterns.empty? && !self.class.included_patterns.include?(line_key))
   end
 end

data/lib/version.rb

@@ -7,7 +7,7 @@ class LdifParser
 
   module VERSION
     MAJOR = 0
-    MINOR = 2
+    MINOR = 5
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldif_parser
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Maxime Désécot
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-04 00:00:00.000000000 Z
+date: 2023-10-17 00:00:00.000000000 Z
 dependencies: []
 description: Simple class to parse ldif file
 email:
@@ -20,6 +20,7 @@ files:
 - LICENSE
 - README.md
 - lib/entry_maker.rb
+- lib/hash_insensitive.rb
 - lib/ldif_parser.rb
 - lib/version.rb
 - sig/entry_maker.rbs
@@ -31,7 +32,7 @@ metadata:
   homepage_uri: https://github.com/RaoH37/ldif_parser
   source_code_uri: https://github.com/RaoH37/ldif_parser
   changelog_uri: https://github.com/RaoH37/ldif_parser
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -39,15 +40,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: LDIF parser
 test_files: []