sitedog_parser 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49947334cc7ee3ec9a5fae7622586f0ad834c515af3470beee348637742ab532
-  data.tar.gz: 352cfe07e7b0451ce0e06a5b816d8a4ff0b72e1c623fef8cce313860e3609db4
+  metadata.gz: bc2c49e2954f32248580ffe84be2ca0429e8ed789dfe9a5633efb3265b68df63
+  data.tar.gz: 48ca3723090e666381b0fb73f4ba28289080716b92b12fadaafaabae6471e0a8
 SHA512:
-  metadata.gz: 2a9b6e77751102b746f4332f9b4d253800b37951512abb2b7df1db1df53662890d94cb41e4c2d4626e5bd563c14bd2349111fe6069db1f273e5ceea9d4d76be7
-  data.tar.gz: 97a48e91c2878bcce840907b92cbfc3986df3cf71a3d5b2e4541a083effb884ecac10f9b4c56334d0b5696a47f4db059006fb4d05fa4cccb33643ea6cb521c65
+  metadata.gz: '09f672c98c9e504c25b340e11a174b3eb7ca16c9366e5d0b6c746f7a7d24fbf7c72822242a47452b507d432a671ba4054c0ded9b245128c5cf9f8f0a8d9cdc86'
+  data.tar.gz: 4a378dde7d127218003fbe641b8d505dcd30c038f18533bd673ee8f9e3221eed3d7aa087d7516ce5707d66fc4d21e61978d15796062de89f7db2e52b40b34305

data/README.md

