opening_hours_converter 1.8.0 → 1.8.1

data/lib/opening_hours_converter/opening_hours_rule.rb

@@ -9,53 +9,45 @@ module OpeningHoursConverter
       @date = []
       @time = []
       @is_defined_off = false
-      @comment = ""
+      @comment = ''
     end
 
     def get
-      result = ""
+      result = ''
 
-      if @date.length > 0
-        result += get_wide_selector
-      end
+      result += get_wide_selector if !@date.empty?
 
-      if @date.length > 0
+      if !@date.empty?
         wd = @date[0].get_weekdays
-        if wd.length > 0
-          result += " #{wd}"
-        end
+        result += " #{wd}" if !wd.empty?
       end
       if @is_defined_off
-        result += " off"
-      elsif @time.length > 0
-        result += " "
+        result += ' off'
+      elsif !@time.empty?
+        result += ' '
         @time.uniq.each_with_index do |t, i|
-          if (i > 0)
-            result += ","
-          end
+          result += ',' if i > 0
           result += t.get
         end
       else
-        result += " off"
+        result += ' off'
       end
 
       rgx_day = /(Mo|Tu|We|Th|Fr|Sa|Su)/
 
-      if result.strip == "00:00-24:00" || (!(result =~ /00:00-24:00/).nil? && (result =~ rgx_day).nil?)
-        result.gsub!("00:00-24:00", "24/7")
+      if result.strip == '00:00-24:00' || (!(result =~ /00:00-24:00/).nil? && (result =~ rgx_day).nil?)
+        result.gsub!('00:00-24:00', '24/7')
       end
 
-      if !comment.nil? && comment.length != 0
-        result += " #{comment}"
-      end
+      result += " #{comment}" if !comment.nil? && !comment.empty?
 
       result.strip
     end
 
     def get_wide_selector
-      if @date.length == 1 && @date[0].wide_interval.type == "holiday"
+      if @date.length == 1 && @date[0].wide_interval.type == 'holiday'
         if @date[0].wide_interval.start[:year].nil?
-          return "PH"
+          return 'PH'
         else
           if @date[0].wide_interval.end && @date[0].wide_interval.end[:year]
             return "#{@date[0].wide_interval.start[:year]}-#{@date[0].wide_interval.end[:year]} PH"
@@ -71,8 +63,8 @@ module OpeningHoursConverter
 
       result = {}
 
-      if !years["always"].nil?
-        always = years.delete("always")
+      if !years['always'].nil?
+        always = years.delete('always')
 
         always.each_with_index do |month_array, month|
           month_array.each_with_index do |day_bool, day|
@@ -81,17 +73,17 @@ module OpeningHoursConverter
               day_start = day
             end
             if day_bool && month_start >= 0 && month == 11 && day == 30
-              result["always"] ||= []
-              result["always"] << {start: { day: day_start, month: month_start }, end: { day: 30, month: 11 }}
+              result['always'] ||= []
+              result['always'] << { start: { day: day_start, month: month_start }, end: { day: 30, month: 11 } }
               month_start = -1
               day_start = -1
             elsif !day_bool && month_start >= 0
-              result["always"] ||= []
+              result['always'] ||= []
               end_res = day == 0 ?
                 month == 0 ?
-                  { day: 30, month: 11 } : { day: MONTH_END_DAY[month-1]-1, month: month-1 } :
-                { day: day-1, month: month }
-              result["always"] << { start: { day: day_start, month: month_start }, end: end_res }
+                  { day: 30, month: 11 } : { day: MONTH_END_DAY[month - 1] - 1, month: month - 1 } :
+                { day: day - 1, month: month }
+              result['always'] << { start: { day: day_start, month: month_start }, end: end_res }
               month_start = -1
               day_start = -1
             end
@@ -107,15 +99,15 @@ module OpeningHoursConverter
               month_start = month
               day_start = day
             end
-            if day_bool && year_start >= 0 && month == 11 && day == 30 && years[year+1].nil?
+            if day_bool && year_start >= 0 && month == 11 && day == 30 && years[year + 1].nil?
               if year_start == year
                 result[year] ||= []
                 result[year] << { start: { day: day_start, month: month_start }, end: { day: 30, month: 11 } }
               else
-                result["multi_year"] ||= {}
-                result["multi_year"]["#{year_start}-#{year}"] ||= []
-                result["multi_year"]["#{year_start}-#{year}"] << { start: { day: day_start, month: month_start, year: year_start },
-                  end: { day: 30, month: 11, year: year } }
+                result['multi_year'] ||= {}
+                result['multi_year']["#{year_start}-#{year}"] ||= []
+                result['multi_year']["#{year_start}-#{year}"] << { start: { day: day_start, month: month_start, year: year_start },
+                                                                   end: { day: 30, month: 11, year: year } }
               end
               year_start = -1
               month_start = -1
@@ -123,25 +115,25 @@ module OpeningHoursConverter
             elsif !day_bool && year_start >= 0
               end_res = {}
 
-              if day == 0
-                if month == 0
-                  end_res = { day: 30, month: 11 }
-                else
-                  end_res = { day: MONTH_END_DAY[month-1]-1, month: month-1 }
-                end
-              else
-                end_res = { day: day-1, month: month }
-              end
+              end_res = if day == 0
+                          if month == 0
+                            { day: 30, month: 11 }
+                          else
+                            { day: MONTH_END_DAY[month - 1] - 1, month: month - 1 }
+                                    end
+                        else
+                          { day: day - 1, month: month }
+                        end
 
               if year_start == year
                 result[year] ||= []
                 result[year] << { start: { day: day_start, month: month_start }, end: end_res }
               else
-                result["multi_year"] ||= {}
-                result["multi_year"]["#{year_start}-#{year}"] ||= []
+                result['multi_year'] ||= {}
+                result['multi_year']["#{year_start}-#{year}"] ||= []
                 end_res[:year] = year
-                result["multi_year"]["#{year_start}-#{year}"] << { start: { day: day_start, month: month_start, year: year_start },
-                  end: end_res }
+                result['multi_year']["#{year_start}-#{year}"] << { start: { day: day_start, month: month_start, year: year_start },
+                                                                   end: end_res }
               end
               year_start = -1
               month_start = -1
@@ -155,40 +147,36 @@ module OpeningHoursConverter
     end
 
     def result_to_string(result)
-      str_result = ""
+      str_result = ''
       result.each do |selector, intervals|
-        if selector == "always"
+        if selector == 'always'
           intervals.each do |interval|
-            if str_result.length > 0
-              str_result += ","
-            end
+            str_result += ',' if !str_result.empty?
             if is_full_year?(interval)
             elsif is_full_month?(interval)
-              str_result += "#{OSM_MONTHS[interval[:start][:month]]}"
+              str_result += (OSM_MONTHS[interval[:start][:month]]).to_s
             elsif starts_month?(interval) && ends_month?(interval)
               str_result += "#{OSM_MONTHS[interval[:start][:month]]}-#{OSM_MONTHS[interval[:end][:month]]}"
             elsif is_same_month?(interval)
               if is_same_day?(interval)
-                str_result += "#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day]+1 < 10 ? "0#{interval[:start][:day]+1}" : interval[:start][:day]+1}"
+                str_result += "#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day] + 1 < 10 ? "0#{interval[:start][:day] + 1}" : interval[:start][:day] + 1}"
               else
-                str_result += "#{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}"
+                str_result += "#{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 += "#{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}"
+              str_result += "#{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
-        elsif selector == "multi_year"
-          intervals.each do |years, intervals|
+        elsif selector == 'multi_year'
+          intervals.each do |_years, intervals|
             intervals.each do |interval|
-              if str_result.length > 0
-                str_result += ","
-              end
+              str_result += ',' if !str_result.empty?
               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]]}"
               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}"
+                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
             end
           end
@@ -196,21 +184,21 @@ module OpeningHoursConverter
           local_str = "#{selector} "
           intervals.each do |interval|
             if is_full_year?(interval)
-            # elsif
+              # elsif
               # local_str += "#{local_str.length > 5 ? "," : ""}#{OSM_MONTHS[interval[:start][:month]]}"
-            # elsif
+              # 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}"
+                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
-                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}"
+                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}-#{selector} #{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}"
+          str_result += "#{!str_result.empty? ? ',' : ''}#{local_str}"
         end
       end
 
@@ -255,23 +243,23 @@ module OpeningHoursConverter
 
     def same_time?(o)
       if o.nil? || o.time.length != @time.length || @is_defined_off != o.is_defined_off
-        return false
+        false
       else
         @time.each_with_index do |t, i|
           return false if !t.equals(o.time[i])
         end
-        return true
+        true
       end
     end
 
     def same_date?(o)
       if o.nil? || o.date.length != @date.length
-        return false
+        false
       else
         @date.each_with_index do |d, i|
           return false if !d.wide_interval.equals(o.date[i].wide_interval)
         end
-        return true
+        true
       end
     end
 
@@ -281,11 +269,11 @@ module OpeningHoursConverter
     end
 
     def is_off?
-      @time.length == 0 || (@time.length == 1 && time[0].start.nil?)
+      @time.empty? || (@time.length == 1 && time[0].start.nil?)
     end
 
     def has_overwritten_weekday?
-      @date.length > 0 && @date[0].weekdays_over.length > 0
+      !@date.empty? && !@date[0].weekdays_over.empty?
     end
 
     def add_weekday(weekday)
@@ -295,9 +283,7 @@ module OpeningHoursConverter
     end
 
     def add_ph_weekday
-      @date.each do |d|
-        d.add_ph_weekday
-      end
+      @date.each(&:add_ph_weekday)
     end
 
     def add_overwritten_weekday(weekday)
@@ -311,11 +297,11 @@ module OpeningHoursConverter
         raise ArgumentError
       end
 
-      if @date.length == 0 || date.same_weekdays?(@date.first.weekdays)
+      if @date.empty? || date.same_weekdays?(@date.first.weekdays)
         @date << date
       else
         if !@date.first.same_weekdays?(date.weekdays)
-          raise ArgumentError, "This date #{@date.inspect} can't be added to this rule #{self.inspect}"
+          raise ArgumentError, "This date #{@date.inspect} can't be added to this rule #{inspect}"
         end
       end
     end
@@ -324,13 +310,11 @@ module OpeningHoursConverter
       @time.each do |t|
         return true if t.start == time.start && t.end == time.end
       end
-      return false
+      false
     end
 
     def add_time(time)
-      if (@time.length == 0 || @time[0].get != "off") && !include_time?(time)
-        @time << time
-      end
+      @time << time if (@time.empty? || @time[0].get != 'off') && !include_time?(time)
     end
 
     def add_comment(comment)

data/lib/opening_hours_converter/opening_hours_time.rb

@@ -2,16 +2,14 @@ module OpeningHoursConverter
   class OpeningHoursTime
     attr_reader :start, :end, :priority
 
-    def initialize(minute_start=nil, minute_end=nil)
+    def initialize(minute_start = nil, minute_end = nil)
       @start = minute_start
-      unless minute_start == minute_end
-        @end = minute_end
-      end
+      @end = minute_end unless minute_start == minute_end
     end
 
     def get
-      return "off" if (@start.nil? && @end.nil?)
-      "#{time_string(@start)}#{@end.nil? ? "" : "-#{time_string(@end)}"}"
+      return 'off' if @start.nil? && @end.nil?
+      "#{time_string(@start)}#{@end.nil? ? '' : "-#{time_string(@end)}"}"
     end
 
     def equals(t)
@@ -20,9 +18,9 @@ module OpeningHoursConverter
 
     def time_string(minutes)
       fminutes = minutes.to_f
