opening_hours_converter 1.4.16 → 1.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ebcf36fa4db20e99f9831f2244a9933fc2d0764
-  data.tar.gz: fdb289a6a6da2c1cbecd024ac37b95583b67f107
+  metadata.gz: 669c41a41232c2ec313fc364e29d48fa5eb12dc7
+  data.tar.gz: 1152ac197152568691c9d49cc1090e19d71b0537
 SHA512:
-  metadata.gz: 4b6775c9aa28aad1f9c9dbd9669d25e2ba678856b5d3f75c173753b610f58ccafc64e2e96d64c04eee5e184b7878349106758db8041c808be2766054e29996dc
-  data.tar.gz: dd4208dcde059e87893e8b69f7874ed14693fad58d8b0df143b48996bc8bd51045541c46d2c9814c9c29b3e710fdfd092ee347940552dce69a8d588cd289a244
+  metadata.gz: 296912ab3c446e5203b8dd6c3698e654dbc310dc4046c81607e99b4fe84dc2e6316f445a1e8f35ad2eed5569fa989fd8eb40ee191e6a0aa2ede2bbe6ea7e12b5
+  data.tar.gz: 0b23783a4444834f48d4ddc0292def520ba2f9254186a6bda0def62b91c330cd2b964bc4f974c3fbbfc149e40bb68dc85fef927ea51762893c645122eb1d98f5

data/lib/opening_hours_converter/opening_hours_rule.rb

@@ -179,8 +179,8 @@ module OpeningHoursConverter
               end
               if starts_year?(interval) && ends_year?(interval)
                 str_result += "#{interval[:start][:year]}-#{interval[:end][:year]}"
-              elsif starts_month?(interval) && ends_month?(interval)
-                str_result += "#{interval[:start][:year]} #{OSM_MONTHS[interval[:start][:month]]}-#{interval[:end][:year]} #{OSM_MONTHS[interval[:end][:month]]}"
+              # elsif starts_month?(interval) && ends_month?(interval)
+              #   str_result += "#{interval[:start][:year]} #{OSM_MONTHS[interval[:start][:month]]}-#{interval[:end][:year]} #{OSM_MONTHS[interval[:end][:month]]}"
               else
                 str_result += "#{interval[:start][:year]} #{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day]+1 < 10 ? "0#{interval[:start][:day]+1}" : interval[:start][:day]+1}-#{interval[:end][:year]} #{OSM_MONTHS[interval[:end][:month]]} #{interval[:end][:day]+1 < 10 ? "0#{interval[:end][:day]+1}" : interval[:end][:day]+1}"
               end
@@ -190,10 +190,10 @@ module OpeningHoursConverter
           local_str = "#{selector} "
           intervals.each do |interval|
             if is_full_year?(interval)
-            elsif is_full_month?(interval)
-              local_str += "#{local_str.length > 5 ? "," : ""}#{OSM_MONTHS[interval[:start][:month]]}"
-            elsif starts_month?(interval) && ends_month?(interval)
-              local_str += "#{local_str.length > 5 ? "," : ""}#{OSM_MONTHS[interval[:start][:month]]}-#{OSM_MONTHS[interval[:end][:month]]}"
+            # elsif
+              # local_str += "#{local_str.length > 5 ? "," : ""}#{OSM_MONTHS[interval[:start][:month]]}"
+            # elsif
+              # local_str += "#{local_str.length > 5 ? "," : ""}#{OSM_MONTHS[interval[:start][:month]]}-#{OSM_MONTHS[interval[:end][:month]]}"
             elsif is_same_month?(interval)
               if is_same_day?(interval)
                 local_str += "#{local_str.length > 5 ? "," : ""}#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day]+1 < 10 ? "0#{interval[:start][:day]+1}" : interval[:start][:day]+1}"
@@ -201,7 +201,7 @@ module OpeningHoursConverter
                 local_str += "#{local_str.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
-              local_str += "#{local_str.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}"
+              local_str += "#{local_str.length > 5 ? "," : ""}#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day]+1 < 10 ? "0#{interval[:start][:day]+1}" : interval[:start][:day]+1}-#{selector} #{OSM_MONTHS[interval[:end][:month]]} #{interval[:end][:day]+1 < 10 ? "0#{interval[:end][:day]+1}" : interval[:end][:day]+1}"
             end
           end
           str_result += "#{str_result.length > 0 ? "," : ""}#{local_str}"

metadata

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