dash-mario 0.16 → 0.17

data/test/github_test.rb

@@ -61,25 +61,25 @@ test DashFu::Mario::Github do
 
     should "handle 404" do
       stub_request(:get, interactions.first.uri).to_return :status=>404
-      assert_raise(RuntimeError) { source.update }
+      source.update
       assert_equal "Could not find the repository assaf/vanity", source.last_error
     end
 
     should "handle 401" do
       stub_request(:get, interactions.first.uri).to_return :status=>401
-      assert_raise(RuntimeError) { source.update }
+      source.update
       assert_equal "You are not authorized to access this repository, or invalid username/password", source.last_error
     end
 
     should "handle other error" do
       stub_request(:get, interactions.first.uri).to_return :status=>500
-      assert_raise(RuntimeError) { source.update }
+      source.update
       assert_equal "Last request didn't go as expected, trying again later", source.last_error
     end
 
     should "handle invlid document entity" do
       stub_request(:get, interactions.first.uri).to_return :body=>"Not JSON"
-      assert_raise(RuntimeError) { source.update }
+      source.update
       assert_equal "Last request didn't go as expected, trying again later", source.last_error
     end
 
@@ -98,128 +98,129 @@ test DashFu::Mario::Github do
       assert_equal 36, source.metric.values[:forks]
     end
 
-    should "not create any activity" do
-      source.update
-      assert source.activities.empty?
-    end
 
-    context "repeating" do
-      setup do
-        source.update
-        repo = interactions.select { |i| i.uri =~ /repos\/show/ }
-        stub_request(:get, repo.first.uri).to_return :body=>repo.last.response.body
-        commits = interactions.select { |i| i.uri =~ /commits\/list/ }
-        stub_request(:get, commits.first.uri).to_return :body=>commits.last.response.body
-        source.update
+    context "activity" do
+      setup { source.update }
+      subject { source.activity }
+
+      should "capture commit URL" do
+        assert_equal "http://github.com/assaf/vanity/commit/dd154a9fdd2ac534b62b55b8acac2fd092d6543a", subject.url
       end
 
-      should "update watchers" do
-        assert_equal 555, source.metric.values[:watchers]
+      should "capture commit SHA" do
+        assert_equal "dd154a9fdd2ac534b62b55b8acac2fd092d6543a", subject.uid
       end
 
-      should "update forks" do
-        assert_equal 38, source.metric.values[:forks]
+      should "capture timestamp" do
+        assert_equal Time.parse("2010-08-06T00:18:01-07:00 UTC").utc, subject.timestamp
       end
 
-      should "capture new number of commits" do
-        assert_equal 39, source.metric.values[:commits]
+      should "capture push" do
+        assert_match %{pushed to master at <a href="http://github.com/assaf/vanity">assaf/vanity</a>:}, subject.html
       end
 
-      context "activity" do
-        subject { source.activity }
+      should "tag as push" do
+        assert_contains subject.tags, "push"
+      end
 
-        should "capture commit URL" do
-          assert_equal "http://github.com/assaf/vanity/commit/dd154a9fdd2ac534b62b55b8acac2fd092d65439", subject.url
-        end
+      should "be valid" do
+        subject.validate
+        assert subject.valid?
+      end
+
+      context "person" do
+        subject { source.activity.person }
 
-        should "capture commit SHA" do
-          assert_equal "cc156a9fdd2ac534b62b55b8acac2fd092d65439", subject.uid
+        should "capture full name" do
+          assert_equal "Assaf Arkin", subject.fullname
         end
 
-        should "capture timestamp" do
-          assert_equal Time.parse("2010-08-06T00:22:01-07:00 UTC"), subject.timestamp
+        should "capture email" do
+          assert_equal "assaf@labnotes.org", subject.email
         end
 
-        should "capture push" do
-          assert_match %{pushed to master at <a href="http://github.com/assaf/vanity">assaf/vanity</a>:}, subject.html
+        should "capture identity" do
+          assert_contains subject.identities, "github.com:assaf"
         end
+      end
+
+      context "commit message" do
+        subject { (Nokogiri::HTML(source.activity.html)/"blockquote").map(&:inner_text).join("\n") }
 
-        should "tag as push" do
-          assert_contains subject.tags, "push"
+        should "start with commit SHA" do
+          assert_match /^dd154a9 /, subject
         end
 
-        should "be valid" do
-          subject.validate
-          assert subject.valid?
+        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
 
-        context "person" do
-          subject { source.activity.person }
+        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
 
