vanity-source 0.11 → 0.12

data/CHANGELOG

@@ -1,3 +1,11 @@
+2010-08-30 v0.12 Github data source merges related commits
+
+Github data source merges related commits (same committer/time) into single
+activity and shows first line of all commit messages.
+
+Changed to coding/testing with Ruby 1.9.2, since this is the target
+environment.
+
 2010-08-30 v0.11 Changes to activity person, AS 3.0 support
 
 Activity's person name is now fullname, photo is photo_url and url is no

data/Gemfile

@@ -7,6 +7,8 @@ group :development do
 end
 
 group :test do
+  gem "awesome_print"
+  gem "nokogiri"
   gem "shoulda"
   gem "timecop"
   gem "vcr"

data/lib/vanity/sources/backtweets.rb

@@ -37,7 +37,7 @@ module Vanity
 <a href="#{url}">tweeted</a>:
 <blockquote>#{tweet["tweet_text"]}</blockquote>
                 HTML
-                person = { :fullname=>handle, :identities=>%{twitter.com:#{handle}}, :photo_url=>tweet["tweet_profile_image_url"] }
+                person = { :fullname=>handle, :identities=>%W{twitter.com:#{handle}}, :photo_url=>tweet["tweet_profile_image_url"] }
                 block.call :activity=>{ :uid=>id, :url=>url, :html=>html, :tags=>%w{twitter mention},
                                         :timestamp=>Time.parse(tweet["tweet_created_at"]).utc, :person=>person }
               end

data/lib/vanity/sources/github.rb

@@ -52,15 +52,24 @@ module Vanity
             last_seen_id = context["last_commit"]["id"] if context["last_commit"]
             if last_seen_id
               new_ones = commits.take_while { |commit| commit["id"] != last_seen_id }
-              new_ones.reverse.each do |commit|
-                committer = commit["committer"]
-                html = <<-HTML
-pushed to #{h context["branch"]} at <a href="http://github.com/#{context["repo"]}">#{h context["repo"]}</a>:
-<blockquote><a href="#{commit["url"]}">#{commit["id"][0,7]}</a> #{h commit["message"]}</blockquote>
-                HTML
-                person = { :fullname=>committer["name"], :identities=>%{github.com:#{committer["name"]}}, :email=>committer["email"] }
-                block.call :activity=>{ :uid=>commit["id"], :html=>html, :url=>commit["url"], :tags=>"push",
-                                        :timestamp=>Time.parse(commit["committed_date"]).utc, :person=>person }
+              merged = new_ones.inject([]) do |all, commit|
+                last = all.last.last unless all.empty?
+                if last && last["committer"]["email"] == commit["committer"]["email"] && last["committed_date"] == commit["committed_date"]
+                  all.last << commit
+                else
+                  all << [commit]
+                end
+                all
+              end
+
+              merged.reverse.each do |commits|
+                first = commits.first
+                committer = first["committer"]
+                person = { :fullname=>committer["name"], :identities=>%W{github.com:#{committer["name"]}}, :email=>committer["email"] }
+                messages = commits.map { |commit| %{<blockquote><a href="#{commit["url"]}">#{commit["id"][0,7]}</a> #{h commit["message"].strip.split(/[\n\r]/).first[0,50]}</blockquote>} }
+                html = %{pushed to #{h context["branch"]} at <a href="http://github.com/#{context["repo"]}">#{h context["repo"]}</a>:\n#{messages.join("\n")}}
+                block.call :activity=>{ :uid=>first["id"], :html=>html, :url=>first["url"], :tags=>%w{push},
+                                        :timestamp=>Time.parse(first["committed_date"]).utc, :person=>person }
               end
               block.call :inc=>{ :commits=>new_ones.count }
             else

data/test/backtweets_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/setup"
+require_relative "setup"
 
 test Vanity::Source::Backtweets do
   context "setup" do

data/test/cassettes/github.yml

@@ -102,20 +102,25 @@
     body: |-
       { "commits": [
         { "url": "http://github.com/assaf/vanity/commit/dd154a9fdd2ac534b62b55b8acac2fd092d65439",
-          "id": "dd154a9fdd2ac534b62b55b8acac2fd092d65439",
+          "id": "cc156a9fdd2ac534b62b55b8acac2fd092d65439",
           "committed_date": "2010-08-06T00:22:01-07:00",
-          "message": "Third & last",
+          "message": "Most recent commit",
           "committer": { "name": "Assaf Arkin", "login": "assaf", "email": "assaf@labnotes.org" } },
         { "url": "http://github.com/assaf/vanity/commit/dd154a9fdd2ac534b62b55b8acac2fd092d6543b",
-          "id": "dd154a9fdd2ac534b62b55b8acac2fd092d6543b",
+          "id": "dd156a9fdd2ac534b62b55b8acac2fd092d6543b",
           "committed_date": "2010-08-06T00:22:01-07:00",
-          "message": "The second commit",
+          "message": "Not most recent commit",
           "committer": { "name": "Assaf Arkin", "login": "assaf", "email": "assaf@labnotes.org" } },
         { "url": "http://github.com/assaf/vanity/commit/dd154a9fdd2ac534b62b55b8acac2fd092d6543a",
-          "id": "dd154a9fdd2ac534b62b55b8acac2fd092d6543a",
-          "committed_date": "2010-08-06T00:18:01-07:00",
-          "message": "Gemfile changes necessary to pass test suite.",
-          "committer": { "name": "Assaf Arkin", "login": "assaf", "email": "assaf@labnotes.org" } }
+          "id": "ee156a9fdd2ac534b62b55b8acac2fd092d6543a",
+          "committed_date": "2010-08-06T00:22:01-07:00",
+          "message": "Different committer",
+          "committer": { "name": "Assaf Arkin", "login": "assaf", "email": "not.assaf@labnotes.org" } },
+        { "url": "http://github.com/assaf/vanity/commit/dd154a9fdd2ac534b62b55b8acac2fd092d6543a",
+          "id": "ff156a9fdd2ac534b62b55b8acac2fd092d6543a",
+          "committed_date": "2010-08-06T00:15:01-07:00",
+          "message": "Different push",
+          "committer": { "name": "Assaf Arkin", "login": "assaf", "email": "not.assaf@labnotes.org" } }
         ]
       }
 

data/test/github_issues_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/setup"
+require_relative "setup"
 
 test Vanity::Source::GithubIssues do
   context "setup" do

data/test/github_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/setup"
+require_relative "setup"
 
 test Vanity::Source::Github do
   context "setup" do
@@ -122,11 +122,7 @@ test Vanity::Source::Github do
       end
 
       should "capture new number of commits" do
-        assert_equal 37, totals[:commits]
-      end
-
-      should "create activity for each commit" do
-        assert_equal 2, activities.count
+        assert_equal 39, totals[:commits]
       end
 
       context "activity" do
@@ -137,18 +133,15 @@ test Vanity::Source::Github do
         end
 
         should "capture commit SHA" do
-          assert_equal "dd154a9fdd2ac534b62b55b8acac2fd092d65439", subject.uid
+          assert_equal "cc156a9fdd2ac534b62b55b8acac2fd092d65439", subject.uid
         end
 
         should "capture timestamp" do
           assert_equal Time.parse("2010-08-06T00:22:01-07:00 UTC"), subject.timestamp
         end
 
-        should "capture commit message and SHA1" do
-          assert_equal <<-HTML, subject.html
-pushed to master at <a href="http://github.com/assaf/vanity">assaf/vanity</a>:
-<blockquote><a href="http://github.com/assaf/vanity/commit/dd154a9fdd2ac534b62b55b8acac2fd092d65439">dd154a9</a> Third &amp; last</blockquote>
-          HTML
+        should "capture push" do
+          assert_match %{pushed to master at <a href="http://github.com/assaf/vanity">assaf/vanity</a>:}, subject.html
         end
 
         should "tag as push" do
@@ -156,6 +149,7 @@ pushed to master at <a href="http://github.com/assaf/vanity">assaf/vanity</a>:
         end
 
         should "be valid" do
+          subject.validate
           assert subject.valid?
         end
 
@@ -170,6 +164,55 @@ pushed to master at <a href="http://github.com/assaf/vanity">assaf/vanity</a>:
             assert_equal "assaf@labnotes.org", subject.email
           end
         end
+
+        context "commit message" do
+          subject { (Nokogiri::HTML(activity.html)/"blockquote").inner_text.strip }
+
+          should "start with commit SHA" do
+            assert_match /^cc156a9 /, subject
+          end
+
+          should "include first 50 characters of message" do
+            with_message "This is a very long message and we're only going to show the first 50 characters of it."
+            assert_equal 50, subject[/\s(.*)/, 1].length
+          end
+
+          should "use only first line of message" do
+            with_message "This message is made\nof two lines"
+            assert_match "This message is made", subject[/\s(.*)/, 1]
+          end
+
+          def with_message(message)
+            commits = interactions.select { |i| i.uri =~ /commits\/list/ }
+            commit = JSON.parse(commits.first.response.body)["commits"].first
+            commit["message"] = message
+            stub_request(:get, commits.first.uri).to_return :body=>{ :commits=>[commit] }.to_json
+            update_source
+          end
+        end
+
+        context "multiple commits" do
+          setup do
+            interaction = interactions.select { |i| i.uri =~ /commits\/list/ }.last
+            stub_request(:get, interaction.uri).to_return :body=>interaction.response.body
+            update_source
+          end
+          subject { (Nokogiri::HTML(activity.html)/"blockquote") }
+
+          should "show as multiple activities" do
+            assert_equal 3, activities.count # 4 commits -> 3 activities
+          end
+
+          should "merge related commits into single activity" do
+            assert_equal 2, subject.length   # last one has two commits
+          end
+
+          should "merge related commits in order they were listed" do
+            first, second = subject.map { |bq| bq.inner_text.strip }
+            assert_equal "cc156a9 Most recent commit", first
+            assert_equal "dd156a9 Not most recent commit", second
+          end
+        end
       end
 
     end

data/test/helpers/test.rb

@@ -6,7 +6,7 @@
 #     . . .
 #   end
 def test(klass, &block)
-  returning Class.new(Test::Unit::TestCase) do |test_case|
+  Class.new(Test::Unit::TestCase).tap do |test_case|
     test_case.class_eval do
       include WebMock
       include Vanity::Source::TestHelpers

data/test/ruby_gems_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/setup"
+require_relative "setup"
 
 test Vanity::Source::RubyGems do
   context "setup" do

data/test/setup.rb

@@ -2,11 +2,16 @@ require "test/unit"
 require "shoulda"
 require "webmock/test_unit"
 require "vcr"
+require "ap"
+require "logger"
 
-require "test/helpers/test"
-require "test/helpers/person"
-require "test/helpers/activity"
-require "test/helpers/metric"
+require "nokogiri"
+require "active_support/all"
+
+require_relative "helpers/test"
+require_relative "helpers/person"
+require_relative "helpers/activity"
+require_relative "helpers/metric"
 
 
 require File.dirname(__FILE__) + "/../lib/vanity/source"

data/test/test.log

@@ -612,3 +612,79 @@ Backtweets: 200
 Backtweets: 500 
 RubyGems: 200 
 RubyGems: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 200 
+Backtweets: 500 
+RubyGems: 200 
+RubyGems: 500 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 200 
+Backtweets: 500 
+RubyGems: 200 
+RubyGems: 500 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 200 
+Backtweets: 500 
+RubyGems: 200 
+RubyGems: 500 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 200 
+Backtweets: 500 
+RubyGems: 200 
+RubyGems: 500 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 200 
+Backtweets: 500 
+RubyGems: 200 
+RubyGems: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 200 
+Backtweets: 500 
+RubyGems: 200 
+RubyGems: 500 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 200 
+Backtweets: 500 
+RubyGems: 200 
+RubyGems: 500 

data/vanity-source.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name           = "vanity-source"
-  spec.version        = "0.11"
+  spec.version        = "0.12"
   spec.author         = "Assaf Arkin"
   spec.email          = "assaf@labnotes.org"
   spec.homepage       = "http://vanitydash.com"
@@ -17,4 +17,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "json"
   spec.add_dependency "rack"
+  spec.add_dependency "i18n"
 end

metadata

@@ -1,12 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: vanity-source
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 0
-  - 11
-  version: "0.11"
+  - 12
+  version: "0.12"
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 -07:00
+date: 2010-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +24,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -39,7 +37,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -53,12 +50,24 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: 
 email: assaf@labnotes.org
 executables: []
@@ -106,7 +115,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --title
-- Vanity::Source 0.11
+- Vanity::Source 0.12
 - --main
 - README.rdoc
 - --webcvs
@@ -118,7 +127,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
       segments: 
       - 1
       - 8
@@ -129,7 +137,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"