ice_cube 0.16.2 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 51dd94d70b0d51847c678abf736d395ddbee5e2e
-  data.tar.gz: 2b69372e7e4e67487347cab5a8a773da40a87e91
+SHA256:
+  metadata.gz: 6f736ccbe2ce60c734d37420278729ecf69b8fb9a31716aff0c2ca22df02020e
+  data.tar.gz: abda4a9eaad18bf0ff1f7a57056542dcffdc210fab6ba7634d0977893bb6decd
 SHA512:
-  metadata.gz: d20e08c68105003f8a6c3f192c679d185c07e43681543844f890d00947d94d6c42d5e82a350e83cab506c74183bbd42eef2cb8d5deeab8f7979a819884221dff
-  data.tar.gz: f1ab8c1b534dd70e185da9b272a973202cb071f29bd90cb2a31fa7d83d1b3f0e61c321d3d402e79e0059cf698374a0465dc954218de77afe0ac459cc0f990f47
+  metadata.gz: 474281dcabc90c8a25b5789b5a49dac347afbc89b7d1b31accb5d07fa4f8c1a5a8c440669b61733f49a24d5b7dae4ff5add7cf2e39831ca198dbbc3b524c9749
+  data.tar.gz: 00d8c976dc6b6513f3a6e3170ed0f7022fc7ea04bdb2d592dfb7ac7d29b2744d07bd4c21006f822f58ba05e4dfeb312c9dc97d35f521f69fefef485b9b06c8bb

data/config/locales/de.yml

@@ -141,7 +141,7 @@ de:
     day_names:
     - Sonntag
     - Montag
-    - Dinstag
+    - Dienstag
     - Mittwoch
     - Donnerstag
     - Freitag

data/config/locales/fr.yml

@@ -137,7 +137,7 @@ fr:
     - dimanche
     - lundi
     - mardi
-    - mecredi
+    - mercredi
     - jeudi
     - vendredi
     - samedi
@@ -170,4 +170,4 @@ fr:
       default: "%a, %d %b %Y %H:%M:%S %z"
       long: "%d %B %Y %H:%M"
       short: "%d %b %H:%M"
-    pm: pm
+    pm: pm

data/config/locales/it.yml

