vortex_client 0.5.9 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.9
+0.6.0

data/examples/create_collection.rb

@@ -5,11 +5,17 @@ include Vortex
 vortex = Vortex::Connection.new("https://vortex-dav.uio.no/")
 vortex.cd('/brukere/thomasfl/events/')
 
-collection = ArticleListingCollection.new(:url => 'my-collection', :title => 'My articles')
+# Create standard folder
+collection = Collection.new(:url => 'my-collection', :title => 'My articles')
 path = vortex.create(collection)
 puts "Created folder: " + path
 
+# Create a folder that lists articles
+collection = ArticleListingCollection.new(:url => 'my-collection', :title => 'My articles')
+path = vortex.create(collection)
+puts "Created folder: " + path
 
+# Create a folder that lists events
 collection = EventListingCollection.new(:title => 'My events')
 path = vortex.create(collection)
 puts "Created folder: " + path

data/examples/publish_article.rb

@@ -1,11 +1,10 @@
 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",
+article  = Vortex::StructuredArticle.new(:title => "Hello world",
                            :introduction => "Short introduction",
                            :body => "<p>Longer body</p>",
                            :publishedDate => Time.now,

data/lib/vortex_client.rb

@@ -438,7 +438,7 @@ module Vortex
   # Vortex article stored as JSON data.
   class StructuredArticle <  HtmlArticle
 
-    attr_accessor :title, :introduction, :body, :filename, :modifiedDate, :publishDate, :owner, :url, :picture, :hideAdditionalContent
+    attr_accessor :title, :introduction, :body, :filename, :modifiedDate, :publishDate, :owner, :url, :picture, :hideAdditionalContent, :tags
 
     # Create an article
     # Options:
@@ -470,6 +470,47 @@ module Vortex
 
 
     def content
+      properties = { }
+      if(body and body.size > 0)
+        properties = properties.merge(:content => body)
+      end
+
+      if(tags and tags.kind_of?(Array) and tags.size > 0)then
+        properties = properties.merge(:tags => tags)
+      end
+
+      if(author and author.size > 0)
+        properties =  properties.merge(:author => author)
+      end
+      if(introduction and introduction.size > 0)
+        properties = properties.merge(:introduction => introduction)
+      end
+
+      if(picture)
+        properties = properties.merge(:picture => picture)
+      end
+
+      if(title)
+        properties = properties.merge(:title => title)
+      end
+
+      if(@hideAdditionalContent != nil)then
+        if(@hideAdditionalContent.kind_of?(FalseClass))
+          value = "false"
+        elsif(@hideAdditionalContent.kind_of?(TrueClass))then
+          value = "true"
+        elsif(@hideAdditionalContent.kind_of?(String))
+          value = @hideAdditionalContent
+        end
+        properties = properties.merge(:hideAdditionalContent => value)
+      end
+
+      json = { :resourcetype => "structured-article"}.merge(:properties => properties).to_json
+
+      return json
+    end
+
+    def zzzzz_content_old
       json = <<-EOF
       {
          "resourcetype": "structured-article",
@@ -482,6 +523,12 @@ module Vortex
         tmp_body = tmp_body.gsub(/\r/,"\\\r").gsub(/\n/,"\\\n").gsub(/\"/,"\\\"") ## .to_json
         json += "           \"content\": \"#{tmp_body}\",\n"
       end
+
+      if(tags and tags.kind_of?(Array) and tags.size > 0)
+        json += "           \"tags\": ,\n"
+        json += "             \"" + tags.join("\"\n, \"") + "\"\n"
+      end
+
       if(author and author.size > 0)
         json += "           \"author\": [\"#{author}\"],\n"
       end
@@ -513,12 +560,14 @@ module Vortex
         }
         EOF
 
+      # puts "DEBUG: json:" + json
+      # puts
+
       return json
     end
 
     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>'
 
@@ -542,19 +591,10 @@ module Vortex
         '<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">' +
@@ -563,14 +603,6 @@ module Vortex
 #        '</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
 
@@ -608,9 +640,7 @@ module Vortex
     end
 
     def properties()
-      # props = "<v:resourceType xmlns:v=\"vrtx\">collection</v:resourceType>" +
-      #  "<v:collection-type xmlns:v=\"vrtx\">article-listing</v:collection-type>"
-      props = ""
+      props = "<v:resourceType xmlns:v=\"vrtx\">collection</v:resourceType>"
       if(title and title != "")
         props += "<v:userTitle xmlns:v=\"vrtx\">#{title}</v:userTitle>"
       end
@@ -629,18 +659,18 @@ module Vortex
   #
   # Examaple:
   #
-  #   collection = ArticleListingCollection(:url => 'news')
-  #   collection = ArticleListingCollection(:foldername => 'news')
-  #   collection = ArticleListingCollection(:title => 'My articles')
-  #   collection = ArticleListingCollection(:title => 'My articles',
-  #                                         :foldername => 'articles',
-  #                                         :navigationTitle => 'Read articles')
+  #   collection = ArticleListingCollection.new(:url => 'news')
+  #   collection = ArticleListingCollection.new(:foldername => 'news')
+  #   collection = ArticleListingCollection.new(:title => 'My articles')
+  #   collection = ArticleListingCollection.new(:title => 'My articles',
+  #                                             :foldername => 'articles',
+  #                                             :navigationTitle => 'Read articles')
   class ArticleListingCollection < Collection
 
     def properties()
       props = super
-      props += "<v:resourceType xmlns:v=\"vrtx\">article-listing</v:resourceType>" +
-        "<v:collection-type xmlns:v=\"vrtx\">article-listing</v:collection-type>"
+      props += '<v:resourceType xmlns:v="vrtx">article-listing</v:resourceType>'  +
+               '<v:collection-type xmlns:v="vrtx">article-listing</v:collection-type>'
       return props
     end
 
@@ -652,7 +682,7 @@ module Vortex
     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>'
+               '<v:collection-type xmlns:v="vrtx">person-listing</v:collection-type>'
       return props
     end
 
@@ -664,8 +694,8 @@ module Vortex
 
     def properties()
       props = super
-      props += "<v:resourceType xmlns:v=\"vrtx\">event-listing</v:resourceType>" +
-        "<v:collection-type xmlns:v=\"vrtx\">event-listing</v:collection-type>"
+      props += '<v:resourceType xmlns:v="vrtx">event-listing</v:resourceType>' +
+               '<v:collection-type xmlns:v="vrtx">event-listing</v:collection-type>'
       return props
     end
 

data/test/test_vortex_article_publish.rb

@@ -6,9 +6,10 @@ class TestVortexClientUtils < Test::Unit::TestCase
 
   def setup
     if(not(@vortex))
-      user = ENV['DAVUSER']
-      pass = ENV['DAVPASS']
-      @vortex = Connection.new("https://vortex-dav.uio.no/",user, pass)
+      # user = ENV['DAVUSER']
+      # pass = ENV['DAVPASS']
+      # @vortex = Connection.new("https://vortex-dav.uio.no/",user, pass)
+      @vortex = Connection.new("https://vortex-dav.uio.no/", :use_osx_keychain => true)
     end
   end
 
@@ -22,6 +23,18 @@ class TestVortexClientUtils < Test::Unit::TestCase
     article = Vortex::HtmlArticle.new(:title => "Sample Title 2",
                                       :introduction => "Sample introduction",
                                       :body => "<p>Hello world</p>",
+                                      :tags => ["Tag1", "Tag2"],
+                                      ## :date => Time.now,
+                                      :publishedDate => "05.01.2010 12:00",
+                                      :author => "Thomas Flemming")
+
+    @vortex.publish(article)
+    assert @vortex.exists?(url)
+
+    article = Vortex::StrucHtmlArticle.new(:title => "Sample Title 2",
+                                      :introduction => "Sample introduction",
+                                      :body => "<p>Hello world</p>",
+                                      :tags => ["Tag1", "Tag2"],
                                       ## :date => Time.now,
                                       :publishedDate => "05.01.2010 12:00",
                                       :author => "Thomas Flemming")

data/test/test_vortex_person.rb

@@ -17,11 +17,9 @@ class TestVortexPerson < Test::Unit::TestCase
     end
   end
 
-  def self.zshould(*args)
-  end
-
-  zshould "publish person presentation" do
+  should "publish person presentation" do
     @vortex.cd('/konv/personer_test/')
+
     person = Vortex::Person.new(:user => 'thomasfl',
                                 :image => '/brukere/thomasfl/thomasfl.jpg',
                                 :language => :english,
@@ -37,9 +35,14 @@ class TestVortexPerson < Test::Unit::TestCase
   should "publish default person presentation for scientists" do
     @vortex.cd('/konv/personer_test/')
 
+    collection = Vortex::PersonListingCollection.new(:foldername => '/konv/personer_test/scientific')
+
+    created_path = @vortex.create(collection)
+    @vortex.cd(created_path)
     person = Vortex::Person.new(:user => 'herman',
                                 :image => '/konv/personer_test/placeholder.jpg',
                                 :language => :english,
+                                :url =>  '/konv/personer_test/scientific/index.html',
                                 :scientific => true)
 
     # puts person.content

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vortex_client
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 9
-  version: 0.5.9
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Thomas Flemming
@@ -21,9 +22,11 @@ dependencies:
   name: net_dav
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
         - 5
@@ -35,9 +38,11 @@ dependencies:
   name: highline
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 5
@@ -49,9 +54,11 @@ dependencies:
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -108,23 +115,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Vortex CMS client