ice_cube 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d075ab984a12f078d212922e5119adb3280095f9
-  data.tar.gz: afed7767f9d95f17308f6dd3a40fcfc025c46d44
+  metadata.gz: 51dd94d70b0d51847c678abf736d395ddbee5e2e
+  data.tar.gz: 2b69372e7e4e67487347cab5a8a773da40a87e91
 SHA512:
-  metadata.gz: 2a24dc8dc9b8a745a6753bc60d9551366af050e3ce7d80d32b4d7c6b97006c0a9c65338a75fb4b184141bb38467dbb0e73eca98e35f2407f29d79df5bd069a3a
-  data.tar.gz: c309f41dd53711998b439544e5b9b386617d2a2b63b1792688cff76346b56765a11012b4d15e3cede673f8ed658a9997ac0e430c4af34bb7c8fa7aed35f3bc57
+  metadata.gz: d20e08c68105003f8a6c3f192c679d185c07e43681543844f890d00947d94d6c42d5e82a350e83cab506c74183bbd42eef2cb8d5deeab8f7979a819884221dff
+  data.tar.gz: f1ab8c1b534dd70e185da9b272a973202cb071f29bd90cb2a31fa7d83d1b3f0e61c321d3d402e79e0059cf698374a0465dc954218de77afe0ac459cc0f990f47

data/config/locales/en.yml

@@ -6,28 +6,6 @@ en:
     date:
       formats:
         default: '%B %-d, %Y'
-      month_names:
-      -
-      - January
-      - February
-      - March
-      - April
-      - May
-      - June
-      - July
-      - August
-      - September
-      - October
-      - November
-      - December
-      day_names:
-      - Sunday
-      - Monday
-      - Tuesday
-      - Wednesday
-      - Thursday
-      - Friday
-      - Saturday
     times:
       other: '%{count} times'
       one: '%{count} time'
@@ -91,13 +69,13 @@ en:
     on_weekends: on Weekends
     on_weekdays: on Weekdays
     days_on:
-      - Sundays
-      - Mondays
-      - Tuesdays
-      - Wednesdays
-      - Thursdays
-      - Fridays
-      - Saturdays
+    - Sundays
+    - Mondays
+    - Tuesdays
+    - Wednesdays
+    - Thursdays
+    - Fridays
+    - Saturdays
     on_days: on %{days}
     array:
       last_word_connector: ', and '
@@ -114,7 +92,6 @@ en:
         until: '%{rest} %{current}'
         count: '%{rest} %{current}'
         default: '%{rest} %{current}'
-
   date:
     abbr_day_names:
     - Sun
@@ -146,10 +123,6 @@ en:
     - Thursday
     - Friday
     - Saturday
-    formats:
-      default: "%Y-%m-%d"
-      long: "%B %d, %Y"
-      short: "%b %d"
     month_names:
     -
     - January
@@ -164,15 +137,3 @@ en:
     - October
     - November
     - December
-    order:
-    - :year
-    - :month
-    - :day
-
-  time:
-    am: am
-    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/es.yml

@@ -6,28 +6,6 @@ es:
     date:
       formats:
         default: '%-d de %B de %Y'
-      month_names:
-        -
-        - Enero
-        - Febrero
-        - Marzo
-        - Abril
-        - Mayo
-        - Junio
-        - Julio
-        - Agosto
-        - Septiembre
-        - Octubre
-        - Noviembre
-        - Diciembre
-      day_names:
-        - Domingo
-        - Lunes
-        - Martes
-        - Miércoles
-        - Jueves
-        - Viernes
-        - Sábado
     times:
       other: '%{count} veces'
       one: '%{count} vez'
@@ -92,13 +70,13 @@ es:
     on_weekends: en fin de semana
     on_weekdays: en días laborables
     days_on:
-      - los domingos
-      - los lunes
-      - los martes
-      - los miércoles
-      - los jueves
-      - los viernes
-      - los sábados
+    - los domingos
+    - los lunes
+    - los martes
+    - los miércoles
+    - los jueves
+    - los viernes
+    - los sábados
     on_days: '%{days}'
     array:
       last_word_connector: ' y '
@@ -115,62 +93,48 @@ es:
         until: '%{rest} %{current}'
         count: '%{rest} %{current}'
         default: '%{rest} %{current}'
-
   date:
     day_names:
-      - Domingo
-      - Lunes
-      - Martes
-      - Miércoles
-      - Jueves
-      - Viernes
-      - Sábado
+    - Domingo
+    - Lunes
+    - Martes
+    - Miércoles
+    - Jueves
+    - Viernes
+    - Sábado
     abbr_day_names:
-      - Dom
-      - Lun
-      - Mar
-      - Mie
-      - Jue
-      - Vie
-      - Sab
-    # Don't forget the nil at the beginning; there's no such thing as a 0th month
+    - Dom
+    - Lun
+    - Mar
+    - Mie
+    - Jue
+    - Vie
+    - Sab
     month_names:
-      -
-      - Enero
-      - Febrero
-      - Marzo
-      - Abril
-      - Mayo
-      - Junio
-      - Julio
-      - Agosto
-      - Septiembre
-      - Octubre
-      - Noviembre
-      - Diciembre
+    -
+    - Enero
+    - Febrero
+    - Marzo
+    - Abril
+    - Mayo
+    - Junio
+    - Julio
+    - Agosto
+    - Septiembre
+    - Octubre
+    - Noviembre
+    - Diciembre
     abbr_month_names:
-      -
-      - Ene
-      - Feb
-      - Mar
-      - Abr
-      - May
-      - Jun
-      - Jul
-      - Ago
-      - Sep
-      - Oct
-      - Nov
-      - Dic
-    formats:
-      default: '%d/%m/%Y'
-      long: '%d de %B de %Y'
-      short: '%d de %B'
-
-  time:
-    formats:
-      default: "%A, %d de %B de %Y %H:%M:%S %z"
-      short: "%d de %b %H:%M"
-      long: "%d de %B de %Y a las %H:%M"
-    am: "am"
-    pm: "pm"
+    -
+    - Ene
+    - Feb
+    - Mar
+    - Abr
+    - May
+    - Jun
+    - Jul
+    - Ago
+    - Sep
+    - Oct
+    - Nov
+    - Dic

data/config/locales/ja.yml

@@ -6,28 +6,6 @@ ja:
     date:
       formats:
         default: '%Y年%m月%d日'
-      month_names:
-      -
-      - 1月
-      - 2月
-      - 3月
-      - 4月
-      - 5月
-      - 6月
-      - 7月
-      - 8月
-      - 9月
-      - 10月
-      - 11月
-      - 12月
-      day_names:
-      - 日曜
-      - 月曜
-      - 火曜
-      - 水曜
-      - 木曜
-      - 金曜
-      - 土曜
     times:
       other: '%{count}回'
       one: '%{count}回'
@@ -82,13 +60,13 @@ ja:
     on_weekends: 週末
     on_weekdays: 平日
     days_on:
-      - 日曜
-      - 月曜
-      - 火曜
-      - 水曜
-      - 木曜
-      - 金曜
-      - 土曜
+    - 日曜
+    - 月曜
+    - 火曜
+    - 水曜
+    - 木曜
+    - 金曜
+    - 土曜
     on_days: '%{days}'
     array:
       last_word_connector: '、'
@@ -105,3 +83,48 @@ ja:
         until: '%{current}%{rest}'
         count: '%{rest}%{current}'
         default: '%{rest}%{current}'
+  date:
+    abbr_day_names:
+    - 日
+    - 月
+    - 火
+    - 水
+    - 木
+    - 金
+    - 土
+    abbr_month_names:
+    -
+    - 1月
+    - 2月
+    - 3月
+    - 4月
+    - 5月
+    - 6月
+    - 7月
+    - 8月
+    - 9月
+    - 10月
+    - 11月
+    - 12月
+    day_names:
+    - 日曜
+    - 月曜
+    - 火曜
+    - 水曜
+    - 木曜
+    - 金曜
+    - 土曜
+    month_names:
+    -
+    - 1月
+    - 2月
+    - 3月
+    - 4月
+    - 5月
+    - 6月
+    - 7月
+    - 8月
+    - 9月
+    - 10月
+    - 11月
+    - 12月

data/lib/ice_cube/rules/weekly_rule.rb

@@ -41,9 +41,9 @@ module IceCube
       wday_validations = other_interval_validations.select { |v| v.type == :wday }
       return 0 if wday_validations.none?
 
-      days = (step_time - start_time).to_i / ONE_DAY
+      days = step_time.to_date - start_time.to_date
       interval = base_interval_validation.validate(step_time, start_time).to_i
-      min_wday = TimeUtil.normalize_wday(wday_validations.min_by(&:day).day, week_start)
+      min_wday = wday_validations.map { |v| TimeUtil.normalize_wday(v.day, week_start) }.min
       step_wday = TimeUtil.normalize_wday(step_time.wday, week_start)
 
       days + interval - step_wday + min_wday

data/lib/ice_cube/schedule.rb

@@ -420,7 +420,7 @@ module IceCube
     # Find all of the occurrences for the schedule between opening_time
     # and closing_time
     # Iteration is unrolled in pairs to skip duplicate times in end of DST
-    def enumerate_occurrences(opening_time, closing_time = nil, options = {}, &block)
+    def enumerate_occurrences(opening_time, closing_time = nil, options = {})
       opening_time = TimeUtil.match_zone(opening_time, start_time)
       closing_time = TimeUtil.match_zone(closing_time, start_time)
       opening_time += start_time.subsec - opening_time.subsec rescue 0
@@ -428,23 +428,16 @@ module IceCube
       spans = options[:spans] == true && duration != 0
       Enumerator.new do |yielder|
         reset
-        t1 = full_required? ? start_time : opening_time - (spans ? duration : 0)
+        t1 = full_required? ? start_time : opening_time
+        t1 -= duration if spans
+        t1 = start_time if t1 < start_time
         loop do
           break unless (t0 = next_time(t1, closing_time))
           break if closing_time && t0 > closing_time
           if (spans ? (t0.end_time > opening_time) : (t0 >= opening_time))
-            yielder << (block_given? ? block.call(t0) : t0)
+            yielder << (block_given? ? yield(t0) : t0)
           end
-          break unless (t1 = next_time(t0 + 1, closing_time))
-          break if closing_time && t1 > closing_time
-          if TimeUtil.same_clock?(t0, t1) && recurrence_rules.any?(&:dst_adjust?)
-            wind_back_dst
-            next (t1 += 1)
-          end
-          if (spans ? (t1.end_time > opening_time) : (t1 >= opening_time))
-            yielder << (block_given? ? block.call(t1) : t1)
-          end
-          next (t1 += 1)
+          t1 = t0 + 1
         end
       end
     end
@@ -460,7 +453,7 @@ module IceCube
             min_time
           end
         end
-        break nil unless min_time
+        break unless min_time
         next (time = min_time + 1) if exception_time?(min_time)
         break Occurrence.new(min_time, min_time + duration)
       end
@@ -511,12 +504,6 @@ module IceCube
       end
     end
 
-    def wind_back_dst
-      recurrence_rules.each do |rule|
-        rule.skipped_for_dst
-      end
-    end
-
   end
 
 end

data/lib/ice_cube/time_util.rb

@@ -47,7 +47,7 @@ module IceCube
                time.in_time_zone(reference.time_zone)
              else
                if reference.utc?
-                 time.utc
+                 time.getgm
                elsif reference.zone
                  time.getlocal
                else
@@ -89,18 +89,27 @@ module IceCube
 
     # Serialize a time appropriate for storing
     def self.serialize_time(time)
-      if time.respond_to?(:time_zone)
-        {:time => time.utc, :zone => time.time_zone.name}
-      elsif time.is_a?(Time)
-        time
+      case time
+      when Time, Date
+        if time.respond_to?(:time_zone)
+          {:time => time.utc, :zone => time.time_zone.name}
+        else
+          time
+        end
+      when DateTime
+        Time.local(time.year, time.month, time.day, time.hour, time.min, time.sec)
+      else
+        raise ArgumentError, "cannot serialize #{time.inspect}, expected a Time"
       end
     end
 
     # Deserialize a time serialized with serialize_time or in ISO8601 string format
     def self.deserialize_time(time_or_hash)
       case time_or_hash
-      when Time
+      when Time, Date
         time_or_hash
+      when DateTime
+        Time.local(time.year, time.month, time.day, time.hour, time.min, time.sec)
       when Hash
         hash = FlexibleHash.new(time_or_hash)
         hash[:time].in_time_zone(hash[:zone])
@@ -260,27 +269,32 @@ module IceCube
 
       def initialize(time, dst_adjust = true)
         @dst_adjust = dst_adjust
-        @time = time
+        @base = time
+        if dst_adjust
+          @time = Time.utc(time.year, time.month, time.day, time.hour, time.min, time.sec + time.subsec)
+        else
+          @time = time
+        end
       end
 
-      # Get the wrapper time back
+      # Get the wrapped time back in its original zone & format
       def to_time
-        @time
+        return @time unless @dst_adjust
+        parts = @time.year, @time.month, @time.day, @time.hour, @time.min, @time.sec + @time.subsec
+        TimeUtil.build_in_zone(parts, @base)
       end
 
       # DST-safely add an interval of time to the wrapped time
       def add(type, val)
         type = :day if type == :wday
-        adjust do
-          @time += case type
-          when :year then TimeUtil.days_in_n_years(@time, val) * ONE_DAY
-          when :month then TimeUtil.days_in_n_months(@time, val) * ONE_DAY
-          when :day  then val * ONE_DAY
-          when :hour then val * ONE_HOUR
-          when :min  then val * ONE_MINUTE
-          when :sec  then val
-          end
-        end
+        @time += case type
+                 when :year then TimeUtil.days_in_n_years(@time, val) * ONE_DAY
+                 when :month then TimeUtil.days_in_n_months(@time, val) * ONE_DAY
+                 when :day  then val * ONE_DAY
+                 when :hour then val * ONE_HOUR
+                 when :min  then val * ONE_MINUTE
+                 when :sec  then val
+                 end
       end
 
       # Clear everything below a certain type
@@ -289,25 +303,12 @@ module IceCube
         type = :day if type == :wday
         CLEAR_ORDER.each do |ptype|
           break if ptype == type
-          adjust do
-            send(:"clear_#{ptype}")
-          end
+          send :"clear_#{ptype}"
         end
       end
 
       private
 
-      def adjust(&block)
-        if @dst_adjust
-          off = @time.utc_offset
-          yield
-          diff = off - @time.utc_offset
-          @time += diff if diff != 0
-        else
-          yield
-        end
-      end
-
       def clear_sec
         @time.sec > 0 ? @time -= @time.sec : @time
       end

data/lib/ice_cube/validated_rule.rb

@@ -79,12 +79,12 @@ module IceCube
     end
 
     def dst_adjust?
-      @validations[:interval].any? &:dst_adjust?
+      @validations[:interval].any?(&:dst_adjust?)
     end
 
     def to_s
       builder = StringBuilder.new
-      @validations.each do |name, validations|
+      @validations.each_value do |validations|
         validations.each do |validation|
           validation.build_s(builder)
         end
@@ -94,7 +94,7 @@ module IceCube
 
     def to_hash
       builder = HashBuilder.new(self)
-      @validations.each do |name, validations|
+      @validations.each_value do |validations|
         validations.each do |validation|
           validation.build_hash(builder)
         end
@@ -104,7 +104,7 @@ module IceCube
 
     def to_ical
       builder = IcalBuilder.new
-      @validations.each do |name, validations|
+      @validations.each_value do |validations|
         validations.each do |validation|
           validation.build_ical(builder)
         end

data/lib/ice_cube/validations/day_of_week.rb

@@ -48,7 +48,7 @@ module IceCube
         builder.piece(:day_of_week) << IceCube::I18n.t(
           'ice_cube.days_of_week',
           segments: StringBuilder.nice_number(occ),
-          day: IceCube::I18n.t('ice_cube.date.day_names')[day]
+          day: IceCube::I18n.t('date.day_names')[day]
         )
       end
 

data/lib/ice_cube/validations/month_of_year.rb

@@ -32,7 +32,7 @@ module IceCube
       end
 
       def build_s(builder)
-        builder.piece(:month_of_year) << IceCube::I18n.t("ice_cube.date.month_names")[month]
+        builder.piece(:month_of_year) << IceCube::I18n.t("date.month_names")[month]
       end
 
       def build_hash(builder)

data/lib/ice_cube/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - John Crepezzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ice-cube
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby Date Recurrence Library