opening_hours_converter 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0522647daec6e61185f989eaafa5d941598197a3
-  data.tar.gz: 553d55c9362adf5c5ca5b599f96c09b29046ad1c
+  metadata.gz: 33f59f13fa2cdc370c95156630a9789e52ebb3a2
+  data.tar.gz: ea7af1b0b5e99e622fb179b6e4c0da4dd6059436
 SHA512:
-  metadata.gz: facfbcdd2e95cb34d3cd502688b77daddd063893e50258af80af586f4c104f371cf7e3f9c492b42fe142a2828bb917d1deb34505a531a47973d8225ffdc20a63
-  data.tar.gz: 94dd7f5933622f28dad516d43880f693f698b15591bd52e3876ef2e94b66c376bb55e24c142d19722b24f5ffaba3ddba82d62ea4b56c4d35446f97e877467385
+  metadata.gz: 40af9709076c5302ff46b25226ff8ff6173129263522cf031d9f79c59a4643fe13e7d84f3cf943d591f04bd4bc56a4756bd50051306ed636302f77d387227c57
+  data.tar.gz: a44404b688eeeb156b0e7f228b855efc7d27a1088b16181d2e4973c03c4ce83880a59cd88ccaa283273cd27655c8cd1d391ef1ac1c7ea43239fd704c8519d476

data/lib/opening_hours_converter/opening_hours_builder.rb

@@ -1,5 +1,5 @@
 require 'opening_hours_converter/constants'
-
+require 'pry-nav'
 module OpeningHoursConverter
   class OpeningHoursBuilder
     include Constants

data/lib/opening_hours_converter/opening_hours_rule.rb

@@ -99,7 +99,8 @@ module OpeningHoursConverter
               year_start = year
               month_start = month
               day_start = day
-            elsif day_bool && year_start >= 0 && month == 11 && day == 30 && years[year+1].nil?
+            end
+            if day_bool && year_start >= 0 && month == 11 && day == 30 && years[year+1].nil?
               if year_start == year
                 result[year] ||= []
                 result[year] << { start: { day: day_start, month: month_start }, end: { day: 30, month: 11 } }
@@ -142,6 +143,7 @@ module OpeningHoursConverter
           end
         end
       end
+
       result_to_string(result)
     end
 
@@ -188,7 +190,11 @@ module OpeningHoursConverter
             elsif starts_month?(interval) && ends_month?(interval)
               str_result += "#{str_result.length > 5 ? "," : ""}#{OSM_MONTHS[interval[:start][:month]]}-#{OSM_MONTHS[interval[:end][:month]]}"
             elsif is_same_month?(interval)
-              str_result += "#{str_result.length > 5 ? "," : ""}#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day]+1 < 10 ? "0#{interval[:start][:day]+1}" : interval[:start][:day]+1}-#{interval[:end][:day]+1 < 10 ? "0#{interval[:end][:day]+1}" : interval[:end][:day]+1}"
+              if is_same_day?(interval)
+                str_result += "#{str_result.length > 5 ? "," : ""}#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day]+1 < 10 ? "0#{interval[:start][:day]+1}" : interval[:start][:day]+1}"
+              else
+                str_result += "#{str_result.length > 5 ? "," : ""}#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day]+1 < 10 ? "0#{interval[:start][:day]+1}" : interval[:start][:day]+1}-#{interval[:end][:day]+1 < 10 ? "0#{interval[:end][:day]+1}" : interval[:end][:day]+1}"
+              end
             else
               str_result += "#{str_result.length > 5 ? "," : ""}#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day]+1 < 10 ? "0#{interval[:start][:day]+1}" : interval[:start][:day]+1}-#{OSM_MONTHS[interval[:end][:month]]} #{interval[:end][:day]+1 < 10 ? "0#{interval[:end][:day]+1}" : interval[:end][:day]+1}"
             end
@@ -215,6 +221,10 @@ module OpeningHoursConverter
       r[:start][:month] == r[:end][:month]
     end
 
+    def is_same_day?(r)
+      r[:start][:day] == r[:end][:day]
+    end
+
     def starts_month?(r)
       r[:start][:day] == 0
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Ziserman Martin