dash-mario 0.15 → 0.16

data/CHANGELOG

@@ -1,3 +1,9 @@
+2010-09-08 v0.16 To name a source, set source.name
+
+During setup, name the source by setting source.name, not metric.name.
+
+Revised and improved test suite.
+
 2010-09-07 v0.15 Renamed to DashFu::Mario
 
 2010-09-07 v0.14 RubyGems and Github identities

data/README.rdoc

@@ -22,11 +22,13 @@ from the form fields. Since the Mario needs to store state information, it uses
 the context for that. The context is a Hash that can store basic Ruby values
 (nil, String, boolean, Numeric, Array and Hash).
 
-Some sources collect metrics. These sources must set three specific values
-(during setup):
+At the very least, it should name the source by setting "source.name", typically
+using other values (e.g. a Twitter source could be named "Twitter mentions for
+@dash_fu").
+
+Some sources collect metrics. These sources must specify two additional values
+during setup:
 
-* metric.name -- The name of the metric, e.g. Twitter source might use the
-  name "Twitter mentions of @dash_fu".
 * metric.columns -- Specifies the columns (at least one) that make up this
   metric. The value if an array where each item describes a single column, see
   below for more details.

data/dash-mario.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name           = "dash-mario"
-  spec.version        = "0.15"
+  spec.version        = "0.16"
   spec.author         = "Assaf Arkin"
   spec.email          = "assaf@labnotes.org"
   spec.homepage       = "http://dash-fu.com"

data/lib/dash-fu/marios/backtweets.rb

@@ -5,7 +5,7 @@ module DashFu::Mario
 
     def setup(source, params)
       url = params["url"].strip.downcase.sub(/^http(s?):\/\//, "")
-      source["metric.name"] = "Tweets for #{url}"
+      source["source.name"] = "Tweets for #{url}"
       source["metric.columns"] = [{ :id=>"tweets", :label=>"Tweets" }]
       source["metric.totals"] = true
       source["url"] = url

data/lib/dash-fu/marios/github.rb

@@ -5,7 +5,7 @@ module DashFu::Mario
 
     def setup(source, params)
       repo = params["repo"].strip
-      source["metric.name"] = "Github: #{repo}"
+      source["source.name"] = "Github: #{repo}"
       source["metric.columns"] = [{ :id=>"commits", :label=>"Commits" }, { :id=>"watchers", :label=>"Watchers" }, { :id=>"forks", :label=>"Forks" }]
       source["metric.totals"] = true
       source["repo"] = repo

data/lib/dash-fu/marios/github_issues.rb

@@ -5,7 +5,7 @@ module DashFu::Mario
 
     def setup(source, params)
       repo = params["repo"].to_s.strip
-      source["metric.name"] = "Github Issues for #{repo}"
+      source["source.name"] = "Github Issues for #{repo}"
       source["metric.columns"] = [{ :id=>"open", :label=>"Open issues" }, { :id=>"closed", :label=>"Closed issues" }]
       source["metric.totals"] = true
       source["repo"] = repo

data/lib/dash-fu/marios/ruby_gems.rb

@@ -5,7 +5,7 @@ module DashFu::Mario
 
     def setup(source, params)
       gem_name = params["gem_name"].to_s.strip
-      source["metric.name"] = "RubyGems: #{gem_name}"
+      source["source.name"] = "RubyGems: #{gem_name}"
       source["metric.columns"] = [{ :id=>"downloads", :label=>"Downloads" }]
       source["metric.totals"] = true
       source["gem_name"] = gem_name

data/test/backtweets_test.rb

@@ -2,15 +2,15 @@ require_relative "setup"
 
 test DashFu::Mario::Backtweets do
   context "setup" do
-    setup { setup_source "url"=>"vanity.labnotes.org" }
+    setup { source.setup "url"=>"vanity.labnotes.org" }
 
     should "use normalize URL and remove scheme" do
-      setup_source "url"=>"http://Vanity.Labnotes.Org"
-      assert_equal "Tweets for vanity.labnotes.org", metric.name
+      source.setup "url"=>"http://Vanity.Labnotes.Org"
+      assert_equal "Tweets for vanity.labnotes.org", source.name
     end
 
     context "metric" do
-      subject { metric }
+      subject { source.metric }
 
       should "use URL" do
         assert_equal "Tweets for vanity.labnotes.org", subject.name
@@ -29,66 +29,67 @@ test DashFu::Mario::Backtweets do
 
   context "validation" do
     should "raise error if URL missing" do
-      assert_raise(RuntimeError) { setup_source "url"=>" " }
+      assert_raise(RuntimeError) { source.setup "url"=>" " }
     end
 
     should "create valid metric" do
-      setup_source "url"=>"vanity.labnotes.org"
-      assert metric.valid?
+      source.setup "url"=>"vanity.labnotes.org"
+      assert source.valid?
     end
   end
 
 
   context "update" do
-    setup { setup_source "url"=>"vanity.labnotes.org" }
+    setup { source.setup "url"=>"vanity.labnotes.org" }
 
     should "include API key" do
-      update_source
+      source.update
       assert_requested :get, "http://backtweets.com/search.json?key=4554feeeeeeeeeeeeeee&q=vanity.labnotes.org"
     end
 
     should "properly encode URL" do
-      setup_source "url"=>"need&this=encoded"
-      update_source rescue nil
+      stub_request(:get, /backtweets.com/).to_return :body=>interactions.first.response.body
+      source.setup "url"=>"need&this=encoded"
+      source.update
       assert_requested :get, "http://backtweets.com/search.json?key=#{mario.send :api_key}&q=need%26this%3Dencoded"
     end
 
     should "handle errors" do
       stub_request(:get, interactions.first.uri).to_return :status=>500
-      assert_raise(RuntimeError) { update_source }
-      assert_equal "Last request didn't go as expected, trying again later", last_error
+      assert_raise(RuntimeError) { 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) { update_source }
-      assert_equal "Last request didn't go as expected, trying again later", last_error
+      assert_raise(RuntimeError) { source.update }
+      assert_equal "Last request didn't go as expected, trying again later", source.last_error
     end
 
     should "capture number of tweets" do
-      update_source
-      assert_equal({ :tweets=>11 }, totals)
+      source.update
+      assert_equal({ :tweets=>11 }, source.metric.values)
     end
 
     should "ignore previous tweets" do
-      update_source
-      assert activities.empty?
+      source.update
+      assert source.activities.empty?
     end
 
     context "repeating" do
       setup do
-        update_source
+        source.update
         second = interactions.last
         stub_request(:get, second.uri).to_return :body=>second.response.body
-        update_source
+        source.update
       end
 
       should "capture new tweets" do
-        assert_equal 2, activities.count
+        assert_equal 2, source.activities.count
       end
 
       context "activity" do
-        subject { activity }
+        subject { source.activity }
 
         should "capture tweet identifier" do
           assert_equal "20959239300", subject.uid
@@ -119,7 +120,7 @@ test DashFu::Mario::Backtweets do
         end
 
         context "author" do
-          subject { activity.person }
+          subject { source.activity.person }
 
           should "capture full name" do
             assert_equal "assaf", subject.fullname
@@ -141,8 +142,8 @@ test DashFu::Mario::Backtweets do
 
 
   context "meta" do
-    setup { setup_source "url"=>"vanity.labnotes.org" }
-    subject { meta }
+    setup { source.setup "url"=>"vanity.labnotes.org" }
+    subject { source.meta }
 
     should "link to search results" do
       assert subject.include?(:text=>"Search yourself", :url=>"http://backtweets.com/search?q=vanity.labnotes.org")

data/test/github_issues_test.rb

@@ -2,10 +2,10 @@ require_relative "setup"
 
 test DashFu::Mario::GithubIssues do
   context "setup" do
-    setup { setup_source "repo"=>"assaf/vanity" }
+    setup { source.setup "repo"=>"assaf/vanity" }
 
     context "metric" do
-      subject { metric }
+      subject { source.metric }
 
       should "use repository name" do
         assert_equal "Github Issues for assaf/vanity", subject.name
@@ -28,95 +28,95 @@ test DashFu::Mario::GithubIssues do
 
   context "validation" do
     should "raise error if repository name missing" do
-      assert_raise(RuntimeError) { setup_source "repo"=>" " }
+      assert_raise(RuntimeError) { source.setup "repo"=>" " }
     end
 
     should "raise error if repository name not user/repo" do
-      assert_raise(RuntimeError) { setup_source "repo"=>"vanity" }
+      assert_raise(RuntimeError) { source.setup "repo"=>"vanity" }
     end
 
     should "allow alphanumeric, minus and underscore" do
-      setup_source "repo"=>"assaf/the-vanity_0"
-      assert metric.valid?
+      source.setup "repo"=>"assaf/the-vanity_0"
+      assert source.valid?
     end
 
-    should "create valid metric" do
-      setup_source "repo"=>"assaf/vanity"
-      assert metric.valid?
+    should "create valid source" do
+      source.setup "repo"=>"assaf/vanity"
+      assert source.valid?
     end
   end
 
 
   context "update" do
-    setup { setup_source "repo"=>"assaf/vanity" }
+    setup { source.setup "repo"=>"assaf/vanity" }
 
     should "handle 404" do
       stub_request(:get, interactions.first.uri).to_return :status=>404
       stub_request(:get, interactions.second.uri).to_return :status=>404
-      assert_raise(RuntimeError) { update_source }
-      assert_equal "Could not find the repository assaf/vanity", last_error
+      assert_raise(RuntimeError) { 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
       stub_request(:get, interactions.second.uri).to_return :status=>401
-      assert_raise(RuntimeError) { update_source }
-      assert_equal "You are not authorized to access this repository, or invalid username/password", last_error
+      assert_raise(RuntimeError) { 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
       stub_request(:get, interactions.second.uri).to_return :status=>500
-      assert_raise(RuntimeError) { update_source }
-      assert_equal "Last request didn't go as expected, trying again later", last_error
+      assert_raise(RuntimeError) { 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"
       stub_request(:get, interactions.last.uri).to_return :body=>"Not JSON"
-      assert_raise(RuntimeError) { update_source }
-      assert_equal "Last request didn't go as expected, trying again later", last_error
+      assert_raise(RuntimeError) { source.update }
+      assert_equal "Last request didn't go as expected, trying again later", source.last_error
     end
 
     should "capture number of open issues" do
-      update_source
-      assert_equal 9, totals[:open]
+      source.update
+      assert_equal 9, source.metric.values[:open]
     end
 
     should "capture number of closed issues" do
-      update_source
-      assert_equal 12, totals[:closed]
+      source.update
+      assert_equal 12, source.metric.values[:closed]
     end
 
     should "not create any activity" do
-      update_source
-      assert activities.empty?
+      source.update
+      assert source.activities.empty?
     end
 
     context "repeating" do
       setup do
-        update_source
+        source.update
         open = interactions.select { |i| i.uri =~ /open/ }
         stub_request(:get, open.first.uri).to_return :body=>open.last.response.body
         closed = interactions.select { |i| i.uri =~ /closed/ }
         stub_request(:get, closed.first.uri).to_return :body=>closed.last.response.body
-        update_source
+        source.update
       end
 
       should "update open count" do
-        assert_equal 2, totals[:open]
+        assert_equal 2, source.metric.values[:open]
       end
 
       should "update closed count" do
-        assert_equal 2, totals[:closed]
+        assert_equal 2, source.metric.values[:closed]
       end
 
       should "create activity for each issue opened or closed" do
-        assert_equal 2, activities.count
+        assert_equal 2, source.activities.count
       end
 
       context "activity for open issue" do
-        subject { activities.first }
+        subject { source.activities.first }
 
         should "capture issue URL" do
           assert_equal "http://github.com/assaf/vanity/issues#issue/22", subject.url
@@ -148,7 +148,7 @@ opened <a href="http://github.com/assaf/vanity/issues#issue/22">issue 22</a> on
       end
 
       context "activity for closed issue" do
-        subject { activities.last }
+        subject { source.activities.last }
 
         should "capture issue URL" do
           assert_equal "http://github.com/assaf/vanity/issues#issue/19", subject.url
@@ -184,8 +184,8 @@ closed <a href="http://github.com/assaf/vanity/issues#issue/19">issue 19</a> on
 
 
   context "meta" do
-    setup { setup_source "repo"=>"assaf/vanity" }
-    subject { meta }
+    setup { source.setup "repo"=>"assaf/vanity" }
+    subject { source.meta }
 
     should "link to repository" do
       assert_contains subject, :title=>"On Github", :url=>"http://github.com/assaf/vanity/issues"

data/test/github_test.rb

@@ -2,15 +2,15 @@ require_relative "setup"
 
 test DashFu::Mario::Github do
   context "setup" do
-    setup { setup_source "repo"=>"assaf/vanity", "branch"=>"master" }
+    setup { source.setup "repo"=>"assaf/vanity", "branch"=>"master" }
 
     should "default branch to master" do
-      setup_source "repo"=>"assaf/vanity", "branch"=>" "
-      assert_equal "master", source["branch"]
+      source.setup "repo"=>"assaf/vanity", "branch"=>" "
+      assert_equal "master", source.state["branch"]
     end
 
     context "metric" do
-      subject { metric }
+      subject { source.metric }
 
       should "use repository name" do
         assert_equal "Github: assaf/vanity", subject.name
@@ -37,96 +37,96 @@ test DashFu::Mario::Github do
 
   context "validation" do
     should "raise error if repository name missing" do
-      assert_raise(RuntimeError) { setup_source "repo"=>" ", "branch"=>"master" }
+      assert_raise(RuntimeError) { source.setup "repo"=>" ", "branch"=>"master" }
     end
 
     should "raise error if repository name not user/repo" do
-      assert_raise(RuntimeError) { setup_source "repo"=>"vanity", "branch"=>"master" }
+      assert_raise(RuntimeError) { source.setup "repo"=>"vanity", "branch"=>"master" }
     end
 
     should "allow alphanumeric, minus and underscore" do
-      setup_source "repo"=>"assaf/the-vanity_0", "branch"=>"master"
-      assert metric.valid?
+      source.setup "repo"=>"assaf/the-vanity_0", "branch"=>"master"
+      assert source.valid?
     end
 
-    should "create valid metric" do
-      setup_source "repo"=>"assaf/vanity", "branch"=>"master"
-      assert metric.valid?
+    should "create valid source" do
+      source.setup "repo"=>"assaf/vanity", "branch"=>"master"
+      assert source.valid?
     end
   end
 
 
   context "update" do
-    setup { setup_source "repo"=>"assaf/vanity", "branch"=>"master" }
+    setup { source.setup "repo"=>"assaf/vanity", "branch"=>"master" }
 
     should "handle 404" do
       stub_request(:get, interactions.first.uri).to_return :status=>404
-      assert_raise(RuntimeError) { update_source }
-      assert_equal "Could not find the repository assaf/vanity", last_error
+      assert_raise(RuntimeError) { 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) { update_source }
-      assert_equal "You are not authorized to access this repository, or invalid username/password", last_error
+      assert_raise(RuntimeError) { 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) { update_source }
-      assert_equal "Last request didn't go as expected, trying again later", last_error
+      assert_raise(RuntimeError) { 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) { update_source }
-      assert_equal "Last request didn't go as expected, trying again later", last_error
+      assert_raise(RuntimeError) { source.update }
+      assert_equal "Last request didn't go as expected, trying again later", source.last_error
     end
 
     should "capture number of commits" do
-      update_source
-      assert_equal 35, totals[:commits]
+      source.update
+      assert_equal 35, source.metric.values[:commits]
     end
 
     should "capture number of wacthers" do
-      update_source
-      assert_equal 534, totals[:watchers]
+      source.update
+      assert_equal 534, source.metric.values[:watchers]
     end
 
     should "capture number of forks" do
-      update_source
-      assert_equal 36, totals[:forks]
+      source.update
+      assert_equal 36, source.metric.values[:forks]
     end
 
     should "not create any activity" do
-      update_source
-      assert activities.empty?
+      source.update
+      assert source.activities.empty?
     end
 
     context "repeating" do
       setup do
-        update_source
+        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
-        update_source
+        source.update
       end
 
       should "update watchers" do
-        assert_equal 555, totals[:watchers]
+        assert_equal 555, source.metric.values[:watchers]
       end
 
       should "update forks" do
-        assert_equal 38, totals[:forks]
+        assert_equal 38, source.metric.values[:forks]
       end
 
       should "capture new number of commits" do
-        assert_equal 39, totals[:commits]
+        assert_equal 39, source.metric.values[:commits]
       end
 
       context "activity" do
-        subject { activity }
+        subject { source.activity }
 
         should "capture commit URL" do
           assert_equal "http://github.com/assaf/vanity/commit/dd154a9fdd2ac534b62b55b8acac2fd092d65439", subject.url
@@ -154,7 +154,7 @@ test DashFu::Mario::Github do
         end
 
         context "person" do
-          subject { activity.person }
+          subject { source.activity.person }
 
           should "capture full name" do
             assert_equal "Assaf Arkin", subject.fullname
@@ -170,7 +170,7 @@ test DashFu::Mario::Github do
         end
 
         context "commit message" do
-          subject { (Nokogiri::HTML(activity.html)/"blockquote").inner_text.strip }
+          subject { (Nokogiri::HTML(source.activity.html)/"blockquote").inner_text.strip }
 
           should "start with commit SHA" do
             assert_match /^cc156a9 /, subject
@@ -191,7 +191,7 @@ test DashFu::Mario::Github do
             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
+            source.update
           end
         end
 
@@ -199,12 +199,12 @@ test DashFu::Mario::Github 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
+            source.update
           end
-          subject { (Nokogiri::HTML(activity.html)/"blockquote") }
+          subject { (Nokogiri::HTML(source.activity.html)/"blockquote") }
 
           should "show as multiple activities" do
-            assert_equal 3, activities.count # 4 commits -> 3 activities
+            assert_equal 3, source.activities.count # 4 commits -> 3 activities
           end
 
           should "merge related commits into single activity" do
@@ -224,8 +224,8 @@ test DashFu::Mario::Github do
 
 
   context "meta" do
-    setup { setup_source "repo"=>"assaf/vanity", "branch"=>"master" }
-    subject { meta }
+    setup { source.setup "repo"=>"assaf/vanity", "branch"=>"master" }
+    subject { source.meta }
 
     should "link to repository" do
       assert_contains subject, :title=>"Repository", :text=>"assaf/vanity", :url=>"http://github.com/assaf/vanity"

data/test/helpers/metric.rb

@@ -3,9 +3,11 @@ class Metric
     args.each do |name, value|
       send "#{name}=", value
     end
+    @values = {}
   end
 
   attr_accessor :name, :columns, :totals
+  attr_reader :values
 
   def valid?
     validate rescue return false
@@ -19,4 +21,5 @@ class Metric
     fail "All metric columns must have an id" unless col_ids.all? { |col_id| col_id }
     fail "Metric columns must have unique ids" unless col_ids.uniq == col_ids
   end
+
 end

data/test/helpers/source.rb

@@ -0,0 +1,91 @@
+class Source
+  def initialize(args)
+    @mario = args[:mario]
+    @state = {}
+  end
+
+  attr_accessor :name, :mario, :state, :last_error, :metric
+
+  # Sets up source using supplied parameters, also validates.
+  #
+  # @example
+  #   assert_raise RuntimeError do
+  #     setup_source "gem_name"=>""
+  #   end
+  # @example
+  #   setup { source.setup "gem_name"=>"vanity" }
+  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"]
+    validate
+  end
+
+  def validate
+    raise "Must be named" if name.blank?
+    raise "Name must be 3 characters of longer" if name.length < 3
+    mario.validate state
+    metric.validate if metric
+  end
+
+  def valid?
+    validate rescue return false
+    return true
+  end
+
+  # Performs an update on the source.
+  #
+  # @example
+  #   assert source.update
+  def update(request = nil)
+    @last_error = nil
+    mario.update state, request, &callback
+  rescue
+    @last_error = $!.message
+    raise
+  end
+
+  # Performs an update on the source and returns the meta-data.
+  #
+  # @example
+  #   assert source.meta.include?(:title=>"Version", :text=>"1.4.0")
+  def meta
+    mario.update state, nil, &callback
+    mario.meta(state)
+  end
+
+  # Returns all activities reported by this source. See Activity.
+  def activities
+    @activities ||= []
+  end
+
+  # Returns last (most recent) activity.
+  #
+  # @example
+  #   assert_equal "Pushed a new release of awesome", source.activity.body
+  def activity
+    activities.last
+  end
+
+protected
+
+  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)
+      end
+    end
+  end
+
+end

data/test/helpers/test.rb

@@ -38,74 +38,9 @@ module DashFu
         @mario ||= mario_class.new
       end
 
-      # Sets up source using supplied parameters, also calls validate.
-      #
-      # @example
-      #   assert_raise RuntimeError do
-      #     setup_source "gem_name"=>""
-      #   end
-      # @example
-      #   setup { setup_source "gem_name"=>"vanity" }
-      def setup_source(params)
-        mario.setup source, params
-        mario.validate source
-      end
-
       # Returns the source. New source for each test.
       def source
-        @source ||= {}
-      end
-
-      # Updates the source. If an error occurs, raises an exception. You can get
-      # the last error message by calling #last_error.
-      def update_source(request = nil)
-        @last_error = nil
-        mario.update source, request, &updator
-      rescue
-        @last_error = $!.message
-        raise
-      end
-
-      # Last error after calling #update_source.
-      attr_reader :last_error
-
-      # Returns a new metric. See Metric.
-      #
-      # @example
-      #   assert_equal "My metric", metric.name
-      def metric
-        values = { :name=>source["metric.name"], :columns=>source["metric.columns"], :totals=>!!source["metric.totals"] }
-        Metric.new(values)
-      end
-
-      # Performs an update on the source and returns the meta-data.
-      #
-      # @example
-      #   assert meta.include?(:title=>"Version", :text=>"1.4.0")
-      def meta
-        mario.update source, nil, &updator
-        mario.meta(source)
-      end
-
-      # Returns totals collected by this source.
-      #
-      # @example
-      #   assert_equal({ :hits=>54 }, totals)
-      def totals
-        @totals ||= {}
-      end
-
-      # Returns all activities reported by this source. See Activity.
-      def activities
-        @activities ||= []
-      end
-
-      # Returns last (most recent) activity.
-      #
-      # @example
-      #   assert_equal "Pushed a new release of awesome", activity.body
-      def activity
-        activities.last
+        @source ||= Source.new(mario: mario)
       end
 
       # Returns the named fixture. Fixture looked up in the file
@@ -136,26 +71,6 @@ module DashFu
         @mario_class ||= self.class.instance_variable_get :@mario_class
       end
    
-      # Source update block. 
-      def updator
-        lambda do |args|
-          if args[:set]
-            totals.update args[:set]
-          elsif args[:inc]
-            args[:inc].each do |name, value|
-              totals[name] ||= 0
-              totals[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)
-          end
-        end
-      end
-
     end
   end
 end

data/test/ruby_gems_test.rb

@@ -2,10 +2,10 @@ require_relative "setup"
 
 test DashFu::Mario::RubyGems do
   context "setup" do
-    setup { setup_source "gem_name"=>"vanity" }
+    setup { source.setup "gem_name"=>"vanity" }
 
     context "metric" do
-      subject { metric }
+      subject { source.metric }
 
       should "use gem name" do
         assert_equal "RubyGems: vanity", subject.name
@@ -24,75 +24,75 @@ test DashFu::Mario::RubyGems do
 
   context "validation" do
     should "raise error if gem name missing" do
-      assert_raise(RuntimeError) { setup_source "gem_name"=>" " }
+      assert_raise(RuntimeError) { source.setup "gem_name"=>" " }
     end
 
-    should "create valid metric" do
-      setup_source "gem_name"=>"vanity"
-      assert metric.valid?
+    should "create valid source" do
+      source.setup "gem_name"=>"vanity"
+      assert source.valid?
     end
   end
 
 
   context "update" do
-    setup { setup_source "gem_name"=>"vanity" }
+    setup { source.setup "gem_name"=>"vanity" }
 
     should "properly encode gem name" do
-      setup_source "gem_name"=>"need&this=encoded"
-      update_source rescue nil
+      source.setup "gem_name"=>"need&this=encoded"
+      source.update rescue nil
       assert_requested :get, "http://rubygems.org/api/v1/gems/need%26this%3Dencoded.json"
     end
 
     should "handle 404" do
       stub_request(:get, interactions.first.uri).to_return :status=>404
-      assert_raise(RuntimeError) { update_source }
-      assert_equal "Could not find the Gem vanity", last_error
+      assert_raise(RuntimeError) { 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) { update_source }
-      assert_equal "Last request didn't go as expected, trying again later", last_error
+      assert_raise(RuntimeError) { 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) { update_source }
-      assert_equal "Last request didn't go as expected, trying again later", last_error
+      assert_raise(RuntimeError) { source.update }
+      assert_equal "Last request didn't go as expected, trying again later", source.last_error
     end
 
     should "capture number of downloads" do
-      update_source
-      assert_equal({ :downloads=>3492 }, totals)
+      source.update
+      assert_equal({ :downloads=>3492 }, source.metric.values)
     end
 
     should "not create any activity" do
-      update_source
-      assert activities.empty?
+      source.update
+      assert source.activities.empty?
     end
 
     context "repeating" do
       setup do
-        update_source
+        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
-        update_source
+        source.update
       end
 
       should "update version number" do
-        assert 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 }, totals)
+        assert_equal({ :downloads=>9040 }, source.metric.values)
       end
 
       should "create activity for new release" do
-        assert activity
+        assert source.activity
       end
 
       context "activity" do
-        subject { activity }
+        subject { source.activity }
 
         should "should have unique identifier" do
           assert_equal "vanity-2.1.0", subject.uid
@@ -118,7 +118,7 @@ released <a href=\"http://rubygems.org/gems/vanity/versions/2.1.0\">vanity versi
         end
 
         context "person" do
-          subject { activity.person }
+          subject { source.activity.person }
 
           should "be named Ruby Gems" do
             assert_equal "RubyGems", subject.fullname
@@ -138,8 +138,8 @@ released <a href=\"http://rubygems.org/gems/vanity/versions/2.1.0\">vanity versi
 
 
   context "meta" do
-    setup { setup_source "gem_name"=>"vanity" }
-    subject { meta }
+    setup { source.setup "gem_name"=>"vanity" }
+    subject { source.meta }
 
     should "link to project page" do
       assert_contains subject, :title=>"Project", :text=>"vanity", :url=>"http://vanity.labnotes.org"

data/test/setup.rb

@@ -8,6 +8,7 @@ require "nokogiri"
 require "active_support/all"
 
 require_relative "helpers/test"
+require_relative "helpers/source"
 require_relative "helpers/person"
 require_relative "helpers/activity"
 require_relative "helpers/metric"

data/test/test.log

@@ -850,3 +850,67 @@ Github: 200
 Github: 500 
 RubyGems: 200 
 RubyGems: 500 
+RubyGems: 200 
+RubyGems: 500 
+RubyGems: 200 
+RubyGems: 500 
+RubyGems: 200 
+RubyGems: 500 
+RubyGems: 200 
+RubyGems: 500 
+RubyGems: 200 
+RubyGems: 500 
+RubyGems: 200 
+RubyGems: 500 
+RubyGems: 200 
+RubyGems: 500 
+RubyGems: 200 
+RubyGems: 500 
+RubyGems: 200 
+RubyGems: 500 
+RubyGems: 200 
+RubyGems: 500 
+RubyGems: 200 
+RubyGems: 500 
+RubyGems: 200 
+RubyGems: 500 
+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: 200 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Backtweets: 500 
+Backtweets: 200 
+Github: 200 
+Github: 500 
+Backtweets: 500 
+Backtweets: 200 
+Github: 200 
+Github: 500 
+RubyGems: 200 
+RubyGems: 500 
+Backtweets: 500 
+Backtweets: 200 
+Github: 200 
+Github: 500 
+RubyGems: 200 
+RubyGems: 500 

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 15
-  version: "0.15"
+  - 16
+  version: "0.16"
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 -07:00
+date: 2010-09-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,6 +111,7 @@ files:
 - test/helpers/activity.rb
 - test/helpers/metric.rb
 - test/helpers/person.rb
+- test/helpers/source.rb
 - test/helpers/test.rb
 - test/ruby_gems_test.rb
 - test/setup.rb
@@ -128,7 +129,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --title
-- DashFu::Mario 0.15
+- DashFu::Mario 0.16
 - --main
 - README.rdoc
 - --webcvs