@@ -0,0 +1,179 @@
+it:
+  ice_cube:
+    pieces_connector: ' / '
+    not: 'tranne %{target}'
+    not_on: 'tranne %{target}'
+    date:
+      formats:
+        default: '%-d. %B %Y'
+      month_names:
+      -
+      - gennaio
+      - febbraio
+      - marzo
+      - aprile
+      - maggio
+      - giugno
+      - luglio
+      - agosto
+      - settembre
+      - ottobre
+      - novembre
+      - dicembre
+      day_names:
+      - domenica
+      - lunedì
+      - martedì
+      - mercoledì
+      - giovedì
+      - venerdì
+      - sabato
+    times:
+      other: '%{count} volte'
+      one: '%{count} volta'
+    until: 'fino al %{date}'
+    days_of_week: '%{segments} %{day}'
+    days_of_month:
+      one: '%{segments} giorno del mese'
+      other: '%{segments} giorni del mese'
+    days_of_year:
+      one: "%{segments} giorno dell'anno"
+      other: "%{segments} giorni dell'anno"
+    at_hours_of_the_day:
+      one: alla %{segments} ora del giorno
+      other: alla %{segments} ora del giorno
+    on_minutes_of_hour:
+      one: al %{segments} minuto dell'ora
+      other: al %{segments} minuto dell'ora
+    at_seconds_of_minute:
+      one: al %{segments} secondo
+      other: al %{segments} secondo
+    on_seconds_of_minute:
+      one: al %{segments} secondo del minuto
+      other: al %{segments} secondo del minuto
+    each_second:
+      one: ogni secondo
+      other: Ogni %{count} secondi
+    each_minute:
+      one: Ogni minuto
+      other: Ogni %{count} minuti
+    each_hour:
+      one: Ogni ora
+      other: Ogni %{count} ore
+    each_day:
+      one: Ogni giorno
+      other: Ogni %{count} giorni
+    each_week:
+      one: Ogni settimana
+      other: Ogni %{count} settimane
+    each_month:
+      one: Ogni mese
+      other: Ogni %{count} mesi
+    each_year:
+      one: Ogni anno
+      other: Ogni %{count} anni
+    'on': il %{sentence}
+    in: 'a %{target}'
+    integer:
+      negative: '%{ordinal}. e ultimo'
+      literal_ordinals:
+        -1: ultimo
+        -2: penultimo
+      ordinal: '%{number}%{ordinal}'
+      ordinals:
+        default: '.'
+        # 1: st
+        # 2: nd
+        # 3: rd
+        # 11: th
+        # 12: th
+        # 13: th
+    on_weekends: nel fine settimana
+    on_weekdays: nei giorni feriali
+    days_on:
+      - di domenica
+      - di lunedì
+      - di martedì
+      - di mercoledì
+      - di giovedì
+      - di venerdì
+      - di sabato
+    on_days: '%{days}'
+    array:
+      last_word_connector: ' e '
+      two_words_connector: ' e '
+      words_connector: ', '
+    string:
+      format:
+        day: '%{rest} %{current}'
+        day_of_week: '%{rest} %{current}'
+        day_of_month: '%{rest} %{current}'
+        day_of_year: '%{rest} %{current}'
+        hour_of_day: '%{rest} %{current}'
+        minute_of_hour: '%{rest} %{current}'
+        until: '%{rest} %{current}'
+        count: '%{rest} %{current}'
+        default: '%{rest} %{current}'
+
+  date:
+    abbr_day_names:
+    - dom
+    - lun
+    - mar
+    - mer
+    - gio
+    - ven
+    - sab
+    abbr_month_names:
+    -
+    - gen
+    - feb
+    - mar
+    - apr
+    - mag
+    - giu
+    - lug
+    - ago
+    - set
+    - ott
+    - nov
+    - dic
+    day_names:
+    - domenica
+    - lunedì
+    - martedì
+    - mercoledì
+    - giovedì
+    - venerdì
+    - sabato
+    formats:
+      default: "%d/%m/%Y"
+      long: "%d %B %Y"
+      short: "%d %b"
+    month_names:
+    -
+    - gennaio
+    - febbraio
+    - marzo
+    - aprile
+    - maggio
+    - giugno
+    - luglio
+    - agosto
+    - settembre
+    - ottobre
+    - novembre
+    - dicembre
+    order:
+    - :day
+    - :month
+    - :year
+
+  time:
+    am: alle
+    formats:
+      default: "%a, %d %b %Y %H:%M:%S %z"
+      long: "%B %d, %Y %H:%M"
+      short: "%d %b %H:%M"
+    pm: pm
+    

data/config/locales/nl.yml

@@ -0,0 +1,133 @@
+nl:
+  ice_cube:
+    pieces_connector: ' / '
+    not: 'niet %{target}'
+    not_on: 'niet op %{target}'
+    date:
+      formats:
+        default: '%-d %B %Y'
+    times:
+      other: '%{count} keer'
+      one: '%{count} keer'
+    until: 'tot %{date}'
+    days_of_week: '%{segments} %{day}'
+    days_of_month:
+      other: '%{segments} dagen van de maand'
+      one: '%{segments} dag van de maand'
+    days_of_year:
+      other: '%{segments} dagen van het jaar'
+      one: '%{segments} dag van het jaar'
+    at_hours_of_the_day:
+      other: op de %{segments} uren van de dag
+      one: op het %{segments} uur
+    on_minutes_of_hour:
+      other: op de %{segments} minuten van het uur
+      one: om de %{segments} minuut van het uur
+    at_seconds_of_minute:
+      other: op de %{segments} seconden
+      one: op de %{segments} seconde
+    on_seconds_of_minute:
+      other: op de %{segments} seconden van de minuut
+      one: op de %{segments} seconde van de minuut
+    each_second:
+      one: Elke seconde
+      other: Elke %{count} seconden
+    each_minute:
+      one: Elke minuut
+      other: Elke %{count} minuten
+    each_hour:
+      one: Elk uur
+      other: Elke %{count} uren
+    each_day:
+      one: Dagelijks
+      other: Elke %{count} dagen
+    each_week:
+      one: Wekelijks
+      other: Elke %{count} weken
+    each_month:
+      one: Maandelijks
+      other: Elke %{count} maanden
+    each_year:
+      one: Jaarlijks
+      other: Elke %{count} jaren
+    'on': op de  %{sentence}
+    in: 'in %{target}'
+    integer:
+      negative: '%{ordinal} laatste'
+      literal_ordinals:
+        -1: laatste
+        -2: voorlaatste
+      ordinal: '%{number}%{ordinal}'
+      ordinals:
+        default: e
+    on_weekends: in het weekend
+    on_weekdays: op weekdagen
+    days_on:
+    - zondagen
+    - maandagen
+    - dinsdagen
+    - woensdagen
+    - donderdagen
+    - vrijdagen
+    - zaterdagen
+    on_days: op %{days}
+    array:
+      last_word_connector: ' en '
+      two_words_connector: ' en '
+      words_connector: ', '
+    string:
+      format:
+        day: '%{rest} %{current}'
+        day_of_week: '%{rest} %{current}'
+        day_of_month: '%{rest} %{current}'
+        day_of_year: '%{rest} %{current}'
+        hour_of_day: '%{rest} %{current}'
+        minute_of_hour: '%{rest} %{current}'
+        until: '%{rest} %{current}'
+        count: '%{rest} %{current}'
+        default: '%{rest} %{current}'
+  date:
+    abbr_day_names:
+    - zo
+    - ma
+    - di
+    - wo
+    - do
+    - vr
+    - za
+    abbr_month_names:
+    -
+    - jan
+    - feb
+    - mrt
+    - apr
+    - mei
+    - jun
+    - jul
+    - aug
+    - sep
+    - okt
+    - nov
+    - dec
+    day_names:
+    - zondag
+    - maandag
+    - dinsdag
+    - woensdag
+    - donderdag
+    - vrijdag
+    - zaterdag
+    month_names:
+    -
+    - januari
+    - februari
+    - maart
+    - april
+    - mei
+    - juni
+    - juli
+    - augustus
+    - september
+    - oktober
+    - november
+    - december

data/config/locales/sv.yml

@@ -127,7 +127,7 @@ sv:
     - Aug
     - Sep
     - Okt
-    - Mov
+    - Nov
     - Dec
     day_names:
     - Söndag

data/lib/ice_cube/i18n.rb

@@ -1,24 +1,23 @@
+require 'ice_cube/null_i18n'
+
 module IceCube
   module I18n
-    def self.t(*args)
-      backend.t(*args)
-    end
 
-    def self.l(*args)
-      backend.l(*args)
+    LOCALES_PATH = File.expand_path(File.join('..', '..', '..', 'config', 'locales'), __FILE__)
+
+    class << self
+      delegate :t, :l, to: :backend
     end
 
     def self.backend
-      @backend
+      @backend ||= detect_backend!
     end
 
     def self.detect_backend!
-      require 'i18n'
-      ::I18n.load_path += Dir[File.expand_path('../../../config/locales/*{rb,yml}', __FILE__)]
-      @backend = ::I18n
-    rescue LoadError
-      require 'ice_cube/null_i18n'
-      @backend = NullI18n
+      ::I18n.load_path += Dir[File.join(LOCALES_PATH, '*.yml')]
+      ::I18n
+    rescue NameError
+      NullI18n
     end
   end
 end

data/lib/ice_cube/input_alignment.rb

@@ -0,0 +1,89 @@
+module IceCube
+  class InputAlignment
+
+    def initialize(rule, value, rule_part)
+      @rule = rule
+      @value = value
+      @rule_part = rule_part
+    end
+
+    attr_reader :rule, :value, :rule_part
+
+    def verify(freq, options={}, &block)
+      @rule.validations[:interval] or return
+
+      case @rule
+      when DailyRule
+        verify_wday_alignment(freq, &block)
+      when MonthlyRule
+        verify_month_alignment(freq, &block)
+      else
+        verify_freq_alignment(freq, &block)
+      end
+    end
+
+    private
+
+    def interval_validation
+      @interval_validation ||= @rule.validations[:interval].first
+    end
+
+    def interval_value
+      @interval_value ||= (rule_part == :interval) ? value : interval_validation.interval
+    end
+
+    def fixed_validations
+      @fixed_validations ||= @rule.validations.values.flatten.select { |v|
+        interval_type = (v.type == :wday ? :day : v.type)
+        v.class < Validations::FixedValue &&
+          interval_type == rule.base_interval_validation.type
+      }
+    end
+
+    def verify_freq_alignment(freq)
+      interval_validation.type == freq or return
+      (last_validation = fixed_validations.min_by(&:value)) or return
+
+      alignment = (value - last_validation.value) % interval_validation.interval
+      return if alignment.zero?
+
+      validation_values = fixed_validations.map(&:value).join(', ')
+      if rule_part == :interval
+        message = "interval(#{value}) " \
+                  "must be a multiple of " \
+                  "intervals in #{last_validation.key}(#{validation_values})"
+      else
+        message = "intervals in #{last_validation.key}(#{validation_values}, #{value}) " \
+                  "must be multiples of " \
+                  "interval(#{interval_validation.interval})"
+      end
+
+      yield ArgumentError.new(message)
+    end
+
+    def verify_month_alignment(_freq)
+      return if interval_value == 1 || (interval_value % 12).zero?
+      return if fixed_validations.empty?
+
+      message = "month_of_year can only be used with interval(1) or multiples of interval(12)"
+
+      yield ArgumentError.new(message)
+    end
+
+    def verify_wday_alignment(freq)
+      return if interval_value == 1
+
+      if freq == :wday
+        return if (interval_value % 7).zero?
+        return if Array(@rule.validations[:day]).empty?
+        message = "day can only be used with multiples of interval(7)"
+      else
+        (fixed_validation = fixed_validations.first) or return
+        message = "#{fixed_validation.key} can only be used with interval(1)"
+      end
+
+      yield ArgumentError.new(message)
+    end
+
+  end
+end

data/lib/ice_cube/null_i18n.rb

@@ -7,13 +7,19 @@ module IceCube
 
       base = base[options[:count] == 1 ? "one" : "other"] if options[:count]
 
-      if base.is_a?(Hash)
-        return base.each_with_object({}) do |(key, value), hash|
-          hash[key.is_a?(String) ? key.to_sym : key] = value
+      case base
+      when Hash
+        base.each_with_object({}) do |(k, v), hash|
+          hash[k.is_a?(String) ? k.to_sym : k] = v
         end
+      when Array
+        base.each_with_index.each_with_object({}) do |(v, k), hash|
+          hash[k] = v
+        end
+      else
+        return base unless base.include?('%{')
+        base % options
       end
-
-      options.reduce(base) { |result, (find, replace)| result.gsub("%{#{find}}", "#{replace}") }
     end
 
     def self.l(date_or_time, options = {})
@@ -22,7 +28,7 @@ module IceCube
     end
 
     def self.config
-      @config ||= YAML.load(File.read(File.join(File.dirname(__FILE__), '..', '..', 'config', 'locales', 'en.yml')))['en']
+      @config ||= YAML.load_file(File.join(IceCube::I18n::LOCALES_PATH, 'en.yml'))['en']
     end
   end
 end

data/lib/ice_cube/occurrence.rb

@@ -1,4 +1,3 @@
-require 'forwardable'
 require 'delegate'
 
 module IceCube
@@ -20,18 +19,16 @@ module IceCube
   #     Time.now - Occurrence.new(start_time) # => 3600
   #
   class Occurrence < SimpleDelegator
+    include Comparable
 
     # Report class name as 'Time' to thwart type checking.
     def self.name
       'Time'
     end
 
-    # Optimize for common methods to avoid method_missing
-    extend Forwardable
-    def_delegators :start_time, :to_i, :<=>, :==
-    def_delegators :to_range, :cover?, :include?, :each, :first, :last
-
     attr_reader :start_time, :end_time
+    alias first start_time
+    alias last end_time
 
     def initialize(start_time, end_time=nil)
       @start_time = start_time
@@ -39,29 +36,34 @@ module IceCube
       __setobj__ @start_time
     end
 
+    def to_i
+      @start_time.to_i
+    end
+
+    def <=>(other)
+      @start_time <=> other
+    end
+
     def is_a?(klass)
       klass == ::Time || super
     end
     alias_method :kind_of?, :is_a?
 
