vortex_client 0.5.8 → 0.5.9

data/README.rdoc

@@ -22,7 +22,7 @@ Running the script.
    Username: thomasfl
    Password: *****
 
-The article should be published to "https://www-dav.server.com/news/my-title.html".
+An article should now be published to "https://www-dav.server.com/news/my-title.html".
 
 = Creating folders (collections)
 
@@ -31,7 +31,7 @@ To create a folder named "2010" in the "/news/" folder.
    require 'rubygems'
    require 'vortex_client'
 
-   vortex = Vortex::Connection.new("https://www-dav.server.com", ENV['DAVUSER'], ENV['DAVPASS'])
+   vortex = Vortex::Connection.new("https://www-dav.server.com")
    vortex.cd("/news/")
    collection = Vortex::ArticleListingCollection.new(:title => "News for 2009", :foldername => "2009")
    vortex.create(collection)
@@ -50,6 +50,30 @@ If your'e having problems installing the xml parser nokogiri on is x:  http://wi
 Also how to compile ruby 1.9.1 on os x http://wonko.com/post/how-to-compile-ruby-191
 On ubuntu openssl can be an issue http://blog.maxaller.name/2009/02/ruby-19-and-openssl-on-ubuntu/
 
+= Using KeyChain authentication on OS X
+
+To retrieve password from KeyChain on OS X, use the option :use_osx_keychain => true.
+
+   vortex = Vortex::Connection.new("https://www-dav.server.com", :use_osx_keychain => true)
+
+When running for the first time, ruby prompts for the password. Username must be
+the same both locally and on the server.
+
+   Password not found on OS X KeyChain.
+   Enter password to store new password on OS X KeyChain.
+   Password: *****
+   Password for 'tiger' on 'www-dav.server.com' stored on OS X KeyChain.
+
+The next time the script is executed, ruby won't prompt for username or password.
+
+KeyChain authentication requires 'osx_keychain' and 'RubyInline' gem.
+
+To install:
+
+   $ sudo gem install RubyInline
+   $ sudo gem install osx_keychain
+
+
 == Note on Patches/Pull Requests
 
 * Fork the project.

data/Rakefile

@@ -14,7 +14,7 @@ begin
     gem.add_dependency "net_dav", ">= 0.5.0"
     gem.add_dependency "highline", ">= 1.5.1"
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.files.include %w(lib/vortex_client.rb lib/vortex_client/string_utils.rb lib/vortex_client/item_extensions.rb bin/vrtx-sync)
+    gem.files.include %w(lib/vortex_client.rb lib/vortex_client/string_utils.rb lib/vortex_client/item_extensions.rb lib/vortex_client/person.rb bin/vrtx-sync)
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.5.9

data/examples/create_collection.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'vortex_client'
 include Vortex
 
-vortex = Vortex::Connection.new("https://vortex-dav.uio.no/", ENV['DAVUSER'], ENV['DAVPASS'])
+vortex = Vortex::Connection.new("https://vortex-dav.uio.no/")
 vortex.cd('/brukere/thomasfl/events/')
 
 collection = ArticleListingCollection.new(:url => 'my-collection', :title => 'My articles')

data/examples/disable_right_column.rb

@@ -0,0 +1,8 @@
+require 'rubygems'
+require 'vortex_client'
+
+vortex = Vortex::Connection.new('https://nyweb2-dav.uio.no/', :use_osx_keychain => true)
+# url = 'https://nyweb2-dav.uio.no/for-ansatte/aktuelt/hf-aktuelt-mod/utg2/index.html'
+url = '/for-ansatte/aktuelt/hf-aktuelt-mod/utg2/index.html'
+snippet = '<hideAdditionalContent xmlns="http://www.uio.no/vrtx/__vrtx/ns/structured-resources">true</hideAdditionalContent>'
+vortex.proppatch(url, snippet)

data/examples/person_presentation.rb

@@ -1,162 +1,14 @@
 # -*- coding: utf-8 -*-
 require 'rubygems'
 require 'vortex_client'
-require 'open-uri'
-require 'time'
-## require 'ldap_util'
 
-class PersonPresentasjon
+@vortex = Vortex::Connection.new("https://nyweb1-dav.uio.no/")
+@vortex.cd('/konv/personer_test/')
 
-  def initialize(uri,user,pwd)
-    @vortex = Vortex::Connection.new(uri,user,pwd)
-  end
-
-
-  def find_pictures(src_url, dest_url, language)
-    count = 0
-    @vortex.find('.',:recursive => true,:suppress_errors => true) do |item|
-      url = item.url.to_s
-      if(item.type == :directory) then
-        new_url = url.gsub(src_url,dest_url)
-        create_person_listing_folder(new_url)
-      elsif(url.match(/\.jpg$|\.png$/i)) then
-        dest_folder = url.gsub(src_url,dest_url)
-        dest_folder = dest_folder.sub(/\.jpg$|\.png$/i,'/')
-        create_person_presentation(url, dest_folder, language)
-      end
-
-      # exit if(count > 6) # TODO Remove this
-      count += 1
-    end
-
-    puts
-    puts "Done creating " + count.to_s + " presentations."
-  end
-
-  def create_person_listing_folder(new_url)
-    mkdir(new_url)
-    puts "Reading folder: " + new_url
-    props = '<v:collection-type xmlns:v="vrtx">person-listing</v:collection-type>' +
-      '<v:resourceType xmlns:v="vrtx">person-listing</v:resourceType>'
-    begin
-      @vortex.proppatch(new_url, props )
-    rescue
-      puts "Warning: problems patching folder: " + new_url
-    end
-  end
-
-  def create_person_presentation(url, dest_folder, language)
-    username = dest_folder.sub(/\/$/,'')[/([^\/]*)$/,1]
-    dest_image_url = dest_folder + url[/([^\/]*)$/,1]
-    mkdir(dest_folder)
-    copy(url,dest_image_url)
-    create_json_doc(username, dest_folder, dest_image_url, language)
-   end
-
-
-  def mkdir(url)
-    begin
-      @vortex.mkdir(url)
-    rescue
-      puts "Warning: mkdir(" + url + ") exists."
-    end
-  end
-
-  def copy(src,dest)
-    begin
-      @vortex.copy(src,dest)
-    rescue
-      puts "Warning: cp(src," + dest + ") exists."
-    end
-  end
-
-  def person_presentation_json(args)
-    image_path = args[:image_path]
-    image_path = image_path.sub(/^https?:\/\/[^\/]*/i,'')
-    image_path = File.basename(image_path)
-    if(args[:language] && args[:language] == :english) then
-      html_xxx = '<h2>Tasks performed<\/h2>\r\n<p>Add information about job duties, as a short text or a bulleted list:<\/p>' +
-        '\r\n<ul>\r\n' +
-        '<li>&lt;Task 1&gt;<\/li>\r\n' +
-        '<li>&lt;Task 1&gt;<\/li>\r\n' +
-        '<li>...<\/li>\r\n<\/ul>\r\n<h2>Background<\/h2>\r\n<p>Add information about previous education and employment.<\/p>'
-      html = ''
-    else
-      html = '<h2>Arbeidsomr&aring;der<\/h2>\r\n<p>Her kan du skrive om arbeidsomr&aring;der, ' +
-        'enten som kort tekst eller som listepunkter:</p>' +
-        '\r\n' +
-        '<ul>\r\n    <li>&lt;Arbeidsomr&aring;de 1&gt;</li>\r\n    '+
-        '<li>&lt;Arbeidsomr&aring;de 1&gt;</li>\r\n    <li>...</li>\r\n</ul>' +
-        '\r\n<h2>Bakgrunn</h2>\r\n<p>Eventuelt kort om tidligere arbeidserfaring og utdanning.</p>'
-    end
-
-    json = ''
-  json = <<EOF
-{
-   "resourcetype": "person",
-   "properties":    {
-      "getExternalPersonInfo": "true",
-      "picture": "#{image_path}",
-      "content": "#{html}",
-      "getExternalScientificInformation": "false",
-      "username": "#{args[:username]}",
-      "getRelatedGroups": "true",
-      "getRelatedProjects": "true"
-   }
-}
-EOF
-    return json
-  end
-
-  def proppatch_person_presentasjon(json_url,language)
-    time = Time.now.httpdate.to_s
-    properties = '<v:publish-date xmlns:v="vrtx">' + time + '</v:publish-date>' +
-            '<v:userSpecifiedCharacterEncoding xmlns:v="vrtx">utf-8</v:userSpecifiedCharacterEncoding>' +
-            '<d:getcontenttype>application/json</d:getcontenttype>' +
-            '<v:resourceType xmlns:v="vrtx">person</v:resourceType>'
-    if(language == :english) then
-      properties += '<d:getcontentlanguage>en</d:getcontentlanguage>'
-    else
-      ## properties += '<d:getcontentlanguage>no</d:getcontentlanguage>'
-    end
-
-    begin
-      @vortex.proppatch(json_url, properties)
-    rescue
-      puts "Warning: error while proppatching: " + json_url
-    end
-  end
-
-  def create_json_doc(username, path, image_path, language)
-    json = person_presentation_json(:username => username, :image_path => image_path, :language => language)
-    json_url = path + 'index.html'
-
-    puts "Create person page: " + json_url
-    @vortex.put_string(json_url,json)
-    proppatch_person_presentasjon(json_url, language)
-
-#    realname = ldap_realname(username)
-#    if(realname) then
-#      @vortex.proppatch(path, '<v:userTitle xmlns:v="vrtx">' + realname + '</v:userTitle>')
-#    else
-#      puts "Warning: Unable to get info from ldap on: " + username
-#    end
-  end
-
-end
-
-user = ENV['DAVUSER'] #  ask("Username : ") {|q| q.echo = true}
-pass  = ENV['DAVPASS'] #  ask("Password  : ") {|q| q.echo = false}
-if(!pass)then
-  puts "Usage: export DAVPASS=pass "
-  exit
-end
-
-host = 'https://www2-dav.uio.no'
-
-src_url = host + '/personer/person-bilder/'
-dest_url = host + '/english/people/'  # 'personpresentasjoner/'
-
-presentasjoner = PersonPresentasjon.new(src_url, user, pass)
-presentasjoner.find_pictures(src_url, dest_url, :english)
+person = Vortex::Person.new(:user => 'herman',
+                            :image => '/konv/personer_test/placeholder.jpg',
+                            :language => :english,
+                            :scientific => true)
 
+url = @vortex.publish(person)
+puts "Published: " + url

data/lib/vortex_client.rb

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 require 'net/dav'
 require 'vortex_client/string_utils'
+require 'vortex_client/person'
 require 'highline/import'
 require 'time'
 
+require 'json'
 
 
 # Utilities for managing content in the web content management system Vortex.
@@ -26,14 +28,15 @@ module Vortex
     # Retrieve password from KeyChain if running on OS X. Username must be the
     # the same on server as user locally.
     #
-    # Requires 'osx_keychain' and 'RubyInline' gem. To install
-    #  $ sudo gem install RubyInline
-    #  $ sudo gem instal osx_keychain
+    # Requires 'osx_keychain' and 'RubyInline' gem. To install:
+
+    #   $ sudo gem install RubyInline
+    #   $ sudo gem install osx_keychain
     #
     #
     #   vortex = Vortex::Connection.new("https://www-dav.server.com", :use_osx_keychain => true)
-    #     Password not found in OS X KeyChain.
-    #     Enter password to store new password in OS X KeyChain.
+    #     Password not found on OS X KeyChain.
+    #     Enter password to store new password on OS X KeyChain.
     #     Password: *****
     #     Password for 'tiger' on 'www-dav.server.com' stored in OS X KeyChain.
     #
@@ -61,14 +64,14 @@ module Vortex
             pass = keychain[@uri.host, user ]
 
             if(pass == nil) then
-              puts "Password not found in OS X KeyChain. "
-              puts "Enter password to store new password in OS X KeyChain."
+              puts "Password not found on OS X KeyChain. "
+              puts "Enter password to store new password on OS X KeyChain."
               ## @handler.user = ask("Username: ") {|q| q.echo = true}
               ## Todo: store username in a config file so we can have
               ## different username locally and on server
               pass = ask("Password: ") {|q| q.echo = "*"} # false => no echo
               keychain[@uri.host, user] = pass
-              puts "Password for '#{user}' on '#{@uri.host}' stored in OS X KeyChain."
+              puts "Password for '#{user}' on '#{@uri.host}' stored on OS X KeyChain."
               @handler.user = user
               @handler.pass = pass
             else
@@ -109,9 +112,9 @@ module Vortex
     # Writes a document a document to the web. Same as publish, except
     # that if document type is StructuredArticle publishDate
     def write(object)
-      if(object.is_a? HtmlArticle or object.is_a? HtmlEvent or object.is_a? StructuredArticle)
+      if(object.is_a? HtmlArticle or object.is_a? HtmlEvent or object.is_a? StructuredArticle or object.is_a? Vortex::Person)
         uri = @uri.merge(object.url)
-        # puts "DEBUG: '" + object.class.to_s + "=" + object.properties
+        # puts "DEBUG: uri = " + uri.to_s
         self.put_string(uri, object.content)
         self.proppatch(uri, object.properties)
         return uri.to_s
@@ -435,7 +438,7 @@ module Vortex
   # Vortex article stored as JSON data.
   class StructuredArticle <  HtmlArticle
 
-    attr_accessor :title, :introduction, :content, :filename, :modifiedDate, :publishDate, :owner, :url, :picture, :hideAdditionalContent
+    attr_accessor :title, :introduction, :body, :filename, :modifiedDate, :publishDate, :owner, :url, :picture, :hideAdditionalContent
 
     # Create an article
     # Options:
@@ -472,10 +475,11 @@ module Vortex
          "resourcetype": "structured-article",
          "properties": {
       EOF
+
       if(body and body.size > 0)
         tmp_body = body
         # Escape '"' and line shifts so html will be valid json data.
-        tmp_body = body.gsub(/\r/,"\\\r").gsub(/\n/,"\\\n").gsub(/\"/,"\\\"")
+        tmp_body = tmp_body.gsub(/\r/,"\\\r").gsub(/\n/,"\\\n").gsub(/\"/,"\\\"") ## .to_json
         json += "           \"content\": \"#{tmp_body}\",\n"
       end
       if(author and author.size > 0)
@@ -643,6 +647,19 @@ module Vortex
   end
 
 
+  class PersonListingCollection < Collection
+
+    def properties()
+      props = super
+      props += '<v:resourceType xmlns:v="vrtx">person-listing</v:resourceType>' +
+        '<v:collection-type xmlns:v="vrtx">person-listing</v:collection-type>'
+      return props
+    end
+
+  end
+
+
+
   class EventListingCollection < Collection
 
     def properties()

data/lib/vortex_client/person.rb

@@ -0,0 +1,224 @@
+# -*- coding: utf-8 -*-
+require 'uri'
+
+module Vortex
+
+  # Publish Person presentations on Vortex enabled web servers.
+  #
+  # Examples:
+  #
+  #     person = Vortex::Person.new(:user => 'thomasfl',
+  #                                 :image => '/images/thomasfl.jpg',
+  #                                 :language => :english,
+  #                                 :scientific => true)
+  #                                 :publishedDate => "05.01.2010 12:00")
+  #    vortex.publish(person)
+  #
+  # Mandatory parameters:
+  #    :user  => username
+  #    :image => path to image ex. '/user
+  #
+  # Optional parameters:
+  #     :language => :english or :norwegian (defaults)
+  #     :scientific => false (default). Get list of publications
+  #     :administrative = true (default). Same as :scientific => false
+  #     :html => json encoded html. Ex
+  #     :url  => path to presentation. Ex. '/persons/thomas.html'
+  #     :publishedDate => date to be published. Defaults to now. Ex. "05.01.2010 12:00"
+  #     :filename => filename ex. 'index.html'
+  #
+  # Author: Thomas Flemming, thomasfl(at)usit.uio.no 2010
+  #
+  class Person
+
+    attr_accessor :user, :html, :url, :publishedDate, :language, :scientific, :administrative, :image, :filename
+
+    def initialize(options={})
+      options.each{|k,v|send("#{k}=",v)}
+
+      if(not(@user))then
+        raise Exception.new("missing mandatory parameter :user")
+      end
+      if(not(@image))then
+        raise Exception.new("missing mandatory parameter :image ")
+      end
+
+      # Set defaults
+      if(@language == nil)then
+        @language = :norwegian
+      end
+
+      if(@scientific == nil)then
+        @scientific = false
+      end
+
+      if(@administrative == nil and not(@scientific))then
+        @administrative = true
+      end
+
+    end
+
+    def url
+      if(@url)
+        return @url
+      else
+        if(@filename)
+          return @filename
+        else
+          return @user + ".html"
+        end
+      end
+    end
+
+    def content
+      image_path = @image
+      image_path = image_path.sub(/^https?:\/\/[^\/]*/i,'')
+      image_path = File.basename(image_path)
+
+      if(@html)then
+        html = @html
+      else
+        if(@scientific)then
+          html_template = :scientific
+        else
+          html_template = :administrative
+        end
+        html = create_html(:html_template => html_template, :language => @language)
+      end
+
+    json = <<EOF
+{
+   "resourcetype": "person",
+   "properties":    {
+      "getExternalPersonInfo": "true",
+      "picture": "#{image_path}",
+      "content": "#{html}",
+      "getExternalScientificInformation": "#{@scientific}",
+      "username": "#{@user}",
+      "getRelatedGroups": "true",
+      "getRelatedProjects": "true"
+   }
+}
+EOF
+      return json
+    end
+
+
+    def properties
+      properties = '<v:userSpecifiedCharacterEncoding xmlns:v="vrtx">utf-8</v:userSpecifiedCharacterEncoding>' +
+              '<d:getcontenttype>application/json</d:getcontenttype>' +
+              '<v:resourceType xmlns:v="vrtx">person</v:resourceType>'
+
+      if(@publishedDate and @publishedDate != "")
+        if(@publishedDate.kind_of? Time)
+          @publishedDate = @publishedDate.httpdate.to_s
+        end
+        props += '<v:published-date xmlns:v="vrtx">' + @publishedDate + '</v:published-date>'
+      else
+        time = Time.now.httpdate.to_s
+        properties += '<v:publish-date xmlns:v="vrtx">' + time + '</v:publish-date>'
+      end
+
+      if(language == :english) then
+        properties += '<v:contentLocale xmlns:v="vrtx">en</v:contentLocale>'
+      else
+        properties += '<v:contentLocale xmlns:v="vrtx">no_NO</v:contentLocale>'
+      end
+      return properties
+    end
+
+    # Generate html for person presentation. Defaults to presentation
+    # for administrative employees in norwegian
+    #
+    # Examples:
+    #
+    #    create_html()
+    #    create_html(:language => :english, :html_template => :scientific)
+    #    create_html(:language => :norwegian, :html_template => :administrative)
+    #
+    def create_html(options)
+      if(options[:html_template] && options[:html_template] == :scientific) then
+
+        if(options[:language] && options[:language] == :english) then
+          html = '<h2>Academic Interests<\/h2>\r\n' +
+            '<p>Add information about academic fields of interest.<\/p>\r\n' +
+            '<h2>Teaching<\/h2>\r\n' +
+            '<ul>\r\n' +
+            '    <li>&lt;Link to programme of study/course&gt;<\/li>\r\n' +
+            '    <li>&lt;Link to programme of study/course&gt;<\/li>\r\n' +
+            '    <li>...<\/li>\r\n' +
+            '<\/ul>\r\n' +
+            '<h2>Higher education and employment history<\/h2>\r\n' +
+            '<p>Brief introduction to previous education and employment.<\/p>\r\n' +
+            '<h2>Honoraria<\/h2>\r\n' +
+            '<ul>\r\n' +
+            '    <li>&lt;Name of prize and (if applicable) link 1&gt;<\/li>\r\n' +
+            '    <li>&lt;Name of prize and (if applicable) link 2&gt;<\/li>\r\n' +
+            '    <li>...<\/li>\r\n' +
+            '<\/ul>\r\n' +
+            '<h2>Appointments<\/h2>\r\n' +
+            '<ul>\r\n' +
+            '    <li>&lt;Title and (if applicable) link 1&gt;<\/li>\r\n' +
+            '    <li>&lt;Title and (if applicable) link 2&gt;<\/li>\r\n' +
+            '    <li>...<\/li>\r\n' +
+            '<\/ul>\r\n' +
+            '<h2>Cooperation<\/h2>\r\n' +
+            '<p>&nbsp;<\/p>'
+        else
+          html = '<h2>Faglige interesser<\/h2>\r\n' +
+            '<p>Her kan du skrive om faglige interesser.<\/p>\r\n' +
+            '<h2>Undervisning<\/h2>\r\n<p>' +
+            '&lt;Lenke til studieprogram/emne&gt; <br />\r\n' +
+            '&lt;Lenke til studieprogram/emne&gt; <br />\r\n...<\/p>\r\n' +
+            '<h2>Bakgrunn<\/h2>\r\n' +
+            '<p>Kort om tidligere arbeidserfaring og utdanning<\/p>\r\n' +
+            '<h2>Priser<\/h2>\r\n' +
+            '<p>&lt;Navn og eventuelt lenke til pris 1&gt; <br />\r\n'  +
+            '&lt;Navn og eventuelt lenke til pris 2&gt; <br />\r\n' +
+            '...<\/p>\r\n' +
+            '<h2>Verv<\/h2>\r\n<p>' +
+            '&lt;Navn og eventuelt lenke til verv 1&gt; <br />\r\n' +
+            '&lt;Navn og eventuelt lenke til verv 2&gt; <br />\r\n...' +
+            '<\/p>\r\n' +
+            '<h2>Samarbeid<\/h2>\r\n' +
+            '<p>&nbsp;<\/p>'
+        end
+      else
+
+        if(options[:language] && options[:language] == :english) then
+          html = '<h2>Tasks performed<\/h2>\r\n' +
+            '<p>Add information about job duties, as a short text or a bulleted list:<\/p>' +
+            '\r\n<ul>\r\n' +
+            '  <li>&lt;Task 1&gt;<\/li>\r\n' +
+            '  <li>&lt;Task 1&gt;<\/li>\r\n' +
+            '  <li>...<\/li>\r\n' +
+            '<\/ul>\r\n' +
+            '<h2>Background<\/h2>\r\n' +
+            '<p>Add information about previous education and employment.<\/p>'
+        else
+          html = '<h2>Arbeidsomr&aring;der<\/h2>\r\n' +
+            '<p>Her kan du skrive om arbeidsomr&aring;der, ' +
+            'enten som kort tekst eller som listepunkter:</p>' +
+            '\r\n' +
+            '<ul>\r\n' +
+            '    <li>&lt;Arbeidsomr&aring;de 1&gt;</li>\r\n' +
+            '    <li>&lt;Arbeidsomr&aring;de 1&gt;</li>\r\n' +
+            '    <li>...</li>\r\n' +
+            '</ul>' +
+            '\r\n' +
+            '<h2>Bakgrunn</h2>\r\n' +
+            '<p>Eventuelt kort om tidligere arbeidserfaring og utdanning.</p>'
+        end
+      end
+      return html
+    end
+
+
+    def to_s
+      "#<Vortex::Person "+instance_variables.collect{|var|var+": "+instance_variable_get(var).to_s}.join(",")+">"
+    end
+
+
+  end
+
+end

data/test/test_vortex_person.rb

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestVortexPerson < Test::Unit::TestCase
+  include Vortex
+
+  def setup
+    if(not(@vortex))
+      user = ENV['DAVUSER']
+      pass = ENV['DAVPASS']
+      # puts "JSON testene kan foreløpig ikke kjøres på vortex.uio.no?"
+      @vortex = Connection.new("https://nyweb1-dav.uio.no/",user, pass)
+
+      if(@vortex.exists?("/konv/personer_test/thomasfl.html"))then
+        @vortex.delete("/konv/personer_test/thomasfl.html")
+      end
+    end
+  end
+
+  def self.zshould(*args)
+  end
+
+  zshould "publish person presentation" do
+    @vortex.cd('/konv/personer_test/')
+    person = Vortex::Person.new(:user => 'thomasfl',
+                                :image => '/brukere/thomasfl/thomasfl.jpg',
+                                :language => :english,
+                                :scientific => false)
+
+    assert @vortex.exists?("/konv/personer_test/thomasfl.html") == false
+    url = @vortex.publish(person)
+    assert @vortex.exists?("/konv/personer_test/thomasfl.html")
+    puts "Published: " + url
+    # puts person.content
+  end
+
+  should "publish default person presentation for scientists" do
+    @vortex.cd('/konv/personer_test/')
+
+    person = Vortex::Person.new(:user => 'herman',
+                                :image => '/konv/personer_test/placeholder.jpg',
+                                :language => :english,
+                                :scientific => true)
+
+    # puts person.content
+    url = @vortex.publish(person)
+    puts "Published: " + url
+  end
+
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 8
-  version: 0.5.8
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - Thomas Flemming
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 +02:00
+date: 2010-07-06 00:00:00 +02:00
 default_executable: vrtx-sync
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ files:
 - bin/vrtx-sync
 - examples/change_folder_type.rb
 - examples/create_collection.rb
+- examples/disable_right_column.rb
 - examples/ldap_util.rb
 - examples/person_presentation.rb
 - examples/publish_article.rb
@@ -83,6 +84,7 @@ files:
 - examples/sitemap.rb
 - lib/vortex_client.rb
 - lib/vortex_client/item_extensions.rb
+- lib/vortex_client/person.rb
 - lib/vortex_client/string_utils.rb
 - test/helper.rb
 - test/test_acl.rb
@@ -92,6 +94,7 @@ files:
 - test/test_vortex_client.rb
 - test/test_vortex_collection.rb
 - test/test_vortex_event.rb
+- test/test_vortex_person.rb
 - test/test_vortex_pic.rb
 - test/test_vortex_tags.rb
 - test/test_vortex_utils.rb
@@ -134,18 +137,15 @@ test_files:
 - test/test_vortex_client.rb
 - test/test_vortex_collection.rb
 - test/test_vortex_event.rb
+- test/test_vortex_person.rb
 - test/test_vortex_pic.rb
 - test/test_vortex_tags.rb
 - test/test_vortex_utils.rb
 - examples/change_folder_type.rb
 - examples/create_collection.rb
-- examples/create_collection_flymake.rb
+- examples/disable_right_column.rb
 - examples/ldap_util.rb
 - examples/person_presentation.rb
 - examples/publish_article.rb
-- examples/publish_article_flymake.rb
 - examples/publish_event.rb
-- examples/publish_event_flymake.rb
 - examples/sitemap.rb
-- examples/sitemap_flymake.rb
-- examples/sitemap_flymake_flymake.rb

data/examples/create_collection_flymake.rb

@@ -1,15 +0,0 @@
-require 'rubygems'
-require 'vortex_client'
-include Vortex
-
-vortex = Vortex::Connection.new("https://vortex-dav.uio.no/", ENV['DAVUSER'], ENV['DAVPASS'])
-vortex.cd('/brukere/thomasfl/events/')
-
-collection = ArticleListingCollection.new(:url => 'my-collection', :title => 'My articles')
-path = vortex.create(collection)
-puts "Created folder: " + path
-
-
-collection = EventListingCollection.new(:title => 'My events')
-path = vortex.create(collection)
-puts "Created folder: " + path

data/examples/publish_article_flymake.rb

@@ -1,16 +0,0 @@
-require 'rubygems'
-require 'vortex_client'
-include Vortex
-
-vortex = Vortex::Connection.new("https://vortex-dav.uio.no/")
-
-vortex.cd('/brukere/thomasfl/nyheter/')
-article  = HtmlArticle.new(:title => "My new title",
-                           :introduction => "Short introduction",
-                           :body => "<p>Longer body</p>",
-                           :publishedDate => Time.now,
-                           :author => "Thomas Flemming")
-path = vortex.publish(article)
-puts "published " + path
-
-# => published https://vortex-dav.uio.no/brukere/thomasfl/nyheter/my-new-title.html

data/examples/publish_event_flymake.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'vortex_client'
-include Vortex
-
-vortex = Vortex::Connection.new("https://vortex-dav.uio.no/")
-vortex.cd('/brukere/thomasfl/events/')
-event = HtmlEvent.new(:title => "My 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 => Time.now )
-path = vortex.publish(event)
-puts "published " + path
-

data/examples/sitemap_flymake.rb

@@ -1,106 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generate sitemap from WebDAV tree:
-#
-# Example:
-#
-# $ruby generate_vortex_sitemap.rb http://www.iss.uio.no/
-#
-# Author: Thomas Flemming, thomas.flemming@usit.uio.no 2010
-#
-require "net/https"
-require "uri"
-
-require 'rubygems'
-require 'vortex_client'
-require 'open-uri'
-
-user = ask("Username : ") {|q| q.echo = true}
-pwd  = ask("Pssword  : ") {|q| q.echo = false}
-
-
-# Returns "200" if everything's ok.
-def responseCode(url)
-  uri = URI.parse(url)
-  http = Net::HTTP.new(uri.host, uri.port)
-  if(uri.scheme == "https")
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-  end
-  request = Net::HTTP::Get.new(uri.request_uri)
-  response = http.request(request)
-  return response.code
-end
-
-
-def property(item, xpath)
-  namespaces = {'v' => "vrtx",'d' => "DAV:"}
-  xml = item.propfind
-  xml.xpath(xpath, namespaces).inner_text
-end
-
-def dav_url2http_url(url)
-  if(url =~ /\/vortex-dav\./)
-    url = url.sub( /\/vortex-dav\./, '/vortex.' )
-  else
-    url = url.sub(/https:\/\/www-dav\./,'http://www.')
-  end
-  return url
-end
-
-def http_url2dav_url(url)
-  url = url.sub(/^http:\/\//i,'https://')
-  url = url.sub(/^https?:\/\/www\./i,'https://www-dav.')
-  return url
-end
-
-def outline_number(url)
-  @numbering = [] if(@numbering == nil)
-  @prev_url = "" if(@prev_url == nil)
-
-  size = url.split(/\//).size
-  prev_size = @prev_url.split(/\//).size
-
-  if(size > prev_size)
-    @numbering << 1
-  end
-
-  if(size < prev_size)
-    index = size - 1
-    # index = @numbering.size - 2
-    @numbering = @numbering[0..index]
-    @numbering[index] = @numbering.last + 1
-  end
-
-  if(prev_size == size)
-    index = @numbering.size - 1
-    @numbering[index] = @numbering.last + 1
-  end
-
-  @prev_url = url
-  return @numbering.join(".")
-end
-
-
-url = ARGV[0]
-dav_url = http_url2dav_url(url)
-
-vortex = Vortex::Connection.new(dav_url,user,pwd)
-
-vortex.find('.',:recursive => true,:suppress_errors => true) do |item|
-  url = item.url.to_s
-  if(url =~ /\/$/ ) # Print folders onlye
-    collectionTitle = property(item,'.//v:collectionTitle') # Vortex folder title
-    resourceType = property(item,'.//v:resourceType') # Vortex folder type
-    http_url = dav_url2http_url(url)
-    responseCode = responseCode(http_url)
-    path = URI.parse(url).path
-    foldername = path[/\/([^\/]*)\/$/,1]
-
-    if(responseCode == "200" and not(foldername =~ /^[\.|_]/ or path =~ /^\/vrtx\// ) )
-      number = outline_number(path)
-      puts "#{number};#{foldername};#{http_url};#{collectionTitle}"
-    end
-
-  end
-end
-

data/examples/sitemap_flymake_flymake.rb

@@ -1,106 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generate sitemap from WebDAV tree:
-#
-# Example:
-#
-# $ruby generate_vortex_sitemap.rb http://www.iss.uio.no/
-#
-# Author: Thomas Flemming, thomas.flemming@usit.uio.no 2010
-#
-require "net/https"
-require "uri"
-
-require 'rubygems'
-require 'vortex_client'
-require 'open-uri'
-
-user = ask("Username : ") {|q| q.echo = true}
-pwd  = ask("Pssword  : ") {|q| q.echo = false}
-
-
-# Returns "200" if everything's ok.
-def responseCode(url)
-  uri = URI.parse(url)
-  http = Net::HTTP.new(uri.host, uri.port)
-  if(uri.scheme == "https")
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-  end
-  request = Net::HTTP::Get.new(uri.request_uri)
-  response = http.request(request)
-  return response.code
-end
-
-
-def property(item, xpath)
-  namespaces = {'v' => "vrtx",'d' => "DAV:"}
-  xml = item.propfind
-  xml.xpath(xpath, namespaces).inner_text
-end
-
-def dav_url2http_url(url)
-  if(url =~ /\/vortex-dav\./)
-    url = url.sub( /\/vortex-dav\./, '/vortex.' )
-  else
-    url = url.sub(/https:\/\/www-dav\./,'http://www.')
-  end
-  return url
-end
-
-def http_url2dav_url(url)
-  url = url.sub(/^http:\/\//i,'https://')
-  url = url.sub(/^https?:\/\/www\./i,'https://www-dav.')
-  return url
-end
-
-def outline_number(url)
-  @numbering = [] if(@numbering == nil)
-  @prev_url = "" if(@prev_url == nil)
-
-  size = url.split(/\//).size
-  prev_size = @prev_url.split(/\//).size
-
-  if(size > prev_size)
-    @numbering << 1
-  end
-
-  if(size < prev_size)
-    index = size - 1
-    # index = @numbering.size - 2
-    @numbering = @numbering[0..index]
-    @numbering[index] = @numbering.last + 1
-  end
-
-  if(prev_size == size)
-    index = @numbering.size - 1
-    @numbering[index] = @numbering.last + 1
-  end
-
-  @prev_url = url
-  return @numbering.join(".")
-end
-
-
-url = ARGV[0]
-dav_url = http_url2dav_url(url)
-
-vortex = Vortex::Connection.new(dav_url,user,pwd)
-
-vortex.find('.',:recursive => true,:suppress_errors => true) do |item|
-  url = item.url.to_s
-  if(url =~ /\/$/ ) # Print folders onlye
-    collectionTitle = property(item,'.//v:collectionTitle') # Vortex folder title
-    resourceType = property(item,'.//v:resourceType') # Vortex folder type
-    http_url = dav_url2http_url(url)
-    responseCode = responseCode(http_url)
-    path = URI.parse(url).path
-    foldername = path[/\/([^\/]*)\/$/,1]
-
-    if(responseCode == "200" and not(foldername =~ /^[\.|_]/ or path =~ /^\/vrtx\// ) )
-      number = outline_number(path)
-      puts "#{number};#{foldername};#{http_url};#{collectionTitle}"
-    end
-
-  end
-end
-