fewald-worklog 0.2.21 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a799c589dedc9f7ed68ef9b2acfd8ad08e29f3fb5f3a26d0a90dee1320ee164e
-  data.tar.gz: 9e38d05b4303b41cf7ae2016d23990290ef2b41eba34db9b8c53f4a7587a84d2
+  metadata.gz: 948c6e8bb4859bffc163d5e3a1608568d2edb408bec8e2c7ad34b682d8f9fc07
+  data.tar.gz: acdade00ab4828cc48bacc0c6cdb338372a88f27c710a81a557efdf4ac128857
 SHA512:
-  metadata.gz: a9cc6c2ef435e43390491c2d31793c4e2ae8febd54bdd68ea535decb109defd70538bdaaaa1dc70d660c0f1193e9786d4bab66cf1a0619bf5166146b1c8eb95c
-  data.tar.gz: aa43dfa148848d4161a791105934e36c9caf21929d4e978e3b20468fe076b288b555137cf7b74f06fb17157f9312fcc40050894e494c176334679d61033fa198
+  metadata.gz: 20b674f1f4f372b1b0ca3531a6471b5f8b6cb2ae4ee158d4572a729ecdc76d06f44de2115aa6143a725f0a47692e788146643b6b4035349f183ec9a8aa0b2f60
+  data.tar.gz: 98e8577a4e2a8957eaa58d0e9060352d2692950b5158cee39d0900be6d427c960ce0583db99d9d9e09bbfbc96e8cbb993826965d2fe9de9c6bca880a6cb34c34

data/.version

@@ -1 +1 @@
-0.2.21
+0.2.23

data/lib/daily_log.rb

@@ -44,6 +44,17 @@ module Worklog
       entries.flat_map(&:tags).uniq.sort
     end
 
+    # Create a DailyLog from a hash with symbolized keys
+    #
+    # @param hash [Hash] the hash to convert
+    # @return [DailyLog] the created DailyLog object
+    def self.from_hash(hash)
+      new(
+        date: hash[:date],
+        entries: hash[:entries].map { |entry| LogEntry.from_hash(entry) }
+      )
+    end
+
     # Equals method to compare two DailyLog objects.
     #
     # @param other [DailyLog] the other DailyLog object to compare with

data/lib/log_entry.rb

@@ -104,6 +104,22 @@ module Worklog
       people.size.positive?
     end
 
+    # Create a LogEntry from a hash with symbolized keys
+    #
+    # @param hash [Hash] the hash to convert
+    # @return [LogEntry] the created LogEntry object
+    def self.from_hash(hash)
+      new(
+        time: hash[:time],
+        tags: hash[:tags],
+        ticket: hash[:ticket],
+        url: hash[:url],
+        epic: hash[:epic],
+        message: hash[:message],
+        project: hash[:project]
+      )
+    end
+
     # Convert the log entry to YAML format.
     def to_yaml
       to_hash.to_yaml

data/lib/storage.rb

@@ -6,10 +6,6 @@ require 'log_entry'
 require 'worklogger'
 require 'person'
 
-# Alias for classes to handle existing log entries
-DailyLog = Worklog::DailyLog
-LogEntry = Worklog::LogEntry
-
 module Worklog
   # Handles storage of daily logs and people
   class Storage
@@ -110,11 +106,11 @@ module Worklog
 
     def load_log!(file)
       WorkLogger.debug "Loading file #{file}"
-
-      # Alias DailyLog to Worklog::DailyLog
-
       begin
-        log = YAML.load_file(file, permitted_classes: [Date, Time, DailyLog, LogEntry])
+        yaml_content = File.read(file)
+        cleaned_yaml = yaml_content.gsub(%r{!ruby/object:[^\s]+}, '')
+        log = DailyLog.from_hash(YAML.safe_load(cleaned_yaml, permitted_classes: [Date, Time], symbolize_names: true))
+
         log.entries.each do |entry|
           entry.time = Time.parse(entry.time) unless entry.time.respond_to?(:strftime)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fewald-worklog
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.23
 platform: ruby
 authors:
 - Friedrich Ewald