@@ -61,7 +61,7 @@ You can specify which fields should be treated as simple string values, not as s
 
 ```ruby
 # Define which fields should remain as simple strings (not wrapped in Service objects)
-simple_fields = [:project, :role, :environment, :registry, :bought_at]
+simple_fields = [:project, :role, :environment, :registry]
 
 # Parse with simple fields
 parsed_data = SitedogParser::Parser.parse(yaml_data, simple_fields: simple_fields)

data/bin/analyze_dictionary

@@ -42,7 +42,7 @@ begin
   end
 
   # Определяем простые поля, которые не должны рассматриваться как сервисы
-  simple_fields = [:project, :role, :environment, :registry, :bought_at]
+  simple_fields = [:project, :role, :environment, :registry]
 
   # Анализируем данные через наш интерфейс Parser
   data = SitedogParser::Parser.parse(sites_data, simple_fields: simple_fields, dictionary_path: dictionary_path)

data/lib/service.rb

@@ -1,11 +1,16 @@
-class Service < Data.define(:service, :url, :children)
-  def initialize(service:, url: nil, children: [])
+class Service < Data.define(:service, :url, :children, :image_url)
+  def initialize(service:, url: nil, children: [], image_url: nil)
     raise ArgumentError, "Service cannot be empty" if service.nil? || service.empty?
 
     service => String
     url => String if url
     children => Array if children
+    image_url => String if image_url
 
     super
   end
+
+  def has_children?
+    !children.empty?
+  end
 end

data/lib/service_factory.rb

@@ -18,11 +18,13 @@ class ServiceFactory
     slug = nil
     url = nil
     dictionary = Dictionary.new(dictionary_path)
+    dict_entry = nil
 
     case data
     in String if UrlChecker.url_like?(data) # url
       url = UrlChecker.normalize_url(data)
-      slug = dictionary.match(url)&.dig('name')
+      dict_entry = dictionary.match(url)
+      slug = dict_entry&.dig('name')
 
       # If not found in dictionary and service_type exists, use it
       if slug.nil? && service_type
@@ -35,11 +37,20 @@ class ServiceFactory
       puts "url: #{slug} <- #{url}"
     in String if !UrlChecker.url_like?(data) # slug
       slug = data
-      url = dictionary.lookup(slug)&.dig('url')
+      dict_entry = dictionary.lookup(slug)
+
+      # Если нашли запись в словаре, используем её имя
+      if dict_entry && dict_entry['name']
+        slug = dict_entry['name']
+      end
+
+      url = dict_entry&.dig('url')
       puts "slug: #{slug} -> #{url}"
     in { service: String => service_slug, url: String => service_url }
       slug = service_slug.to_s.capitalize
       url = service_url
+      # Поиск в словаре после получения slug
+      dict_entry = dictionary.lookup(slug)
       puts "hash: #{slug} + #{url}"
     in Hash
       puts "hash: #{data}"
@@ -57,7 +68,30 @@ class ServiceFactory
         children = []
         data.each do |key, url_value|
           service_name = key.to_s
-          child_service = Service.new(service: service_name.capitalize, url: url_value)
+          # Первый приоритет - поиск в словаре по URL
+          child_dict_entry = dictionary.match(url_value)
+
+          if child_dict_entry && child_dict_entry['name']
+            # Если нашли запись в словаре по URL, используем её имя вместо ключа
+            service_name = child_dict_entry['name']
+          else
+            # Если записи в словаре нет по URL, ищем по имени
+            key_dict_entry = dictionary.lookup(service_name)
+            if key_dict_entry && key_dict_entry['name']
+              service_name = key_dict_entry['name']
+            else
+              # Если не нашли в словаре ни по URL, ни по имени, капитализируем исходное имя
+              service_name = service_name.capitalize
+            end
+          end
+
+          child_image_url = child_dict_entry&.dig('image_url')
+
+          child_service = Service.new(
+            service: service_name,
+            url: url_value,
+            image_url: child_image_url
+          )
           children << child_service
         end
 
@@ -79,7 +113,15 @@ class ServiceFactory
         url_key = data.key?(:url) ? :url : "url"
         url_value = data[url_key]
 
-        return Service.new(service: service_name.capitalize, url: url_value)
+        # Ищем в словаре
+        service_dict_entry = dictionary.lookup(service_name) || dictionary.match(url_value)
+        service_image_url = service_dict_entry&.dig('image_url')
+
+        return Service.new(
+          service: service_name.capitalize,
+          url: url_value,
+          image_url: service_image_url
+        )
       end
 
       # 3. Process nested hashes
@@ -98,13 +140,28 @@ class ServiceFactory
             url_key = value.key?(:url) ? :url : "url"
             url_value = value[url_key]
 
-            child = Service.new(service: service_name.capitalize, url: url_value)
+            # Ищем в словаре
+            nested_dict_entry = dictionary.lookup(service_name) || dictionary.match(url_value)
+            nested_image_url = nested_dict_entry&.dig('image_url')
+
+            child = Service.new(
+              service: service_name.capitalize,
+              url: url_value,
+              image_url: nested_image_url
+            )
           # 3.2 If value has hash with only URL-like values
           elsif value.values.all? { |v| v.is_a?(String) && UrlChecker.url_like?(v) }
             child_children = []
 
             value.each do |sub_key, url_value|
-              child_children << Service.new(service: sub_key.to_s.capitalize, url: url_value)
+              sub_dict_entry = dictionary.lookup(sub_key.to_s) || dictionary.match(url_value)
+              sub_image_url = sub_dict_entry&.dig('image_url')
+
+              child_children << Service.new(
+                service: sub_key.to_s.capitalize,
+                url: url_value,
+                image_url: sub_image_url
+              )
             end
 
             child = Service.new(service: key.to_s, children: child_children)
@@ -120,7 +177,14 @@ class ServiceFactory
               value.each do |sub_key, sub_value|
                 if sub_value.is_a?(String) && UrlChecker.url_like?(sub_value)
                   has_urls = true
-                  child_children << Service.new(service: sub_key.to_s.capitalize, url: sub_value)
+                  sub_dict_entry = dictionary.lookup(sub_key.to_s) || dictionary.match(sub_value)
+                  sub_image_url = sub_dict_entry&.dig('image_url')
+
+                  child_children << Service.new(
+                    service: sub_key.to_s.capitalize,
+                    url: sub_value,
+                    image_url: sub_image_url
+                  )
                 end
               end
 
@@ -129,7 +193,14 @@ class ServiceFactory
           end
         # 3.4 If the value is a URL string
         elsif value.is_a?(String) && UrlChecker.url_like?(value)
-          child = Service.new(service: key.to_s.capitalize, url: value)
+          url_dict_entry = dictionary.match(value)
+          url_image_url = url_dict_entry&.dig('image_url')
+
+          child = Service.new(
+            service: key.to_s.capitalize,
+            url: value,
+            image_url: url_image_url
+          )
         end
 
         children << child if child
@@ -169,7 +240,11 @@ class ServiceFactory
 
     # Create service with collected data
     if slug
-      Service.new(service: slug, url: url)
+      # Получаем URL изображения из записи словаря, если она есть
+      image_url = dict_entry&.dig('image_url')
+
+      # Создаем сервис со всеми данными сразу
+      Service.new(service: slug, url: url, image_url: image_url)
     else
       nil
     end

data/lib/sitedog_parser/version.rb

@@ -1,3 +1,3 @@
 module SitedogParser
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/sitedog_parser.rb

@@ -1,5 +1,6 @@
 require "sitedog_parser/version"
 require 'yaml'
+require 'date'
 
 require_relative "service"
 require_relative "dictionary"
@@ -40,10 +41,23 @@ module SitedogParser
 
         # Process each service type and its data
         items.each do |service_type, data|
-          # Проверяем, является ли это поле "простым" (не сервисом)
-          if simple_fields.include?(service_type)
-            # Для простых полей просто сохраняем значение без оборачивания в сервис
-            services[service_type] = data
+          # Проверяем, является ли это поле "простым", имеет суффикс _at, или данные - экземпляр DateTime
+          if simple_fields.include?(service_type) || service_type.to_s.end_with?('_at') || data.is_a?(DateTime)
+            # Если данные уже DateTime, сохраняем как есть
+            if data.is_a?(DateTime)
+              services[service_type] = data
+            # Для полей _at пробуем преобразовать строку в DateTime
+            elsif service_type.to_s.end_with?('_at') && data.is_a?(String)
+              begin
+                services[service_type] = DateTime.parse(data)
+              rescue Date::Error
+                # Если не удалось преобразовать, оставляем как строку
+                services[service_type] = data
+              end
+            else
+              # Для обычных простых полей просто сохраняем значение
+              services[service_type] = data
+            end
           else
             # Для обычных полей создаем сервис
             service = ServiceFactory.create(data, service_type, dictionary_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sitedog_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ivan Nemytchenko