vortex_client 0.3.1 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/bin/vrtx-sync

@@ -2,6 +2,7 @@
 require 'rubygems'
 require 'uri'
 require 'vortex_client'
+require 'filewatcher'
 
 # vrtx-sync: keep local files synced with webdav content
 #
@@ -31,42 +32,6 @@ def download(url, vortex)
   return path
 end
 
-
-# Monitor files
-class FileMon
-
-  def initialize(filenames)
-    @last_mtimes = { }
-    filenames.each do |filename|
-      raise "File does not exist: " + filename unless File.exist?(filename)
-      @last_mtimes[filename] = File.stat(filename).mtime
-    end
-    @filenames = filenames
-  end
-
-  def run(sleep=1, &on_update)
-    loop do
-      Kernel.sleep sleep until file_updated?
-      yield @updated_file
-    end
-  end
-
-  def file_updated?
-    @filenames.each do |filename|
-      mtime = File.stat(filename).mtime
-      updated = @last_mtimes[filename] < mtime
-      @last_mtimes[filename] = mtime
-      if(updated)
-        @updated_file = filename
-        return true
-      end
-    end
-    return false
-  end
-
-end
-
-
 if $*.size < 1
   print_usage
 end
@@ -85,7 +50,7 @@ $*.each do |url|
   downloaded_files[filename] = url
 end
 
-FileMon.new(downloaded_files.keys).run do |filename|
+FileWatcher.new(downloaded_files.keys).watch do |filename|
   url = downloaded_files[filename]
   file = File.open(filename, "rb")
   contents = file.read

data/lib/vortex_client.rb

@@ -7,6 +7,44 @@ require 'time'
 # All calls are done with the webdav protocol.
 module Vortex
 
+  # Convert norwegian date to Time object with a forgiven regexp
+  #
+  # Examples:
+  #
+  #   t = norwegian_date('1.1.2010')
+  #   t = norwegian_date('22.01.2010')
+  #   t = norwegian_date('22.01.2010 12:15')
+  #   t = norwegian_date('22.01.2010 12:15:20')
+  def norwegian_date(date)
+    if /\A\s*
+            (\d\d?).(\d\d?).(-?\d+)
+            \s?
+            (\d\d?)?:?(\d\d?)?:?(\d\d?)?
+            \s*\z/ix =~ date
+      year = $3.to_i
+      mon = $2.to_i
+      day = $1.to_i
+      hour = $4.to_i
+      min = $5.to_i
+      sec = $6.to_i
+
+      # puts "Debug: #{year} #{mon} #{day} #{hour}:#{min}:#{sec}"
+
+      usec = 0
+      usec = $7.to_f * 1000000 if $7
+      if $8
+        zone = $8
+        year, mon, day, hour, min, sec =
+          apply_offset(year, mon, day, hour, min, sec, zone_offset(zone))
+        Time.utc(year, mon, day, hour, min, sec, usec)
+      else
+        Time.local(year, mon, day, hour, min, sec, usec)
+      end
+    else
+      raise ArgumentError.new("invalid date: #{date.inspect}")
+    end
+  end
+
   class Connection < Net::DAV
 
     # Create a new connection to Vortex. Prompts for username and password if not
@@ -61,7 +99,7 @@ module Vortex
     #   article = Vortex::StructuredArticle(:title=>"My title")
     #   vortex.publish(article)
     def publish(object)
-      if(object.is_a? HtmlArticle)
+      if(object.is_a? HtmlArticle or object.is_a? HtmlEvent)
         uri = @uri.merge(object.url)
         # puts "DEBUG: '" + object.properties
         self.put_string(uri, object.content)
@@ -312,18 +350,23 @@ module Vortex
   #
   # Examples:
   #
-  #   event = HtmlEvent.new(:title => "Sample Event",
-  #                         :introduction => "Introduction",
-  #                         :body => "<p>Hello world</p>",
-  #                         :startDatetime => Time.now,
-  #                         :endDatetime => Time.now + (60*60*60),
-  #                         :venue => "Vilhelm Bjerkes hus, Rom 207" )
-  #   vortex.publish(article)
+  #     event = Vortex::HtmlEvent.new(:title => "Sample Event 1",
+  #                                   :introduction => "Sample event introduction",
+  #                                   :body => "<p>Hello world</p>",
+  #                                   :startDate => Time.now, ## "22.01.2010 12:15",
+  #                                   :endDate =>  Time.now + 60*60, ## "22.01.2010 13:00",
+  #                                   :location => "Forskningsveien 3B",
+  #                                   :mapUrl => "http://maps.google.com/123",
+  #                                   :tags => ["vortex","testing"],
+  #                                   :publishedDate => "05.01.2010 12:00")
+  #    vortex.publish(event)
   class HtmlEvent < PlainFile
 
-    attr_accessor :title, :introduction, :body, :filename, :modifiedDate, :publishedDate, :owner, :url, :author, :date, :tags
+    attr_accessor :title, :introduction, :body, :filename, :modifiedDate, :publishedDate, :date,
+    :owner, :url, :tags, :startDate, :endDate, :location, :mapUrl
 
-    # Create a new article of type html-article: plain html file with introduction stored as a webdav property.
+    # Create a new article of type html-article: plain html file with
+    # introduction stored as a webdav property.
     def initialize(options={})
       options.each{|k,v|send("#{k}=",v)}
     end
@@ -344,8 +387,8 @@ module Vortex
     end
 
     def properties
-      props = '<v:resourceType xmlns:v="vrtx">article</v:resourceType>' +
-        '<v:xhtml10-type xmlns:v="vrtx">article</v:xhtml10-type>' +
+      props = '<v:resourceType xmlns:v="vrtx">event</v:resourceType>' +
+        '<v:xhtml10-type xmlns:v="vrtx">event</v:xhtml10-type>' +
         '<v:userSpecifiedCharacterEncoding xmlns:v="vrtx">utf-8</v:userSpecifiedCharacterEncoding>'
 
       if(@publishedDate and @publishedDate != "")
@@ -355,9 +398,9 @@ module Vortex
         props += '<v:published-date xmlns:v="vrtx">' + @publishedDate + '</v:published-date>'
       end
 
-      if(date and date != "")
-        if(date.kind_of? Time)
-          date = @date.httpdate.to_s
+      if(@date and @date != "")
+        if(@date.kind_of? Time)
+          @date = @date.httpdate.to_s
         end
         if(@publishedDate == nil or @publishedDate != "")
           props += '<v:published-date xmlns:v="vrtx">' + date + '</v:published-date>'
@@ -376,13 +419,6 @@ module Vortex
       if(introduction and introduction != "")
         props += '<introduction xmlns="vrtx">' + introduction + '</introduction>'
       end
-      if(author and author != "")
-        props += '<v:authors xmlns:v="vrtx">' +
-          '<vrtx:values xmlns:vrtx="http://vortikal.org/xml-value-list">' +
-             '<vrtx:value>' + author + '</vrtx:value>' +
-           '</vrtx:values>' +
-        '</v:authors>'
-      end
 
       if(tags and tags.kind_of?(Array) and tags.size > 0)
         props += '<v:tags xmlns:v="vrtx">' +
@@ -393,9 +429,31 @@ module Vortex
         props += '</vrtx:values></v:tags>'
       end
 
+
+      if(@startDate and @startDate != "")
+        if(@startDate.kind_of? Time)
+          @startDate = @startDate.httpdate.to_s
+        end
+        props += '<v:start-date xmlns:v="vrtx">' + @startDate + '</v:start-date>'
+      end
+
+      if(@endDate and @endDate != "")
+        if(@endDate.kind_of? Time)
+          @endDate = @endDate.httpdate.to_s
+        end
+        props += '<v:end-date xmlns:v="vrtx">' + @endDate + '</v:end-date>'
+      end
+
+      if(@location and @location != "")
+        props += '<v:location xmlns:v="vrtx">' + @location + '</v:location>'
+      end
+      if(@mapUrl and @mapUrl != "")
+        props += '<v:mapurl xmlns:v="vrtx">' + @mapUrl + '</v:mapurl>'
+      end
       return props
     end
 
+    # TODO: Samme kode som i article... Bruk arv!
     def content
       content = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" ' +
         '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' +

data/test/test_date_conversion.rb

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestVortexDateConversion < Test::Unit::TestCase
+  include Vortex
+
+  should "parse norwegian date and time formats" do
+    assert norwegian_date('1.1.2010')
+    assert norwegian_date('1.1.2010')
+    assert norwegian_date('22.01.2010')
+    assert norwegian_date('22.01.2010 12:15')
+    assert norwegian_date('22.01.2010 12:15:20')
+  end
+
+end

data/test/test_vortex_event.rb

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestVortexClientUtils < Test::Unit::TestCase
+  include Vortex
+
+  def setup
+    if(not(@vortex))
+      user = ENV['DAVUSER']
+      pass = ENV['DAVPASS']
+      @vortex = Connection.new("https://vortex-dav.uio.no/",user, pass)
+    end
+  end
+
+  should "publish events" do
+    url = 'https://vortex-dav.uio.no/brukere/thomasfl/nyheter/sample-event-1.html'
+    if(@vortex.exists?(url))
+      @vortex.delete(url)
+    end
+
+    @vortex.cd('/brukere/thomasfl/nyheter/')
+    event = HtmlEvent.new(:title => "Sample Event 1",
+                          :introduction => "Sample event introduction",
+                          :body => "<p>Hello world</p>",
+                          :startDate => "19.06.2010 17:56",
+                          :endDate =>  "19.06.2010 19:00",
+                          :location => "Forskningsveien 3B",
+                          :mapUrl => "http://maps.google.com/123",
+                          :tags => ["vortex","testing","ruby"],
+                          :publishedDate => "05.01.2010 12:00")
+    @vortex.publish(event)
+    assert @vortex.exists?(url)
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vortex_client
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Thomas Flemming
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 +01:00
+date: 2010-01-26 00:00:00 +01:00
 default_executable: vrtx-sync
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +58,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/vrtx-sync
 - lib/vortex_client.rb
 - lib/vortex_client/string_utils.rb
 - test/helper.rb
@@ -96,8 +97,10 @@ specification_version: 3
 summary: Vortex CMS client
 test_files: 
 - test/helper.rb
+- test/test_date_conversion.rb
 - test/test_vortex_article_publish.rb
 - test/test_vortex_client.rb
 - test/test_vortex_collection.rb
+- test/test_vortex_event.rb
 - test/test_vortex_tags.rb
 - test/test_vortex_utils.rb