ice_cube 0.6.10 → 0.6.11

data/lib/ice_cube/rule.rb

@@ -5,6 +5,12 @@ module IceCube
     attr_reader :occurrence_count, :until_date
     
     include ValidationTypes
+    include Comparable
+
+    # Compare based on hash representations
+    def <=>(other)
+      to_hash <=> other.to_hash
+    end
 
     def to_hash
       hash = Hash.new

data/lib/ice_cube/schedule.rb

@@ -168,6 +168,14 @@ module IceCube
       @rrule_occurrence_heads << RuleOccurrence.new(rule, @start_date, @end_time)
     end
 
+    # Remove a recurrence rule, returns the removed rules, or nil
+    def remove_recurrence_rule(rule)
+      raise ArgumentError.new('Argument must be a valid rule') unless rule.class < Rule
+      deletions = []
+      @rrule_occurrence_heads.delete_if { |h| deletions << h.rule if h.rule == rule }
+      deletions
+    end
+
     def rrules
       @rrule_occurrence_heads.map { |h| h.rule }
     end
@@ -178,6 +186,14 @@ module IceCube
       @exrule_occurrence_heads << RuleOccurrence.new(rule, @start_date, @end_time)
     end
 
+    # Remove an exception rule, returns the removed rule, or nil
+    def remove_exception_rule(rule)
+      raise ArgumentError.new('Argument must be a valid rule') unless rule.class < Rule
+      deletions = []
+      @exrule_occurrence_heads.delete_if { |h| deletions << h.rule if h.rule == rule }
+      deletions
+    end
+
     def exrules
       @exrule_occurrence_heads.map { |h| h.rule }
     end
@@ -187,11 +203,23 @@ module IceCube
       @rdates << date unless date.nil?
     end
 
+    # Remove an individual date from this schedule's recurrence dates
+    # return date that was removed, nil otherwise
+    def remove_recurrence_date(date)
+      @rdates.delete(date)
+    end
+
     # Add an individual date exception to this schedule
     def add_exception_date(date)
       @exdates << date unless date.nil?
     end
 
+    # Remove an individual date exception from this schedule's exception dates
+    # return date that was removed, nil otherwise
+    def remove_exception_date(date)
+      @exdates.delete(date)
+    end
+
     def occurrences_between(begin_time, end_time)
       # adjust to the propert end date
       end_time = @end_time if @end_time && @end_time < end_time
@@ -209,10 +237,15 @@ module IceCube
     end
 
     alias :rdate :add_recurrence_date
-    alias rrule add_recurrence_rule
-    alias exdate add_exception_date
-    alias exrule add_exception_rule
-
+    alias :rrule :add_recurrence_rule
+    alias :exdate :add_exception_date
+    alias :exrule :add_exception_rule
+    alias :recurrence_dates :rdates
+    alias :exception_dates :exdates
+    alias :remove_rdate :remove_recurrence_date
+    alias :remove_exdate :remove_exception_date
+    alias :remove_rrule :remove_recurrence_rule
+    alias :remove_exrule :remove_exception_rule
 
     private
 

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
   
-  VERSION = '0.6.10'
+  VERSION = '0.6.11'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70363623868640 !ruby/object:Gem::Requirement
+  requirement: &70126045890940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363623868640
+  version_requirements: *70126045890940
 description: ice_cube is a recurring date library for Ruby.  It allows for quick,
   programatic expansion of recurring date rules.
 email: john@crepezzi.com