tweedle 0.1.1 → 0.1.2

data/lib/tweedle/client.rb

@@ -57,14 +57,7 @@ module Tweedle
       uri = build_uri(uri, params)
       http = build_http(uri)
       request = build_get_request(uri, http, params)
-
-      begin
-        http.request(request) { |response| handle_response(response, &block) }
-      rescue *[Timeout::Error, Errno::ECONNRESET, EOFError]
-        retry # reconnect
-      ensure
-        http.finish
-      end
+      issue_request(http, request, &block)
     end
 
     # Internal: Sends a POST request to the given stream.
@@ -88,7 +81,22 @@ module Tweedle
       uri = build_uri(uri, params)
       http = build_http(uri)
       request = build_post_request(uri, http, post_data, params)
+      issue_request(http, request, &block)
+    end
+
+    private
 
+    # Private: Issue the given http request, handles the response and
+    # reconnects if necessary. Yields each response chunk to the
+    # passed block.
+    #
+    # http    - The Net::HTTP instance to use.
+    # request - The request object to be used.
+    #
+    # Returns nothing.
+    # Raises Tweedle::ConnectionError if the server response is not an
+    #   Net::HTTPSuccess.
+    def issue_request(http, request, &block)
       begin
         http.request(request) { |response| handle_response(response, &block) }
       rescue *[Timeout::Error, Errno::ECONNRESET, EOFError]
@@ -98,8 +106,6 @@ module Tweedle
       end
     end
 
-    private
-
     # Private: Reads the streaming body of a given HTTP response and
     # yields a parsed JSON object to the given block for each received chunk.
     #
@@ -205,7 +211,7 @@ module Tweedle
     # Examples
     #
     #   uri = URI.parse("http://www.google.com/")
-    #   build_post_request(uri, "follow=12",build_http(uri))
+    #   build_post_request(uri, "follow=12", build_http(uri))
     #   # => Net::HTTP::Post
     #
     # Returns a Net::HTTP::Post instance.
@@ -213,7 +219,7 @@ module Tweedle
       Net::HTTP::Post.new(uri.request_uri).tap do |request|
         request["content-type"] = "application/x-www-form-urlencoded"
         request.body = encode_params(post_data)
-        request.oauth!(http, consumer, access_token)
+        request.oauth!(http, consumer, access_token, scheme: 'body')
       end
     end
 
@@ -265,4 +271,3 @@ module Tweedle
     end
   end
 end
-

data/lib/tweedle/version.rb

@@ -1,4 +1,4 @@
 module Tweedle
   # Public: The current Tweedle version.
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/test_client.rb

@@ -76,17 +76,35 @@ class TestClient < MiniTest::Unit::TestCase
     Tweedle.new.post(@uri, foo: "bar") do |body|
       assert_equal ["post"], body
     end
-    assert_equal "foo=bar", FakeWeb.last_request.body
+
+    assert_includes FakeWeb.last_request.body.downcase,
+      "foo=bar".downcase
+    assert_includes FakeWeb.last_request.body.downcase,
+      "oauth_consumer_key=abc".downcase
+    assert_includes FakeWeb.last_request.body.downcase,
+      "oauth_token=ghi".downcase
 
     Tweedle.new.post(@uri, foo: ["bar", "baz"]) do |body|
       assert_equal ["post"], body
     end
-    assert_equal "foo=bar,baz", FakeWeb.last_request.body
+
+    assert_includes FakeWeb.last_request.body.downcase,
+      "foo=bar%2Cbaz".downcase
+    assert_includes FakeWeb.last_request.body.downcase,
+      "oauth_consumer_key=abc".downcase
+    assert_includes FakeWeb.last_request.body.downcase,
+      "oauth_token=ghi".downcase
 
     Tweedle.new.post(@uri, foo: "bar", baz: 42) do |body|
       assert_equal ["post"], body
     end
-    assert_equal "foo=bar&baz=42", FakeWeb.last_request.body
+
+    assert_includes FakeWeb.last_request.body.downcase,
+      "foo=bar&baz=42".downcase
+    assert_includes FakeWeb.last_request.body.downcase,
+      "oauth_consumer_key=abc".downcase
+    assert_includes FakeWeb.last_request.body.downcase,
+      "oauth_token=ghi".downcase
   end
 
   def test_get_with_params
