tracco 0.0.12 → 0.0.13

data/CHANGELOG

@@ -1,42 +1,59 @@
+0.0.13 / 2013-02-27
+==================
+  * adding muted status on Effort to be able to 'turn off' a card's specific effort
+  * adding a TrackedCard.efforts_between method to fetch all the cards with an effort spent in a given date range
+  * improving TrackedCard#trello_notifications
+
 0.0.12
+======
   - Adding a TrackedCard#trello_notifications to fetch all the notifications belonging to the card
   - Introducing FactoryGirl as a factory gem to simplify specs
 
 0.0.11
+======
   - Adding a TrackedCard.all_tracked_cards method to fetch all cards with a valid tracking. Moreover, sorting_options can be passed to sort using a method e.g. TrackedCard.all_tracked_cards(:method => :name, :order => :desc)
 
 0.0.10
+======
   - Including Mongoid::MultiParameterAttributes in Effort and Estimate to enable date params to be collected correctly by Rails app (e.g. using the Rails' date_select form helper)
 
 0.0.8 - 0.0.9
+=============
   - Gem rename :)
 
 0.0.7
+=====
   - Minor refactorings on the rake tasks
 
 0.0.6
+=====
   - Added TrackedCard#status to track card status: :todo if no effort has been spent, :done if the card is in a DONE column, :in_progress otherwise
   - Added a Members#effort_spent and #effort_spent_since to extract the overall effort tracked by a member since a given date
   - Re-merged in the trello_effort_app branch to bring on the Rails app
 
 0.0.5
+=====
   - Improved docs
   - Improved use of this tool as a gem
 
 0.0.4
+=====
   - A card moved into a DONE column is closed
 
 0.0.3
+=====
   - When I send a tracking with "DONE" then the card is "closed" (aka "finished")
   - Export all cards in a Google Docs spreadsheet
   - When I card change its name, the tracked card should be updated too
   - A card should tells its estimate error (3)
 
 0.0.2
+=====
   - Very simple Rails app on a separate branch, still experimenting
   - Should be able to open a Trello console with a rake task
   - Avoid running the script if already run for that period
   - Tracking data is now persisted in a mongo database
 
 0.0.1
+=====
   - Initial Release.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tracco (0.0.12)
+    tracco (0.0.13)
       bson_ext
       chronic
       google_drive
@@ -19,7 +19,7 @@ GEM
     activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.3.2)
+    addressable (2.3.3)
     bson (1.8.2)
     bson_ext (1.8.2)
       bson (~> 1.8.2)

data/lib/patches/trello/member.rb

@@ -1,10 +1,10 @@
 module Trello
   class Member
     # Reopening the Trello::Member class to add a notifications helper method
-    def notifications_from(starting_date)
+    def notifications_since(starting_date)
       notifications(limit:1000).select(&greater_than_or_equal_to(starting_date)).select(&tracking_notification?)
     end
-    
+
     private
 
     def greater_than_or_equal_to(starting_date)
@@ -14,7 +14,7 @@ module Trello
     def tracking_notification?
       lambda { |notification| notification.type == "mentionedOnCard" }
     end
-    
+
   end
 
 end

data/lib/tracco/effort.rb

@@ -6,11 +6,12 @@ class Effort
   field :amount,  type: BigDecimal
   field :date,    type: Date
   field :tracking_notification_id
+  field :muted,   type: Boolean, default: false
 
   embeds_many :members
   embedded_in :tracked_card
 
-  default_scope asc(:date)
+  default_scope where(muted: false).asc(:date)
 
   validates_presence_of :amount, :date, :members
 

data/lib/tracco/google_docs_exporter.rb

@@ -18,7 +18,7 @@ class GoogleDocsExporter
     create_header(worksheet)
     index = 2 # skip the header
 
-    cards = TrackedCard.all.reject(&:no_tracking?).sort_by(&:first_activity_date).reverse
+    cards = TrackedCard.all_tracked_cards(:method => :first_activity_date, :order => :desc)
     cards.each do |card|
       print ".".color(:green)
       worksheet[index, columns[:user_story_id]] = card.short_id

data/lib/tracco/member.rb

@@ -28,7 +28,7 @@ class Member
   end
 
   def effort_spent(from_date=nil)
-    cards = TrackedCard.where("efforts.members.username" => username)
+    cards = TrackedCard.with_effort_spent_by(username)
     efforts = cards.map(&:efforts).compact.flatten
     efforts = efforts.select {|e| e.date >= from_date} if from_date
     efforts.select { |effort| effort.include?(self) }.inject(0) { |total, effort| total + effort.amount_per_member }

data/lib/tracco/tracked_card.rb

@@ -19,6 +19,8 @@ class TrackedCard
   validates_presence_of :name, :short_id, :trello_id
   validates_numericality_of :short_id
 
+  scope :with_effort_spent_by, ->(username){ where("efforts.members.username" => username) }
+
   def self.find_by_trello_id(trello_id)
     without_mongo_raising_errors do
       find_by(trello_id: trello_id)
@@ -35,10 +37,9 @@ class TrackedCard
 
   def self.all_tracked_cards(sorting_options = {})
     cards = all.reject(&:no_tracking?)
-
-    cards = cards.sort_by(&sorting_options[:method].to_sym) if sorting_options[:method]
-
-    sorting_options[:order] == :desc ? cards.reverse : cards
+    cards.sort_by!(&sorting_options[:sort_by].to_sym) if sorting_options[:sort_by]
+    cards.reverse! if sorting_options[:order] == :desc
+    return cards
   end
 
   def self.build_from(trello_card)
@@ -47,6 +48,15 @@ class TrackedCard
     new(trello_card.attributes.merge(trello_id: trello_card_id))
   end
 
+  def self.efforts_between(search_options)
+    condition = {}
+    {'$gte' => :from_date, '$lte' => :to_date}.each do |selection, option_key|
+      condition[selection] = search_options[option_key] if search_options[option_key]
+    end
+
+    where("efforts.date" => condition)
+  end
+
   def status
     if done?
       :done
@@ -118,7 +128,7 @@ class TrackedCard
 
   def trello_notifications
     notification_ids = efforts.map(&:tracking_notification_id) | estimates.map(&:tracking_notification_id)
-    notification_ids.map { |each_id| Trello::Notification.find(each_id) }.sort_by(&:date)
+    notification_ids.map { |id| Trello::Notification.find(id) rescue nil }.compact.sort_by(&:date)
   end
 
   def to_s

data/lib/tracco/tracking/effort_tracking.rb

@@ -2,39 +2,36 @@ module Tracking
   class EffortTracking
     include Base
 
-    #TODO: rename to 'amount' ?
-    #TODO: avoid recomputing effort every time using a lazy instance variable
-    def effort
-      effort_amount = convert_to_hours(raw_effort)
-      if effort_amount
-        total_effort = effort_amount * effort_members.size
-        Effort.new(amount: total_effort, date: date, members: effort_members, tracking_notification_id: tracking_notification.id)
-      end
-    end
-
     def add_to(card)
       card.efforts << effort unless card.contains_effort?(effort)
     end
 
+    def effort
+      @effort ||= Effort.new(amount: total_effort_from(raw_effort), date: date, members: effort_members, tracking_notification_id: tracking_notification.id)
+    end
+
     private
 
+    def total_effort_from(raw_effort)
+      effort_amount = convert_to_hours(raw_effort)
+      total_effort = effort_amount * effort_members.size
+    end
+
     def raw_effort
       extract_match_from_raw_tracking(/\+#{DURATION_REGEXP}/)
     end
 
     def effort_members
-      @effort_members ||= users_involved_in_the_effort.map do |username|
+      @effort_members ||= members_involved_in_the_effort.map do |username|
         Member.build_from(Trello::Member.find(username))
       end
-
-      @effort_members
     end
 
-    def users_involved_in_the_effort
-      users_involved_in_the_effort = raw_tracking.scan(/@(\w+)/).flatten
-      users_involved_in_the_effort << notifier.username unless should_count_only_listed_members?
+    def members_involved_in_the_effort
+      members_involved_in_the_effort = raw_tracking.scan(/@(\w+)/).flatten
+      members_involved_in_the_effort << notifier.username unless should_count_only_listed_members?
 
-      users_involved_in_the_effort
+      members_involved_in_the_effort
     end
 
     def should_count_only_listed_members?

data/lib/tracco/tracking/estimate_tracking.rb

@@ -2,11 +2,8 @@ module Tracking
   class EstimateTracking
     include Base
 
-    #TODO: rename to 'amount' ?
-    #TODO: avoid recomputing estimate every time using a lazy instance variable
     def estimate
-      estimate = convert_to_hours(raw_estimate)
-      Estimate.new(amount: estimate, date: date, tracking_notification_id: tracking_notification.id)
+      @estimate ||= Estimate.new(amount: convert_to_hours(raw_estimate), date: date, tracking_notification_id: tracking_notification.id)
     end
 
     def add_to(card)

data/lib/tracco/tracking/factory.rb

@@ -0,0 +1,26 @@
+module Tracking
+  class Factory
+
+    DURATION_REGEXP = '(\d+\.?\d*[phdg])'
+
+    @match_pairs = {}
+
+    def self.build_from(tracking_notification)
+      matching_pair = @match_pairs.find { |regexp, tracking_class| tracking_notification.data['text'] =~ regexp }
+
+      tracking_class = matching_pair ? matching_pair.last : Tracking::InvalidTracking
+      tracking_class.new(tracking_notification)
+    end
+
+    private
+
+    def self.match(match_pair)
+      @match_pairs.merge!(match_pair)
+    end
+
+    match /\[#{DURATION_REGEXP}\]/ => Tracking::EstimateTracking
+             match /\+#{DURATION_REGEXP}/   => Tracking::EffortTracking
+             match /DONE/ => Tracking::CardDoneTracking
+
+  end
+end

data/lib/tracco/trello_tracker.rb

@@ -10,13 +10,13 @@ class TrelloTracker
   end
 
   def track(starting_date=Date.today)
-    notifications = tracker.notifications_from(starting_date)
+    notifications = tracker.notifications_since(starting_date)
 
     oldest, latest = boundary_dates_in(notifications)
     Trello.logger.info "Processing #{notifications.size} tracking notifications (from #{oldest} to #{latest}) starting from #{starting_date}..."
 
     notifications.each do |notification|
-      tracking = TrackingFactory.build_from(notification)
+      tracking = Tracking::Factory.build_from(notification)
       begin
         tracked_card = TrackedCard.update_or_create_with(notification.card)
         tracked_card.add!(tracking)

data/lib/tracco/version.rb

@@ -1,3 +1,3 @@
 class TrelloEffortTracker
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/lib/tracco.rb

@@ -18,7 +18,7 @@ require 'tracco/tracking/estimate_tracking'
 require 'tracco/tracking/effort_tracking'
 require 'tracco/tracking/card_done_tracking'
 require 'tracco/tracking/invalid_tracking'
-require 'tracco/tracking_factory'
+require 'tracco/tracking/factory'
 require 'tracco/trello_tracker'
 require 'tracco/google_docs_exporter'
 

data/spec/effort_spec.rb

@@ -3,7 +3,7 @@ require 'mongoid-rspec'
 
 describe Effort do
 
-  it { should have_fields(:amount, :date) }
+  it { should have_fields(:amount, :date, :muted, :tracking_notification_id) }
   it { should be_embedded_in(:tracked_card) }
   it { should embed_many(:members) }
 

data/spec/factories/effort_factory.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+
+  factory :effort do
+    amount 4
+    date Date.today
+    members [Member.new(username: "any_name")]
+    sequence(:tracking_notification_id, 1000)
+    muted false
+  end
+
+end

data/spec/factories/estimate_factory.rb

@@ -0,0 +1,9 @@
+FactoryGirl.define do
+
+  factory :estimate do
+    amount 42
+    date Date.today
+    sequence(:tracking_notification_id, 1000)
+  end
+
+end

data/spec/factories/tracked_card_factory.rb

@@ -1,13 +1,12 @@
 FactoryGirl.define do
+
   factory :tracked_card do
-    sequence(:name) { |n| "any_card_#{n}" }
-    description "any description"
-    sequence(:short_id, 1000) { |n| n }
+    sequence(:short_id, 1000)
     sequence(:trello_id, 100000) { |n| "xyz#{n}" }
-    done false
+    sequence(:name)              { |n| "any_card_#{n}" }
+    description "any description"
+    done   false
     closed false
-
-    # embeds_many :estimates
-    # embeds_many :efforts
   end
+
 end

data/spec/spec_helper.rb

@@ -14,8 +14,6 @@ rescue Bundler::GemNotFound => e
   exit!
 end
 
-Bundler.require(:spec)
-
 require 'tracco'
 
 require 'factory_girl'
@@ -32,39 +30,3 @@ end
 
 # force test env for the mongodb configuration
 TrelloConfiguration::Database.load_env("test")
-
-
-## Spec Helper Methods (TODO: should we move them in a separate file?)
-
-def unrecognized_notification
-  create_notification(data: { 'text' => '@trackinguser hi there!' })
-end
-
-def notification_with_message(message)
-  create_notification(data: { 'text' => message })
-end
-
-def create_estimate(time_measurement)
-  create_notification(data: { 'text' => "@trackinguser [1.5#{TIME_MEASUREMENTS[time_measurement]}]" })
-end
-
-def create_effort(time_measurement)
-  create_notification(data: { 'text' => "@trackinguser +4.5#{TIME_MEASUREMENTS[time_measurement]}]" })
-end
-
-def with(notification)
-  tracking = TrackingFactory.build_from(notification)
-  yield(tracking)
-end
-
-def with_message(notification_message, &block)
-  with(notification_with_message(notification_message), &block)
-end
-
-def create_notification(custom_params)
-  params = { data: { 'text' => "@trackinguser +2h" }, date: "2012-10-28T21:06:14.801Z", member_creator: stub(username: "pietrodibello") }
-  params.merge!(custom_params)
-
-  stub(data: params[:data], date: params[:date], member_creator: params[:member_creator]).as_null_object
-end
-

data/spec/support/spec_helper_methods.rb

@@ -0,0 +1,32 @@
+
+def unrecognized_notification
+  create_notification(data: { 'text' => '@trackinguser hi there!' })
+end
+
+def notification_with_message(message)
+  create_notification(data: { 'text' => message })
+end
+
+def create_estimate(time_measurement)
+  create_notification(data: { 'text' => "@trackinguser [1.5#{TIME_MEASUREMENTS[time_measurement]}]" })
+end
+
+def create_effort(time_measurement)
+  create_notification(data: { 'text' => "@trackinguser +4.5#{TIME_MEASUREMENTS[time_measurement]}]" })
+end
+
+def with(notification)
+  tracking = Tracking::Factory.build_from(notification)
+  yield(tracking)
+end
+
+def with_message(notification_message, &block)
+  with(notification_with_message(notification_message), &block)
+end
+
+def create_notification(custom_params)
+  params = { data: { 'text' => "@trackinguser +2h" }, date: "2012-10-28T21:06:14.801Z", member_creator: stub(username: "pietrodibello") }
+  params.merge!(custom_params)
+
+  stub(data: params[:data], date: params[:date], member_creator: params[:member_creator]).as_null_object
+end

data/spec/tracked_card_spec.rb

@@ -8,6 +8,11 @@ describe TrackedCard do
 
   subject(:card) { build(:tracked_card) }
 
+  before(:each) do
+    # adding a muted effort to check that won't be counted
+    card.efforts << build(:effort, amount: 1000, muted: true)
+  end
+
   %w{piero tommaso michele}.each do |username|
     let(username.to_sym) { Member.new(username: username) }
   end
@@ -40,60 +45,67 @@ describe TrackedCard do
     end
   end
 
-  describe ".all_tracked_cards" do
-    it "finds all tracked cards with a valid tracking" do
-      # TODO introduce a factory on estimate and effort
-      card = create(:tracked_card, :estimates => [Estimate.new(amount: 5, date: Date.today)],
-                                   :efforts => [Effort.new(amount: 3, date: Date.today, members: [piero])])
-      card_without_tracking = create(:tracked_card)
+  describe ".with_effort_spent_by" do
+    it "finds all the cards worked by a given member" do
+      card = create(:tracked_card, efforts: [build(:effort, members: [piero, tommaso])])
+      another_card = create(:tracked_card, efforts: [build(:effort, members: [piero, michele])])
 
+      TrackedCard.with_effort_spent_by("piero").should =~ [card, another_card]
+      TrackedCard.with_effort_spent_by("tommaso").should == [card]
+      TrackedCard.with_effort_spent_by("michele").should == [another_card]
+    end
+  end
+
+  describe ".efforts_between" do
+    it "finds all the cards worked in a given date range" do
+      a_card          = create(:tracked_card, efforts: [build(:effort, date: Date.parse("2013-01-02"))])
+      another_card    = create(:tracked_card, efforts: [build(:effort, date: Date.parse("2013-11-03"))])
+      a_very_old_card = create(:tracked_card, efforts: [build(:effort, date: Date.parse("2009-11-03"))])
 
-      TrackedCard.all_tracked_cards.should == [card]
+      TrackedCard.efforts_between(from_date: Date.parse("2012-01-01")).should =~ [a_card, another_card]
+      TrackedCard.efforts_between(from_date: Date.parse("2013-01-01")).should =~ [a_card, another_card]
+      TrackedCard.efforts_between(from_date: Date.parse("2013-01-22")).should == [another_card]
+      TrackedCard.efforts_between(from_date: Date.parse("2014-01-22")).should == []
+
+      TrackedCard.efforts_between(from_date: Date.parse("2012-01-01"), to_date: Date.parse("2012-11-01")).should == []
+      TrackedCard.efforts_between(from_date: Date.parse("2012-01-01"), to_date: Date.parse("2013-02-02")).should == [a_card]
+      TrackedCard.efforts_between(from_date: Date.parse("2012-01-01"), to_date: Date.parse("2014-02-02")).should =~ [a_card, another_card]
     end
+  end
 
-    it "optionally sorts the cards using a given sorting method" do
-      card = create(:tracked_card, name: "AAA")
-      card.estimates << Estimate.new(amount: 5, date: Date.today)
-      card.efforts << Effort.new(amount: 3, date: Date.today, members: [piero])
+  describe ".all_tracked_cards" do
+    let!(:card)          { create(:tracked_card, name: "AAA", estimates: [build(:estimate)], efforts: [build(:effort)]) }
+    let!(:another_card)  { create(:tracked_card, name: "ZZZ", estimates: [build(:estimate)], efforts: [build(:effort)]) }
+    let!(:card_without_tracking) { create(:tracked_card) }
 
-      another_card = create(:tracked_card, name: "ZZZ")
-      another_card.estimates << Estimate.new(amount: 5, date: Date.today)
-      another_card.efforts << Effort.new(amount: 3, date: Date.today, members: [piero])
+    it "finds all tracked cards with a valid tracking" do
+      TrackedCard.all_tracked_cards.should =~ [card, another_card]
+    end
 
-      card_without_tracking = create(:tracked_card)
+    it "optionally sorts the cards using a given sorting method" do
+      card.update_attributes(name: "AAA")
+      another_card.update_attributes(name: "ZZZ")
 
-      TrackedCard.all_tracked_cards(:method => :name).should == [card, another_card]
+      TrackedCard.all_tracked_cards(:sort_by => :name).should == [card, another_card]
     end
 
     it "applies an optional sorting order" do
-      card = create(:tracked_card, name: "AAA")
-      card.estimates << Estimate.new(amount: 5, date: Date.today)
-      card.efforts << Effort.new(amount: 3, date: Date.today, members: [piero])
-
-      another_card = create(:tracked_card, name: "ZZZ")
-      another_card.estimates << Estimate.new(amount: 5, date: Date.today)
-      another_card.efforts << Effort.new(amount: 3, date: Date.today, members: [piero])
+      card.update_attributes(name: "AAA")
+      another_card.update_attributes(name: "ZZZ")
 
       card_without_tracking = create(:tracked_card)
 
-      TrackedCard.all_tracked_cards(:method => :name, :order => :desc).should == [another_card, card]
+      TrackedCard.all_tracked_cards(:sort_by => :name, :order => :desc).should == [another_card, card]
     end
 
     it "uses the ascending order as default sorting order option" do
-      card = create(:tracked_card, name: "AAA", short_id: 44)
-      card.estimates << Estimate.new(amount: 5, date: Date.today)
-      card.efforts << Effort.new(amount: 3, date: Date.today, members: [piero])
-
-      another_card = create(:tracked_card, name: "ZZZ", short_id: 12)
-      another_card.estimates << Estimate.new(amount: 5, date: Date.today)
-      another_card.efforts << Effort.new(amount: 3, date: Date.today, members: [piero])
+      card.update_attributes(name: "AAA", short_id: 44)
+      another_card.update_attributes(name: "ZZZ", short_id: 11)
+      card_without_tracking.update_attributes(short_id: 3456)
 
-      card_without_tracking = create(:tracked_card, short_id: 3456)
-
-      TrackedCard.all_tracked_cards(:method => :short_id).should == [another_card, card]
+      TrackedCard.all_tracked_cards(:sort_by => :short_id).should == [another_card, card]
     end
 
-
   end
 
   describe ".update_or_create_with" do
@@ -162,22 +174,39 @@ describe TrackedCard do
 
   end
 
+  describe "card with muted effort" do
+    it "fetches only non-muted efforts" do
+      card =  create(:tracked_card, efforts: [build(:effort, muted: false)])
+      card_with_muted_effort = create(:tracked_card, efforts: [build(:effort, muted: true)])
+
+      TrackedCard.should have(2).cards
+
+      card.efforts.should have(1).effort
+
+      card_with_muted_effort.efforts.should be_empty
+      card_with_muted_effort.efforts.unscoped.should have(1).effort
+    end
+
+    it "skips muted effort when computing the total effort on the card" do
+      card.efforts << build(:effort, amount: 3, muted: true)
+      card.efforts << build(:effort, amount: 5, muted: false)
+
+      card.total_effort.should == 5
+    end
+  end
+
   it "has no estimates and efforts initially" do
     card.estimates.should be_empty
     card.efforts.should be_empty
   end
 
   it "is possible to add estimates" do
-    card.estimates << Estimate.new(amount: 5, date: Date.yesterday)
-    card.estimates << Estimate.new(amount: 12, date: Date.today)
-
+    card.estimates << build(:estimate) << build(:estimate)
     card.estimates.should have(2).estimates
   end
 
   it "is possible to add efforts" do
-    card.efforts << Effort.new(amount: 3, date: Date.today, members: [piero, tommaso])
-    card.efforts << Effort.new(amount: 5, date: Date.today, members: [tommaso])
-
+    card.efforts << build(:effort) << build(:effort)
     card.efforts.should have(2).efforts
   end
 
@@ -185,14 +214,26 @@ describe TrackedCard do
     let(:first_notification)   { stub("notification1", date: Date.yesterday) }
     let(:second_notification)  { stub("notification1", date: Date.today)     }
 
-    it "fetch all the card notifications from trello" do
+    it "fetches all the card notifications from trello" do
       card.estimates << Estimate.new(tracking_notification_id: "xyz987", amount: 5, date: Date.yesterday)
       card.efforts << Effort.new(tracking_notification_id: "abc123", amount: 3, date: Date.today, members: [piero])
 
       Trello::Notification.should_receive(:find).with("xyz987").and_return(second_notification)
       Trello::Notification.should_receive(:find).with("abc123").and_return(first_notification)
+
       card.trello_notifications.should == [first_notification, second_notification]
     end
+
+    it "skips the notifications not found" do
+      card.estimates << build(:estimate, tracking_notification_id: "unexisting_id")
+      card.efforts << build(:effort, tracking_notification_id: "first_notification_id")
+
+      Trello::Notification.should_receive(:find).with("unexisting_id").and_raise(Trello::Error)
+      Trello::Notification.should_receive(:find).with("first_notification_id").and_return(first_notification)
+
+      card.trello_notifications.should == [first_notification]
+    end
+
   end
 
   describe "equality" do
@@ -207,7 +248,7 @@ describe TrackedCard do
   end
 
   describe "#add" do
-    let(:card) { TrackedCard.new(name: "a name", trello_id: "123456789") }
+    let(:card) { build(:tracked_card) }
     let(:estimate_tracking) { Tracking::EstimateTracking.new(create_notification(data: { 'text' => "@trackinguser [1h]" })) }
 
     it "adds an estimate from a tracking estimate notification" do
@@ -232,7 +273,7 @@ describe TrackedCard do
   end
 
   describe "#add!" do
-    let(:card) { TrackedCard.new(name: "a name", trello_id: "123456789", short_id: "123") }
+    let(:card) { build(:tracked_card) }
 
     it "saves the tracked card after adding the tracking" do
       any_tracking = Tracking::EstimateTracking.new(create_notification(data: { 'text' => "@trackinguser [1h]" }))
@@ -248,50 +289,51 @@ describe TrackedCard do
     end
 
     it "computes the total effort on the card" do
-      card.efforts << Effort.new(amount: 3, date: Date.today, members: [piero, tommaso])
-      card.efforts << Effort.new(amount: 5, date: Date.today, members: [tommaso])
+      card.efforts << build(:effort, amount: 3)
+      card.efforts << build(:effort, amount: 5)
 
       card.total_effort.should == 3+5
     end
   end
 
   describe "#last_estimate_error" do
+
     it "is nil when the card has no estimate" do
-      card.efforts << Effort.new(amount: 5, date: Date.today, members: [tommaso])
+      card.efforts << build(:effort, amount: 5)
 
       card.last_estimate_error.should be_nil
     end
 
     it "is nil when the card has no effort" do
-      card.efforts << Estimate.new(amount: 5, date: Date.today)
+      card.efforts << build(:estimate)
 
       card.last_estimate_error.should be_nil
     end
 
     it "is zero when actual effort is equal to estimate" do
-      card.estimates << Estimate.new(amount: 5, date: Date.today)
-      card.efforts << Effort.new(amount: 5, date: Date.today, members: [tommaso])
+      card.estimates << build(:estimate, amount: 5)
+      card.efforts << build(:effort, amount: 5)
 
       card.last_estimate_error.should == 0.0
     end
 
     it "is 100 when the actual effort is twice the given estimate" do
-      card.estimates << Estimate.new(amount: 5, date: Date.today)
-      card.efforts << Effort.new(amount: 10, date: Date.today, members: [tommaso])
+      card.estimates << build(:estimate, amount: 5)
+      card.efforts << build(:effort, amount: 10)
 
       card.last_estimate_error.should == 100.0
     end
 
     it "is -50 when the actual effort is half of the given estimate" do
-      card.estimates << Estimate.new(amount: 10, date: Date.today)
-      card.efforts << Effort.new(amount: 5, date: Date.today, members: [tommaso])
+      card.estimates << build(:estimate, amount: 10)
+      card.efforts << build(:effort, amount: 5)
 
       card.last_estimate_error.should == -50.0
     end
 
     it "is rounded with two decimal digits" do
-      card.estimates << Estimate.new(amount: 3, date: Date.today)
-      card.efforts << Effort.new(amount: 5, date: Date.today, members: [tommaso])
+      card.estimates << build(:estimate, amount: 3)
+      card.efforts << build(:effort, amount: 5)
 
       card.last_estimate_error.should == 66.67
     end
@@ -313,9 +355,9 @@ describe TrackedCard do
 
   describe "#members" do
     it "lists all the members which spent some effort on the card" do
-      card.efforts << Effort.new(amount: 3, date: Date.today, members: [piero, tommaso])
-      card.efforts << Effort.new(amount: 5, date: Date.today, members: [tommaso])
-      card.efforts << Effort.new(amount: 5, date: Date.today, members: [tommaso, michele])
+      card.efforts << build(:effort, members: [piero, tommaso])
+      card.efforts << build(:effort, members: [tommaso])
+      card.efforts << build(:effort, members: [tommaso, michele])
 
       card.members.should == [piero, tommaso, michele]
     end
@@ -324,9 +366,9 @@ describe TrackedCard do
   describe "#working_start_date" do
 
     it "is the date of the first effort spent on the card" do
-      card.efforts << Effort.new(amount: 5, date: Date.today, members: [tommaso])
-      card.efforts << Effort.new(amount: 3, date: Date.yesterday, members: [tommaso])
-      card.efforts << Effort.new(amount: 5, date: Date.tomorrow, members: [tommaso])
+      card.efforts << build(:effort, date: Date.today)
+      card.efforts << build(:effort, date: Date.yesterday)
+      card.efforts << build(:effort, date: Date.tomorrow)
 
       card.working_start_date.should == Date.yesterday
     end
@@ -334,12 +376,12 @@ describe TrackedCard do
 
   describe "#first_activity_date" do
     it "is the date of the first effort or estimate given on the card" do
-      card.estimates << Estimate.new(amount: 5, date: Date.yesterday)
-      card.estimates << Estimate.new(amount: 12, date: Date.yesterday.prev_day)
-      card.estimates << Estimate.new(amount: 12, date: Date.tomorrow)
+      card.estimates << build(:estimate, date: Date.yesterday)
+      card.estimates << build(:estimate, date: Date.yesterday.prev_day)
+      card.estimates << build(:estimate, date: Date.tomorrow)
 
-      card.efforts << Effort.new(amount: 3, date: Date.yesterday, members: [tommaso])
-      card.efforts << Effort.new(amount: 5, date: Date.today, members: [tommaso])
+      card.efforts << build(:effort, date: Date.yesterday)
+      card.efforts << build(:effort, date: Date.today)
 
       card.first_activity_date.should == Date.yesterday.prev_day
     end
@@ -347,9 +389,9 @@ describe TrackedCard do
 
   describe "#first_estimate_date" do
     it "is the date of the first estimate given on the card" do
-      card.estimates << Estimate.new(amount: 5, date: Date.tomorrow)
-      card.estimates << Estimate.new(amount: 12, date: Date.yesterday.prev_day)
-      card.estimates << Estimate.new(amount: 12, date: Date.today)
+      card.estimates << build(:estimate, date: Date.tomorrow)
+      card.estimates << build(:estimate, date: Date.yesterday.prev_day)
+      card.estimates << build(:estimate, date: Date.today)
 
       card.first_estimate_date.should == Date.yesterday.prev_day
     end
@@ -357,9 +399,9 @@ describe TrackedCard do
 
   describe "#last_estimate_date" do
     it "is the date of the last estimate given on the card" do
-      card.estimates << Estimate.new(amount: 5, date: Date.yesterday)
-      card.estimates << Estimate.new(amount: 12, date: Date.tomorrow)
-      card.estimates << Estimate.new(amount: 12, date: Date.today)
+      card.estimates << build(:estimate, date: Date.yesterday)
+      card.estimates << build(:estimate, date: Date.tomorrow)
+      card.estimates << build(:estimate, date: Date.today)
 
       card.last_estimate_date.should == Date.tomorrow
     end
@@ -369,7 +411,7 @@ describe TrackedCard do
     it "is false when there's no effort or estimate tracked on the card" do
       card.no_tracking?.should be_true
 
-      card.estimates << Estimate.new(amount: 5, date: Date.yesterday)
+      card.estimates << build(:estimate, date: Date.yesterday)
       card.no_tracking?.should be_false
     end
   end
@@ -387,10 +429,10 @@ describe TrackedCard do
 
   describe "#status" do
     it "is done when is done" do
-      done_card = TrackedCard.new(done:true)
+      done_card = TrackedCard.new(done: true)
       done_card.status.should == :done
 
-      done_card.efforts << Effort.new(amount: 3, date: Date.today, members: [Member.new(username: "any")])
+      done_card.efforts << build(:effort)
       done_card.status.should == :done
     end
 
@@ -398,7 +440,7 @@ describe TrackedCard do
       card = TrackedCard.new
       card.status.should == :todo
 
-      card.efforts << Effort.new(amount: 3, date: Date.today, members: [Member.new(username: "any")])
+      card.efforts << build(:effort)
       card.status.should == :in_progress
     end
   end

data/spec/tracking/card_done_tracking_spec.rb

@@ -7,7 +7,7 @@ module Tracking
       it "marks the card as done" do
         card = TrackedCard.new
 
-        done_tracking = TrackingFactory.build_from(notification_with_message("DONE"))
+        done_tracking = Tracking::Factory.build_from(notification_with_message("DONE"))
         done_tracking.add_to(card)
 
         card.done?.should be_true

data/spec/tracking/effort_tracking_spec.rb

@@ -28,7 +28,7 @@ module Tracking
                                        date: "2012-10-28T21:06:14.801Z",
                                        member_creator: stub(username: "michelepangrazzi"))
 
-        TrackingFactory.build_from(raw_data).effort.should == Effort.new(amount: 2.0, date: Date.parse('2012-10-28'), members: [michelepangrazzi])
+        Tracking::Factory.build_from(raw_data).effort.should == Effort.new(amount: 2.0, date: Date.parse('2012-10-28'), members: [michelepangrazzi])
       end
 
       it "converts the effort in hours when the notification contains an effort in days" do
@@ -87,7 +87,7 @@ module Tracking
       it "tracks the effort with the date given in the notification text, not the actual notification date" do
         raw_data = create_notification(data: { 'text' => "@trackinguser 22.11.2012 +6p" }, date: "2012-09-19T12:46:13.713Z")
 
-        tracking = TrackingFactory.build_from(raw_data)
+        tracking = Tracking::Factory.build_from(raw_data)
 
         tracking.effort.date.should == Date.parse('2012-11-22')
       end
@@ -95,7 +95,7 @@ module Tracking
       it "tracks the effort to yesterday when the keyword 'yesterday' is present before the effort amount" do
         raw_data = create_notification(data: { 'text' => "@trackinguser yesterday +6p" }, date: "2012-09-19T12:46:13.713Z")
 
-        tracking = TrackingFactory.build_from(raw_data)
+        tracking = Tracking::Factory.build_from(raw_data)
 
         tracking.effort.date.should == Date.parse('2012-09-18')
       end
@@ -103,7 +103,7 @@ module Tracking
       it "tracks the effort to yesterday when the keyword 'yesterday' is present before the effort amount" do
         raw_data = create_notification(data: { 'text' => "@trackinguser +6p yesterday" }, date: "2012-09-19T12:46:13.713Z")
 
-        tracking = TrackingFactory.build_from(raw_data)
+        tracking = Tracking::Factory.build_from(raw_data)
 
         tracking.effort.date.should == Date.parse('2012-09-18')
       end

data/spec/tracking/estimate_tracking_spec.rb

@@ -6,34 +6,34 @@ module Tracking
     describe "#estimate" do
 
       it "is nil when the notification does not contain an estimate" do
-        TrackingFactory.build_from(unrecognized_notification).estimate.should be_nil
+        Tracking::Factory.build_from(unrecognized_notification).estimate.should be_nil
       end
 
       it "is the hour-based estimate when the notification contains an estimate in hours" do
         raw_data = create_notification(data: { 'text' => "@trackinguser [2h]" }, date: "2012-10-28T21:06:14.801Z")
 
-        TrackingFactory.build_from(raw_data).estimate.should == Estimate.new(amount: 2.0, date: Date.parse('2012-10-28'))
+        Tracking::Factory.build_from(raw_data).estimate.should == Estimate.new(amount: 2.0, date: Date.parse('2012-10-28'))
       end
 
       it "converts the estimate in hours when the notification contains an estimate in days" do
-        TrackingFactory.build_from(create_notification(data: { 'text' => "@trackinguser [1.5d]" })).estimate.amount.should == 8+4
-        TrackingFactory.build_from(create_notification(data: { 'text' => "@trackinguser [1.5g]" })).estimate.amount.should == 8+4
+        Tracking::Factory.build_from(create_notification(data: { 'text' => "@trackinguser [1.5d]" })).estimate.amount.should == 8+4
+        Tracking::Factory.build_from(create_notification(data: { 'text' => "@trackinguser [1.5g]" })).estimate.amount.should == 8+4
       end
 
       it "converts the estimate in hours when the notification contains an estimate in pomodori" do
         raw_data = create_notification(data: { 'text' => "@trackinguser [10p]" })
-        TrackingFactory.build_from(raw_data).estimate.amount.should == 5
+        Tracking::Factory.build_from(raw_data).estimate.amount.should == 5
       end
 
       it "fetch the estimate from a complex estimate message" do
         raw_data = create_notification(data: { 'text' => "@maxmazza Dobbiamo ancora lavorarci.\n@trackinguser ristimo ancora [3h] per il fix" })
-        TrackingFactory.build_from(raw_data).estimate.amount.should == 3.0
+        Tracking::Factory.build_from(raw_data).estimate.amount.should == 3.0
       end
 
       it "tracks the effort with the date given in the notification text, not the actual notification date" do
         raw_data = create_notification( data: { 'text' => "@trackinguser 22.11.2012 [6p]" }, date: "2012-09-19T12:46:13.713Z")
 
-        tracking = TrackingFactory.build_from(raw_data)
+        tracking = Tracking::Factory.build_from(raw_data)
 
         tracking.estimate.date.should == Date.parse('2012-11-22')
       end

data/spec/tracking_factory_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe TrackingFactory do
+describe Tracking::Factory do
 
   TIME_MEASUREMENTS = {
     hours:    'h',
@@ -11,7 +11,7 @@ describe TrackingFactory do
 
   context "unknown tracking format" do
     it "builds an invalid tracking instance" do
-      TrackingFactory.build_from(unrecognized_notification).class.should == Tracking::InvalidTracking
+      Tracking::Factory.build_from(unrecognized_notification).class.should == Tracking::InvalidTracking
 
       with_message("@trackinguser +30m") { |tracking| tracking.class.should == Tracking::InvalidTracking }
     end
@@ -21,13 +21,13 @@ describe TrackingFactory do
 
     context "estimate tracking notification in #{time_measurement}" do
       it "builds an estimate tracking instance" do
-        TrackingFactory.build_from(create_estimate(time_measurement)).class.should == Tracking::EstimateTracking
+        Tracking::Factory.build_from(create_estimate(time_measurement)).class.should == Tracking::EstimateTracking
       end
     end
 
     context "effort tracking notification in #{time_measurement}" do
       it "builds an effort tracking instance" do
-        TrackingFactory.build_from(create_effort(time_measurement)).class.should == Tracking::EffortTracking
+        Tracking::Factory.build_from(create_effort(time_measurement)).class.should == Tracking::EffortTracking
       end
     end
 

data/tracco.sublime-project

@@ -3,7 +3,7 @@
  [
    {
      "path": ".",
-     "folder_exclude_patterns": ["tmp", "log", "coverage"],
+     "folder_exclude_patterns": ["pkg", "tmp", "log", "coverage"],
      "file_exclude_patterns": ["tracco.sublime-workspace"]
    }
  ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracco
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-trello
@@ -272,8 +272,8 @@ files:
 - lib/tracco/tracking/card_done_tracking.rb
 - lib/tracco/tracking/effort_tracking.rb
 - lib/tracco/tracking/estimate_tracking.rb
+- lib/tracco/tracking/factory.rb
 - lib/tracco/tracking/invalid_tracking.rb
-- lib/tracco/tracking_factory.rb
 - lib/tracco/trello_authorize.rb
 - lib/tracco/trello_configuration.rb
 - lib/tracco/trello_tracker.rb
@@ -284,6 +284,8 @@ files:
 - script/mate.sh
 - spec/effort_spec.rb
 - spec/estimate_spec.rb
+- spec/factories/effort_factory.rb
+- spec/factories/estimate_factory.rb
 - spec/factories/tracked_card_factory.rb
 - spec/integration/trello_authorization_spec.rb
 - spec/integration/trello_tracker_spec.rb
@@ -291,6 +293,7 @@ files:
 - spec/patches/trello/card_spec.rb
 - spec/spec_helper.rb
 - spec/support/database_cleaner.rb
+- spec/support/spec_helper_methods.rb
 - spec/tracked_card_spec.rb
 - spec/tracking/card_done_tracking_spec.rb
 - spec/tracking/effort_tracking_spec.rb
@@ -315,7 +318,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2200448488814002736
+      hash: 1645942165596305334
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/tracco/tracking_factory.rb

@@ -1,22 +0,0 @@
-class TrackingFactory
-
-  DURATION_REGEXP = '(\d+\.?\d*[phdg])'
-
-  @match_pairs = {}
-
-  def self.match(match_pair)
-    @match_pairs.merge!(match_pair)
-  end
-
-  def self.build_from(tracking_notification)
-    matching_pair = @match_pairs.find { |regexp, tracking_class| tracking_notification.data['text'] =~ regexp }
-
-    tracking_class = matching_pair ? matching_pair.last : Tracking::InvalidTracking
-    tracking_class.new(tracking_notification)
-  end
-
-  match /\[#{DURATION_REGEXP}\]/ => Tracking::EstimateTracking
-  match /\+#{DURATION_REGEXP}/ => Tracking::EffortTracking
-  match /DONE/ => Tracking::CardDoneTracking
-
-end