time-sheet 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbb94daa084b68389e2fc8f28fc599bd87fd5d9016c876b7b0ba04fa508bd298
-  data.tar.gz: 21e136b14b65c75ce3210b314a650778015093cbab530af1ceb10ff244534c0a
+  metadata.gz: 0dcc4d06773fec0e5b25f70420d655de6fdd663600737706792fc6a544d02830
+  data.tar.gz: ae0ebb5d103910f4da1e1e438a91d22d09acf5749ce51914cf5cef06845621d5
 SHA512:
-  metadata.gz: ebcad92e2658984db81e9f1e9edd2dc616aa342e838254c86b3e6717dd065d171d69d4d7a63ebf03744cc1670ab74637426d86aa32d9180f82d466c22e934676
-  data.tar.gz: e19d852e99883432284fe5953bdf684e0056bb6e814f024c42d1a5272abaf95dfd1ae56e061eb94ee3a8dc4620c9dde7f424a167e3c4df6f17350a57fd930a51
+  metadata.gz: 6aaa1db33009cba4d3d2e6b72117e893b40f0603864beb89046aa4da122c5f3c01ec5096d5ddeb1edde7e9fc7a7659df4285fe75ba267494f56bd685927c3a68
+  data.tar.gz: 6880e21f5ce5a904d59d7101406463432e4ec7f4c67776c9fcc5fbfdb69de6e9456987449aa876e4559ad1c18712409d970aeed0a88d2e6f35ecf3fc5353af62

data/lib/time_sheet/time/entry.rb

@@ -7,7 +7,7 @@ class TimeSheet::Time::Entry
     @data = data
   end
 
-  attr_accessor :prev, :next
+  attr_accessor :prev, :next, :exception, :data
 
   def project
     @data['project'] ||= self.prev.project
@@ -32,7 +32,6 @@ class TimeSheet::Time::Entry
     )
   end
 
-
   def end
     ends_at = @data['end'] || (self.next ? self.next.start : self.class.now)
 
@@ -96,8 +95,25 @@ class TimeSheet::Time::Entry
   end
 
   def valid?
-    (duration > 0) &&
-    ((self.start < self.end) || !self.next)
+    valid!
+    true
+  rescue TimeSheet::Time::Exception => e
+    self.exception = e
+    false
+  end
+
+  def valid!
+    if !@data['start']
+      raise TimeSheet::Time::Exception.new('time entry has no start')
+    end
+
+    if duration <= 0
+      raise TimeSheet::Time::Exception.new('time entry duration is 0 or less')
+    end
+
+    if (self.start >= self.end) && self.next
+      raise TimeSheet::Time::Exception.new('time entry has no end')
+    end
   end
 
   def to_row

data/lib/time_sheet/time/parser.rb

@@ -37,7 +37,12 @@ class TimeSheet::Time::Parser
       results.each do |r|
         unless r.valid?
           # byebug
-          raise TimeSheet::Time::Exception.new("invalid time entry: #{r.to_row.inspect}")
+          raise r.exception, [
+            r.exception.message, ': ',
+            r.data.inspect,
+            ', preceeding entry: ',
+            r.prev
+          ].join
         end
       end
       results

data/lib/time_sheet/version.rb

@@ -1,3 +1,3 @@
 module TimeSheet
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time-sheet
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Moritz Schepp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet