agcaldav 0.1 → 0.1.1

data/.gitignore

@@ -1 +1,2 @@
 caldaver-test.sh
+*.gem

data/lib/caldav.rb

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

data/lib/caldav/client.rb

@@ -49,12 +49,13 @@ module CalDAV
             http
         end
     
-        def report start, stop
+        def report datetime_start, datetime_stop            
             res = nil
             __create_http.start {|http|
                 req = Net::HTTP::Report.new(@url, initheader = {'Content-Type'=>'application/xml'} )
                 req.basic_auth @user, @password
-                req.body = CalDAV::Request::ReportVEVENT.new( start, stop ).to_xml
+                req.body = CalDAV::Request::ReportVEVENT.new(DateTime.parse(datetime_start).strftime("%Y%m%dT%H%M"), 
+                                                             DateTime.parse(datetime_stop).strftime("%Y%m%dT%H%M") ).to_xml
                 res = http.request( req )
             }
             format.parse_calendar( res.body )
@@ -81,30 +82,23 @@ module CalDAV
         end
     
         def create event
-            nowstr = DateTime.now.strftime "%Y%m%dT%H%M%SZ"
-            uuid   = UUID.generate
-            dings  = """BEGIN:VCALENDAR
-PRODID:Caldav.rb
-VERSION:2.0
-BEGIN:VEVENT
-CREATED:#{nowstr}
-UID:#{uuid}
-SUMMARY:#{event.summary}
-DTSTART:#{event.dtstart.strftime("%Y%m%dT%H%M%S")}
-DTEND:#{event.dtend.strftime("%Y%m%dT%H%M%S")}
-END:VEVENT
-END:VCALENDAR"""
-
+            event.uid = UUID.generate
+            event.dtstamp = DateTime.now.strftime "%Y%m%dT%H%M%SZ"
+            event.dtstart = event.dtstart.strftime("%Y%m%dT%H%M%S")
+            event.dtend = event.dtend.strftime("%Y%m%dT%H%M%S")
+            cal = Calendar.new
+            cal.event = Event.new(event)
+            c = cal.to_ical
             res = nil
             http = Net::HTTP.new(@host, @port) 
             __create_http.start { |http|
-                req = Net::HTTP::Put.new("#{@url}/#{uuid}.ics")
+                req = Net::HTTP::Put.new("#{@url}/#{event.uid}.ics")
                 req['Content-Type'] = 'text/calendar'
                 req.basic_auth @user, @password
                 req.body = dings
                 res = http.request( req )
             }
-            return uuid, res
+            return event.uid, res
         end
     
         def add_alarm tevent, altCal="Calendar"

data/lib/caldav/version.rb

@@ -1,3 +1,3 @@
 module CalDAV
-    VERSION=0.1
+    VERSION = "0.1.1"
 end

data/ruby-caldav.gemspec

@@ -1,20 +1,29 @@
+# -*- encoding: utf-8 -*-
 require File.expand_path('../lib/caldav/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "agcaldav"
   s.version     = CalDAV::VERSION
-  s.summary     = "Ruby CalDAV client"
-  s.description = "Ruby client for CalDAV calendar and tasks."
-  s.homepage    = "https://github.com/agilastic/ruby-caldav"
-  s.authors     = ["Alex Ebeling-Hoppe"]
-  s.email       = ["ebeling-hoppe@agilastic.de"]
-  
-  s.add_runtime_dependency 'nokogiri'
+  s.summary     = "new Ruby CalDAV client"
+  s.description = "yet another new Ruby client for CalDAV calendar and tasks."
+
+  s.required_ruby_version     = '>= 1.9.2'
+
+  s.license     = 'MIT'
+
+  s.homepage    = 'https://github.com/agilastic/caldav2'
+  s.authors     = "Alex Ebeling-Hoppe"
+  s.email       = "ebeling-hoppe@agilastic.de"
+  # forked from "Martin Povolny" => "https://github.com/martinpovolny", 
+  #             "Cannon Matthews" => "https://github.com/loosecannon93", 
+  #             "Bradley McCrorey" => "https://github.com/4fthawaiian"
+
   s.add_runtime_dependency 'icalendar'
   s.add_runtime_dependency 'uuid'
   s.add_runtime_dependency 'builder'
+  #s.add_dependency "json"
+  #s.add_development_dependency "rspec"  
 
   s.files         = `git ls-files`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   s.require_paths = ["lib"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: agcaldav
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: icalendar
   requirement: !ruby/object:Gem::Requirement
@@ -75,20 +59,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Ruby client for CalDAV calendar and tasks.
-email:
-- ebeling-hoppe@agilastic.de
-executables:
-- caldav
+description: yet another new Ruby client for CalDAV calendar and tasks.
+email: ebeling-hoppe@agilastic.de
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - README.rdoc
-- bin/caldav
-- caldavtest.rb
 - lib/caldav.rb
-- lib/caldav/caldaver.rb
 - lib/caldav/client.rb
 - lib/caldav/filter.rb
 - lib/caldav/format.rb
@@ -97,8 +76,9 @@ files:
 - lib/caldav/request.rb
 - lib/caldav/version.rb
 - ruby-caldav.gemspec
-homepage: https://github.com/agilastic/ruby-caldav
-licenses: []
+homepage: https://github.com/agilastic/caldav2
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -108,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,5 +100,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Ruby CalDAV client
+summary: new Ruby CalDAV client
 test_files: []

data/bin/caldav

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'caldav'
-
-prg = CalDAV::CalDAVer.new
-prg.run_args( ARGV )
-

data/caldavtest.rb

@@ -1,100 +0,0 @@
-require './lib/caldav.rb'
-
-class CalDAVTester
-
-    def initialize
-        $caldav = {
-            :host     => 'localhost',
-            :port     => 5232,
-            :url      => '/user/calendar/',
-            :user     => 'user',
-            :password => 'yourpassword'
-        }
-        begin
-            require '~/.caldav_cred.rb'
-        rescue LoadError
-        end
-        
-        @cal = CalDAV::Client.new $caldav[:host], $caldav[:port], $caldav[:url], $caldav[:user], $caldav[:password]
-    end
-
-    attr :cal
-
-    def test_create_event
-        myevent = Event.new
-        myevent.dtstart = DateTime.parse( '2012/08/11 09:45')
-        myevent.dtend = DateTime.parse( '2012/08/11 10:45')
-        myevent.summary = "Jo?"
-        
-        uuid, response = cal.create myevent
-        
-        puts "CREATE Response #{response.code} #{response.message}: #{response.body}"
-        puts "UUID: #{uuid}"
-
-        return uuid
-    end
-
-    def test_delete_event( uuid )
-        response = cal.delete uuid
-        puts "DETELE Response #{response.code} #{response.message}: #{response.body}"
-    end
-
-    def test_get_event( uuid )
-        #ev, response = cal.get uuid
-        ev = cal.get( uuid )
-        #puts "GET Response #{response.code} #{response.message}: #{response.body}"
-        puts ev
-    end
-
-    def test_read_todo
-        puts '*' * 20 + ' TODO ' + '*' * 20
-        res = cal.todo
-        
-        res.each{ |todo| 
-            p todo
-        }
-    end
-    
-    def test_report
-        puts '*' * 20 + ' EVENTS ' + '*' * 20
-        p cal.report "20111201T000000", "20131231T000000"
-    end
-
-    def test_query0
-        puts CalDAV::Query.event.to_xml
-
-        time1 = DateTime.parse('2011/08/08 09:45')
-        time2 = DateTime.parse('2012/08/08 10:45')
-        puts CalDAV::Query.event(time1..time2).to_xml
-        puts CalDAV::Query.event.uid( UUID.generate ).to_xml
-        #puts CalDAV::Query.todo.alarm(time1..time2).to_xml
-        #puts CalDAV::Query.event.attendee(email).partstat('NEEDS-ACTION').to_xml
-        #puts CalDAV::Query.todo.completed(false).status(:cancelled => false).to_xml
-    end
-
-    def test_query
-        p cal.query( CalDAV::Query.event ) #=> All events
-        p cal.query( CalDAV::Query.event(time1..time2) )
-        p cal.query( CalDAV::Query.event.uid("UID") )
-        p cal.query( CalDAV::Query.todo.alarm(time1..time2) )
-        p cal.query( CalDAV::Query.event.attendee(email).partstat('NEEDS-ACTION') )
-        p cal.query( CalDAV::Query.todo.completed(false).status(:cancelled => false) )
-    end
-end
-
-#r = CalDAV::Request::Report.new( "20111201T000000", "20131231T000000" )
-#puts r.to_xml
-#exit
-
-t = CalDAVTester.new
-
-t.test_query0
-
-uuid = t.test_create_event
-t.test_get_event( uuid )
-t.test_delete_event( uuid )
-
-t.test_report
-t.test_read_todo
-#t.test_query
-

data/lib/caldav/caldaver.rb

@@ -1,103 +0,0 @@
-require 'optparse'
-
-# caldav --user USER --password PASSWORD --uri URI --command COMMAND
-# caldav --user martin@solnet.cz --password test --uri https://mail.solnet.cz/caldav.php/martin.povolny@solnet.cz/test --command create_event 
-
-# caldav report --begin 2012-01-01 --end 2012-07-01 --format raw --user USER --password PASSWORD --uri https://in.solnet.cz/caldav.php/martin.povolny@solnet.cz/public
-# caldav get --user USER --password PASSWD --uri https://mail.solnet.cz/caldav.php/martin.povolny%40solnet.cz/public/ --uuid 64d0b933-e916-4755-9e56-2f4d0d9068cb
-
-module CalDAV
-
-class CalDAVer
-
-    def create_object( options )
-        if options[:raw]
-            # STDIN
-            return STDIN.read(nil)
-        else
-            # options[:subject]
-            # options[:login]
-            # options[:summary]
-            # options[:begin]
-            # options[:end]
-            # options[:due]
-            case options[:what].intern
-            when :task
-                # FIXME
-            when :event
-                # FIXME
-            when :contact
-                # FIXME
-            else
-                print_help_and_exit if options[:command].to_s.empty? or options[:uri].to_s.empty?
-            end
-        end
-    end
-
-    def print_help_and_exit
-        puts @o.help
-        exit 1
-    end
-
-    def run_args( args )
-        options = {}
-        @o = OptionParser.new do |o|
-            o.banner = "Usage: caldaver [command] [options]"
-            o.on('-p', '--password [STRING]', String, 'Password')     { |p|   options[:password] = p }
-            o.on('-u', '--user [STRING}',     String, 'User (login)') { |l|   options[:login]    = l }
-            o.on('--uri [STRING]',        String, 'Calendar URI') { |uri| options[:uri] = uri }
-            o.on('--format [STRING]',     String, 'Format of output: raw,pretty,[debug]') { 
-                                                                    |fmt| options[:fmt] = fmt }
-            ##o.on('--command [STRING]',    String, 'Command')      { |c|   options[:command] = c }
-            o.on('--uuid [STRING]',       String, 'UUID')         { |u|   options[:uuid] = u }
-            # what to create
-            o.on('--what [STRING]',       String, 'Event/task/contact') { |c| options[:command]  = command }
-            o.on('--raw',                         'Read raw data (event/task/contact) from STDIN') { |raw|   options[:raw] = true }
-            # report and event options
-            o.on('--begin [DATETIME]',    String, 'Start time')   { |dt|  options[:begin] = dt }
-            o.on('--end [DATETIME]',      String, 'End time')     { |dt|  options[:end]   = dt }
-            o.on('--due [DATETIME]',      String, 'Due time')     { |dt|  options[:due]   = dt }
-            #o.on('--begin [DATETIME]',    DateTime, 'Start time') { |dt|  options[:begin]    = dt }
-            #o.on('--end [DATETIME]',      DateTime, 'End time')   { |dt|  options[:end]      = dt }
-            # event options
-            o.on('--summary  [string]',   String, 'summary of event/task')  { |s|  options[:summary]  = s }
-            o.on('--location [string]',   String, 'location of event/task') { |s|  options[:location] = s }
-            o.on('--subject  [string]',   String, 'subject of event/task')  { |s|  options[:subject]  = s }
-            o.on('-h') { print_help_and_exit }
-        end
-
-        options[:command] =  @o.parse( args )[0]
-
-        print_help_and_exit if options[:command].to_s.empty? or options[:uri].to_s.empty?
-        cal = CalDAV::Client.new( options[:uri], options[:login], options[:password] )
-
-        if options[:format]
-            cal.format = case options[:format].intern
-                when :raw
-                    CalDAV::Format::Raw.new
-                when :pretty
-                    CalDAV::Format::Pretty.new
-                when :debug
-                    CalDAV::Format::Debug.new
-                else
-                    nil
-            end
-        end
-
-        case options[:command].intern
-        when :create
-            obj = create_object( options )
-        when :delete
-        when :modify
-            obj = create_object( options )
-        when :get
-            puts cal.get( options[:uuid] )
-        when :report
-            puts cal.report( options[:begin], options[:end] )
-        else
-            print_help_and_exit
-        end
-    end
-end
-
-end