ice_cube 0.7.7 → 0.7.8

data/lib/ice_cube/schedule.rb

@@ -238,7 +238,7 @@ module IceCube
     # String serialization
     def to_s
       pieces = []
-      ed = exdates; rd = rdates - ed
+      ed = extimes; rd = rtimes - ed
       pieces.concat rd.sort.map { |t| t.strftime(TO_S_TIME_FORMAT) }
       pieces.concat rrules.map { |t| t.to_s }
       pieces.concat exrules.map { |t| "not #{t.to_s}" }
@@ -278,10 +278,10 @@ module IceCube
       data[:duration] = duration if duration
       data[:rrules] = recurrence_rules.map(&:to_hash)
       data[:exrules] = exception_rules.map(&:to_hash)
-      data[:rdates] = recurrence_times.map do |rt|
+      data[:rtimes] = recurrence_times.map do |rt|
         TimeUtil.serialize_time(rt)
       end
-      data[:exdates] = exception_times.map do |et|
+      data[:extimes] = exception_times.map do |et|
         TimeUtil.serialize_time(et)
       end
       data
@@ -296,6 +296,13 @@ module IceCube
       schedule.end_time = TimeUtil.deserialize_time(data[:end_time]) if data[:end_time]
       data[:rrules] && data[:rrules].each { |h| schedule.rrule(IceCube::Rule.from_hash(h)) }  
       data[:exrules] && data[:exrules].each { |h| schedule.exrule(IceCube::Rule.from_hash(h)) }
+      data[:rtimes] && data[:rtimes].each do |t|
+        schedule.add_recurrence_time TimeUtil.deserialize_time(t)
+      end
+      data[:extimes] && data[:extimes].each do |t|
+        schedule.add_exception_time TimeUtil.deserialize_time(t)
+      end
+      # Also serialize old format for backward compat
       data[:rdates] && data[:rdates].each do |t|
         schedule.add_recurrence_time TimeUtil.deserialize_time(t)
       end

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
 
-  VERSION = '0.7.7'
+  VERSION = '0.7.8'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000Z
+date: 2012-02-25 00:00:00.000000000 -05:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153297040 !ruby/object:Gem::Requirement
+  requirement: &70283886751000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153297040
+  version_requirements: *70283886751000
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &2153296340 !ruby/object:Gem::Requirement
+  requirement: &70283886750480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153296340
+  version_requirements: *70283886750480
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &2153295880 !ruby/object:Gem::Requirement
+  requirement: &70283886750060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153295880
+  version_requirements: *70283886750060
 description: ice_cube is a recurring date library for Ruby.  It allows for quick,
   programatic expansion of recurring date rules.
 email: john@crepezzi.com
@@ -91,6 +92,7 @@ files:
 - lib/ice_cube/version.rb
 - lib/ice_cube.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://seejohnrun.github.com/ice_cube/
 licenses: []
 post_install_message: 
@@ -111,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ice-cube
-rubygems_version: 1.8.15
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby Date Recurrence Library