ice_cube 0.6.8 → 0.6.9

data/lib/ice_cube/schedule.rb

@@ -12,7 +12,7 @@ module IceCube
       @exrule_occurrence_heads = []
       @rdates = []
       @exdates = []
-      @start_date = start_date
+      @start_date = start_date || Time.now
       raise ArgumentError.new('Duration cannot be negative') if options[:duration] && options[:duration] < 0
       @duration = options[:duration]
       raise ArgumentError.new('Start time must be before end time') if options[:end_time] && options[:end_time] < @start_date
@@ -115,6 +115,15 @@ module IceCube
       self.occurrences_between(Time.send(time_format, date.year, date.month, date.day, 0, 0, 0), Time.send(time_format, date.year, date.month, date.day, 23, 59, 59)).any?
     end
 
+    def occurs_between?(begin_time, end_time)
+      if defined?(ActiveSupport::TimeWithZone) && @start_date.is_a?(ActiveSupport::TimeWithZone)
+        return active_support_occurs_between?(begin_time, end_time)
+      end
+      # fall back to our own way of doing things
+      time_format = @start_date.utc? ? :utc : :local
+      self.occurrences_between(Time.send(time_format, begin_time.year, begin_time.month, begin_time.day, 0, 0, 0), Time.send(time_format, end_time.year, end_time.month, end_time.day, 23, 59, 59)).any?
+    end
+
     # Return all possible occurrences
     # In order to make this call, all rules in the schedule must have
     # either an until date or an occurrence count
@@ -214,6 +223,13 @@ module IceCube
       occurrences_between(time.beginning_of_day, time.end_of_day).any?
     end
 
+    def active_support_occurs_between(start_time, end_time)
+      time_start = Time.zone.parse(start_time.to_s) # date.to_time.in_time_zone(@start_date.time_zone)
+      time_end = Time.zone.parse(end_time.to_s) # date.to_time.in_time_zone(@end_date.time_zone)
+
+      occurrences_between(time_start.beginning_of_day, time_end.end_of_day).any?
+    end
+
     # tell if, from a list of rule_occurrence heads, a certain time is occurring
     def any_occurring_at?(what, time)
       return false if @start_time && time < @start_time

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
   
-  VERSION = '0.6.8'
+  VERSION = '0.6.9'
 
 end

metadata

@@ -1,38 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ice_cube
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.9
   prerelease: 
-  version: 0.6.8
 platform: ruby
-authors: 
+authors:
 - John Crepezzi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-10 00:00:00 -04:00
+date: 2011-07-31 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70106362064800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-description: ice_cube is a recurring date library for Ruby.  It allows for quick, programatic expansion of recurring date rules.
+  prerelease: false
+  version_requirements: *70106362064800
+description: ice_cube is a recurring date library for Ruby.  It allows for quick,
+  programatic expansion of recurring date rules.
 email: john@crepezzi.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/ice_cube/rule.rb
 - lib/ice_cube/rule_occurrence.rb
 - lib/ice_cube/rules/daily_rule.rb
@@ -59,30 +56,26 @@ files:
 has_rdoc: true
 homepage: http://seejohnrun.github.com/ice_cube/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ice-cube
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby Date Recurrence Library
 test_files: []
-