calfilter 1.0.0 → 1.1.0

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.1.0 / 2008-05-03
+
+* 1 major enhancement
+
+  * Collapsed filter_calendars, filter_icalendars, and
+    filter_calendars_at into one smarter filter_calendars
+    method.
+
 === 1.0.0 / 2008-05-02
 
 * 1 major enhancement

data/README.txt

@@ -24,7 +24,7 @@ various purposes, including:
 
   require 'calfilter'
 
-  cals = filter_calendars_at('some_url') do |cal|
+  cals = filter_calendars('some_url') do |cal|
       cal.keep(:events)  # not journals, todos, or freebusys
     
       cal.filter_events do |evt|

data/example.rb

@@ -1,11 +1,14 @@
 #!/usr/bin/env ruby
 
+# Would be accessed like this:
+# http://example.com/cgi_bin/example.rb?http://example.com/unfiltered_calendar.ics
+
 require 'rubygems'
 gem 'calfilter'
 require 'calfilter'
 require 'calfilter/cgi'
 
-filter_calendars_at(CalFilter::CGI.query_string}) do |cal|
+filter_calendars(CalFilter::CGI.query_string}) do |cal|
   cal.keep(:events) # drop todos, journals, etc.
   
   cal.filter_events do |evt|

data/lib/calfilter.rb

@@ -1,7 +1,7 @@
 %w{rubygems icalendar date open-uri}.each{|l| require l}
 
 module CalFilter
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
   
   def self.output_stream
     @output_stream
@@ -140,15 +140,8 @@ module CalFilter
   
 end
 
-def filter_calendars_at(url, &block)
-  filter_calendars(open(url, 'r'), &block)
-end
-
-def filter_calendars(ics_data, &block)
-  filter_icalendars(Icalendar.parse(ics_data), &block)
-end
-
-def filter_icalendars(cals)
+def filter_calendars(*sources, &block)
+  cals = convert_to_icalendars(sources)
   return cals unless block_given?
   actions = cals.map do |cal| 
     wrapper = CalFilter.wrap_calendar(cal)
@@ -163,4 +156,21 @@ def filter_icalendars(cals)
     new_cals.each{|cal| os.puts cal.to_ical}
   end
   new_cals
-end
+end
+
+def convert_to_icalendars(sources)
+  sources.map{|source| convert_to_icalendar(source)}.flatten
+end
+
+def convert_to_icalendar(source)
+  case source
+  when Icalendar::Calendar
+    [source]
+  when Array
+    source
+  when /^\s*BEGIN:VCALENDAR/m
+    Icalendar.parse(source)
+  else
+    Icalendar.parse(open(source, 'r'))
+  end
+end

data/test/test_calfilter.rb

@@ -5,24 +5,41 @@ require 'mocha'
 require 'calfilter'
 
 describe "filtering calendars" do
+  it "should fetch urls and parse them" do
+    url = 'http://example.com/'
+    ics = 'ics data'
+    self.expects(:open).with('http://example.com/', 'r').returns(ics)
+    Icalendar.expects(:parse).with(ics).returns([])
+    filter_calendars("http://example.com/")
+  end
+  
+  it "should parse ics data" do
+    ics = %{
+      
+      BEGIN:VCALENDAR
+    }
+    Icalendar.expects(:parse).with(ics).returns([])
+    filter_calendars(ics)
+  end
+  
   it "should pass things straight through" do
     expected_cals = [1, 2, 3]
-    actual_cals = filter_icalendars(expected_cals.dup)
+    actual_cals = filter_calendars(expected_cals.dup)
     assert_equal expected_cals.size, actual_cals.size
   end
   
   it "should delete a calendar when told" do
-    cals = filter_icalendars([1, 2, 3]){|cal| cal.remove if cal.__delegate__ == 2}
+    cals = filter_calendars([1, 2, 3]){|cal| cal.remove if cal.__delegate__ == 2}
     assert_equal [1, 3], cals
   end
   
   it "should keep a calendar when told" do
-    cals = filter_icalendars([1, 2, 3]){|cal| cal.keep if cal.__delegate__ == 2}
+    cals = filter_calendars([1, 2, 3]){|cal| cal.keep if cal.__delegate__ == 2}
     assert_equal [2], cals
   end
   
   it "should delete parts of a calendar when told" do
-    cals = filter_icalendars(%w{1 2 3}) do |cal| 
+    cals = filter_calendars(%w{1 2 3}) do |cal| 
       events = mock(:clear => nil)
       cal.__delegate__.stubs(:events).returns(events)
       cal.remove(:events)
@@ -30,7 +47,7 @@ describe "filtering calendars" do
   end
   
   it "should keep parts of a calendar when told" do
-    cals = filter_icalendars(%w{1 2 3}) do |cal| 
+    cals = filter_calendars(%w{1 2 3}) do |cal| 
       events = mock(:clear => nil)
       cal.__delegate__.stubs(:events).returns(events)
       cal.keep(:freebusys, :journals, :todos)
@@ -39,13 +56,13 @@ describe "filtering calendars" do
   
   it "should complain if we both keep and remove a calendar" do
     assert_raise(CalFilter::FilterError) do
-      cals = filter_icalendars([1]){|cal| cal.keep; cal.remove}
+      cals = filter_calendars([1]){|cal| cal.keep; cal.remove}
     end
   end
   
   it "should complain if we keep one calendar and remove another" do
     assert_raises(CalFilter::FilterError) do
-      cals = filter_icalendars([1, 2, 3]) do |cal|
+      cals = filter_calendars([1, 2, 3]) do |cal|
         case cal.__delegate__
         when 1: cal.keep;
         when 2: cal.remove;
@@ -56,7 +73,7 @@ describe "filtering calendars" do
   
   it "should delegate unknown methods to the Calendar objects" do
     results = []
-    cals = filter_icalendars([0, 1]){|cal| results << cal.zero?}
+    cals = filter_calendars([0, 1]){|cal| results << cal.zero?}
     assert_equal [true, false], results
   end
     
@@ -82,7 +99,7 @@ describe "filtering resources" do
   end
   
   xit "should leave resources alone if no block specified" do
-    filter_icalendars([@cal]) do |cal|
+    filter_calendars([@cal]) do |cal|
       cal.__delegate__.expects(:events).returns(@cal.events)
       cal.filter_events
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: calfilter
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Glenn Vanderburg
@@ -30,7 +30,7 @@ cert_chain:
   zrNa6ECLh1VS/pV78rYbAO1ZXsg3l7bY
   -----END CERTIFICATE-----
 
-date: 2008-05-02 00:00:00 -05:00
+date: 2008-05-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency