agcaldav 0.2.2 → 0.2.3.beta

data/README.md

@@ -1,7 +1,7 @@
 #Ruby CalDAV library named "agcaldav"
 **agcaldav is a CalDAV library based on martinpovolny/ruby-caldav and 4fthawaiian/ruby-caldav and collectiveidea/caldav**
 
-##Usage
+##Usage Events
 
 First, you've to install the gem
 
@@ -20,54 +20,117 @@ Now you can e.g. create a new AgCalDAV-Client:
 
 Alternatively, the proxy parameters can be specified:
 
-	cal = AgCalDAV::Client.new(:uri => "http://localhost:5232/user/calendar",:user => "user" , :password => "password, :proxy_uri => "http://my-proxy.com:8080")
+	cal = AgCalDAV::Client.new(:uri => "http://localhost:5232/user/calendar",:user => "user" , :password => "password", :proxy_uri => "http://my-proxy.com:8080")
 
 
-####Create an Event and save it
+####Create an Event
 
-    result = cal.create_event(:start => "2012-12-29 10:00", :end => "2012-12-30 12:00", :title => "12345", :description => "sdkvjsdf sdkf sdkfj sdkf dsfj")
+    result = cal.create_event(:start => "2012-12-29 10:00", :end => "2012-12-30 12:00", :title => "12345", :description => "12345 12345")
 
 Analyze result:
-    
+   
+    >> result
+    => #<Icalendar::Event:0x007ff653b47520 @name="VEVENT", @components={}, @properties={"sequence"=>0, "dtstamp"=>#<DateTime: 2012-12-30T19:59:04+00:00 (26527957193/10800,0/1,2299161)>, "description"=>"sdkvjsdf sdkf sdkfj sdkf dsfj", "dtend"=>#<DateTime: 2012-12-30T12:00:00+00:00 (2456292/1,0/1,2299161)>, "dtstart"=>#<DateTime: 2012-12-29T10:00:00+00:00 (29475491/12,0/1,2299161)>, "summary"=>"12345", "uid"=>"e795c480-34e0-0130-7d1d-109add70606c", "x-radicale_name"=>"e795c480-34e0-0130-7d1d-109add70606c.ics"}> 
+   
     >> result.class
-    => Icalendar::Calendar
+    => Icalendar::Event
 
-    >> result.events.count
+    >> result.count
     => 1
 
-    >> result.events.first
-    => #<Icalendar::Event:0x007ff653b47520 @name="VEVENT", @components={}, @properties={"sequence"=>0, "dtstamp"=>#<DateTime: 2012-12-30T19:59:04+00:00 (26527957193/10800,0/1,2299161)>, "description"=>"sdkvjsdf sdkf sdkfj sdkf dsfj", "dtend"=>#<DateTime: 2012-12-30T12:00:00+00:00 (2456292/1,0/1,2299161)>, "dtstart"=>#<DateTime: 2012-12-29T10:00:00+00:00 (29475491/12,0/1,2299161)>, "summary"=>"12345", "uid"=>"e795c480-34e0-0130-7d1d-109add70606c", "x-radicale_name"=>"e795c480-34e0-0130-7d1d-109add70606c.ics"}>
-
+   
 get UID of this Event:
-    >> result.events.first.uid
+
+    >> result.uid
     => "e795c480-34e0-0130-7d1d-109add70606c"
 
 
-Find Event:
-    
-    r = cal.find_event("e795c480-34e0-0130-7d1d-109add70606c")
+####Find an Event  (via UUID)  
+
+    result = cal.find_event("e795c480-34e0-0130-7d1d-109add70606c")
     
     >> result.class
-    => Icalendar::Calendar
+    => Icalendar::Event
 
 
-Find Events within time interval:
+####Find Events within time interval
 
     result = cal.find_events(:start => "2012-10-01 08:00", :end => "2013-01-01")
 
+    >> result
+    => [#<Icalendar::Event:0x007f8ad11cfdf0 @name="VEVENT", @components={}, @properties={"sequence"=>0, "dtstamp"=>#<DateTime: 2012-12-31T13:44:10+00:00 (4244474429/1728,0/1,2299161)>, "description"=>"sdkvjsdf sdkf sdkfj sdkf dsfj", "dtend"=>#<DateTime: 2012-12-30T12:00:00+00:00 (2456292/1,0/1,2299161)>, "dtstart"=>#<DateTime: 2012-12-29T10:00:00+00:00 (29475491/12,0/1,2299161)>, "summary"=>"12345", "uid"=>"b2c45e20-3575-0130-7d2e-109add70606c", "x-radicale_name"=>"b2c45e20-3575-0130-7d2e-109add70606c.ics"}>, #<Icalendar::Event:0x007f8ad10d7dd0 @name="VEVENT", @components={}, @properties={"sequence"=>0, "dtstamp"=>#<DateTime: 2012-12-31T13:44:10+00:00 (4244474429/1728,0/1,2299161)>, "uid"=>"b2c45e20-3575-0130-7d2e-109add70606c", "x-radicale_name"=>"b2c45e20-3575-0130-7d2e-109add70606c.ics"}>]
+
+    >> result.class
+    => Array
+
+    >> result.count
+    => 2
+
+
+
+####Update Event
+
+    event = {:start => "2012-12-29 10:00", :end => "2012-12-30 12:00", :title => "12345", :description => "sdkvjsdf sdkf sdkfj sdkf dsfj"}
+    c = cal.update_event("e795c480-34e0-0130-7d1d-109add70606c", event)
+
+    # not nice ...
+
+
+
+####Delete Event
+
+    cal.delete_event("e795c480-34e0-0130-7d1d-109add70606c")
+
+
 
-####TODO's
 
-###############################################################
-#                                                             #
-#   TODO :                                                    #
-#       1. find and notify if overlapping events              #
-#       2. "create_event" check for UUID is really unique     #
-#       3. errorhandling & code cleanup                       #
-#                                                             #
-###############################################################
+##Usage ToDo
 
+####not finished ATM
+Have a look tomorrow...
 
+
+
+####Work to be done ...
+
+1. find and notify if overlapping events              
+2. code cleanup -> more ActiveRecord style    
+            
+                                                             
+
+
+####Testing
+
+agcaldav will use RSpec for its test coverage. Inside the gem
+directory, you can run the specs for RoR 3.x with:
+
+  rake spec 
+(will be implemented in > v0.2.5)  
+
+
+ 
 ####Licence
 
- -> MIT
+MIT
+
+
+
+####Contributors
+
+[Check all contributors][c]
+
+
+
+Contributing
+------------
+
+1. Fork it.
+2. Create a branch (`git checkout -b my_feature_branch`)
+3. Commit your changes (`git commit -am "bugfixed abc..."`)
+4. Push to the branch (`git push origin my_feature_branch`)
+5. Open a [Pull Request][1]
+6. Enjoy a refreshing Club Mate and wait
+
+[c]: https://github.com/agilastic/agcaldav/contributors
+[1]: https://github.com/agilastic/agcaldav/pull/
+

data/agcaldav.gemspec

@@ -21,9 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'icalendar'
   s.add_runtime_dependency 'uuid'
   s.add_runtime_dependency 'builder'
-  #s.add_dependency "json"
   s.add_development_dependency "rspec"  
-  # sorry for no tests atm :-/
 
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]

data/lib/agcaldav/client.rb

@@ -48,16 +48,13 @@ module AgCalDAV
         req.body = AgCalDAV::Request::ReportVEVENT.new(DateTime.parse(data[:start]).strftime("%Y%m%dT%H%M"),
                                                        DateTime.parse(data[:end]).strftime("%Y%m%dT%H%M") ).to_xml
         res = http.request(req)
-        s = res.body
+      } 
+        errorhandling res
         result = ""
-        xml = REXML::Document.new(s)
+        xml = REXML::Document.new(res.body)
         REXML::XPath.each( xml, '//c:calendar-data/', {"c"=>"urn:ietf:params:xml:ns:caldav"} ){|c| result << c.text}
         r = Icalendar.parse(result)
-        r.first
-
-      }
-
-     
+        r.first.events
     end
 
     def find_event uuid
@@ -66,26 +63,33 @@ module AgCalDAV
         req = Net::HTTP::Get.new("#{@url}/#{uuid}.ics")
         req.basic_auth @user, @password
         res = http.request( req )
-      }
-      raise AuthenticationError if res.code.to_i == 401
-      raise APIError if res.code.to_i >= 500
-      r = Icalendar.parse(res.body)      
-      r.first
+      }  
+      errorhandling res
+      r = Icalendar.parse(res.body)
+      r.first.events.first
     end
 
     def delete_event uuid
+      res = nil
       __create_http.start {|http|
         req = Net::HTTP::Delete.new("#{@url}/#{uuid}.ics")
         req.basic_auth @user, @password
         res = http.request( req )
       }
+      errorhandling res
+      if res.code.to_i == 200
+        return true
+      else
+        return false
+      end
     end
 
     def create_event event
       c = Calendar.new
       uuid = UUID.new.generate
+      raise DuplicateError if entry_with_uuid_exists?(uuid)
       c.event do
-        uid           uuid  # still a BUG
+        uid           uuid 
         dtstart       DateTime.parse(event[:start])
         dtend         DateTime.parse(event[:end])
         duration      event[:duration]
@@ -96,7 +100,6 @@ module AgCalDAV
         geo_location  event[:geo_location]
         status        event[:status]
       end
-      c.publish
       c.event.uid = uuid
       cstring = c.to_ical
       res = nil
