ice_cube 0.11.0 → 0.11.1

data/lib/ice_cube/validations/minutely_interval.rb

@@ -13,6 +13,10 @@ module IceCube
 
       attr_reader :interval
 
+      def initialize(interval)
+        @interval = interval
+      end
+
       def type
         :min
       end
@@ -21,33 +25,26 @@ module IceCube
         false
       end
 
-      def build_s(builder)
-        builder.base = interval == 1 ? 'Minutely' : "Every #{interval} minutes"
+      def validate(step_time, schedule)
+        t0, t1 = schedule.start_time.to_i, step_time.to_i
+        sec = (t1 - t1 % ONE_MINUTE) -
+              (t0 - t0 % ONE_MINUTE)
+        minutes = sec / ONE_MINUTE
+        offset = (minutes % interval).nonzero?
+        interval - offset if offset
       end
 
-      def build_ical(builder)
-        builder['FREQ'] << 'MINUTELY'
-        unless interval == 1
-          builder['INTERVAL'] << interval
-        end
+      def build_s(builder)
+        builder.base = interval == 1 ? 'Minutely' : "Every #{interval} minutes"
       end
 
       def build_hash(builder)
         builder[:interval] = interval
       end
 
-      def initialize(interval)
-        @interval = interval
-      end
-
-      def validate(time, schedule)
-        start_time = schedule.start_time
-        sec = (time.to_i - time.to_i % ONE_MINUTE) -
-          (start_time.to_i - start_time.to_i % ONE_MINUTE)
-        minutes = sec / ONE_MINUTE
-        unless minutes % interval == 0
-          interval - (minutes % interval)
-        end
+      def build_ical(builder)
+        builder['FREQ'] << 'MINUTELY'
+        builder['INTERVAL'] << interval unless interval == 1
       end
 
     end

data/lib/ice_cube/validations/month_of_year.rb

@@ -25,6 +25,10 @@ module IceCube
         @month = month
       end
 
+      def type
+        :month
+      end
+
       def build_s(builder)
         builder.piece(:month_of_year) << Date::MONTHNAMES[month]
       end
@@ -37,10 +41,6 @@ module IceCube
         builder['BYMONTH'] << month
       end
 
-      def type
-        :month
-      end
-
       StringBuilder.register_formatter(:month_of_year) do |segments|
         "in #{StringBuilder.sentence(segments)}"
       end

data/lib/ice_cube/validations/monthly_interval.rb

@@ -13,35 +13,33 @@ module IceCube
 
       attr_reader :interval
 
+      def initialize(interval)
+        @interval = interval
+      end
+
       def type
         :month
       end
 
-      def build_s(builder)
-        builder.base = interval == 1 ? 'Monthly' : "Every #{interval} months"
+      def validate(step_time, schedule)
+        t0, t1 = schedule.start_time, step_time
+        months = (t1.month - t0.month) +
+                 (t1.year - t0.year) * 12
+        offset = (months % interval).nonzero?
+        interval - offset if offset
       end
 
-      def build_ical(builder)
-        builder['FREQ'] << 'MONTHLY'
-        unless interval == 1
-          builder['INTERVAL'] << interval
-        end
+      def build_s(builder)
+        builder.base = interval == 1 ? 'Monthly' : "Every #{interval} months"
       end
 
       def build_hash(builder)
         builder[:interval] = interval
       end
 
-      def initialize(interval)
-        @interval = interval
-      end
-
-      def validate(time, schedule)
-        start_time = schedule.start_time
-        months_to_start = (time.month - start_time.month) + (time.year - start_time.year) * 12
-        unless months_to_start % interval == 0
-          interval - (months_to_start % interval)
-        end
+      def build_ical(builder)
+        builder['FREQ'] << 'MONTHLY'
+        builder['INTERVAL'] << interval unless interval == 1
       end
 
     end

data/lib/ice_cube/validations/schedule_lock.rb

@@ -2,16 +2,16 @@ module IceCube
 
   module Validations::ScheduleLock
 
-    # Lock the given times down the schedule's start_time for that position
+    # Lock the given time units to the units from schedule's +start_time+
     # These locks are all clobberable by other rules of the same #type
-    # using clobber_base_validation
+    # using +clobber_base_validation+
+    #
     def schedule_lock(*types)
       types.each do |type|
         validations_for(:"base_#{type}") << Validation.new(type)
       end
     end
 
-    # A validation used for locking time into a certain value
     class Validation
 
       include Validations::Lock
@@ -22,24 +22,25 @@ module IceCube
         @type = type
       end
 
-      # no -op
-      def build_s(builder)
+      def dst_adjust?
+        case @type
+        when :sec, :min then false
+        else true
+        end
       end
 
       # no -op
-      def build_ical(builder)
+      def build_s(builder)
       end
 
       # no -op
       def build_hash(builder)
       end
 
-      def dst_adjust?
-        case @type
-        when :sec, :min then false
-        else true
-        end
+      # no -op
+      def build_ical(builder)
       end
+
     end
 
   end

data/lib/ice_cube/validations/second_of_minute.rb

@@ -17,11 +17,6 @@ module IceCube
 
       include Validations::Lock
 
-      StringBuilder.register_formatter(:second_of_minute) do |segments|
-        str = "on the #{StringBuilder.sentence(segments)} "
-        str << (segments.size == 1 ? 'second of the minute' : 'seconds of the minute')
-      end
-
       attr_reader :second
       alias :value :second
 
@@ -45,6 +40,11 @@ module IceCube
         builder['BYSECOND'] << second
       end
 
+      StringBuilder.register_formatter(:second_of_minute) do |segments|
+        str = "on the #{StringBuilder.sentence(segments)} "
+        str << (segments.size == 1 ? 'second of the minute' : 'seconds of the minute')
+      end
+
     end
 
   end

data/lib/ice_cube/validations/secondly_interval.rb

@@ -13,6 +13,10 @@ module IceCube
 
       attr_reader :interval
 
+      def initialize(interval)
+        @interval = interval
+      end
+
       def type
         :sec
       end
@@ -21,30 +25,23 @@ module IceCube
         false
       end
 
-      def build_s(builder)
-        builder.base = interval == 1 ? 'Secondly' : "Every #{interval} seconds"
+      def validate(step_time, schedule)
+        seconds = step_time.to_i - schedule.start_time.to_i
+        offset = (seconds % interval).nonzero?
+        interval - offset if offset
       end
 
-      def build_ical(builder)
-        builder['FREQ'] << 'SECONDLY'
-        unless interval == 1
-          builder['INTERVAL'] << interval
-        end
+      def build_s(builder)
+        builder.base = interval == 1 ? 'Secondly' : "Every #{interval} seconds"
       end
 
       def build_hash(builder)
         builder[:interval] = interval
       end
 
-      def initialize(interval)
-        @interval = interval
-      end
-
-      def validate(time, schedule)
-        seconds = time.to_i - schedule.start_time.to_i
-        unless seconds % interval == 0
-          interval - (seconds % interval)
-        end
+      def build_ical(builder)
+        builder['FREQ'] << 'SECONDLY'
+        builder['INTERVAL'] << interval unless interval == 1
       end
 
     end

data/lib/ice_cube/validations/until.rb

@@ -2,9 +2,9 @@ module IceCube
 
   module Validations::Until
 
-    extend ::Deprecated
+    extend Deprecated
 
-    # accessor
+    # Value reader for limit
     def until_time
       @until
     end
@@ -21,28 +21,28 @@ module IceCube
 
       attr_reader :time
 
-      def type
-        :dealbreaker
-      end
-
       def initialize(time)
         @time = time
       end
 
-      def build_ical(builder)
-        builder['UNTIL'] << IcalBuilder.ical_utc_format(time)
+      def type
+        :limit
       end
 
-      def build_hash(builder)
-        builder[:until] = TimeUtil.serialize_time(time)
+      def validate(step_time, schedule)
+        raise UntilExceeded if step_time > time
       end
 
       def build_s(builder)
         builder.piece(:until) << "until #{time.strftime(IceCube.to_s_time_format)}"
       end
 
-      def validate(t, schedule)
-        raise UntilExceeded if t > time
+      def build_hash(builder)
+        builder[:until] = TimeUtil.serialize_time(time)
+      end
+
+      def build_ical(builder)
+        builder['UNTIL'] << IcalBuilder.ical_utc_format(time)
       end
 
     end

data/lib/ice_cube/validations/weekly_interval.rb

@@ -20,20 +20,27 @@ module IceCube
 
       attr_reader :interval, :week_start
 
+      def initialize(interval, week_start)
+        @interval = interval
+        @week_start = week_start
+      end
+
       def type
         :day
       end
 
