opening_hours_converter 1.3.12 → 1.3.13.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f468692db741b2e791f1d07c77e3bec3e33834d
-  data.tar.gz: bfca0d4c43a2289e81e86ca6e61da95a8cae06e6
+  metadata.gz: 0f8300647eed6a06164551486a8c975ba7da0bf6
+  data.tar.gz: 168520c8f04c0bb5c05fbf2a3850d7f9f8855ee6
 SHA512:
-  metadata.gz: 4b5fd9166b85dca915151fd37f76e8bbe5f232e6be53521befbf9f84c3b8e14f17152a07362ee21340cf3d929e61f703967672a0cb6e3ae31e0c4d08a68d6781
-  data.tar.gz: 711baa863a46bfa94dc5d842df3e0a3b699ff50e4229c9182214d1fd8b0c309f0f08350b12b4eea9677dcf2d0a6cb4f896170d76a15c24fe344805f986df16dd
+  metadata.gz: 70897a8abe7db86aa64436912b35c10c759f6b489a0a9704cec9723500e948b04cf50fc93951a3906eb13e3fe09c45ae6ab429c49be0bf6b7136f8c1f49f7091
+  data.tar.gz: 25311fc4039e2fca97e8535b7a1f6b8d6c6fbf5c97a523791d990b96ec4441e9361c3f01eca1c481bdb999c5d92a6ee7730f6534352ea0e9a4da7bfcca4f280d

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -260,6 +260,37 @@ module OpeningHoursConverter
       return result
     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
+          end
+          date_range.add_comment(dr["comment"])
+          ret_date_ranges << [date_range]
+        end
+      end
+      ret_date_ranges
+    end
+
     def get_year(wrs)
       single_year = wrs.gsub(/\:$/, '').split('-')
       year_from = single_year[0].to_i

data/lib/opening_hours_converter/public_holiday.rb

@@ -35,6 +35,38 @@ module OpeningHoursConverter
       end
     end
 
+    def self.new_year(year=Time.now.year)
+      Time.new(year, 1, 1)
+    end
+
+    def self.christmas(year=Time.now.year)
+      Time.new(year, 12, 25)
+    end
+
+    def self.assomption(year=Time.now.year)
+      Time.new(year, 8, 15)
+    end
+
+    def self.work_day(year=Time.now.year)
+      Time.new(year, 5, 1)
+    end
+
+    def self.toussaint(year=Time.now.year)
+      Time.new(year, 11, 1)
+    end
+
+    def self.victory(year=Time.now.year)
+      Time.new(year, 5, 8)
+    end
+
+    def self.armistice(year=Time.now.year)
+      Time.new(year, 11, 11)
+    end
+
+    def self.bastille_day(year=Time.now.year)
+      Time.new(year, 7, 14)
+    end
+
     def self.easter_monday(year=Time.now.year)
       easter(year) + days(1)
     end
@@ -43,7 +75,7 @@ module OpeningHoursConverter
       easter(year) - days(2)
     end
 
-    def self.ascension(year=Time.now.year)
+    def self.rise(year=Time.now.year)
       easter(year) + days(39)
     end
 
@@ -57,20 +89,20 @@ module OpeningHoursConverter
 
     def self.ph_for_year(year=Time.now.year)
       ph = []
-      ph << Time.new(year, 1, 1)
+      ph << new_year
       ph << good_friday
       ph << easter
       ph << easter_monday
-      ph << Time.new(year, 5, 1)
-      ph << Time.new(year, 5, 8)
-      ph << ascension
+      ph << work_day
+      ph << victory
+      ph << rise
       ph << pentecote
       ph << pentecote_monday
-      ph << Time.new(year, 7, 14)
-      ph << Time.new(year, 8, 15)
-      ph << Time.new(year, 11, 1)
-      ph << Time.new(year, 11, 11)
-      ph << Time.new(year, 12, 25)
+      ph << bastille_day
+      ph << assomption
+      ph << toussaint
+      ph << armistice
+      ph << christmas
       ph.sort
     end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.3.12
+  version: 1.3.13.pre
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
-dependencies: []
+date: 2017-10-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Datetime range to openinghours, openinghours to datetime range. Very
   strongly inspired by yohours.
 email: tech@publidata.io
@@ -47,9 +61,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13