RubyGems - vortex_client - Versions diffs - 0.5.2 → 0.5.3 - Mend

vortex_client 0.5.2 → 0.5.3

Files changed (5) hide show

data/VERSION +1 -1
data/lib/vortex_client.rb +114 -10
data/lib/vortex_client/string_utils.rb +1 -1
data/test/test_json_publish.rb +40 -0
metadata +4 -3

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.5.2
1	+ 0.5.3

data/lib/vortex_client.rb CHANGED Viewed

@@ -4,6 +4,8 @@ require 'vortex_client/string_utils'
 require 'highline/import'
 require 'time'
 # Utilities for managing content in the web content management system Vortex.
 # All calls are done with the webdav protocol.
 module Vortex
@@ -62,7 +64,7 @@ module Vortex
     #   article = Vortex::StructuredArticle(:title=>"My title")
     #   vortex.publish(article)
     def publish(object)
-      if(object.is_a? HtmlArticle or object.is_a? HtmlEvent)
+      if(object.is_a? HtmlArticle or object.is_a? HtmlEvent or object.is_a? StructuredArticle)
         uri = @uri.merge(object.url)
         # puts "DEBUG: '" + object.class.to_s + "=" + object.properties
         self.put_string(uri, object.content)
@@ -97,7 +99,8 @@ module Vortex
   end
+  # Gimmick the internal resource hierarchy in Vortex as class hierarchy in ruby
+  # with resource as the root class.
   class Resource
   end
@@ -106,7 +109,7 @@ module Vortex
     # Named PlainFile so it won't get mixed up with standard File class.
   end
-  # Plain HTML files with title, introduction and keywords set as webdav properties.
+  # HtmlArticle: Plain HTML files with title, introduction and keywords set as WebDAV properties.
   #
   # Examples:
   #
@@ -213,7 +216,6 @@ module Vortex
         end
         props += '</vrtx:values></v:tags>'
       end
       return props
     end
@@ -362,9 +364,9 @@ module Vortex
   # Vortex article stored as JSON data.
   # TODO: Fill out the stub.
-  class StructuredArticle < PlainFile
+  class StructuredArticle <  HtmlArticle
-    attr_accessor :title, :introduction, :content, :filename, :modifiedDate, :publishedDate, :owner, :url
+    attr_accessor :title, :introduction, :content, :filename, :modifiedDate, :publishedDate, :owner, :url, :picture
     # Create an article
     # Options:
@@ -374,18 +376,120 @@ module Vortex
       options.each{|k,v|send("#{k}=",v)}
     end
+    def url
+      if(@url)
+        @url
+      else
+        if(filename)
+          filename
+        end
+        if(title)
+          StringUtils.create_filename(title) + ".html"
+        else
+          warn "Article must have either a full url or title. "
+        end
+      end
+    end
     def to_s
       "#<Vortex::StructuredArticle "+instance_variables.collect{|var|var+": "+instance_variable_get(var).to_s}.join(",")+">"
     end
-    def dav_properties
-      "<xml todo>"
+    def content
+      json = <<-EOF
+      {
+         "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(/\"/,"\\\"")
+        json += "           \"content\": \"#{tmp_body}\",\n"
+      end
+      if(author and author.size > 0)
+        json += "           \"author\": [\"#{author}\"],\n"
+      end
+      json += "           \"title\": \"#{title}\",\n"
+      if(introduction and introduction.size > 0)
+        tmp_introduction = introduction
+        tmp_introduction = tmp_introduction.gsub(/\r/,"\\\r")
+        tmp_introduction = tmp_introduction.gsub(/\n/,"\\\n")
+        tmp_introduction = tmp_introduction.gsub(/\"/,"\\\"")
+        json += "           \"introduction\": \"#{tmp_introduction}\",\n"
+      end
+      if(picture)
+        json += "           \"picture\": \"#{picture}\",\n"
+      end
+      json += <<-EOF
+           "hideAdditionalContent": "false"
+         }
+      }
+      EOF
+      return json
     end
-    def dav_content
-      "<html todo>"
+    def properties
+      props = '<v:resourceType xmlns:v="vrtx">structured-article</v:resourceType>' +
+    #     '<v:xhtml10-type xmlns:v="vrtx">structured-article</v:xhtml10-type>' +
+        '<v:userSpecifiedCharacterEncoding xmlns:v="vrtx">utf-8</v:userSpecifiedCharacterEncoding>' +
+        '<d:getcontenttype>application/json</d:getcontenttype>'
+      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>'
+      end
+      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>'
+        end
+        props += '<d:getlastmodified>' + date + '</d:getlastmodified>' +
+        '<v:contentLastModified xmlns:v="vrtx">' + date + '</v:contentLastModified>' +
+        '<v:propertiesLastModified xmlns:v="vrtx">' + date + '</v:propertiesLastModified>' +
+        '<v:creationTime xmlns:v="vrtx">' + date + '</v:creationTime>'
+      end
+      if(picture)
+#        props += '<v:picture xmlns:v="vrtx">' + picture + '</v:picture>'
+      end
+      if(title)
+#        props += '<v:userTitle xmlns:v="vrtx">' + title + '</v:userTitle>'
+      end
+      if(owner)
+        props += '<owner xmlns="vrtx">' + owner + '</owner>'
+      end
+      if(introduction and introduction != "")
+#        props += '<introduction xmlns="vrtx">' + escape_html(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">' +
+ #         '<vrtx:values xmlns:vrtx="http://vortikal.org/xml-value-list">'
+ #       tags.each do |tag|
+ #           props += "<vrtx:value>#{tag}</vrtx:value>"
+ #       end
+ #       props += '</vrtx:values></v:tags>'
+      end
+      return props
     end
   end

data/lib/vortex_client/string_utils.rb CHANGED Viewed

@@ -55,7 +55,7 @@ module Vortex
         ['é','è','ê','ë','Ë','É','È','Ê'] => 'e',
         ['í','ì','î','ï','I','Î','Ì'] => 'i',
         ['ó','ò','ô','ö','õ','Õ','Ö','Ô','Ò'] => 'o',
-        ['œ'] => 'oe',
+        ['œ'] => 'e',
         ['ß'] => 'ss',
         ['ú','ù','û','ü','U','Û','Ù'] => 'u',
         ['æ'] => 'ae',

data/test/test_json_publish.rb ADDED Viewed

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+class TestJSONPublish < 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)
+    end
+  end
+  should "publish JSON articles" do
+    # url = 'https://vortex-dav.uio.no/bloggimport/json-test.html'
+    url = 'bloggimport/json-test.html'
+    if(@vortex.exists?(url))
+      @vortex.delete(url)
+    end
+    body = "<p>&nbsp;Bla bla<\/p>\r\n<p>Mer &quot;Bla&quot; bla<\/p>\r\n<p>"+
+      "<strong>Enda<\/strong> <a href=\"http://www.vg.no\">mer<\/a> bla bla<\/p>\r\n<p>&nbsp;<\/p>"
+    @vortex.cd('/bloggimport/')
+    article = Vortex::StructuredArticle.new(:title => "JSON test",
+                                            :introduction => "Sample introduction",
+                                            :body => body, # .to_json, # "<p>Hello world</p><p>Bla bla</p>",
+                                            :publishedDate => "05.01.2010 12:00",
+                                            :author => "Thomas Flemming",
+                                            :picture => "/bloggimport/forskning/arrangementer/disputaser/2008/01/gran_boe.jpg" )
+    url = @vortex.publish(article)
+    puts "For å fullføre testen: Se på denne siden i en nettleser: " + url
+    assert @vortex.exists?(url)
+  end
+end

metadata CHANGED Viewed

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments:
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors:
 - Thomas Flemming
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-03-03 00:00:00 +01:00
+date: 2010-03-11 00:00:00 +01:00
 default_executable: vrtx-sync
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -123,6 +123,7 @@ test_files:
 - test/helper.rb
 - test/test_acl.rb
 - test/test_date_conversion.rb
+- test/test_json_publish.rb
 - test/test_vortex_article_publish.rb
 - test/test_vortex_client.rb
 - test/test_vortex_collection.rb