Merge branch 'master' of https://github.com/sferik/faraday into sferi…

…k-master

Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    faraday (0.4.6)
-      addressable (~> 2.1.1)
+    faraday (0.5.0)
+      addressable (~> 2.2.2)
       multipart-post (~> 1.0.1)
-      rack (~> 1.0.1)
+      rack (~> 1.2.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.1.2)
+    addressable (2.2.2)
     multipart-post (1.0.1)
-    rack (1.0.1)
+    rack (1.2.1)
     rake (0.8.7)
     sinatra (1.0)
       rack (>= 1.0)
@@ -20,9 +20,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  addressable (~> 2.1.1)
+  addressable (~> 2.2.2)
   faraday!
   multipart-post (~> 1.0.1)
-  rack (~> 1.0.1)
+  rack (~> 1.2.1)
   rake (~> 0.8.7)
   sinatra (~> 1.0.0)

README.md

@@ -22,7 +22,7 @@ This mess is gonna get raw, like sushi. So, haters to the left.
     resp1 = conn.get '/nigiri/sake.json'
     resp2 = conn.post do |req|
       req.url  "/nigiri.json", :page => 2
-      req[:content_type] = 'application/json'
+      req["Content-Type"] = 'application/json'
       req.body = {:name => 'Unagi'}
     end
 

Rakefile

@@ -71,6 +71,7 @@ end
 #
 #############################################################################
 
+desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
 task :release => :build do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
@@ -80,15 +81,17 @@ task :release => :build do
   sh "git tag v#{version}"
   sh "git push origin master"
   sh "git push origin v#{version}"
-  sh "gem push pkg/#{name}-#{version}.gem"
+  sh "gem push pkg/#{gem_file}"
 end
 
+desc "Build #{gem_file} into the pkg directory"
 task :build => :gemspec do
   sh "mkdir -p pkg"
   sh "gem build #{gemspec_file}"
   sh "mv #{gem_file} pkg"
 end
 
+desc "Generate #{gemspec_file}"
 task :gemspec => :validate do
   # read spec file and split out manifest section
   spec = File.read(gemspec_file)
@@ -117,6 +120,7 @@ task :gemspec => :validate do
   puts "Updated #{gemspec_file}"
 end
 
+desc "Validate #{gemspec_file}"
 task :validate do
   libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
   unless libfiles.empty?
@@ -127,4 +131,4 @@ task :validate do
     puts "A `VERSION` file at root level violates Gem best practices."
     exit!
   end
-end
+end

faraday.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rake', ['~> 0.8.7'])
   s.add_development_dependency('sinatra', ['~> 1.0.0'])
-  s.add_runtime_dependency('addressable', ['~> 2.1.1'])
+  s.add_runtime_dependency('addressable', ['~> 2.2.2'])
   s.add_runtime_dependency('multipart-post', ['~> 1.0.1'])
   s.add_runtime_dependency('rack', ['~> 1.2.1'])
 
@@ -87,4 +87,4 @@ Gem::Specification.new do |s|
   ## Test files will be grabbed from the file list. Make sure the path glob
   ## matches what you actually use.
   s.test_files = s.files.select { |path| path =~ /^test\/.*_test\.rb/ }
-end
+end