ice_cube_chosko 0.1.0 → 0.1.1

data/lib/ice_cube/single_occurrence_rule.rb

@@ -13,6 +13,11 @@ module IceCube
       true
     end
 
+    # Never overrides duration
+    def duration
+      nil
+    end
+
     def next_time(t, schedule, closing_time)
       unless closing_time && closing_time < t
         time if time.to_i >= t.to_i

data/lib/ice_cube/time_util.rb

@@ -42,7 +42,7 @@ module IceCube
     end
 
     def self.match_zone(input_time, reference)
-      return unless time = ensure_time(input_time)
+      return unless time = ensure_time(input_time, reference)
       time = if reference.respond_to? :time_zone
                time.in_time_zone(reference.time_zone)
              else
@@ -58,13 +58,21 @@ module IceCube
     end
 
     # Ensure that this is either nil, or a time
-    def self.ensure_time(time, date_eod = false)
+    def self.ensure_time(time, reference = nil, date_eod = false)
       case time
       when DateTime
         warn "IceCube: DateTime support is deprecated (please use Time) at: #{ caller[2] }"
         Time.local(time.year, time.month, time.day, time.hour, time.min, time.sec)
       when Date
-        date_eod ? end_of_date(time) : time.to_time
+        if date_eod
+          end_of_date(time, reference)
+        else
+          if reference
+            build_in_zone([time.year, time.month, time.day], reference)
+          else
+            time.to_time
+          end
+        end
       else
         time
       end

data/lib/ice_cube/validated_rule.rb

@@ -15,6 +15,7 @@ module IceCube
 
     include Validations::Count
     include Validations::Until
+    include Validations::OverrideDuration
 
     # Validations ordered for efficiency in sequence of:
     # * descending intervals
@@ -22,12 +23,13 @@ module IceCube
     # * base values by cardinality (n = 60, 60, 31, 24, 12, 7)
     # * locks by cardinality (n = 365, 60, 60, 31, 24, 12, 7)
     # * interval multiplier
+    # * duration
     VALIDATION_ORDER = [
       :year, :month, :day, :wday, :hour, :min, :sec, :count, :until,
       :base_sec, :base_min, :base_day, :base_hour, :base_month, :base_wday,
       :day_of_year, :second_of_minute, :minute_of_hour, :day_of_month,
       :hour_of_day, :month_of_year, :day_of_week,
-      :interval
+      :interval, :duration
     ]
 
     attr_reader :validations

data/lib/ice_cube/validations/day.rb

@@ -5,6 +5,8 @@ module IceCube
   module Validations::Day
 
     def day(*days)
+      days = days.flatten
+      return self if days.empty?
       days.flatten.each do |day|
         unless day.is_a?(Fixnum) || day.is_a?(Symbol)
           raise ArgumentError, "expecting Fixnum or Symbol value for day, got #{day.inspect}"

data/lib/ice_cube/validations/override_duration.rb

@@ -0,0 +1,53 @@
+module IceCube
+
+  module Validations::OverrideDuration
+
+    # Value reader for duration
+    def duration
+      @duration
+    end
+
+    def override_duration(duration)
+      @duration = duration
+      replace_validations_for(:duration, duration.nil? ? nil : [Validation.new(duration)])
+      self
+    end
+
+    class Validation
+
+      attr_reader :duration
+
+      def initialize(duration)
+        @duration = duration
+      end
+
+      def type
+        :duration
+      end
+
+      def dst_adjust?
+        false
+      end
+
+      # Always valid
+      def validate(step_time, schedule)
+      end
+
+      # Do nothing, duration does not affect output string
+      def build_s(builder)
+      end
+
+      def build_hash(builder)
+        builder[:duration] = duration
+      end
+
+      # Do nothing.Do not export DURATION to ical beacuse it would conflict
+      # with DTEND property of schedule (if any)
+      def build_ical(builder)
+      end
+
+    end
+
+  end
+
+end

data/lib/ice_cube/validations/until.rb

@@ -11,7 +11,6 @@ module IceCube
     deprecated_alias :until_date, :until_time
 
     def until(time)
-      time = TimeUtil.ensure_time(time, true)
       @until = time
       replace_validations_for(:until, time.nil? ? nil : [Validation.new(time)])
       self
@@ -34,7 +33,8 @@ module IceCube
       end
 
       def validate(step_time, schedule)
-        raise UntilExceeded if step_time > time
+        end_time = TimeUtil.ensure_time(time, schedule.start_time, true)
+        raise UntilExceeded if step_time > end_time
       end
 
       def build_s(builder)

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
 
-  VERSION = '0.1.0'
-
+  VERSION = '0.1.1'
+  
 end

data/spec/spec_helper.rb

@@ -23,42 +23,26 @@ RSpec.configure do |config|
 
   config.include WarningHelpers
 
-  config.around :each, :if_active_support_time => true do |example|
-    example.run if defined? ActiveSupport
-  end
-
-  config.around :each, :if_active_support_time => false do |example|
-    unless defined? ActiveSupport
-      stubbed_active_support = ::ActiveSupport = Module.new
-      example.run
-      Object.send :remove_const, :ActiveSupport
+  config.before :each do |example|
+    if example.metadata[:requires_active_support]
+      raise 'ActiveSupport required but not present' unless defined?(ActiveSupport)
     end
   end
 
   config.around :each do |example|
     if zone = example.metadata[:system_time_zone]
-      @orig_zone = ENV['TZ']
+      orig_zone = ENV['TZ']
       ENV['TZ'] = zone
       example.run
-      ENV['TZ'] = @orig_zone
+      ENV['TZ'] = orig_zone
     else
       example.run
     end
   end
 
-  config.before :each do
-    if time_args = @example.metadata[:system_time]
-      case time_args
-      when Array then Time.stub!(:now).and_return Time.local(*time_args)
-      when Time  then Time.stub!(:now).and_return time_args
-      end
-    end
-  end
-
   config.around :each, expect_warnings: true do |example|
     capture_warnings do
       example.run
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube_chosko
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - John Crepezzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,58 +28,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: tzinfo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 description: ice_cube is a recurring date library for Ruby.  It allows for quick,
   programatic expansion of recurring date rules.
 email: john@crepezzi.com
@@ -87,9 +45,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/fr.yml
 - config/locales/ja.yml
+- config/locales/ru.yml
+- config/locales/sv.yml
 - lib/ice_cube.rb
 - lib/ice_cube/builders/hash_builder.rb
 - lib/ice_cube/builders/ical_builder.rb
@@ -130,6 +92,7 @@ files:
 - lib/ice_cube/validations/minutely_interval.rb
 - lib/ice_cube/validations/month_of_year.rb
 - lib/ice_cube/validations/monthly_interval.rb
+- lib/ice_cube/validations/override_duration.rb
 - lib/ice_cube/validations/schedule_lock.rb
 - lib/ice_cube/validations/second_of_minute.rb
 - lib/ice_cube/validations/secondly_interval.rb