@@ -108,54 +111,124 @@ module AgCalDAV
         req.body = cstring
         res = http.request( req )
       }
-      raise AuthenticationError if res.code.to_i == 401
-      raise APIError if res.code.to_i >= 500
+      errorhandling res
       find_event uuid
-      #{:uid => uuid, :cal => c, :cal_string => cstring, :response_code => res.code} #TODO
+    end
+
+    def update_event uuid, event
+      #TODO... fix me
+      if delete_event uuid
+        create_event event
+      else
+        return false
+      end
     end
 
     def add_alarm tevent, altCal="Calendar"
-      # FIXME create icalendar event -> cal.event.new (tevent)
+    
+    end
+
+   
 
-      # TODO
 
 
 
 
+
+
+    def find_todo uuid
+      res = nil
+      __create_http.start {|http|
+        req = Net::HTTP::Get.new("#{@url}/#{uuid}.ics")
+        req.basic_auth @user, @password
+        res = http.request( req )
+      }  
+      errorhandling res
+      r = Icalendar.parse(res.body)
+      r.first.todos.first
     end
 
-    def update event
-      # FIXME old one not neat
 
-      # TODO
+
+
+
+    def create_todo todo
+      c = Calendar.new
+      uuid = UUID.new.generate
+      raise DuplicateError if entry_with_uuid_exists?(uuid)
+      c.todo do
+        uid           uuid 
+        start         DateTime.parse(todo[:start])
+        duration      todo[:duration]
+        summary       todo[:title]
+        description   todo[:description]
+        klass         todo[:accessibility] #PUBLIC, PRIVATE, CONFIDENTIAL
+        location      todo[:location]
+        percent       todo[:percent]
+        priority      todo[:priority]
+        url           todo[:url]
+        geo           todo[:geo_location]
+        status        todo[:status]
+      end
+      c.todo.uid = uuid
+      cstring = c.to_ical
+      res = nil
+      http = Net::HTTP.new(@host, @port)
+      __create_http.start { |http|
+        req = Net::HTTP::Put.new("#{@url}/#{uuid}.ics")
+        req['Content-Type'] = 'text/calendar'
+        req.basic_auth @user, @password
+        req.body = cstring
+        res = http.request( req )
+      }
+      errorhandling res
+      find_todo uuid
     end
 
-    def todo
+    def create_todo
       res = nil
+      raise DuplicateError if entry_with_uuid_exists?(uuid)
+
       __create_http.start {|http|
         req = Net::HTTP::Report.new(@url, initheader = {'Content-Type'=>'application/xml'} )
         req.basic_auth @user, @password
         req.body = AgCalDAV::Request::ReportVTODO.new.to_xml
         res = http.request( req )
       }
-      # FIXME: process HTTP code
+      errorhandling res 
       format.parse_todo( res.body )
     end
 
-    def filterTimezone( vcal )
-      data = ""
-      inTZ = false
-      vcal.split("\n").each{ |l|
-        inTZ = true if l.index("BEGIN:VTIMEZONE")
-        data << l+"\n" unless inTZ
-        inTZ = false if l.index("END:VTIMEZONE")
-      }
-      return data
+    private
+    def entry_with_uuid_exists? uuid
+      res = nil
+      __create_http.start {|http|
+        req = Net::HTTP::Get.new("#{@url}/#{uuid}.ics")
+        req.basic_auth @user, @password
+        res = http.request( req )
+      }      
+      if res.body.empty?
+        return false
+      else
+        return true
+      end
+    end
+
+    def  errorhandling response   
+      raise AuthenticationError if response.code.to_i == 401
+      raise NotExistError if response.code.to_i == 410 
+      raise APIError if response.code.to_i >= 500
     end
   end
 
+
+
+
+
   class AgCalDAVError < StandardError
   end
   class AuthenticationError < AgCalDAVError; end
+  class DuplicateError      < AgCalDAVError; end
   class APIError            < AgCalDAVError; end
+  class NotExistError       < AgCalDAVError; end
 end

data/lib/agcaldav/version.rb

@@ -1,3 +1,3 @@
 module AgCalDAV
-    VERSION="0.2.2"
+    VERSION="0.2.3.beta"
 end

data/lib/agcaldav.rb

@@ -6,6 +6,6 @@ require 'icalendar'
 require 'time'
 require 'date'
 
-['client.rb', 'request.rb', 'net.rb', 'query.rb', 'filter.rb', 'event.rb', 'format.rb'].each do |f|
+['client.rb', 'request.rb', 'net.rb', 'query.rb', 'filter.rb', 'event.rb', 'todo.rb', 'format.rb'].each do |f|
     require File.join( File.dirname(__FILE__), 'agcaldav', f )
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: agcaldav
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3.beta
+  prerelease: 6
 platform: ruby
 authors:
 - Alex Ebeling-Hoppe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: icalendar
@@ -109,9 +109,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24