ice_cube 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01f55d89af28400fc30bdfe60ccacd66e42212b0
-  data.tar.gz: a7e85b8afe0d56f8b47c3e22139d080e035ee465
+  metadata.gz: d075ab984a12f078d212922e5119adb3280095f9
+  data.tar.gz: afed7767f9d95f17308f6dd3a40fcfc025c46d44
 SHA512:
-  metadata.gz: a87067a8e0a099b1f9740bd4dab4ed408c72827c1498370b81ba3df3f6246fc7be12f8343f63832554dfa990f1754e5af365755831490d767df84b3462d49a41
-  data.tar.gz: d41ba1b2a5dc98db1522a38320452d9404a92510872a0473ba6dc9b440a5258352ea484ce28dc663908bf6bc19d747f4099035549865745377e4be9f035aed28
+  metadata.gz: 2a24dc8dc9b8a745a6753bc60d9551366af050e3ce7d80d32b4d7c6b97006c0a9c65338a75fb4b184141bb38467dbb0e73eca98e35f2407f29d79df5bd069a3a
+  data.tar.gz: c309f41dd53711998b439544e5b9b386617d2a2b63b1792688cff76346b56765a11012b4d15e3cede673f8ed658a9997ac0e430c4af34bb7c8fa7aed35f3bc57

data/config/locales/pt-BR.yml

@@ -0,0 +1,178 @@
+pt-BR:
+  ice_cube:
+    pieces_connector: ' / '
+    not: 'exceto %{target}'
+    not_on: 'exceto o dia %{target}'
+    date:
+      formats:
+        default: '%-d %B %Y'
+      month_names:
+      -
+      - Janeiro
+      - Fevereiro
+      - Março
+      - Abril
+      - Maio
+      - Junho
+      - Julho
+      - Agosto
+      - Setembro
+      - Outubro
+      - Novembro
+      - Dezembro
+      day_names:
+      - Domingo
+      - Segunda
+      - Terça
+      - Quarta
+      - Quinta
+      - Sexta
+      - Sábado
+    times:
+      other: '%{count} vezes'
+      one: '%{count} vez'
+    until: 'até %{date}'
+    days_of_week: '%{segments} %{day}'
+    days_of_month:
+      other: '%{segments} dias do mês'
+      one: '%{segments} dia'
+    days_of_year:
+      other: '%{segments} dias do ano'
+      one: '%{segments} dia'
+    at_hours_of_the_day:
+      other: às %{segments} horas
+      one: à %{segments} hora
+    on_minutes_of_hour:
+      other: aos %{segments} minutos
+      one: ao %{segments} minuto
+    at_seconds_of_minute:
+      other: aos %{segments} segundos
+      one: ao %{segments} segundo
+    on_seconds_of_minute:
+      other: aos %{segments} segundos
+      one: ao %{segments} segundo
+    each_second:
+      one: A cada segundo
+      other: A cada %{count} segundos
+    each_minute:
+      one: A cada minuto
+      other: A cada %{count} minutos
+    each_hour:
+      one: A cada hora
+      other: A cada %{count} horas
+    each_day:
+      one: Diariamente
+      other: A cada %{count} dias
+    each_week:
+      one: Semanalmente
+      other: A cada %{count} semanas
+    each_month:
+      one: Mensalmente
+      other: A cada %{count} meses
+    each_year:
+      one: Anualmente
+      other: A cada %{count} anos
+    'on': no %{sentence}
+    in: 'em %{target}'
+    integer:
+      negative: '%{ordinal} depois que acabar'
+      literal_ordinals:
+        -1: último
+        -2: penúltimo
+      ordinal: '%{number}%{ordinal}'
+      ordinals:
+        default: º
+        1: º
+        2: º
+        3: º
+        11: º
+        12: º
+        13: º
+    on_weekends: nos finais de semana
+    on_weekdays: nos dias úteis
+    days_on:
+      - Domingos
+      - Segundas-feiras
+      - Terças-feiras
+      - Quartas-feiras
+      - Quintas-feiras
+      - Sextas-feiras
+      - Sábados
+    on_days: no dia %{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
+    - Seg
+    - Ter
+    - Qua
+    - Qui
+    - Sex
+    - Sáb
+    abbr_month_names:
+    -
+    - Jan
+    - Fev
+    - Mar
+    - Abr
+    - Mai
+    - Jun
+    - Jul
+    - Ago
+    - Set
+    - Out
+    - Nov
+    - Dez
+    day_names:
+    - Domingo
+    - Segunda-feira
+    - Terça-feira
+    - Quarta-feira
+    - Quinta-feira
+    - Sexta-feira
+    - Sábado
+    formats:
+      default: "%d/%m/%Y"
+      long: "%d de %B de %Y"
+      short: "%d de %B"
+    month_names:
+    -
+    - Janeiro
+    - Fevereiro
+    - Março
+    - Abril
+    - Maio
+    - Junho
+    - Julho
+    - Agosto
+    - Setembro
+    - Outubro
+    - Novembro
+    - Dezembro
+    order:
+    - :day
+    - :month
+    - :year
+
+  time:
+    am: ''
+    formats:
+      default: "%a, %d de %B de %Y, %H:%M:%S %z"
+      long: "%d de %B de %Y, %H:%M"
+      short: "%d de %B, %H:%M"
+    pm: ''

data/lib/ice_cube/rule.rb

@@ -27,8 +27,7 @@ module IceCube
     end
 
     def hash
-      h = to_hash
-      h.nil? ? super : h.hash
+      to_hash.hash
     end
 
     def to_ical

data/lib/ice_cube/rules/weekly_rule.rb

@@ -13,21 +13,33 @@ module IceCube
       reset
     end
 
-    # Calculate the effective start time for when the given start time is later
-    # in the week than one of the weekday validations, such that times could be
-    # missed by a 7-day jump using the weekly interval, or when selecting from a
-    # date that is misaligned from the schedule interval.
+    # Move the effective start time to correct for when the schedule has
+    # validations earlier in the week than the selected start time, e.g.
+    #
+    #     Schedule.new(wednesday).weekly(2).day(:monday)
+    #
+    # The effective start time gets realigned to the second next Monday, jumping
+    # over the gap week for the interval (2). Without realignment, the correct
+    # Monday occurrence would be missed when the schedule performs a 7-day jump
+    # into the next interval week, arriving on the Wednesday. This corrects any
+    # selections from dates that are misaligned to the schedule interval.
     #
     def realign(step_time, start_time)
       time = TimeUtil::TimeWrapper.new(start_time)
       offset = wday_offset(step_time, start_time)
-      time.add(:day, offset) if offset
+      time.add(:day, offset)
       time.to_time
     end
 
+    # Calculate how many days to the first wday validation in the correct
+    # interval week. This may move backwards within the week if starting in an
+    # interval week with earlier validations.
+    #
     def wday_offset(step_time, start_time)
+      return 0 if step_time == start_time
+
       wday_validations = other_interval_validations.select { |v| v.type == :wday }
-      return if wday_validations.none?
+      return 0 if wday_validations.none?
 
       days = (step_time - start_time).to_i / ONE_DAY
       interval = base_interval_validation.validate(step_time, start_time).to_i

data/lib/ice_cube/schedule.rb

@@ -386,6 +386,19 @@ module IceCube
       recurrence_rules.empty? || recurrence_rules.all?(&:terminating?)
     end
 
+    def hash
+      [
+        TimeUtil.hash(start_time), duration,
+        *@all_recurrence_rules.map(&:hash).sort!,
+        *@all_exception_rules.map(&:hash).sort!
+      ].hash
+    end
+
+    def eql?(other)
+      self.hash == other.hash
+    end
+    alias == eql?
+
     def self.dump(schedule)
       return schedule if schedule.nil? || schedule == ""
       schedule.to_yaml

data/lib/ice_cube/time_util.rb

@@ -109,6 +109,14 @@ module IceCube
       end
     end
 
+    # Get a more precise equality for time objects
+    # Ruby provides a Time#hash method, but it fails to account for UTC
+    # offset (so the current date may be different) or DST rules (so the
+    # hour may be wrong for different schedule occurrences)
+    def self.hash(time)
+      [time, time.utc_offset, time.zone].hash
+    end
+
     # Check the deserialized time offset string against actual local time
     # offset to try and preserve the original offset for plain Ruby Time. If
     # the offset is the same as local we can assume the same original zone and

data/lib/ice_cube/validated_rule.rb

@@ -59,7 +59,10 @@ module IceCube
     # to the given start time
     def next_time(time, start_time, closing_time)
       @time = time
-      @start_time ||= realign(time, start_time)
+      unless @start_time
+        @start_time = realign(time, start_time)
+        @time = @start_time if @time < @start_time
+      end
 
       return nil unless find_acceptable_time_before(closing_time)
 
@@ -134,7 +137,7 @@ module IceCube
 
     def normalized_interval(interval)
       int = interval.to_i
-      raise ArgumentError, "'#{interval}' is not a valid input for interval. Please pass an integer." unless int > 0
+      raise ArgumentError, "'#{interval}' is not a valid input for interval. Please pass a postive integer." unless int > 0
       int
     end
 

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
 
-  VERSION = '0.16.0'
+  VERSION = '0.16.1'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - John Crepezzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -50,6 +50,7 @@ files:
 - config/locales/es.yml
 - config/locales/fr.yml
 - config/locales/ja.yml
+- config/locales/pt-BR.yml
 - config/locales/ru.yml
 - config/locales/sv.yml
 - lib/ice_cube.rb