@@ -108,17 +126,39 @@ class TestClient < MiniTest::Unit::TestCase
     Tweedle.new.post(@uri, { foo: "bar" }, { bar: "baz" }) do |body|
       assert_equal ["post bar=baz"], body
     end
-    assert_equal "foo=bar", FakeWeb.last_request.body
+
+    assert_includes FakeWeb.last_request.body.downcase,
+      "foo=bar".downcase
+    assert_includes FakeWeb.last_request.body.downcase,
+      "oauth_consumer_key=abc".downcase
+    assert_includes FakeWeb.last_request.body.downcase,
+      "oauth_token=ghi".downcase
 
     Tweedle.new.post(@uri, { foo: "bar" }, { bar: ["baz", 42] }) do |body|
       assert_equal ["post bar=baz,42"], body
     end
-    assert_equal "foo=bar", FakeWeb.last_request.body
+
+    assert_includes FakeWeb.last_request.body.downcase,
+      "foo=bar".downcase
+    assert_includes FakeWeb.last_request.body.downcase,
+      "bar=baz%2C42&bar=baz".downcase
+    assert_includes FakeWeb.last_request.body.downcase,
+      "oauth_consumer_key=abc".downcase
+    assert_includes FakeWeb.last_request.body.downcase,
+      "oauth_token=ghi".downcase
 
     Tweedle.new.post(@uri, { foo: "bar" }, { bar: "baz", ok: 42 }) do |body|
       assert_equal ["post bar=baz&ok=42"], body
     end
-    assert_equal "foo=bar", FakeWeb.last_request.body
+
+    assert_includes FakeWeb.last_request.body.downcase,
+      "foo=bar".downcase
+    assert_includes FakeWeb.last_request.body.downcase,
+      "bar=baz&bar=baz&ok=42&ok=42".downcase
+    assert_includes FakeWeb.last_request.body.downcase,
+      "oauth_consumer_key=abc".downcase
+    assert_includes FakeWeb.last_request.body.downcase,
+      "oauth_token=ghi".downcase
   end
 
   def test_get_with_invalid_response

data/test/test_statuses.rb

@@ -47,8 +47,8 @@ class TestStatuses < MiniTest::Unit::TestCase
       assert_equal ["post"], body
     end
 
-    assert_equal "locations=-122.75,36.8,-121.75,37.8&track=ruby,tweedle",
-                 FakeWeb.last_request.body
+    assert_includes FakeWeb.last_request.body.downcase,
+      "locations=-122.75%2C36.8%2C-121.75%2C37.8&track=ruby%2Ctweedle".downcase
   end
 
   def test_filter_with_params
@@ -61,8 +61,8 @@ class TestStatuses < MiniTest::Unit::TestCase
       assert_equal ["post with params"], body
     end
 
-    assert_equal "locations=-122.75,36.8,-121.75,37.8&track=ruby,tweedle",
-                 FakeWeb.last_request.body
+    assert_includes FakeWeb.last_request.body.downcase,
+      "locations=-122.75%2C36.8%2C-121.75%2C37.8&track=ruby%2Ctweedle".downcase
   end
 
   def test_firehose

data/tweedle.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Tweedle::VERSION
 
-  gem.add_dependency "multi_json",    "~> 1.3.2"
-  gem.add_dependency "oauth",         "~> 0.4.6"
-  gem.add_dependency "jruby-openssl", "~> 0.7.6.1" if RUBY_PLATFORM =~ /java/
+  gem.add_dependency "multi_json",    "~> 1.3.6"
+  gem.add_dependency "oauth",         "~> 0.4.7"
+  gem.add_dependency "jruby-openssl", "~> 0.7.7" if RUBY_PLATFORM =~ /java/
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tweedle
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.7
 description: Lightweight wrapper for the Twitter Streaming API
 email:
 - tob@tobiassvensson.co.uk
@@ -81,18 +81,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 53159501431260921
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 53159501431260921
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23