opening_hours_converter 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d01e4f3c1f4306964ee63ade1bb6e018722446a
-  data.tar.gz: 5671d033a5182245b46ff12838c2ccb11de8f7e5
+  metadata.gz: 1d3d220396767c052612ffa5d62d86e1b862f834
+  data.tar.gz: 46759c801d7003a905028e1d9ff2bbe45f8ceab8
 SHA512:
-  metadata.gz: 99ec2ff1a1232f5ff42a6f0c015c4211fdf0a0a801b98c42d448e3b0828dfe0275e5e3246bd39403c716def6c3cbb241b35ad13a4a2114db592c12a0f6b38cb7
-  data.tar.gz: 4438647b1676e08b941159403631eefbc873e90970e24176006c30cb10406822b65a978e93d930fea8486c6b3c4b9f86ca40af42d5910484a633890a70ca9a4c
+  metadata.gz: 68dbbf968aa6cf83f2e6bf1c78a148d378ea49a1ff2fc5c59aa3c7b750378ae51301075cb54cac1844c4b79cbd887ed93d184393b63e4c9a12e11d9654c6f4a5
+  data.tar.gz: 2d7a47fc9f4abd2536aae277843a59dda19ce31fc805a8f1d903cd06804477376d813a47d9a574cfa6833d1e04c868c28d648de0a0dc17d79b36b362439b98ea

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -14,9 +14,6 @@ module OpeningHoursConverter
       @RGX_WEEKDAY = /^(((Mo|Tu|We|Th|Fr|Sa|Su)(\-(Mo|Tu|We|Th|Fr|Sa|Su))?)|(PH|SH|easter))(,(((Mo|Tu|We|Th|Fr|Sa|Su)(\-(Mo|Tu|We|Th|Fr|Sa|Su))?)|(PH|SH|easter)))*$/
       @RGX_HOLIDAY = /^(PH|SH|easter)$/
       @RGX_WD = /^(Mo|Tu|We|Th|Fr|Sa|Su)(\-(Mo|Tu|We|Th|Fr|Sa|Su))?$/
-      @RGX_YEAR = /^(\d{4})(\-(\d{4}))?$/
-      @RGX_YEAR_MONTH_DAY = /^(\d{4}) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) ([012]?[0-9]|3[01])(\-((\d{4}) )?((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) )?([012]?[0-9]|3[01]))?\:?$/
-      @RGX_YEAR_MONTH = /^(\d{4}) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)(\-((\d{4}) )?((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)))?\:?$/
     end
 
     def parse(oh)
@@ -33,19 +30,18 @@ module OpeningHoursConverter
       weekdays = nil
       weeks = nil
       months = nil
-      years = nil
+
+      single_time = nil
+      from = nil
+      to = nil
 
       single_month = nil
       month_from = nil
       month_to = nil
 
-      single_year = nil
-      year_from = nil
-      year_to = nil
-
-      single_year = nil
-      year_from = nil
-      year_to = nil
+      single_week = nil
+      week_from = nil
+      week_to = nil
 
       date_ranges = nil
       date_range = nil
@@ -65,10 +61,29 @@ module OpeningHoursConverter
           current_token -= 1
         end
 
+
+        # get time selector
+        from = nil
+        to = nil
         times = []
         if current_token >= 0 && is_time?(tokens[current_token])
           time_selector = tokens[current_token]
-          times = get_times(time_selector)
+
+          if time_selector == "24/7"
+            times << {from: 0, to: 24*60}
+          else
+            time_selector = time_selector.split(',')
+            time_selector.each do |ts|
+              single_time = ts.split('-')
+              from = as_minutes(single_time[0])
+              if single_time.length > 1
+                to = as_minutes(single_time[1])
+              else
+                to = from
+              end
+              times << {from: from, to: to}
+            end
+          end
           current_token -= 1
         end
 
@@ -78,66 +93,120 @@ module OpeningHoursConverter
           weekdays << {from: 0, to: 6}
         elsif current_token >= 0 && is_weekday?(tokens[current_token])
           weekday_selector = tokens[current_token]
-          weekdays = get_weekdays(weekday_selector)
+          weekday_selector = weekday_selector.split(',')
+          weekday_selector.each do |wd|
+            if !(@RGX_HOLIDAY =~ wd).nil?
+            elsif !(@RGX_WD =~ wd).nil?
+              single_weekday = wd.split('-')
+              wd_from = OSM_DAYS.find_index(single_weekday[0])
+              if single_weekday.length > 1
+                wd_to = OSM_DAYS.find_index(single_weekday[1])
+              else
+                wd_to = wd_from
+              end
+
+              weekdays << {from: wd_from, to: wd_to}
+            else
+              raise ArgumentError, "Invalid weekday interval : #{wd}"
+            end
+          end
           current_token -= 1
         end
 
-        # years = []
-        # if current_token >= 0 && is_year?(tokens[current_token])
-        #   year_selector = tokens[current_token]
-        #   year_selector = year_selector.split(',')
-        #   year_selector.each do |y|
-        #     single_year = y.gsub(/\:$/, '').split('-')
-        #     year_from = single_year[0]
-        #     if single_year.length > 1
-        #       year_to = single_year[1]
-        #     else
-        #       year_to = year_from
-        #     end
-
-        #     years << {from: year_from, to: year_to}
-        #   end
-        #   current_token -= 1
-        # end
-
+        weeks = []
         months = []
-        years = []
         if current_token >= 0
-
           wide_range_selector = tokens[0]
           for i in 1..current_token
             wide_range_selector += " #{tokens[i]}"
           end
           if wide_range_selector.length > 0
-            wide_range_selector = wide_range_selector.strip
-            wide_range_selector = wide_range_selector.split(',')
-            wide_range_selector.each do |wrs|
-              if !(@RGX_YEAR_MONTH_DAY =~ wrs).nil?
-                years << get_year_month_day(wrs)
-              elsif !(@RGX_YEAR_MONTH =~ wrs).nil?
-                years << get_year_month(wrs)
-              elsif !(@RGX_MONTHDAY =~ wrs).nil?
-                months << get_month_day(wrs)
-              elsif !(@RGX_MONTH =~ wrs).nil?
-                months << get_month(wrs)
-              elsif !(@RGX_YEAR =~ wrs).nil?
-
-                years << {from: year_from, to: year_to}
-              else
-                raise ArgumentError, "Unsupported selector #{wrs}"
+            wide_range_selector = wide_range_selector.gsub(/\:$/, '').split('week')
+            month_selector = wide_range_selector[0].strip
+            if month_selector.length == 0
+              month_selector = nil
+            end
+
+            if wide_range_selector.length > 1
+              week_selector = wide_range_selector[1].strip
+              if week_selector.length == 0
+                week_selector = nil
               end
