icalendar-recurrence 0.0.1 → 1.0

data/README.md

@@ -4,14 +4,10 @@ Adds event recurrence to the [icalendar gem](https://github.com/icalendar/icalen
 
 ## Install
 
-_Note: This only works against the 2.0beta release of the icalendar gem._
-
-**Until icalendar 2.0beta is released, use git repos in your Gemfile:**
-
+_Note: Works with 2.0.0beta.1 (or newer) icalendar gem. If you're using icalendar <=1.5.4, take a look at the [new code](https://github.com/icalendar/icalendar/tree/2.0beta) before you switch over._
 
 ```ruby
-gem "icalendar", git: "https://github.com/icalendar/icalendar", branch: "2.0beta"
-gem "icalendar-recurrence", git: "https://github.com/icalendar/icalendar-recurrence"
+gem "icalendar-recurrence"
 ```
 
 and run `bundle install` from your shell.
@@ -35,7 +31,7 @@ An event occurrence is a simple struct object with `start_time` and `end_time` m
 
 ```ruby
 occurrence.start_time # => 2014-02-01 00:00:00 -0800
-occurrence.end_time # => 2014-02-02 00:00:00 -0800
+occurrence.end_time   # => 2014-02-02 00:00:00 -0800
 ```
 
 ### Daily event with excluded date (inline ICS example)

data/icalendar-recurrence.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'icalendar', '~> 2.0.0.beta.1'
+  spec.add_runtime_dependency 'icalendar', '~> 2.0'
   spec.add_runtime_dependency 'ice_cube', '~> 0.11.1'
 
   spec.add_development_dependency 'rake', '~> 10.2.1'

data/lib/icalendar/recurrence/schedule.rb

@@ -25,7 +25,11 @@ module Icalendar
       end
 
       def end_time
-        TimeUtil.to_time(event.end)
+        if event.end
+          TimeUtil.to_time(event.end)
+        else
+          start_time + convert_duration_to_seconds(event.duration)
+        end
       end
 
       def occurrences_between(begin_time, closing_time)
@@ -103,6 +107,7 @@ module Icalendar
       end
 
       def base_ice_cube_recurrence_rule(frequency, interval)
+        interval ||= 1
         if frequency == "DAILY"
           IceCube::DailyRule.new(interval)
         elsif frequency == "WEEKLY"
@@ -143,6 +148,14 @@ module Icalendar
         match = ical_byday.match(/(\d*)([A-Z]{2})/)
         {day_code: match[2], position: match[1].to_i}
       end
+
+      def convert_duration_to_seconds(ical_duration)
+        return 0 unless ical_duration
+
+        conversion_rates = { seconds: 1, minutes: 60, hours: 3600, days: 86400, weeks: 604800 }
+        seconds = conversion_rates.inject(0) { |sum, (unit, multiplier)| sum + ical_duration[unit] * multiplier }
+        seconds * (ical_duration.past ? -1 : 1)
+      end
     end
   end
 end

data/lib/icalendar/recurrence/version.rb

@@ -1,5 +1,5 @@
 module Icalendar
   module Recurrence
-    VERSION = "0.0.1"
+    VERSION = "1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icalendar-recurrence
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: '1.0'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: icalendar
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
@@ -226,18 +226,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3806049795842359372
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3806049795842359372
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23