Merge pull request #6 from jamesantrobus/redmine-link

issue #4 updated Redmine issue description to include link to Redmine
cprice404 · Aug 29, 2012 · 0b3a1ee · 0b3a1ee
2 parents b8cc2b3 + 8bd6902
commit 0b3a1ee
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/lib/rmt/redmine.rb b/lib/rmt/redmine.rb
@@ -78,12 +78,11 @@ def parse_issues(response_body)
       {
         :id => get_value_of_text_child_node(issue_node, "id"),
         :subject => get_value_of_text_child_node(issue_node, "subject"),
-        :description => get_value_of_text_child_node(issue_node, "description"),
+        :description => get_issue_description(issue_node),
         :start_date => get_value_of_text_child_node(issue_node, "start_date"),
         :due_date => get_value_of_text_child_node(issue_node, "due_date"),
         :done_ratio => get_value_of_text_child_node(issue_node, "done_ratio"),
-        :estimated_hours => get_value_of_text_child_node(issue_node, "estimated_hours"),
-        :description => get_value_of_text_child_node(issue_node, "description"),
+        :estimated_hours => get_value_of_text_child_node(issue_node, "estimated_hours"),        
         :created_on => get_value_of_text_child_node(issue_node, "created_on"),
         :updated_on => get_value_of_text_child_node(issue_node, "updated_on"),
         :tracker => get_attribute_of_child_node(issue_node, "tracker", :name),
@@ -103,6 +102,14 @@ def get_value_of_text_child_node(node, child_node_name)
   end
   private :get_value_of_text_child_node
 
+  # prepends the issue description with a link to the issue on Redmine
+  def get_issue_description(node)
+    issue_id = get_value_of_text_child_node(node, "id")
+    description = get_value_of_text_child_node(node, "description") || ""
+    "#{@base_url}/issues/#{issue_id} \n\n#{description}"
+  end
+  private :get_issue_description
+
   # given an Ox xml node, find a child node by the specified child_node_name.  The specified node
   #  should have an attribute with the name specified by attr_name; this method returns the value
   #  of that attribute.

diff --git a/lib/rmt/trello.rb b/lib/rmt/trello.rb
@@ -28,7 +28,7 @@ def create_card(properties)
       puts "Adding card: #{properties[:name]}"
       card = ::Trello::Card.create(:name => properties[:name],
                                    :list_id => properties[:list],
-                                   :description => sanitize_utf8(properties[:description] || ""))
+                                   :description => sanitize_utf8(properties[:description]))
       if properties[:color]
         card.add_label(properties[:color])
       end
@@ -74,4 +74,4 @@ def sanitize_utf8(str)
       str.each_char.map { |c| c.valid_encoding? ? c : "\ufffd"}.join
     end
   end
-end
+end