-      def build_s(builder)
-        builder.base = interval == 1 ? 'Weekly' : "Every #{interval} weeks"
+      def validate(step_time, schedule)
+        t0, t1 = schedule.start_time, step_time
+        d0 = Date.new(t0.year, t0.month, t0.day)
+        d1 = Date.new(t1.year, t1.month, t1.day)
+        days = (d1 - TimeUtil.normalize_wday(d1.wday, week_start)) -
+               (d0 - TimeUtil.normalize_wday(d0.wday, week_start))
+        offset = ((days / 7) % interval).nonzero?
+        (interval - offset) * 7 if offset
       end
 
-      def build_ical(builder)
-        builder['FREQ'] << 'WEEKLY'
-        unless interval == 1
-          builder['INTERVAL'] << interval
-          builder['WKST'] << week_start.to_s.upcase[0..1]
-        end
+      def build_s(builder)
+        builder.base = interval == 1 ? 'Weekly' : "Every #{interval} weeks"
       end
 
       def build_hash(builder)
@@ -41,21 +48,11 @@ module IceCube
         builder[:week_start] = TimeUtil.sym_to_wday(week_start)
       end
 
-      def initialize(interval, week_start)
-        @interval = interval
-        @week_start = week_start
-      end
-
-      def validate(time, schedule)
-        date = Date.new(time.year, time.month, time.day)
-        st = schedule.start_time
-        start_date = Date.new(st.year, st.month, st.day)
-        weeks = (
-          (date - TimeUtil.normalize_wday(date.wday, week_start)) -
-          (start_date - TimeUtil.normalize_wday(start_date.wday, week_start))
-        ) / 7
-        unless weeks % interval == 0
-          (interval - (weeks % interval)) * 7
+      def build_ical(builder)
+        builder['FREQ'] << 'WEEKLY'
+        unless interval == 1
+          builder['INTERVAL'] << interval
+          builder['WKST'] << week_start.to_s.upcase[0..1]
         end
       end
 

data/lib/ice_cube/validations/yearly_interval.rb

@@ -12,10 +12,20 @@ module IceCube
 
       attr_reader :interval
 
+      def initialize(interval)
+        @interval = interval
+      end
+
       def type
         :year
       end
 
+      def validate(step_time, schedule)
+        years = step_time.year - schedule.start_time.year
+        offset = (years % interval).nonzero?
+        interval - offset if offset
+      end
+
       def build_s(builder)
         builder.base = interval == 1 ? 'Yearly' : "Every #{interval} years"
       end
@@ -31,17 +41,6 @@ module IceCube
         end
       end
 
-      def initialize(interval)
-        @interval = interval
-      end
-
-      def validate(time, schedule)
-        years_to_start = time.year - schedule.start_time.year
-        unless years_to_start % interval == 0
-          interval - (years_to_start % interval)
-        end
-      end
-
     end
 
   end

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
 
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 
 end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube
 version: !ruby/object:Gem::Version
-  version: 0.11.0
-  prerelease: 
+  version: 0.11.1
 platform: ruby
 authors:
 - John Crepezzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: active_support
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ice_cube is a recurring date library for Ruby.  It allows for quick,
@@ -90,6 +81,7 @@ files:
 - lib/ice_cube/errors/count_exceeded.rb
 - lib/ice_cube/errors/until_exceeded.rb
 - lib/ice_cube/flexible_hash.rb
+- lib/ice_cube/hash_input.rb
 - lib/ice_cube/occurrence.rb
 - lib/ice_cube/rule.rb
 - lib/ice_cube/rules/daily_rule.rb
@@ -101,6 +93,7 @@ files:
 - lib/ice_cube/rules/yearly_rule.rb
 - lib/ice_cube/schedule.rb
 - lib/ice_cube/single_occurrence_rule.rb
+- lib/ice_cube/string_helpers.rb
 - lib/ice_cube/time_step.rb
 - lib/ice_cube/time_util.rb
 - lib/ice_cube/validated_rule.rb
@@ -129,33 +122,27 @@ files:
 homepage: http://seejohnrun.github.com/ice_cube/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3343770401458335569
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3343770401458335569
 requirements: []
 rubyforge_project: ice-cube
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby Date Recurrence Library
 test_files:
 - spec/spec_helper.rb
+has_rdoc: true