opening_hours_converter 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0ad64a12cda6b180b7ab2a4a6d9e7aacf712b73
-  data.tar.gz: efb6a8c5930dc03ff1346813208df516b550ad38
+  metadata.gz: 842c8f590c509cb332f29ebd42d006a426c724ab
+  data.tar.gz: 860f0b96385bc61f27727efe5bb332ff4fb6d537
 SHA512:
-  metadata.gz: 82c5844c495b9489de4202439c2ffcb7d3fdd5bad1f7d8a8e49c4a56b1e466ea62a3676455f4608c5fe12bc5dacf0c8905635afec76cde44ec7490dd93d748eb
-  data.tar.gz: 35b64100a3ac4b10a194190f07ad64e6c9060a0fabae4a1048e23d6ec25dd48f5b93bfcf36a09fd8afdbef832cc453d130ae6ac87ea79d775a62e11038c00f91
+  metadata.gz: f5e2c1e2929cc7eb853f1acf2f9583d07a2fdc75fdd68067bc5450805d4e7ca753652c0cfb9baa2ba16e13f33fac24d16e986a1035632283fabcb86a9f4987e3
+  data.tar.gz: 921e5977a9f7cf2377bc0cb727e07951bc51399344737585b26baef2dc2f980f47fa3d14a82ae81d829fb893fc4bbf598ff1b1ed113b5c901644cce231e8e25a

data/lib/opening_hours_converter/iterator.rb

@@ -37,7 +37,7 @@ module OpeningHoursConverter
                   if month == 0
                     end_res = DateTime.new(year-1, 12, 31)
                   else
-                    end_res = DateTime.new(year, month, MONTH_END_DAY[month])
+                    end_res = DateTime.new(year, month, MONTH_END_DAY[month-1])
                   end
                 else
 

data/lib/opening_hours_converter/opening_hours_rule.rb

@@ -14,6 +14,7 @@ module OpeningHoursConverter
 
     def get
       result = ""
+
       if @date.length > 0
         result += get_wide_selector
       end

data/lib/opening_hours_converter/year.rb

@@ -122,18 +122,43 @@ module OpeningHoursConverter
               years["always"][wide_interval.start[:month]-1][day] = true
             end
           elsif wide_interval.start[:month] != wide_interval.end[:month]
-            for month in wide_interval.start[:month]-1..wide_interval.end[:month]-1
-              if month == wide_interval.start[:month]-1
-                for day in wide_interval.start[:day]-1...MONTH_END_DAY[month]
-                  years["always"][month][day] = true
+            if wide_interval.end[:month] < wide_interval.start[:month]
+              for month in wide_interval.start[:month]-1..11
+                if month == wide_interval.start[:month]-1
+                  for day in wide_interval.start[:day]-1...MONTH_END_DAY[month]
+                    years["always"][month][day] = true
+                  end
+                else
+                  for day in 0...MONTH_END_DAY[month]
+                    years["always"][month][day] = true
+                  end
                 end
-              elsif month == wide_interval.end[:month]-1
-                for day in 0..wide_interval.end[:day]-1
-                  years["always"][month][day] = true
+              end
+              for month in 0..wide_interval.end[:month]-1
+                if month == wide_interval.end[:month]-1
+                  for day in 0..wide_interval.end[:day]-1
+                    years["always"][month][day] = true
+                  end
+                else
+                  for day in 0...MONTH_END_DAY[month]
+                    years["always"][month][day] = true
+                  end
                 end
-              else
-                for day in 0...MONTH_END_DAY[month]
-                  years["always"][month][day] = true
+              end
+            else
+              for month in wide_interval.start[:month]-1..wide_interval.end[:month]-1
+                if month == wide_interval.start[:month]-1
+                  for day in wide_interval.start[:day]-1...MONTH_END_DAY[month]
+                    years["always"][month][day] = true
+                  end
+                elsif month == wide_interval.end[:month]-1
+                  for day in 0..wide_interval.end[:day]-1
+                    years["always"][month][day] = true
+                  end
+                else
+                  for day in 0...MONTH_END_DAY[month]
+                    years["always"][month][day] = true
+                  end
                 end
               end
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json