holidays_from_google_calendar 0.4.5 → 0.4.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.rubocop.yml +0 -8
- data/bin/console +2 -6
- data/holidays_from_google_calendar.gemspec +1 -0
- data/lib/holidays_from_google_calendar/cache.rb +1 -0
- data/lib/holidays_from_google_calendar/cache_unit.rb +4 -4
- data/lib/holidays_from_google_calendar/version.rb +1 -1
- metadata +15 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 59d4d036317d5ad1ff9807433d1a475b4643add2
|
4
|
+
data.tar.gz: 896ce2010c7329bd3efb95524a9b50f5129734f2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b54fe874772619a7ec877990aecd1a9d2d34002b38ad6c6299f800f51656fc849adc3ed6952ad6cc4094ae81cad8898a162cb7c7b0a74649f83e6a4c03579394
|
7
|
+
data.tar.gz: 496bfa2f3fb07d89940ebd86aa1305f57c64258cd1d0e71c787e8f2354b9ff3d0ba0267e934bea5549518dd911fe82c449ee783315aed325fc37e982f0782eff
|
data/.rubocop.yml
CHANGED
@@ -37,14 +37,6 @@ Style/BlockDelimiters:
|
|
37
37
|
FormatString:
|
38
38
|
EnforcedStyle: sprintf
|
39
39
|
|
40
|
-
# Maximum line length
|
41
|
-
LineLength:
|
42
|
-
Max: 100
|
43
|
-
|
44
|
-
# Whatever we should use "postfix if/unless"
|
45
|
-
IfUnlessModifier:
|
46
|
-
MaxLineLength: 100
|
47
|
-
|
48
40
|
# Maximum method length
|
49
41
|
MethodLength:
|
50
42
|
Max: 20
|
data/bin/console
CHANGED
@@ -6,9 +6,5 @@ require "holidays_from_google_calendar"
|
|
6
6
|
# You can add fixtures and/or initialization code here to make experimenting
|
7
7
|
# with your gem easier. You can also use a different console, if you like.
|
8
8
|
|
9
|
-
|
10
|
-
|
11
|
-
# Pry.start
|
12
|
-
|
13
|
-
require "irb"
|
14
|
-
IRB.start
|
9
|
+
require "pry"
|
10
|
+
Pry.start
|
@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
|
|
24
24
|
|
25
25
|
spec.add_development_dependency "bundler", "~> 1.10"
|
26
26
|
spec.add_development_dependency "rake", "~> 10.0"
|
27
|
+
spec.add_development_dependency "pry"
|
27
28
|
spec.add_development_dependency "rspec"
|
28
29
|
spec.add_development_dependency "rspec-its"
|
29
30
|
spec.add_development_dependency "simplecov"
|
@@ -21,14 +21,14 @@ module HolidaysFromGoogleCalendar
|
|
21
21
|
end
|
22
22
|
|
23
23
|
def overlapped?(other)
|
24
|
-
(date_min <= other.date_max && other.date_min <= date_max + 1) ||
|
25
|
-
(other.date_min <= date_max && date_min <= other.date_max + 1)
|
24
|
+
(@date_min <= other.date_max && other.date_min <= @date_max + 1.day) ||
|
25
|
+
(other.date_min <= @date_max && @date_min <= other.date_max + 1.day)
|
26
26
|
end
|
27
27
|
|
28
28
|
def combine(other)
|
29
29
|
return unless overlapped?(other)
|
30
|
-
date_min = [date_min, other.date_min].min
|
31
|
-
date_max = [date_max, other.date_max].max
|
30
|
+
@date_min = [@date_min, other.date_min].min
|
31
|
+
@date_max = [@date_max, other.date_max].max
|
32
32
|
@holidays =
|
33
33
|
@holidays.concat(other.holidays).uniq.sort { |a, b| a.date <=> b.date }
|
34
34
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: holidays_from_google_calendar
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- necojackarc
|
@@ -66,6 +66,20 @@ dependencies:
|
|
66
66
|
- - "~>"
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '10.0'
|
69
|
+
- !ruby/object:Gem::Dependency
|
70
|
+
name: pry
|
71
|
+
requirement: !ruby/object:Gem::Requirement
|
72
|
+
requirements:
|
73
|
+
- - ">="
|
74
|
+
- !ruby/object:Gem::Version
|
75
|
+
version: '0'
|
76
|
+
type: :development
|
77
|
+
prerelease: false
|
78
|
+
version_requirements: !ruby/object:Gem::Requirement
|
79
|
+
requirements:
|
80
|
+
- - ">="
|
81
|
+
- !ruby/object:Gem::Version
|
82
|
+
version: '0'
|
69
83
|
- !ruby/object:Gem::Dependency
|
70
84
|
name: rspec
|
71
85
|
requirement: !ruby/object:Gem::Requirement
|