social_current 0.0.7 → 0.0.8

data/lib/social_current/{github.rb → github_service.rb}

@@ -1,5 +1,5 @@
 module SocialCurrent
-  class Github < Service
+  class GithubService < Service
     include HTTParty
     base_uri "https://api.github.com"
 

data/lib/social_current/stream.rb

@@ -6,7 +6,7 @@ module SocialCurrent
 
     def build
       @stream ||= @options.collect do |k, v|
-        eval("SocialCurrent::" + k.to_s.capitalize).new(v).stream
+        eval("SocialCurrent::" + k.to_s.capitalize + "Service").new(v).stream
       end.flatten.sort_by { |k, v| k[:created_at] }.reject { |k, v| k[:message].nil? }.reverse
     end
   end

data/lib/social_current/{twitter.rb → twitter_service.rb}

@@ -1,6 +1,8 @@
 module SocialCurrent
-  class Twitter < Service
+  class TwitterService < Service
     include HTTParty
+    include Twitter::Autolink
+
     base_uri "https://api.twitter.com/1"
 
     def raw_user
@@ -20,7 +22,7 @@ module SocialCurrent
     private
 
     def format_message(status)
-      "#{raw_user["name"]} said \"#{status["text"]}\""
+      auto_link("#{raw_user["name"]} said \"#{status["text"]}\"")
     end
   end
 end

data/lib/social_current/version.rb

@@ -1,4 +1,4 @@
 module SocialCurrent
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
   SUPPORTED_INTEGRATIONS = [:github, :twitter]
 end

data/lib/social_current.rb

@@ -1,9 +1,10 @@
 require "httparty"
 require "json"
 require "tmpdir"
+require "twitter-text"
 
 require "social_current/version"
 require "social_current/service"
-require "social_current/github"
-require "social_current/twitter"
+require "social_current/github_service"
+require "social_current/twitter_service"
 require "social_current/stream"

data/social_current.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = SocialCurrent::VERSION
 
-  gem.add_runtime_dependency     "httparty", "~> 0.8.3"
-  gem.add_development_dependency "fakeweb", "~> 1.3.0"
+  gem.add_runtime_dependency     "httparty",     "~> 0.8.3"
+  gem.add_runtime_dependency     "twitter-text", "~> 1.4.17"
+  gem.add_development_dependency "fakeweb",      "~> 1.3.0"
 end

data/test/{test_github.rb → test_github_service.rb}

@@ -2,11 +2,11 @@ require "test_helper"
 
 class TestGithub < Test::Unit::TestCase
   def setup
-    @github = SocialCurrent::Github.new("tristanoneil")
+    @github = SocialCurrent::GithubService.new("tristanoneil")
   end
 
   def test_initialize
-    assert_instance_of SocialCurrent::Github, @github
+    assert_instance_of SocialCurrent::GithubService, @github
     assert_respond_to @github, :raw_stream
   end
 

data/test/test_stream.rb

@@ -11,7 +11,7 @@ class TestStream < Test::Unit::TestCase
   end
 
   def test_build
-    assert_equal "Tristan O'Neil said \"Was thinking @gristmilled should put on a \"How to write a Ruby Gem\" course. It may just directly benefit me. Any interest in #btv?\"", @stream.build[0][:message]
+    assert_equal "Tristan O'Neil said \"Was thinking @<a class=\"tweet-url username\" href=\"https://twitter.com/gristmilled\" rel=\"nofollow\">gristmilled</a> should put on a \"How to write a Ruby Gem\" course. It may just directly benefit me. Any interest in <a href=\"https://twitter.com/#!/search?q=%23btv\" title=\"#btv\" class=\"tweet-url hashtag\" rel=\"nofollow\">#btv</a>?\"", @stream.build[0][:message]
     assert_equal 42, @stream.build.size
   end
 end

data/test/{test_twitter.rb → test_twitter_service.rb}

@@ -2,11 +2,11 @@ require "test_helper"
 
 class TestTwitter < Test::Unit::TestCase
   def setup
-    @twitter = SocialCurrent::Twitter.new("tristanoneil")
+    @twitter = SocialCurrent::TwitterService.new("tristanoneil")
   end
 
   def test_initialize
-    assert_instance_of SocialCurrent::Twitter, @twitter
+    assert_instance_of SocialCurrent::TwitterService, @twitter
     assert_respond_to @twitter, :raw_stream
   end
 
@@ -19,7 +19,7 @@ class TestTwitter < Test::Unit::TestCase
   end
 
   def test_stream
-    assert_equal "Tristan O'Neil said \"Was thinking @gristmilled should put on a \"How to write a Ruby Gem\" course. It may just directly benefit me. Any interest in #btv?\"",  @twitter.stream[0][:message]
+    assert_equal "Tristan O'Neil said \"Was thinking @<a class=\"tweet-url username\" href=\"https://twitter.com/gristmilled\" rel=\"nofollow\">gristmilled</a> should put on a \"How to write a Ruby Gem\" course. It may just directly benefit me. Any interest in <a href=\"https://twitter.com/#!/search?q=%23btv\" title=\"#btv\" class=\"tweet-url hashtag\" rel=\"nofollow\">#btv</a>?\"",  @twitter.stream[0][:message]
     assert_equal "2012-05-16 13:59:57 UTC", @twitter.stream[0][:created_at].to_s
     assert_equal 13, @twitter.stream.size
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_current
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.3
+- !ruby/object:Gem::Dependency
+  name: twitter-text
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.17
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.17
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -57,20 +73,20 @@ files:
 - README.md
 - Rakefile
 - lib/social_current.rb
-- lib/social_current/github.rb
+- lib/social_current/github_service.rb
 - lib/social_current/service.rb
 - lib/social_current/stream.rb
-- lib/social_current/twitter.rb
+- lib/social_current/twitter_service.rb
 - lib/social_current/version.rb
 - social_current.gemspec
 - test/support/github/stream.json
 - test/support/github/user.json
 - test/support/twitter/stream.json
 - test/support/twitter/user.json
-- test/test_github.rb
+- test/test_github_service.rb
 - test/test_helper.rb
 - test/test_stream.rb
-- test/test_twitter.rb
+- test/test_twitter_service.rb
 homepage: 
 licenses: []
 post_install_message: 
@@ -101,7 +117,7 @@ test_files:
 - test/support/github/user.json
 - test/support/twitter/stream.json
 - test/support/twitter/user.json
-- test/test_github.rb
+- test/test_github_service.rb
 - test/test_helper.rb
 - test/test_stream.rb
-- test/test_twitter.rb
+- test/test_twitter_service.rb