-      h = (fminutes/60).floor.to_i
-      m = (fminutes%60).to_i
-      "#{h < 10 ? "0" : ""}#{h}:#{m < 10 ? "0" : ""}#{m}"
+      h = (fminutes / 60).floor.to_i
+      m = (fminutes % 60).to_i
+      "#{h < 10 ? '0' : ''}#{h}:#{m < 10 ? '0' : ''}#{m}"
     end
   end
 end

data/lib/opening_hours_converter/public_holiday.rb

@@ -1,10 +1,10 @@
 module OpeningHoursConverter
   class PublicHoliday
-    def self.easter(year=Time.now.year)
+    def self.easter(year = Time.now.year)
       # code from https://github.com/jrobertson/easter
       golden_number = (year % 19) + 1
 
-      if year <= 1752 then
+      if year <= 1752
         # Julian calendar
         dominical_number = (year + (year / 4) + 5) % 7
         paschal_full_moon = (3 - (11 * golden_number) - 7) % 30
@@ -19,14 +19,14 @@ module OpeningHoursConverter
       dominical_number += 7 until dominical_number > 0
 
       paschal_full_moon += 30 until paschal_full_moon > 0
-      paschal_full_moon -= 1 if paschal_full_moon == 29 or (paschal_full_moon == 28 and golden_number > 11)
+      paschal_full_moon -= 1 if (paschal_full_moon == 29) || ((paschal_full_moon == 28) && (golden_number > 11))
 
       difference = (4 - paschal_full_moon - dominical_number) % 7
       difference += 7 if difference < 0
 
       day_easter = paschal_full_moon + difference + 1
 
-      if day_easter < 11 then
+      if day_easter < 11
         # Easter occurs in March.
         return Time.new(year, 3, day_easter + 21)
       else
@@ -35,59 +35,59 @@ module OpeningHoursConverter
       end
     end
 
-    def self.new_year(year=Time.now.year)
+    def self.new_year(year = Time.now.year)
       Time.new(year, 1, 1)
     end
 
-    def self.christmas(year=Time.now.year)
+    def self.christmas(year = Time.now.year)
       Time.new(year, 12, 25)
     end
 
-    def self.assomption(year=Time.now.year)
+    def self.assomption(year = Time.now.year)
       Time.new(year, 8, 15)
     end
 
-    def self.work_day(year=Time.now.year)
+    def self.work_day(year = Time.now.year)
       Time.new(year, 5, 1)
     end
 
-    def self.toussaint(year=Time.now.year)
+    def self.toussaint(year = Time.now.year)
       Time.new(year, 11, 1)
     end
 
-    def self.victory(year=Time.now.year)
+    def self.victory(year = Time.now.year)
       Time.new(year, 5, 8)
     end
 
-    def self.armistice(year=Time.now.year)
+    def self.armistice(year = Time.now.year)
       Time.new(year, 11, 11)
     end
 
-    def self.bastille_day(year=Time.now.year)
+    def self.bastille_day(year = Time.now.year)
       Time.new(year, 7, 14)
     end
 
-    def self.easter_monday(year=Time.now.year)
+    def self.easter_monday(year = Time.now.year)
       easter(year) + days(1)
     end
 
-    def self.good_friday(year=Time.now.year)
+    def self.good_friday(year = Time.now.year)
       easter(year) - days(2)
     end
 
-    def self.rise(year=Time.now.year)
+    def self.rise(year = Time.now.year)
       easter(year) + days(39)
     end
 
-    def self.pentecote(year=Time.now.year)
+    def self.pentecote(year = Time.now.year)
       easter(year) + days(49)
     end
 
-    def self.pentecote_monday(year=Time.now.year)
+    def self.pentecote_monday(year = Time.now.year)
       easter(year) + days(50)
     end
 
-    def self.ph_for_year(year=Time.now.year)
+    def self.ph_for_year(year = Time.now.year)
       ph = []
       ph << new_year(year)
       ph << good_friday(year)
@@ -106,7 +106,7 @@ module OpeningHoursConverter
       ph.sort
     end
 
-    def self.days(days=0)
+    def self.days(days = 0)
       days * 24 * 60 * 60
     end
   end