ticketmaster-github 0.8.0 → 0.8.1

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/lib/provider/comment.rb

@@ -16,14 +16,13 @@ module TicketMaster::Provider
                     :body => object.body,
                     :created_at => object.created_at,
                     :author => object.user.login}
-
           else
             hash = object
           end
           super hash
         end
       end
-
+      
       def author
         self.user.login
       end
@@ -53,6 +52,7 @@ module TicketMaster::Provider
      def self.find_all(project_id, ticket_id)
        TicketMaster::Provider::Github.api.issue_comments(project_id, ticket_id).collect do |comment|
          comment.merge!(:project_id => project_id, :ticket_id => ticket_id)
+         clean_body! comment
          self.new comment
        end
      end
@@ -60,8 +60,22 @@ module TicketMaster::Provider
      def self.create(project_id, ticket_id, comment)
        github_comment = TicketMaster::Provider::Github.api.add_comment(project_id, ticket_id, comment)
        github_comment.merge!(:project_id => project_id, :ticket_id => ticket_id)
+       flat_body github_comment
        self.new github_comment
      end
+     
+     private
+      
+      #See https://www.kanbanpad.com/projects/31edb8d134e7967c1f0d#!xt-4f994d17014289000707433f
+      def self.flat_body(comment_hashie)
+        comment_hashie.body = comment_hashie.body.body
+        comment_hashie
+      end
+      
+      # See https://www.kanbanpad.com/projects/31edb8d134e7967c1f0d#!xt-4f994f2101428900070759fd
+      def self.clean_body!(comment)
+        comment.body = comment.body.sub(/\A---\s\sbody:\s/, '').gsub(/\s\z/, '')
+      end
 
     end
   end

data/lib/provider/ticket.rb

@@ -121,10 +121,9 @@ module TicketMaster::Provider
         Ticket.new(project_id, TicketMaster::Provider::Github.api.close_issue(project_id, number)) 
       end
 
-      def comment!(comment)
-        Comment.create(project_id, number, comment)
+      def comment!(attributes)
+        Comment.create(project_id, number, attributes)
       end
-
     end
   end
 end

data/spec/comment_spec.rb

@@ -16,14 +16,20 @@ describe "Ticketmaster::Provider::Github::Comment" do
   end
 
   it "should be able to load all comments" do
-    @comments = @ticket.comments
-    @comments.should be_an_instance_of(Array)
-    @comments.first.should be_an_instance_of(@klass)
+    comments = @ticket.comments
+    comments.should be_an_instance_of(Array)
+    comments.first.should be_an_instance_of(@klass)
+    comments.first.body.should == "for testing"
   end
-
+  
   it "should be able to create a new comment" do  
-    comment = @ticket.comment!(:body => 'new comment')
+    comment = @ticket.comment!(:body => 'for testing')
     comment.should be_an_instance_of(@klass)
+    comment.body.should == 'for testing'
+  end
+  
+  #see bug 116 tm-github: Bug Ticket#comments returning comments with weird text in the body
+  it "should be able to load a ticket and clean comment body" do
+    comments = @ticket.comments.map(&:body).should == ["for testing", "test comment"]
   end
-
 end

data/spec/fixtures/comments.json

@@ -12,5 +12,19 @@
       "avatar_url": "https://secure.gravatar.com/avatar/42bd18419413dfbd6e7ec4fefdec94ae?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png",
       "id": 1434902
     }
+  },
+  {
+    "url": "https://api.github.com/repos/ticketmaster-user/tmtest-repo/issues/comments/3951282",
+    "created_at": "2012-02-13T22:49:55Z",
+    "body": "--- \nbody: test comment\n",
+    "updated_at": "2012-02-13T22:49:55Z",
+    "id": 3951283,
+    "user": {
+      "url": "https://api.github.com/users/ticketmaster-user",
+      "gravatar_id": "42bd18419413dfbd6e7ec4fefdec94ae",
+      "login": "ticketmaster-user",
+      "avatar_url": "https://secure.gravatar.com/avatar/42bd18419413dfbd6e7ec4fefdec94ae?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png",
+      "id": 1434902
+    }
   }
 ]

data/spec/fixtures/comments/3951282.json

@@ -1,7 +1,9 @@
   {
     "url": "https://api.github.com/repos/ticketmaster-user/tmtest-repo/issues/comments/3951282",
     "created_at": "2012-02-13T22:49:55Z",
-    "body": "for testing",
+    "body": {
+      "body": "for testing"
+    },
     "updated_at": "2012-02-13T22:49:55Z",
     "id": 3951282,
     "user": {

data/ticketmaster-github.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ticketmaster-github"
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["HybridGroup"]
-  s.date = "2012-04-12"
+  s.date = "2012-05-01"
   s.description = "This provides an interface with github through the ticketmaster gem."
   s.email = "hong.quach@abigfisch.com"
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ticketmaster-github
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - HybridGroup
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-12 00:00:00 Z
+date: 2012-05-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ticketmaster