opening_hours_converter 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a42f2ea0d4978fdd0bd57b0689aa32c5e97c80a5
-  data.tar.gz: 7e5f5dfa2d83574529b0f0caf53e307897cb4495
+  metadata.gz: b6234f068f81ea52f797c60e5b9d1fe4168c3db0
+  data.tar.gz: 6f321a2b43003793a5555ae5b6261d45211a01cc
 SHA512:
-  metadata.gz: d5039fd24d5be117ff922b24bf7813efec96dd51c8710a0881be33fd50801a5bbee9842bfbdff3fe0a92a54f3f538a0c737b61ccdd41687e16be4234a51284e1
-  data.tar.gz: 506aaaa469f3a809680ccdc7306c55eb06086e167ddeab1f66ed16f660c8f0f5d6ff09ed3478fa6d69da29be696a8f638a714ad607096727a366b7fac4fa2773
+  metadata.gz: 743880923601f5e4e6f441259b34c8079e95806aa2c84d93ad00083dbba7c8af13824345cdf06dd264982739f37c8e41707b13239b9c16636e38122b39e14a83
+  data.tar.gz: 2673cc2577b15fa397d5f1794674105febc752905bec0fc55488d304eec09da9fe6f4bbb5ec5b063c14fe1a5c95db1f6ba9b1157dd123525bd9f410aaef798ab

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
@@ -212,12 +212,6 @@ module OpeningHoursConverter
             day.add_weekday(last_same_day)
             result << day
           elsif same_day_count > 2
-            for j in (index+1)...last_same_day do
-              if days_status[j] == 0
-                days_status[j] = -index -1
-                day.add_overwritten_weekday(j)
-              end
-            end
             day.add_weekday(last_same_day)
             result << day
           end
@@ -304,11 +298,13 @@ module OpeningHoursConverter
 
         end
       end
+      binding.pry
       result = merge_days(result)
       return result
     end
 
     def merge_days(rules)
+      binding.pry
       return rules if rules.length == 0
       result = []
       result << rules[0]

data/lib/opening_hours_converter/opening_hours_rule.rb

@@ -187,23 +187,24 @@ module OpeningHoursConverter
             end
           end
         else
-          str_result += "#{selector} "
+          local_str = "#{selector} "
           intervals.each do |interval|
             if is_full_year?(interval)
             elsif is_full_month?(interval)
-              str_result += "#{str_result.length > 5 ? "," : ""}#{OSM_MONTHS[interval[:start][:month]]}"
+              local_str += "#{local_str.length > 5 ? "," : ""}#{OSM_MONTHS[interval[:start][:month]]}"
             elsif starts_month?(interval) && ends_month?(interval)
-              str_result += "#{str_result.length > 5 ? "," : ""}#{OSM_MONTHS[interval[:start][:month]]}-#{OSM_MONTHS[interval[:end][:month]]}"
+              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)
-                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}"
+                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}"
               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}"
+                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
-              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}"
+              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}"
             end
           end
+          str_result += "#{str_result.length > 0 ? ", " : ""}#{local_str}"
         end
       end
 

metadata

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