updating faraday required a flurry of other gem updates

leah · Apr 22, 2012 · 5acbbde · 5acbbde
1 parent fc0cbb3
commit 5acbbde
Show file tree

Hide file tree

Showing 25 changed files with 40 additions and 23 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem "activeresource",         "~> 3.0.0"
+gem "addressable",            "~> 2.2.7"
 gem "amqp",                   "0.6.7", :require => 'mq'
 gem "httparty",               "0.7.4"
 gem 'yajl-ruby',              '1.1.0', :require => 'yajl/json_gem'
@@ -9,15 +10,16 @@ gem "mime-types",             "~> 1.15", :require => 'mime/types'
 gem "oauth",                  "0.4.4"
 gem "sinatra",                "~> 1.2.6"
 gem "tilt",                   "~> 1.2.1"
-gem "tinder",                 "1.7.0"
+gem "tinder",                 "1.8.0.github"
 gem "mail",                   "~>2.3"
 gem "xml-simple",             "1.0.11", :require => 'xmlsimple'
 gem "xmpp4r-simple",          "0.8.8"
 #gem "yammer4r",              "0.1.5"
 gem "ruby-hmac",              "0.4.0"
 gem "thin",                   "1.2.2"
-gem "faraday",                "0.7.5.pre"
+gem "faraday",                "0.8.0"
 gem "rake",                   "0.8.7"
+gem "SystemTimer"
 gem "statsd-ruby",            "0.3.0.github.1"
 gem "twilio-ruby",            "3.4.2"
 gem "rack-test", :require => false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    SystemTimer (1.2.3)
     activemodel (3.0.10)
       activesupport (= 3.0.10)
       builder (~> 2.1.2)
@@ -9,20 +10,18 @@ GEM
       activemodel (= 3.0.10)
       activesupport (= 3.0.10)
     activesupport (3.0.10)
-    addressable (2.2.6)
+    addressable (2.2.7)
     amqp (0.6.7)
       eventmachine (>= 0.12.4)
     builder (2.1.2)
     crack (0.1.8)
     daemons (1.1.0)
     eventmachine (0.12.10)
-    faraday (0.7.5.pre)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
-    faraday_middleware (0.7.0)
-      faraday (~> 0.7.3)
-    hashie (1.1.0)
+    faraday (0.8.0)
+      multipart-post (~> 1.1)
+    faraday_middleware (0.8.7)
+      faraday (>= 0.7.4, < 0.9)
+    hashie (1.2.0)
     http_parser.rb (0.5.3)
     httparty (0.7.4)
       crack (= 0.1.8)
@@ -35,12 +34,12 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mash (0.1.1)
-    mime-types (1.16)
-    multi_json (1.0.3)
-    multipart-post (1.1.3)
+    mime-types (1.18)
+    multi_json (1.3.2)
+    multipart-post (1.1.5)
     oauth (0.4.4)
     polyglot (0.3.3)
-    rack (1.3.0)
+    rack (1.4.1)
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.8.7)
@@ -58,12 +57,13 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.2.2)
-    tinder (1.7.0)
+    tinder (1.8.0.github)
       activesupport (>= 2.3, < 4)
       eventmachine (~> 0.12)
-      faraday (>= 0.6, < 0.8)
-      faraday_middleware (>= 0.6, < 0.8)
+      faraday (>= 0.6, < 0.9)
+      faraday_middleware (~> 0.8)
       hashie (~> 1.0)
+      json (~> 1.6)
       mime-types (~> 1.16)
       multi_json (~> 1.0)
       multipart-post (~> 1.1)
@@ -75,7 +75,7 @@ GEM
       builder (>= 2.1.2)
       jwt (>= 0.1.2)
       multi_json (>= 1.0.3)
-    twitter-stream (0.1.14)
+    twitter-stream (0.1.15)
       eventmachine (>= 0.12.8)
       http_parser.rb (~> 0.5.1)
       simple_oauth (~> 0.1.4)
@@ -89,9 +89,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  SystemTimer
   activeresource (~> 3.0.0)
+  addressable (~> 2.2.7)
   amqp (= 0.6.7)
-  faraday (= 0.7.5.pre)
+  faraday (= 0.8.0)
   httparty (= 0.7.4)
   mail (~> 2.3)
   mash (~> 0.1.1)
@@ -106,7 +108,7 @@ DEPENDENCIES
   statsd-ruby (= 0.3.0.github.1)
   thin (= 1.2.2)
   tilt (~> 1.2.1)
-  tinder (= 1.7.0)
+  tinder (= 1.8.0.github)
   twilio-ruby (= 3.4.2)
   xml-simple (= 1.0.11)
   xmpp4r-simple (= 0.8.8)

diff --git a/config/load.rb b/config/load.rb
@@ -85,6 +85,7 @@
 #~ require 'date' # This is needed by the CIA service in ruby 1.8.7 or later
 
 # bundled
+require 'addressable/uri'
 require 'mime/types'
 require 'xmlsimple'
 require 'active_resource'

diff --git a/lib/service.rb b/lib/service.rb
@@ -2,6 +2,18 @@
 require 'ostruct'
 require File.expand_path("../service/structs", __FILE__)
 
+module Faraday
+  def Connection.URI(url)
+    if url.respond_to?(:host)
+      url
+    elsif url.respond_to?(:to_str)
+      Addressable::URI.parse(url)
+    else
+      raise ArgumentError, "bad argument (expected URI object or URI string)"
+    end
+  end
+end
+
 # Represents a single triggered Service call.  Each Service tracks the event
 # type, the configuration data, and the payload for the current call.
 class Service

diff --git a/test/zohoprojects_test.rb b/test/zohoprojects_test.rb
@@ -19,11 +19,11 @@ def test_push
       params = Rack::Utils.parse_query env[:body]
       assert_equal '1234', params['pId']
       assert_equal 'a13d', params['authtoken']
-      assert_equal payload.to_json, params['payload']
+      assert_equal payload, JSON.parse(params['payload'])
       [200, {}, '']
     end
-	
-    svc = service :push, data , payload
+
+    svc = service :push, data, payload
     svc.receive
   end
 

diff --git a/vendor/cache/SystemTimer-1.2.3.gem b/vendor/cache/SystemTimer-1.2.3.gem
diff --git a/vendor/cache/addressable-2.2.6.gem → vendor/cache/addressable-2.2.7.gem b/vendor/cache/addressable-2.2.6.gem → vendor/cache/addressable-2.2.7.gem
diff --git a/vendor/cache/faraday-0.7.5.pre.gem b/vendor/cache/faraday-0.7.5.pre.gem
diff --git a/vendor/cache/faraday-0.8.0.gem b/vendor/cache/faraday-0.8.0.gem
diff --git a/vendor/cache/faraday_middleware-0.7.0.gem b/vendor/cache/faraday_middleware-0.7.0.gem
diff --git a/vendor/cache/faraday_middleware-0.8.7.gem b/vendor/cache/faraday_middleware-0.8.7.gem
diff --git a/vendor/cache/hashie-1.1.0.gem b/vendor/cache/hashie-1.1.0.gem
diff --git a/vendor/cache/hashie-1.2.0.gem b/vendor/cache/hashie-1.2.0.gem
diff --git a/vendor/cache/mime-types-1.16.gem b/vendor/cache/mime-types-1.16.gem
diff --git a/vendor/cache/mime-types-1.18.gem b/vendor/cache/mime-types-1.18.gem
diff --git a/vendor/cache/multi_json-1.0.3.gem b/vendor/cache/multi_json-1.0.3.gem
diff --git a/vendor/cache/multi_json-1.3.2.gem b/vendor/cache/multi_json-1.3.2.gem
diff --git a/vendor/cache/multipart-post-1.1.3.gem b/vendor/cache/multipart-post-1.1.3.gem
diff --git a/vendor/cache/multipart-post-1.1.5.gem b/vendor/cache/multipart-post-1.1.5.gem
diff --git a/vendor/cache/rack-1.3.0.gem b/vendor/cache/rack-1.3.0.gem
diff --git a/vendor/cache/rack-1.4.1.gem b/vendor/cache/rack-1.4.1.gem
diff --git a/vendor/cache/tinder-1.7.0.gem b/vendor/cache/tinder-1.7.0.gem
diff --git a/vendor/cache/tinder-1.8.0.github.gem b/vendor/cache/tinder-1.8.0.github.gem
diff --git a/vendor/cache/twitter-stream-0.1.14.gem b/vendor/cache/twitter-stream-0.1.14.gem
diff --git a/vendor/cache/twitter-stream-0.1.15.gem b/vendor/cache/twitter-stream-0.1.15.gem