-          should "capture full name" do
-            assert_equal "Assaf Arkin", subject.fullname
-          end
+        def with_message(message)
+          commits = interactions.select { |i| i.uri =~ /commits\/list/ }
+          commit = JSON.parse(commits.first.response.body)["commits"].first
+          commit["id"] = "ff156a9fdd2ac534b62b55b8acac2fd092d65439"
+          commit["message"] = message
+          stub_request(:get, commits.first.uri).to_return :body=>{ :commits=>[commit] }.to_json
+          source.update
+        end
+      end
 
-          should "capture email" do
-            assert_equal "assaf@labnotes.org", subject.email
-          end
+      context "sequential commits" do
+        setup do
+          puts source.activities.clear
+          interaction = interactions.select { |i| i.uri =~ /commits\/list/ }.last
+          stub_request(:get, interaction.uri).to_return :body=>interaction.response.body
+          source.update
+        end
+        subject { (Nokogiri::HTML(source.activity.html)/"blockquote") }
 
-          should "capture identity" do
-            assert_contains subject.identities, "github.com:assaf"
-          end
+        should "show as multiple activities" do
+          assert_equal 3, source.activities.count # 4 commits -> 3 activities
         end
 
-        context "commit message" do
-          subject { (Nokogiri::HTML(source.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
-            source.update
-          end
+        should "merge related commits into single activity" do
+          assert_equal 2, subject.length   # last one has two commits
         end
 
-        context "sequential commits" do
-          setup do
-            interaction = interactions.select { |i| i.uri =~ /commits\/list/ }.last
-            stub_request(:get, interaction.uri).to_return :body=>interaction.response.body
-            source.update
-          end
-          subject { (Nokogiri::HTML(source.activity.html)/"blockquote") }
-
-          should "show as multiple activities" do
-            assert_equal 3, source.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
+        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
+
+
+    context "repeating" do
+      setup do
+        source.update
+        repo = interactions.select { |i| i.uri =~ /repos\/show/ }
+        stub_request(:get, repo.first.uri).to_return :body=>repo.last.response.body
+        commits = interactions.select { |i| i.uri =~ /commits\/list/ }
+        stub_request(:get, commits.first.uri).to_return :body=>commits.last.response.body
+        source.update
+      end
+
+      should "update watchers" do
+        assert_equal 555, source.metric.values[:watchers]
+      end
+
+      should "update forks" do
+        assert_equal 38, source.metric.values[:forks]
+      end
+
+      should "capture new number of commits" do
+        assert_equal 39, source.metric.values[:commits]
+      end
+    end
+
   end
 
 

data/test/helpers/source.rb

@@ -17,13 +17,14 @@ class Source
   def setup(params = {})
     mario.setup state, params
     self.name = state.delete("source.name")
-    @metric = Metric.new(:name=>name, :columns=>state["metric.columns"], :totals=>!!state["metric.totals"]) if state["metric.columns"]
+    @metric = Metric.new(:name=>name, :columns=>state.delete("metric.columns"), :totals=>!!state.delete("metric.totals")) if state["metric.columns"]
     validate
   end
 
   def validate
     raise "Must be named" if name.blank?
     raise "Name must be 3 characters of longer" if name.length < 3
+    raise "State fields can only use alphanumeric/underscore in their names" unless state.keys.all? { |k| k =~ /^\w+$/ }
     mario.validate state
     metric.validate if metric
   end
@@ -39,18 +40,25 @@ class Source
   #   assert source.update
   def update(request = nil)
     @last_error = nil
-    mario.update state, request, &callback
+    mario.update state, request, Callback.new(self)
   rescue
     @last_error = $!.message
     raise
   end
 
-  # Performs an update on the source and returns the meta-data.
+  # Similar to update but raises last error.
+  def update!(request = nil)
+    update request
+    raise @last_error if @last_error
+  end
+
+  # Performs an update on the source and returns the meta-data. Raises
+  # last_error if error reported during update.
   #
   # @example
   #   assert source.meta.include?(:title=>"Version", :text=>"1.4.0")
   def meta
-    mario.update state, nil, &callback
+    update!
     mario.meta(state)
   end
 
@@ -67,25 +75,33 @@ class Source
     activities.last
   end
 
-protected
+  class Callback
+    def initialize(source)
+      @source = source
+    end
+
+    def activity!(values)
+      values = values.clone
+      if person = values.delete(:person)
+        values[:person] = Person.new(person)
+      end
+      @source.activities.push Activity.new(values)
+    end
+
+    def set!(values)
+      @source.metric.values.update values
+    end
 
-  def callback
-    lambda do |args|
-      if args[:set]
-        metric.values.update args[:set]
-      elsif args[:inc]
-        args[:inc].each do |name, value|
-          metric.values[name] ||= 0
-          metric.values[name] += value
-        end
-      elsif args[:activity]
-        values = args[:activity].clone
-        if person = values.delete(:person)
-          values[:person] = Person.new(person)
-        end
-        activities.push Activity.new(values)
+    def inc!(values)
+      values.each do |name, value|
+        @source.metric.values[name] ||= 0
+        @source.metric.values[name] += value
       end
     end
+
+    def error!(message)
+      @source.last_error = message
+    end
   end
 
 end

data/test/ruby_gems_test.rb

@@ -16,7 +16,7 @@ test DashFu::Mario::RubyGems do
       end
 
       should "capture downloads" do
-        assert subject.columns.include?(:id=>"downloads", :label=>"Downloads")
+        assert subject.columns.include?(id: "downloads", label: "Downloads")
       end
     end
   end
@@ -44,26 +44,26 @@ test DashFu::Mario::RubyGems do
     end
 
     should "handle 404" do
-      stub_request(:get, interactions.first.uri).to_return :status=>404
-      assert_raise(RuntimeError) { source.update }
+      stub_request(:get, interactions.first.uri).to_return status: 404
+      source.update
       assert_equal "Could not find the Gem vanity", source.last_error
     end
 
     should "handle other error" do
-      stub_request(:get, interactions.first.uri).to_return :status=>500
-      assert_raise(RuntimeError) { source.update }
+      stub_request(:get, interactions.first.uri).to_return status: 500
+      source.update
       assert_equal "Last request didn't go as expected, trying again later", source.last_error
     end
 
     should "handle invlid document entity" do
-      stub_request(:get, interactions.first.uri).to_return :body=>"Not JSON"
-      assert_raise(RuntimeError) { source.update }
+      stub_request(:get, interactions.first.uri).to_return body: "Not JSON"
+      source.update
       assert_equal "Last request didn't go as expected, trying again later", source.last_error
     end
 
     should "capture number of downloads" do
       source.update
-      assert_equal({ :downloads=>3492 }, source.metric.values)
+      assert_equal({ downloads: 3492 }, source.metric.values)
     end
 
     should "not create any activity" do
@@ -75,16 +75,16 @@ test DashFu::Mario::RubyGems do
       setup do
         source.update
         data = JSON.parse(interactions.first.response.body).merge("downloads"=>9040, "version"=>"2.1.0")
-        stub_request(:get, interactions.first.uri).to_return :body=>data.to_json
+        stub_request(:get, interactions.first.uri).to_return body: data.to_json
         source.update
       end
 
       should "update version number" do
-        assert source.meta.include?(:title=>"Version", :text=>"2.1.0")
+        assert source.meta.include?(title: "Version", text: "2.1.0")
       end
 
       should "capture new number of downloads" do
-        assert_equal({ :downloads=>9040 }, source.metric.values)
+        assert_equal({ downloads: 9040 }, source.metric.values)
       end
 
       should "create activity for new release" do

data/test/setup.rb

@@ -28,5 +28,5 @@ WebMock.disable_net_connect!
 VCR.config do |vcr|
   vcr.cassette_library_dir     = File.dirname(__FILE__) + "/cassettes"
   vcr.http_stubbing_library    = :webmock
-  vcr.default_cassette_options = { :record=>ENV["RECORD"] ? :new_episodes : :none }
+  vcr.default_cassette_options = { record: ENV["RECORD"] ? :new_episodes : :none }
 end

data/test/test.log

@@ -914,3 +914,21 @@ Github: 200
 Github: 500 
 RubyGems: 200 
 RubyGems: 500 
+Backtweets: 500 
+Backtweets: 200 
+Github: 200 
+Github: 500 
+RubyGems: 200 
+RubyGems: 500 
+Backtweets: 500 
+Backtweets: 200 
+Github: 200 
+Github: 500 
+Backtweets: 500 
+Backtweets: 200 
+Github: 200 
+Github: 500 
+RubyGems: 200 
+RubyGems: 500 
+RubyGems: 200 
+RubyGems: 500 

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 16
-  version: "0.16"
+  - 17
+  version: "0.17"
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -07:00
+date: 2010-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,7 +129,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --title
-- DashFu::Mario 0.16
+- DashFu::Mario 0.17
 - --main
 - README.rdoc
 - --webcvs