twithub 0.1.3 → 0.1.4

data/lib/twithub/entry_builder_methods.rb

@@ -14,5 +14,10 @@ module Twithub
       @posted_at = posted_at
       self
     end
+
+    def with_url(url)
+      @url = url
+      self
+    end
   end
 end

data/lib/twithub/feed_entry.rb

@@ -2,7 +2,7 @@
 module Twithub
   class FeedEntry
     include Comparable
-    attr_reader :content, :posted_at, :origin, :username
+    attr_reader :content, :posted_at, :origin, :username, :url
 
     def <=>(other_entry)
       other_entry.posted_at <=> posted_at
@@ -12,5 +12,13 @@ module Twithub
       { :content => content, :username => username, 
         :posted_at => posted_at, :origin => origin }.to_json      
     end
+
+    def from_twitter?
+      origin == Twithub::TWITTER
+    end
+
+    def from_github?
+      origin == Twithub::GITHUB
+    end
   end
 end

data/lib/twithub/github.rb

@@ -2,9 +2,9 @@ module Twithub
   class Github
     def self.entries_for(username)
       return [] unless username
-      url = "http://github.com/#{username}.atom"
-      Feedzirra::Feed.fetch_and_parse(url).entries.map do |entry|
-        GithubEntry.new.with_content(entry.title).with_username(entry.author).with_posted_at(entry.published)
+      feed_url = "http://github.com/#{username}.atom"
+      Feedzirra::Feed.fetch_and_parse(feed_url).entries.map do |entry|
+        GithubEntry.new.with_content(entry.title).with_username(entry.author).with_posted_at(entry.published).with_url(entry.url)
       end 
     end
   end

data/lib/twithub/twitter.rb

@@ -3,7 +3,8 @@ module Twithub
     def self.entries_for(username)
       return [] unless username
       ::Twitter.user_timeline(username).map do |status|
-        TwitterEntry.new.with_content(status.text).with_username(status.from_user).with_posted_at(status.created_at) 
+        url = "http://twitter.com/#{status.from_user}/status/#{status.id}"
+        TwitterEntry.new.with_content(status.text).with_username(status.from_user).with_posted_at(status.created_at).with_url(url)
       end 
     end
   end

data/lib/twithub/version.rb

@@ -1,3 +1,3 @@
 module Twithub
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/twithub/feed_entry_spec.rb

@@ -24,6 +24,26 @@ describe Twithub::FeedEntry do
       end 
     end
 
+    describe "entries with mocked out origins" do
+      let(:twitter_entry) { Twithub::FeedEntry.new }
+      let(:github_entry) { Twithub::FeedEntry.new }
+      
+      before do
+        twitter_entry.stub(:origin).and_return(Twithub::TWITTER)
+        github_entry.stub(:origin).and_return(Twithub::GITHUB)
+      end
+
+      it "should know if the entry is from twitter" do
+        twitter_entry.from_twitter?.should be_true
+        github_entry.from_twitter?.should be_false
+      end
+
+      it "should know if the entry is from github" do
+        github_entry.from_github?.should be_true
+        twitter_entry.from_github?.should be_false
+      end
+    end
+
     describe "an entry with stubbed out attributes" do
       let(:entry) { Twithub::FeedEntry.new }
       let(:time) { Time.now }

data/spec/twithub/github_entry_spec.rb

@@ -4,12 +4,14 @@ describe Twithub::GithubEntry do
   let(:time) { Time.now }
   let(:text) { "just a random content string" }
   let(:username) { "randomusername" }
+  let(:url) { "http://foo" } 
 
   it "should allow building of a twitter entry" do
-    entry = Twithub::GithubEntry.new.with_content(text).with_username(username).with_posted_at(time)
+    entry = Twithub::GithubEntry.new.with_content(text).with_username(username).with_posted_at(time).with_url(url)
     entry.content.should == text
     entry.username.should == username
     entry.posted_at.should == time
     entry.origin.should == Twithub::GITHUB
+    entry.url.should == url
   end
 end

data/spec/twithub/github_spec.rb

@@ -6,8 +6,9 @@ describe Twithub::Github do
     let(:recent_time) { Time.now }
     let(:username) { "pzimbelman" }
     let(:url) { "http://github.com/#{username}.atom" }
-    let(:first_github_response) { double("git", :title => "pushed to master!", :author => username, :published => recent_time) }
-    let(:second_github_response) { double("git", :title => "pushed to branch", :author => username, :published => early_time) }
+    let(:first_github_response) { double("git", :title => "pushed to master!", :author => username, :published => recent_time, :url => "http://fooness") }
+    let(:second_github_response) { double("git", :title => "pushed to branch", :author => username, :published => early_time, :url => "http://barness") }
+
     let(:responses) { [first_github_response, second_github_response] }
 
     before do
@@ -21,11 +22,13 @@ describe Twithub::Github do
       entries.first.content.should == first_github_response.title
       entries.first.username.should == username
       entries.first.posted_at.should == recent_time
+      entries.first.url.should == "http://fooness"
 
       entries.last.is_a?(Twithub::GithubEntry).should be_true
       entries.last.content.should == second_github_response.title
       entries.last.username.should == username
       entries.last.posted_at.should == early_time
+      entries.last.url.should == "http://barness"
     end
   end
 

data/spec/twithub/twitter_entry_spec.rb

@@ -4,12 +4,14 @@ describe Twithub::TwitterEntry do
   let(:time) { Time.now }
   let(:text) { "just a random content string" }
   let(:username) { "randomusername" }
+  let(:url) { "http://foobar" }
 
   it "should allow building of a twitter entry" do
-    entry = Twithub::TwitterEntry.new.with_content(text).with_username(username).with_posted_at(time)
+    entry = Twithub::TwitterEntry.new.with_content(text).with_username(username).with_posted_at(time).with_url(url)
     entry.content.should == text
     entry.username.should == username
     entry.posted_at.should == time
     entry.origin.should == Twithub::TWITTER
+    entry.url.should == url
   end
 end

data/spec/twithub/twitter_spec.rb

@@ -5,8 +5,8 @@ describe Twithub::Twitter do
     let(:early_time) { Time.parse("Jan 1 2011 1:00EST") }
     let(:recent_time) { Time.now }
     let(:username) { "pzimbelman" }
-    let(:first_twitter_response) { double("twitter", :text => "the tweet!", :from_user => username, :created_at => recent_time) }
-    let(:second_twitter_response) { double("twitter", :text => "the early tweet!", :from_user => username, :created_at => early_time) }
+    let(:first_twitter_response) { double("twitter", :text => "the tweet!", :from_user => username, :created_at => recent_time, :id => 1234) }
+    let(:second_twitter_response) { double("twitter", :text => "the early tweet!", :from_user => username, :created_at => early_time, :id => 123) }
 
     before do
       Twitter.should_receive(:user_timeline).with(username).and_return([first_twitter_response, 
@@ -20,11 +20,13 @@ describe Twithub::Twitter do
       entries.first.content.should == "the tweet!"
       entries.first.username.should == username
       entries.first.posted_at.should == recent_time
+      entries.first.url.should == "http://twitter.com/pzimbelman/status/1234"
 
       entries.last.is_a?(Twithub::TwitterEntry).should be_true
       entries.last.content.should == "the early tweet!"
       entries.last.username.should == username
       entries.last.posted_at.should == early_time
+      entries.last.url.should == "http://twitter.com/pzimbelman/status/123"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twithub
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70108269820160 !ruby/object:Gem::Requirement
+  requirement: &70303926056680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70108269820160
+  version_requirements: *70303926056680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70108269819700 !ruby/object:Gem::Requirement
+  requirement: &70303926056200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70108269819700
+  version_requirements: *70303926056200
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &70108269819180 !ruby/object:Gem::Requirement
+  requirement: &70303926055680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70108269819180
+  version_requirements: *70303926055680
 - !ruby/object:Gem::Dependency
   name: feedzirra
-  requirement: &70108269818580 !ruby/object:Gem::Requirement
+  requirement: &70303926055160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.2.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *70108269818580
+  version_requirements: *70303926055160
 description: A gem to aggregate your recent twitter and github activity into a single
   feed. Can accept multiple logins for either service.
 email: