opening_hours_converter 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9585065385f691f52c4a58480b885bb00b6ee14f
-  data.tar.gz: 5e5c2d66d29008132a7cce0dd3f21a302685c49b
+  metadata.gz: 51910f5b1ad844e6dd0389e0543f5fcec9de91a5
+  data.tar.gz: acdac6e0de9c5ea000f48f9ea8d18675c724d00f
 SHA512:
-  metadata.gz: 6b3095cd996a5c744e040a5de0f2c4f6b4fb4528084931e2320eb48bab738f2130ba98a4f0ec933748424983d8faa2cd12b07e33fd44d2ee6ef701295fd3c15a
-  data.tar.gz: c274827835fd504f17a7a74c51523c168d3be5de3b9a95717b2eb20221c7fd5e79075c39cfe0065521504e8214131fed17d8bb77745440864eef7c2c8b88e04b
+  metadata.gz: ecaa948f5f328f760038fb8d604b07972e7787a0378cc29ac2f766591a4da8cf29c1babba14e9075fa412e263ae33fe929c0f109729b0230206ce0b35d2e5920
+  data.tar.gz: afcd55214ec201a091a5608fcb838d468b5005af049d67638208d8b1c06294235f6b14f9180a236ed9e9666c31924a961cf8b0157f983686d6b1051946b7e56b

data/lib/opening_hours_converter/opening_hours_builder.rb

@@ -107,6 +107,7 @@ module OpeningHoursConverter
       end
 
       result = ""
+
       if rules.length == 0
 
         date_ranges.each do |dr|

data/lib/opening_hours_converter/opening_hours_rule.rb

@@ -73,7 +73,8 @@ module OpeningHoursConverter
             if day_bool && month_start < 0
               month_start = month
               day_start = day
-            elsif day_bool && month_start >= 0 && month == 11 && day == 30
+            end
+            if day_bool && month_start >= 0 && month == 11 && day == 30
               result["always"] ||= []
               result["always"] << {start: { day: day_start, month: month_start }, end: { day: 30, month: 11 }}
               month_start = -1
@@ -161,7 +162,11 @@ module OpeningHoursConverter
             elsif starts_month?(interval) && ends_month?(interval)
               str_result += "#{OSM_MONTHS[interval[:start][:month]]}-#{OSM_MONTHS[interval[:end][:month]]}"
             elsif is_same_month?(interval)
-              str_result += "#{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 += "#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day]+1 < 10 ? "0#{interval[:start][:day]+1}" : interval[:start][:day]+1}"
+              else
+                str_result += "#{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 += "#{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

metadata

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