zephyr 1.1.9 → 1.2.0

data/Gemfile.lock

@@ -2,12 +2,13 @@ PATH
   remote: .
   specs:
     zephyr (1.1.9)
-      typhoeus (>= 0.2.4)
+      typhoeus (~> 0.4.2)
       yajl-ruby
 
 GEM
   remote: http://rubygems.org/
   specs:
+    ffi (1.2.0)
     git (1.2.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
@@ -19,9 +20,9 @@ GEM
       metaclass (~> 0.0.1)
     rake (0.9.2.2)
     shoulda (2.11.3)
-    typhoeus (0.2.4)
-      mime-types
-      mime-types
+    typhoeus (0.4.2)
+      ffi (~> 1.0)
+      mime-types (~> 1.18)
     yajl-ruby (1.1.0)
 
 PLATFORMS

data/Rakefile

@@ -11,20 +11,6 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "zephyr"
-  gem.homepage = "http://github.com/mhat/zephyr"
-  gem.license = "MIT"
-  gem.summary = %Q{Battle-tested HTTP client using Typhoeus, derived from the Riak client}
-  gem.description = %Q{Battle-tested HTTP client using Typhoeus, derived from the Riak client}
-  gem.email = "matt.knopp@gmail.com"
-  gem.authors = ["Matt Knopp"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -32,13 +18,5 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-##require 'rcov/rcovtask'
-##Rcov::RcovTask.new do |test|
-##  test.libs << 'test'
-##  test.pattern = 'test/**/test_*.rb'
-##  test.verbose = true
-##  test.rcov_opts << '--exclude "gems/*"'
-##end
-
 task :default => :test
 

data/VERSION

@@ -1 +1 @@
-1.1.9
+1.2.0

data/lib/typhoeus_ext/request.rb

@@ -1,6 +1,7 @@
 module Typhoeus
   class Request
     def params_string
+      return nil unless params
       Zephyr.build_query_string(params)
     end
   end

data/lib/zephyr.rb

@@ -79,7 +79,7 @@ class Zephyr
     end
 
     def percent_encode(value)
-      typhoeus_easy.send(:easy_escape, value.to_s, value.to_s.bytesize)
+      Typhoeus::Curl.easy_escape(typhoeus_easy.handle, value.to_s, value.to_s.bytesize)
     end
 
     def build_query_string(params)

data/zephyr.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "zephyr"
-  s.version = "1.1.9"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Knopp"]
@@ -40,21 +40,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<typhoeus>, [">= 0.2.4"])
+      s.add_runtime_dependency(%q<typhoeus>, ["~> 0.4.2"])
       s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<shoulda>, ["~> 2.11.3"])
       s.add_development_dependency(%q<mocha>, ["~> 0.12.0"])
     else
-      s.add_dependency(%q<typhoeus>, [">= 0.2.4"])
+      s.add_dependency(%q<typhoeus>, ["~> 0.4.2"])
       s.add_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
     end
   else
-    s.add_dependency(%q<typhoeus>, [">= 0.2.4"])
+    s.add_dependency(%q<typhoeus>, ["~> 0.4.2"])
     s.add_dependency(%q<yajl-ruby>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zephyr
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -16,17 +16,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement