sappho-data-publisher 0.2.4 → 0.2.5

data/lib/sappho-data-publisher/confluence.rb

@@ -14,7 +14,7 @@ module Sappho
 
         def connect
           super do |url|
-            XMLRPC::Client.new2("#{url}/rpc/xmlrpc").proxy('confluence1')
+            XMLRPC::Client.new2("#{url}/rpc/xmlrpc").proxy('confluence2')
           end
         end
 
@@ -32,7 +32,7 @@ module Sappho
         end
 
         def getScript rawPage
-          rawPage.scan(/^\{noformat.*?\}(.*?)^\{noformat\}/m).each { |pageData| yield pageData[0] }
+          rawPage.scan(/\<ac\:macro ac\:name=\"noformat\"\>.*?\<ac\:plain-text-body\>\<!\[CDATA\[(.*?)\]\]\>\<\/ac\:plain-text-body\>/m).each { |pageData| yield pageData[0] }
         end
 
         def publish content, pageData, parameters

data/lib/sappho-data-publisher/jira.rb

@@ -18,10 +18,14 @@ module Sappho
           end
           @allCustomFields = @appServer.getCustomFields @token
           @users = {}
+          @fetchSubTasks = true
         end
 
         def gatherData pageData, parameters
           checkLoggedIn
+          if fetchSubTasks = parameters['fetchSubTasks']
+            @fetchSubTasks = fetchSubTasks == "yes"
+          end
           # process a single issue fetch request
           if key = parameters['key']
             @logger.info "fetching Jira issue #{key}"
@@ -69,7 +73,7 @@ module Sappho
 
         def processIssues pageData, issues
           pageData['issues'] = cookedIssues = []
-          cookIssues issues, cookedIssues
+          cookIssues issues, cookedIssues, @fetchSubTasks
         end
 
         def jqlQuery jql, maxresults
@@ -77,7 +81,7 @@ module Sappho
           @appServer.getIssuesFromJqlSearch @token, jql, maxresults
         end
 
-        def cookIssues issues, cookedIssues
+        def cookIssues issues, cookedIssues, fetchSubTasks
           issues.each { |issue|
             cookedIssue = {}
             ['id', 'key', 'summary', 'description', 'assignee', 'created', 'duedate', 'priority',
@@ -95,8 +99,8 @@ module Sappho
                   customFieldValue['values']
             }
             cookedIssue['subtasks'] = cookedSubtasks = []
-            subtasks = jqlQuery "parent=#{issue['key']}", 100
-            cookIssues subtasks, cookedSubtasks
+            subtasks = fetchSubTasks ? jqlQuery("parent=#{issue['key']}", 100) : []
+            cookIssues subtasks, cookedSubtasks, false
             cookedIssues << cookedIssue
           }
         end

data/lib/sappho-data-publisher/version.rb

@@ -7,7 +7,7 @@ module Sappho
   module Data
     module Publisher
       NAME = 'sappho-data-publisher'
-      VERSION = '0.2.4'
+      VERSION = '0.2.5'
       AUTHORS = ['Andrew Heald']
       EMAILS = ['andrew@heald.co.uk']
       HOMEPAGE = 'https://wiki.sappho.org.uk/display/DP/sappho-data-publisher'

data/test/data/confluence-chunk.input

@@ -1,6 +1,7 @@
 This is ignored.
 So is this.
-{noformat}
+<ac:macro ac:name="noformat">
+<ac:plain-text-body><![CDATA[
 This is not ignored.
 
 And the above blank line should be included.
@@ -10,32 +11,9 @@ And the above blank line should be included.
 And the above blank lines, and below, should be included.
 
 
-{noformat}
+]]></ac:plain-text-body>
 
 Try a one-liner.
-{noformat}This one-liner is not ignored.
-{noformat}
-
-Try another one-liner.
-{noformat}This one-liner is not ignored.{noformat} <- the trailing {noformat} will be included because it isn't at column 1.
-{noformat}
-
-This is ignored.
-{noformat:nopanel=true}
-This is not ignored, either.
- {noformat} <- And this line should be included.
-{noformat}
-{noformat xx}
-It does not matter about extra invalid stuff on the opening {noformat}.
-{noformat}
-
-Test for an invalid closing {noformat}.
-{noformat}
-Invalid closing: Line 1
-{noformatx}
-Invalid closing: Line 2
-{noformat}
-
-Finally, test what happens when a chunk is left open.
-{noformat}
-This will not end up in a chunk!
+<ac:macro ac:name="noformat">
+<ac:plain-text-body><![CDATA[This one-liner is not ignored.
+]]></ac:plain-text-body>

data/test/data/confluence-chunk.output

@@ -9,13 +9,3 @@ And the above blank lines, and below, should be included.
 
 
 ----This one-liner is not ignored.
-----This one-liner is not ignored.{noformat} <- the trailing {noformat} will be included because it isn't at column 1.
-----
-This is not ignored, either.
- {noformat} <- And this line should be included.
-----
-It does not matter about extra invalid stuff on the opening {noformat}.
-----
-Invalid closing: Line 1
-{noformatx}
-Invalid closing: Line 2

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sappho-data-publisher
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Andrew Heald
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-11 00:00:00 Z
+date: 2013-09-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake