work_calendar 0.1.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf7bb9f5e0d3a093260f7300761a6a9a7eeb4044c6619b7b3a9a29522f142635
-  data.tar.gz: 14e439e03311e6213e00f7f18b318303dd3611e183d5d0cbcd92d18fd1d96ded
+  metadata.gz: f66433c0f4ff9e22ecbc54a74a4c329ba40649a72e4a1cfeeeb643c92f606f28
+  data.tar.gz: 3ec2123e14ac3f60b18738546c2630e1c1c9f2154397d99826902d0a80e548e6
 SHA512:
-  metadata.gz: b5b2fec2157a2fa6cb39a870912356c6acf2451c344dab372ede0c64a9da68aecd0e74fbd96940798d9385a225c6c5f6e41e827df74bb926e4f7ec2417400700
-  data.tar.gz: 40afedcd00e8a2b482ae57562dad7598ceb7b444ee58d24c35de622245c1fb300080381507f20fbab47a30b6908b49daceeb65a3755a2bc2174700ad785f65c2
+  metadata.gz: 668d6439db8f984c36352908e5c2b030ca298eb3af6c94f772baf9d0f91fa3b1dd6db17fc73f94950e0376e4ea47100ee1fabcb42900c2069e0e0d93d619a386
+  data.tar.gz: 9a555ad38e58beb479b1907360e62aeda71fc005f168c2747802406f39b7580ad98717745c93d867b8798823a28baf7827a05788a39cddcb61d6018d45ed27b3

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/work_calendar-*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    work_calendar (0.1.1)
+    work_calendar (1.0.3)
 
 GEM
   remote: https://rubygems.org/
@@ -52,4 +52,4 @@ DEPENDENCIES
   work_calendar!
 
 BUNDLED WITH
-   2.0.2
+   2.2.22

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Anton Korenyushkin, Sergey Tomashevsky, 2019, Toughbyte LTD
+Copyright (c) 2019 Toughbyte Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -32,10 +32,17 @@ Get next `n`'th workday date relative to specified date; if no `date` parameter
 WorkCalendar.next_workday(n, date)
 ```
 
-Get previous workdate relative to specified date; if no `date` parameter was passed, it returns value relative to current day.
+Works same way as `next_workday` method, only looking backwards.
 
 ```ruby
-WorkCalendar.prev_workday(date)
+WorkCalendar.prev_workday(n, date)
+```
+
+Get first/last day since specified date
+
+```ruby
+WorkCalendar.first_workday_since(date)
+WorkCalendar.last_workday_since(date)
 ```
 
 ## License

data/lib/work_calendar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WorkCalendar
-  VERSION = '0.1.1'
+  VERSION = '1.0.3'
 end

data/lib/work_calendar.rb

@@ -47,6 +47,51 @@ module WorkCalendar
       11 => {
         holidays: [4]
       }
+    },
+    2021 => {
+      1 => {
+        holidays: [1, 4, 5, 6, 7, 8]
+      },
+      2 => {
+        workdays: [20],
+        holidays: [22, 23]
+      },
+      3 => {
+        holidays: [8]
+      },
+      5 => {
+        holidays: [3, 10]
+      },
+      6 => {
+        holidays: [14]
+      },
+      11 => {
+        holidays: [4, 5]
+      },
+      12 => {
+        holidays: [31]
+      }
+    },
+    2022 => {
+      1 => {
+        holidays: [3, 4, 5, 6, 7]
+      },
+      2 => {
+        holidays: [23]
+      },
+      3 => {
+        workdays: [5],
+        holidays: [7, 8]
+      },
+      5 => {
+        holidays: [2, 3, 9, 10]
+      },
+      6 => {
+        holidays: [13]
+      },
+      11 => {
+        holidays: [4]
+      }
     }
   }.freeze
 
@@ -76,6 +121,18 @@ module WorkCalendar
       date
     end
 
+    def first_workday_since(date = Time.zone.today)
+      return date if workday?(date)
+
+      _next_workday(date)
+    end
+
+    def last_workday_since(date = Time.zone.today)
+      return date if workday?(date)
+
+      _prev_workday(date)
+    end
+
     private
 
     def _next_workday(date)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: work_calendar
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Anton Korenyushkin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,7 +114,6 @@ files:
 - bin/setup
 - lib/work_calendar.rb
 - lib/work_calendar/version.rb
-- work_calendar-0.1.0.gem
 - work_calendar.gemspec
 homepage: https://github.com/toughbyte/work_calendar
 licenses:
@@ -137,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Workday calculator