twittertype 0.1.0 → 0.2.0

data/lib/tweeterprofile.rb

@@ -5,6 +5,7 @@ module TwitterType
                   :tweet_count,
                   :reply_count,
                   :retweet_count,
+                  :original_count,
                   :link_count,
                   :inferred_type
 
@@ -12,6 +13,7 @@ module TwitterType
       @tweet_count = 0
       @reply_count = 0
       @retweet_count = 0
+      @original_count = 0
       @link_count = 0
       @screen_name = screen_name
     end
@@ -20,18 +22,32 @@ module TwitterType
       begin
         @tweet_count = @tweet_count + 1
 
-        if tweet.text.slice(0, 1) == '@'
+        if reply?(tweet)
           @reply_count = @reply_count + 1
           return
         end
 
-        @retweet_count = @retweet_count + 1 if tweet.text.slice(0, 2) == 'RT'
-        @link_count = @link_count + 1 if tweet.text.index('http://') != nil
+        @retweet_count = @retweet_count + 1 if retweet?(tweet)
+        @link_count = @link_count + 1 if has_link?(tweet)
+        @original_count = @original_count + 1 if !retweet?(tweet) && !reply?(tweet)
+
       rescue NoMethodError => root
         raise ArgumentError.new("Missing method responses in tweet structure:" + root.to_s)
       end
     end
 
+    def retweet?(tweet)
+      tweet.text.slice(0, 2) == 'RT'
+    end
+
+    def has_link?(tweet)
+      tweet.text.index('http://') != nil
+    end
+
+    def reply?(tweet)
+      tweet.text.slice(0, 1) == '@'
+    end
+
     def to_s
       type_to_s = (@inferred_type ? "type " + @inferred_type.inspect + ", " : "")
       @screen_name + ": " + type_to_s + "#tweets " + @tweet_count.to_s + ", #replies " + @reply_count.to_s + ", #retweets " + @retweet_count.to_s + ", #links " + @link_count.to_s + "\n"

data/lib/twitterclientwrapper.rb

@@ -16,6 +16,7 @@ module TwitterType
         @client.gather_recent_tweets_for(screen_name)
       rescue Twitter::RESTError => error
         raise ProtectedUserAccessError.new(error.to_s) if ProtectedUserAccessError.fits(error)
+        raise InvalidUserAccessError.new(error.to_s) if InvalidUserAccessError.fits(error)
         raise TwitterClientError.new(error.to_s)
       end
     end
@@ -36,4 +37,12 @@ module TwitterType
       return !error.code.index(CODE).nil?
     end
   end
+
+  class InvalidUserAccessError < TwitterClientError
+    CODE = "404"
+
+    def self.fits(error)
+      return !error.code.index(CODE).nil?
+    end
+  end
 end

data/lib/twittertypeinferrer.rb

@@ -19,6 +19,9 @@ module TwitterType
       rescue TwitterType::ProtectedUserAccessError => error
         @profile = ProfileFactory.new(user).build([])
         @profile.inferred_type = :unknown_protected_user
+      rescue TwitterType::InvalidUserAccessError => error
+        @profile = ProfileFactory.new(user).build([])
+        @profile.inferred_type = :unknown_user
       end
 
       self

data/test/unit/tweeterprofile_spec.rb

@@ -63,6 +63,23 @@ describe TwitterType::TweeterProfile, " being updated" do
 
   end
 
+  it "should increase the original count for each non retweet and non reply tweet sent to a user" do
+    @profile.original_count.should == 0
+
+    @profile.update_from(Tweet.new("@user text"))
+    @profile.original_count.should == 0
+
+    @profile.update_from(Tweet.new("RT text"))
+    @profile.original_count.should == 0
+
+    @profile.update_from(Tweet.new("original"))
+    @profile.original_count.should == 1
+
+    @profile.update_from(Tweet.new("text http://www.twitter.com", nil))
+    @profile.original_count.should == 2
+
+  end
+
   it "should increase the reply count for each tweet sent to a user" do
     @profile.reply_count.should == 0
 

data/test/unit/twitterclientwrapper_spec.rb

@@ -1,5 +1,6 @@
 require "spec"
 require "twitterclientwrapper"
+require 'twitter'
 
 describe TwitterType::TwitterClientWrapper do
 
@@ -15,7 +16,7 @@ describe TwitterType::TwitterClientWrapper do
     TwitterClientWrapper.new.client.class.should == TwitterClient
   end
 
-  it "should turn raise a custom exception when an attempt to access a protected user's tweets is made" do
+  it "should raise a custom exception when an attempt to access a protected user's tweets is made" do
     protected_user_access_error = Twitter::RESTError.new
     protected_user_access_error.code = "401"
 
@@ -25,6 +26,16 @@ describe TwitterType::TwitterClientWrapper do
     lambda{TwitterClientWrapper.new(client).gather_recent_tweets_for("protected_user")}.should raise_error(ProtectedUserAccessError)
   end
 
+  it "should raise a custom exception when an attempt to access an unknown user's is made" do
+    invalid_user_access_error = Twitter::RESTError.new
+    invalid_user_access_error.code = "404"
+
+    client = mock
+    client.stub!(:gather_recent_tweets_for).with("invalid_user").and_raise(invalid_user_access_error)
+
+    lambda{TwitterClientWrapper.new(client).gather_recent_tweets_for("invalid_user")}.should raise_error(InvalidUserAccessError)
+  end
+
   it "should turn any other exceptiona raised by client into a generci exception" do
     access_error = Twitter::RESTError.new
     access_error.code = "404"

data/test/unit/twittertypeinferrer_spec.rb

@@ -34,6 +34,16 @@ describe TypeInferrer do
 
   end
 
+  it "should use an unknown_user type for any invalid screen name" do
+    @mock_client.stub!(:gather_recent_tweets_for).with(VALID_TWITTER_USER).and_raise(InvalidUserAccessError.new(nil))
+    @cut.client = @mock_client
+
+    @cut.profile.should == nil
+    @cut.infer(VALID_TWITTER_USER)
+    @cut.profile.inferred_type.should == :unknown_user
+
+  end
+
   it "should infer a type for a Twitter User" do
     tweets = Array.new(1) {|i| Tweet.new("test", "to user")}
     @mock_client.stub!(:gather_recent_tweets_for).with(VALID_TWITTER_USER).and_return(tweets)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andy Marks
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 +11:00
+date: 2010-03-08 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency