opening_hours_converter 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfdd235917cd9dc984b9c31fa566571465056700
-  data.tar.gz: dd372a05d992e302206c65dbc68f2a8d2f34ce68
+  metadata.gz: 7266238a63a9061d561b2499841cf1cef07d8162
+  data.tar.gz: d3918d44797f7c783d644f9ebb87060a0c91a409
 SHA512:
-  metadata.gz: 1bd873dd5a53e2a54e052165d940df9db795fc3e1bfa1c4de9a00a44a1b3d8d2460f0dca4604082156e4319da4cdb6aa45a2783909ee0c12c0391e085cc2becb
-  data.tar.gz: cb58baed6a812a8d64e22ba88271ad44393456528373261cdae982a9983dbdc10ce329aeb0195f97318fd9f07838fdd4dd8d288d5142bc1032b1c7e0c20b8b99
+  metadata.gz: '02972aaad283df19719c48c135ea5887a65aac0f4e0f6f394421bfb2c5050bcdecf565eabf5ea0b841006b7b7696936d19d5e47c96495e74f19dcc5f0bffbd7d'
+  data.tar.gz: a3d0bd083c74242765fee460a0e84f13f7e478142287f25630a26696f858a085f7c64e7fff5c0686080f41b856f2bb22fb6bcba799d7407b4a48439f5f69ce32

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -262,34 +262,28 @@ module OpeningHoursConverter
     end
 
     def from_json(json)
-      ret_date_ranges = []
-
       parsed = JSON.parse(json)
-      parsed.each do |date_ranges|
-        date_range = OpeningHoursConverter::DateRange.new
-        date_ranges.each do |dr|
-          wi = {}
-          start_day = DateTime.parse(dr["wide_interval"]["start"])
-          end_day = DateTime.parse(dr["wide_interval"]["end"])
-          case dr["wide_interval"]
-          when "always"
-            wi = OpeningHoursConverter::WideInterval.new.day(start_day.day, start_day.month, nil, end_day.day, end_day.month)
-          else
-            wi = OpeningHoursConverter::WideInterval.new.day(start_day.day, start_day.month, start_day.year, end_day.day, end_day.month, end_day.year)
-          end
-          date_range = OpeningHoursConverter::DateRange.new(wi)
-          dr["typical"]["intervals"].each do |interval|
-            if !interval.nil?
-              start_interval = DateTime.parse(interval["start"])
-              end_interval = DateTime.parse(interval["end"])
-              date_range.typical.add_interval(OpeningHoursConverter::Interval.new(((start_interval.wday + 6) % 7), (start_interval.hour * 60 + start_interval.min), ((end_interval.wday + 6) % 7), (end_interval.hour * 60 + end_interval.min)))
-            end
+      parsed.each do |dr|
+        wi = {}
+        start_day = DateTime.parse(dr["wide_interval"]["start"])
+        end_day = DateTime.parse(dr["wide_interval"]["end"])
+        case dr["wide_interval"]
+        when "always"
+          wi = OpeningHoursConverter::WideInterval.new.day(start_day.day, start_day.month, nil, end_day.day, end_day.month)
+        else
+          wi = OpeningHoursConverter::WideInterval.new.day(start_day.day, start_day.month, start_day.year, end_day.day, end_day.month, end_day.year)
+        end
+        date_range = OpeningHoursConverter::DateRange.new(wi)
+        dr["typical"]["intervals"].each do |interval|
+          if !interval.nil?
+            start_interval = DateTime.parse(interval["start"])
+            end_interval = DateTime.parse(interval["end"])
+            date_range.typical.add_interval(OpeningHoursConverter::Interval.new(((start_interval.wday + 6) % 7), (start_interval.hour * 60 + start_interval.min), ((end_interval.wday + 6) % 7), (end_interval.hour * 60 + end_interval.min)))
           end
-          date_range.add_comment(dr["comment"])
-          ret_date_ranges << [date_range]
         end
+        date_range.add_comment(dr["comment"])
       end
-      ret_date_ranges
+      [date_range]
     end
 
     def get_year(wrs)

metadata

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