-    def intersects? other
-      if other.is_a?(Occurrence) || other.is_a?(Range)
-        lower_bound_1 = first + 1
-        upper_bound_1 = last # exclude end
-        lower_bound_2 = other.first + 1
-        upper_bound_2 = other.last + 1
-        if (lower_bound_2 <=> upper_bound_2) > 0
-          false
-        elsif (lower_bound_1 <=> upper_bound_1) > 0
-          false
-        else
-          (upper_bound_1 <=> lower_bound_2) >= 0 and
-            (upper_bound_2 <=> lower_bound_1) >= 0
-        end
-      else
-        cover? other
-      end
+    def intersects?(other)
+      return cover?(other) unless other.is_a?(Occurrence) || other.is_a?(Range)
+
+      this_start  = first + 1
+      this_end    = last # exclude end boundary
+      other_start = other.first + 1
+      other_end   = other.last + 1
+
+      !(this_end < other_start || this_start > other_end)
+    end
+
+    def cover?(other)
+      to_range.cover?(other)
     end
+    alias_method :include?, :cover?
 
     def comparable_time
       start_time

data/lib/ice_cube/parsers/ical_parser.rb

@@ -4,15 +4,18 @@ module IceCube
       data = {}
       ical_string.each_line do |line|
         (property, value) = line.split(':')
-        (property, tzid) = property.split(';')
+        (property, _tzid) = property.split(';')
         case property
         when 'DTSTART'
-          data[:start_time] = Time.parse(value)
+          data[:start_time] = TimeUtil.deserialize_time(value)
         when 'DTEND'
-          data[:end_time] = Time.parse(value)
+          data[:end_time] = TimeUtil.deserialize_time(value)
+        when 'RDATE'
+          data[:rtimes] ||= []
+          data[:rtimes] += value.split(',').map { |v| TimeUtil.deserialize_time(v) }
         when 'EXDATE'
           data[:extimes] ||= []
-          data[:extimes] += value.split(',').map{|v| Time.parse(v)}
+          data[:extimes] += value.split(',').map { |v| TimeUtil.deserialize_time(v) }
         when 'DURATION'
           data[:duration] # FIXME
         when 'RRULE'
@@ -41,7 +44,7 @@ module IceCube
         when 'COUNT'
           params[:count] = value.to_i
         when 'UNTIL'
-          params[:until] = Time.parse(value).utc
+          params[:until] = TimeUtil.deserialize_time(value).utc
         when 'WKST'
           params[:week_start] = TimeUtil.ical_day_to_symbol(value)
         when 'BYSECOND'

data/lib/ice_cube/rule.rb

@@ -19,11 +19,9 @@ module IceCube
       until_time || occurrence_count
     end
 
-    def ==(rule)
-      if rule.is_a? Rule
-        hash = to_hash
-        hash && hash == rule.to_hash
-      end
+    def ==(other)
+      return false unless other.is_a? Rule
+      hash == other.hash
     end
 
     def hash
@@ -31,7 +29,7 @@ module IceCube
     end
 
     def to_ical
-      raise MethodNotImplemented, "Expected to be overrridden by subclasses"
+      raise MethodNotImplemented, "Expected to be overridden by subclasses"
     end
 
     # Convert from ical string and create a rule
@@ -60,11 +58,6 @@ module IceCube
       next_time(time, schedule, time).to_i == time.to_i
     end
 
-    # Whether this rule requires a full run
-    def full_required?
-      !@count.nil?
-    end
-
     class << self
 
       # Convert from a hash and create a rule

data/lib/ice_cube/rules/daily_rule.rb

@@ -2,6 +2,15 @@ module IceCube
 
   class DailyRule < ValidatedRule
 
+    include Validations::HourOfDay
+    include Validations::MinuteOfHour
+    include Validations::SecondOfMinute
+    include Validations::DayOfMonth
+    include Validations::DayOfWeek
+    include Validations::Day
+    include Validations::MonthOfYear
+    # include Validations::DayOfYear    # n/a
+
     include Validations::DailyInterval
 
     def initialize(interval = 1)

data/lib/ice_cube/rules/hourly_rule.rb

@@ -2,6 +2,15 @@ module IceCube
 
   class HourlyRule < ValidatedRule
 
+    include Validations::HourOfDay
+    include Validations::MinuteOfHour
+    include Validations::SecondOfMinute
+    include Validations::DayOfMonth
+    include Validations::DayOfWeek
+    include Validations::Day
+    include Validations::MonthOfYear
+    include Validations::DayOfYear
+
     include Validations::HourlyInterval
 
     def initialize(interval = 1)