streambot 0.5.1 → 0.5.4

data/README.rdoc

@@ -19,10 +19,8 @@ The full rdoc is available on rdoc.info[http://rdoc.info/projects/gr4y/streambot
 
     require 'streambot'
 
-    @params = {"auth_type" => "oauth",
-        "oauth" => {"key" => "consumer key", "secret" => "consumer secret"},
-        "http" => {"username" => "username", "password" => "password"}
-    }
+    @params = { "oauth" => {"key" => "consumer key", "secret" => "consumer secret"},
+                "http" => {"username" => "username", "password" => "password"} }
     @blacklist = ['mac_rt','apple_rt']
     bot = StreamBot::Tracker.new(@params, @blacklist, 'apple','ipad','iphone os 4','steve jobs')
     bot.start
@@ -33,12 +31,9 @@ Twitter has finally removed the http basic authentication for the REST API.
 The Streaming API, which the tracker is using, still works with http basic authentication only.
 So we still need both, the oauth credentials for retweeting and the http basic authentication credentials for tracking. 
 
-== auth_type
-The auth type is the authentication mechanism you want to use for retweeting.
-*oauth* or *http*
+You need to register an application of the type desktop application on http://dev.twitter.com first!
 
 === oauth
-*Warning!* You need to register an application of the type desktop application on http://dev.twitter.com first!
 
 *key*:: The consumer key Twitter provides you
 *secret*:: The consumer secret Twitter provides you

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.4

data/lib/streambot.rb

@@ -9,7 +9,6 @@ require 'yaml'
 require 'streambot/callbacks'
 require 'streambot/retweet'
 require 'streambot/handler'
-require 'streambot/http'
 require 'streambot/oauth'
 require 'streambot/tracker'
 

data/lib/streambot/retweet.rb

@@ -3,12 +3,7 @@ module StreamBot
   class Retweet
     # intitialize method aka constructor
     def initialize(params)
-      auth_type = params['auth_type']
-      auth_params = params[auth_type]
-      case auth_type
-        when "oauth" then @handler = StreamBot::OAuth.new(auth_params)
-        when "http" then @handler = StreamBot::HTTP.new(auth_params)
-      end
+      @handler = StreamBot::OAuth.new(params['oauth'])
     end
 
     # retweets the status with given id

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Sascha Wessel
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +02:00
+date: 2010-09-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,7 +107,6 @@ files:
 - lib/streambot.rb
 - lib/streambot/callbacks.rb
 - lib/streambot/handler.rb
-- lib/streambot/http.rb
 - lib/streambot/oauth.rb
 - lib/streambot/retweet.rb
 - lib/streambot/tracker.rb
@@ -116,7 +115,6 @@ files:
 - test/streambot/base_test.rb
 - test/streambot/test_oauth.rb
 - test/streambot/test_retweet.rb
-- test/streambot/test_http.rb
 has_rdoc: true
 homepage: http://github.com/gr4y/streambot
 licenses: []
@@ -156,4 +154,3 @@ test_files:
 - test/streambot/base_test.rb
 - test/streambot/test_oauth.rb
 - test/streambot/test_retweet.rb
-- test/streambot/test_http.rb

data/lib/streambot/http.rb

@@ -1,58 +0,0 @@
-module StreamBot
-  # http communication wrapper
-  class HTTP < StreamBot::Handler
-    BASE_URL = "http://api.twitter.com"
-    # intialize http communication wrapper
-    def initialize(auth)
-      @auth = auth
-    end
-
-    # post data to twitter api
-    #
-    #   path takes the path like
-    #     '/statuses/update.format'
-    #
-    #   the body contains all data you send to twitter
-    #     {:status => "a new status"}
-    #
-    def post(path, body)
-      LOG.debug("post #{body} to \"#{path}\"")
-      request = init_request(path, :post)
-      request.body = body if !body.nil?
-      do_request(request)
-    end
-
-    # get data from twitter api
-    #
-    #   path takes the path like
-    #     '/statuses/user_timeline.format'
-    #
-    def get(path)
-      LOG.debug("get data form \"#{path}\"")
-      request = init_request(path, :get)
-      do_request(request)
-    end
-
-    private
-    def do_request(request)
-      request.basic_auth @auth['username'], @auth['password']
-      response = Net::HTTP.new(@uri.host, @uri.port).start do |http|
-        http.request(request)
-      end
-      parse_response(response)
-    end
-
-    # initialize an Net::HTTP::GET or Net::HTTP::POST request
-    # depends on type param
-    def init_request(path, type)
-      @url = "#{BASE_URL}#{path}"
-      @uri = URI.parse(@url)
-      case type
-        when :post then
-          Net::HTTP::Post.new(@uri.path)
-        when :get then
-          Net::HTTP::Get.new(@uri.path)
-      end
-    end
-  end
-end

data/test/streambot/test_http.rb

@@ -1,28 +0,0 @@
-require 'streambot/base_test'
-
-module StreamBot
-  # test for http wrapper class
-  class TestHttp < StreamBot::BaseTest
-    # setup 
-    def setup
-      super
-      WebMock.disable_net_connect!
-      @http = StreamBot::HTTP.new(@params['http'])
-      stub_request(:post, "http://#{@params['http']['username']}:#{@params['http']['password']}@api.twitter.com/path/to/data").to_return(:body => "response")
-    end
-
-    # test a post with basic authentication
-    def test_post
-      res = @http.post('/path/to/data',nil)
-      assert_not_nil(res)
-      assert_equal("response", res)
-    end
-
-    # nil all variables
-    def teardown
-      @http = nil
-      WebMock.allow_net_connect!
-    end
-
-  end
-end