+            else
+              week_selector = nil
+            end
+
+            if (!month_selector.nil? && !week_selector.nil?)
+              raise ArgumentError, "unsupported simultaneous month and week selector"
+            elsif !month_selector.nil?
+              month_selector = month_selector.split(',')
+
+              month_selector.each do |ms|
+                if ms == "SH"
+                elsif !(@RGX_MONTH =~ ms).nil?
+                  single_month = ms.split('-')
+                  month_from = OSM_MONTHS.find_index(single_month[0]) + 1
+                  if month_from < 1
+                    raise ArgumentError, "Invalid month : #{single_month[0]}"
+                  end
+
+                  if single_month.length > 1
+                    month_to = OSM_MONTHS.find_index(single_month[1]) + 1
+                    if month_to < 1
+                      raise ArgumentError, "Invalid month : #{single_month[1]}"
+                    end
+                  else
+                    month_to = month_from
+                  end
+                  months << {from: month_from, to: month_to}
+                elsif !(@RGX_MONTHDAY =~ ms).nil?
+                  single_month = ms.gsub(/\:$/, '').split('-')
+
+                  month_from = single_month[0].split(' ')
+                  month_from = { day: month_from[1].to_i, month: OSM_MONTHS.find_index(month_from[0]) + 1 }
+                  if month_from[:month] < 1
+                    raise ArgumentError, "Invalid month : #{month_from.inspect}"
+                  end
+
+                  if single_month.length > 1
+                    month_to = single_month[1].split(' ')
+                    month_to = { day: month_to[1].to_i, month: OSM_MONTHS.find_index(month_to[0]) + 1 }
+                    if month_to[:month] < 1
+                      raise ArgumentError, "Invalid month : #{month_to.inspect}"
+                    end
+                  else
+                    month_to = nil
+                  end
+                  months << {from_day: month_from, to_day: month_to}
+                else
+                  raise ArgumentError, "Unsupported month selector #{ms}"
+                end
+              end
+            elsif !week_selector.nil?
+              week_selector = week_selector.split(',')
+              week_selector.each do |ws|
+                single_week = ws.split('-')
+                week_from = single_week[0].to_i
+                if single_week.length > 1
+                  week_to = single_week[1].to_i
+                else
+                  week_to = nil
+                end
+                weeks << {from: week_from, to: week_to}
+              end
+            else
+              raise ArgumentError, "Invalid date selector"
             end
           end
         end
-
         if current_token == tokens.length - 1
           raise ArgumentError, "Unreadable string"
         end
-        puts "months : #{months}"
-        puts "weekdays : #{weekdays}"
-        puts "times : #{times}"
-        puts "years : #{years}"
-        puts "rule_modifier : #{rule_modifier}"
+        # puts "months : #{months}"
+        # puts "weeks : #{weeks}"
+        # puts "weekdays : #{weekdays}"
+        # puts "times : #{times}"
+        # puts "rule_modifier : #{rule_modifier}"
 
         date_ranges = []
 
@@ -145,41 +214,26 @@ module OpeningHoursConverter
           months.each do |month|
             if !month[:from_day].nil?
               if !month[:to_day].nil?
-                date_range = OpeningHoursConverter::WideInterval.new.day(month[:from_day][:day], month[:from_day][:month], nil, month[:to_day][:day], month[:to_day][:month], nil)
+                date_range = OpeningHoursConverter::WideInterval.new.day(month[:from_day][:day], month[:from_day][:month], month[:to_day][:day], month[:to_day][:month])
               else
                 date_range = OpeningHoursConverter::WideInterval.new.day(month[:from_day][:day], month[:from_day][:month])
               end
               date_ranges << date_range
             else
               if !month[:to].nil?
-                date_range = OpeningHoursConverter::WideInterval.new.month(month[:from], nil, month[:to])
+                date_range = OpeningHoursConverter::WideInterval.new.month(month[:from], month[:to])
               else
                 date_range = OpeningHoursConverter::WideInterval.new.month(month[:from])
               end
               date_ranges << date_range
             end
           end
-        elsif years.length > 0
-          years.each do |year|
-            # binding.pry
-            if !year[:to].nil?
-              if !year[:from_day].nil?
-                date_range = OpeningHoursConverter::WideInterval.new.day(year[:from_day][:day], year[:from_day][:month], year[:from_day][:year],
-                  year[:to_day][:day], year[:to_day][:month], year[:to_day][:year])
-              elsif !year[:from_month].nil?
-                date_range = OpeningHoursConverter::WideInterval.new.month(year[:from_month][:month], year[:from_month][:year],
-                  year[:to_month][:month], year[:to_month][:year])
-              else
-                date_range = OpeningHoursConverter::WideInterval.new.year(year[:from], year[:to])
-              end
+        elsif weeks.length > 0
+          weeks.each do |week|
+            if !week[:to].nil?
+              date_range = OpeningHoursConverter::WideInterval.new.week(week[:from], week[:to])
             else
-              if !year[:from_month].nil?
-                date_range = OpeningHoursConverter::WideInterval.new.month(year[:from_month][:month], year[:from_month][:year])
-              elsif !year[:from_day].nil?
-                date_range = OpeningHoursConverter::WideInterval.new.day(year[:from_day][:day], year[:from_day][:month], year[:from_day][:year])
-              else
-                date_range = OpeningHoursConverter::WideInterval.new.year(year[:from])
-              end
+              date_range = OpeningHoursConverter::WideInterval.new.week(week[:from])
             end
             date_ranges << date_range
           end
@@ -264,168 +318,6 @@ module OpeningHoursConverter
       return result
     end
 
-    def get_year(wrs)
-      single_year = wrs.gsub(/\:$/, '').split('-')
-      year_from = single_year[0].to_i
-      if year_from < 1
-        raise ArgumentError, "Invalid year : #{single_year[0]}"
-      end
-
-      if single_year.length > 1
-        year_to = single_year[1].to_i
-        if year_to < 1
-          raise ArgumentError, "Invalid year : #{single_year[1]}"
-        end
-      else
-        year_to = nil
-      end
-      { from: year_from, to: year_to }
-    end
-
-    def get_month(wrs)
-      single_month = wrs.gsub(/\:$/, '').split('-')
-      month_from = OSM_MONTHS.find_index(single_month[0]) + 1
-      if month_from < 1
-        raise ArgumentError, "Invalid month : #{single_month[0]}"
-      end
-
-      if single_month.length > 1
-        month_to = OSM_MONTHS.find_index(single_month[1]) + 1
-        if month_to < 1
-          raise ArgumentError, "Invalid month : #{single_month[1]}"
-        end
-      else
-        month_to = month_from
-      end
-      { from: month_from, to: month_to }
-    end
-
-    def get_month_day(wrs)
-      single_month = wrs.gsub(/\:$/, '').split('-')
-
-      month_from = single_month[0].split(' ')
-      month_from = { day: month_from[1].to_i, month: OSM_MONTHS.find_index(month_from[0]) + 1 }
-      if month_from[:month] < 1
-        raise ArgumentError, "Invalid month : #{month_from.inspect}"
-      end
-
-      if single_month.length > 1
-        month_to = single_month[1].split(' ')
-        month_to = { day: month_to[1].to_i, month: OSM_MONTHS.find_index(month_to[0]) + 1 }
-        if month_to[:month] < 1
-          raise ArgumentError, "Invalid month : #{month_to.inspect}"
-        end
-      else
-        month_to = nil
-      end
-      { from_day: month_from, to_day: month_to }
-    end
-
-    def get_year_month(wrs)
-      single_year_month = wrs.gsub(/\:$/, '').split('-')
-      year_month_from = single_year_month[0].split(' ')
-      year_month_from = { month: OSM_MONTHS.find_index(year_month_from[1]) + 1, year: year_month_from[0].to_i }
-      if year_month_from.length < 1
-        raise ArgumentError, "Invalid year_month : #{year_month_from.inspect}"
-      end
-      if single_year_month.length > 1
-        year_month_to = single_year_month[1].split(' ')
-        if year_month_to.length == 2
-          year_month_to = { month: OSM_MONTHS.find_index(year_month_to[1]) + 1, year: year_month_to[0].to_i }
-        elsif year_month_to.length == 1
-          year_month_to = { month: OSM_MONTHS.find_index(year_month_to[1]) + 1, year: year_month_from[:year] }
-        end
-        if year_month_to.length < 1
-          raise ArgumentError, "Invalid year_month : #{year_month_to.inspect}"
-        end
-      else
-        year_month_to = nil
-      end
-      { from_month: year_month_from, to_month: year_month_to }
-    end
-
-    def get_year_month_day(wrs)
-      single_year_month_day = wrs.gsub(/\:$/, '').split('-')
-      year_month_day_from = single_year_month_day[0].split(' ')
-      year_month_day_from = { day: year_month_day_from[2].to_i,
-        month: OSM_MONTHS.find_index(year_month_day_from[1]) + 1,
-        year: year_month_day_from[0].to_i }
-      if year_month_day_from.length < 1
-        raise ArgumentError, "Invalid year_month_day : #{year_month_day_from.inspect}"
-      end
-      if single_year_month_day.length > 1
-        year_month_day_to = single_year_month_day[1].split(' ')
-        if year_month_day_to.length == 3
-          year_month_day_to = { day: year_month_day_to[2].to_i,
-            month: OSM_MONTHS.find_index(year_month_day_to[1]) + 1,
-            year: year_month_day_to[0].to_i }
-        elsif year_month_day_to.length == 2
-          year_month_day_to = { day: year_month_day_to[1].to_i,
-            month: OSM_MONTHS.find_index(year_month_day_to[0]) + 1,
-            year: year_month_day_from[:year] }
-        elsif year_month_day_to.length == 1
-          year_month_day_to = { day: year_month_day_to[0].to_i,
-            month: year_month_day_from[:month],
-            year: year_month_day_from[:year] }
-        end
-        if year_month_day_to.length < 1
-          raise ArgumentError, "Invalid year_month_day : #{year_month_day_to.inspect}"
-        end
-      else
-        year_month_day_to = nil
-      end
-
-      { from_day: year_month_day_from, to_day: year_month_day_to }
-    end
-
-    def get_times(time_selector)
-      times = []
-      from = nil
-      to = nil
-      if time_selector == "24/7"
-        times << {from: 0, to: 24*60}
-      else
-        time_selector = time_selector.split(',')
-        time_selector.each do |ts|
-          single_time = ts.split('-')
-          from = as_minutes(single_time[0])
-          if single_time.length > 1
-            to = as_minutes(single_time[1])
-          else
-            to = from
-          end
-          times << {from: from, to: to}
-        end
-      end
-      times
-    end
-
-    def get_weekdays(weekday_selector)
-      weekdays = []
-      wd_from = nil
-      wd_to = nil
-
-      weekday_selector = weekday_selector.split(',')
-      weekday_selector.each do |wd|
-        if !(@RGX_HOLIDAY =~ wd).nil?
-        elsif !(@RGX_WD =~ wd).nil?
-          single_weekday = wd.split('-')
-          wd_from = OSM_DAYS.find_index(single_weekday[0])
-          if single_weekday.length > 1
-            wd_to = OSM_DAYS.find_index(single_weekday[1])
-          else
-            wd_to = wd_from
-          end
-
-          weekdays << {from: wd_from, to: wd_to}
-        else
-          raise ArgumentError, "Invalid weekday interval : #{wd}"
-        end
-      end
-
-      weekdays
-    end
-
     def remove_interval(typical, weekdays, times)
       if weekdays[:from] <= weekdays[:to]
         for wd in weekdays[:from]..weekdays[:to]
@@ -512,8 +404,5 @@ module OpeningHoursConverter
     def is_weekday?(token)
       !(@RGX_WEEKDAY =~ token).nil?
     end
-    def is_year?(token)
-      !(@RGX_YEAR =~ token).nil?
-    end
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies: []
 description: Datetime range to openinghours, openinghours to datetime range
-email: martinziserman@gmail.com
+email: tech@publidata.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -30,7 +30,7 @@ files:
 - lib/opening_hours_converter/wide_interval.rb
 homepage: http://rubygems.org/gems/opening_hours_converter
 licenses:
-- MIT
+- GNU AFFERO GENERAL PUBLIC LICENSE
 metadata: {}
 post_install_message: 
 rdoc_options: []