maxcdn 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d567c5be45aad2ecdd920d497b14745ec925bec8
-  data.tar.gz: f3dfe98f23eb417f021b3b040f0390683dcfac00
+  metadata.gz: c94f389d66d158ba77d68022369bfc8c913ca04a
+  data.tar.gz: 91ca67962bbb188f27a81dbfb7f96c96cf1b831c
 SHA512:
-  metadata.gz: a11ce6b0f103a2ba7d0ed2922346658dabbc340d16e133c64d42ecc9fea508ac58801660f7f25d6e22d1ddf0d420789b314a9aafc4d7d1614e1e0ca4a8515b0a
-  data.tar.gz: 36d70193078ab28a413f199074958bef2338afb0493ec3221259d1c7d45135c95bef8dad77e2405c104b346d674930ffd8b1f5e901133be379528e68053d3fb5
+  metadata.gz: ae8140863edc58d8ac5f8d4af47d5af918d8e1f75f7b392e40cec9d5330a0252605b2dc1586d0eb7cf7bb9f63a73c8351493412d3b9b4894ca73e2329e4e14c5
+  data.tar.gz: ce93ce746a2bc04633a5d14b5f4bb77115959c190146ebe1fef0bded5df2b5c8c93b886130bbd275de3717e4b47f79a01348db64955c91b023402d72e7389aa6

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
 script: bundle exec rake test
+sudo: false
+before_install:
+  - gem update bundler
 rvm:
-  - 1.9.3
-  - 2.1.2
-  - 2.2.1
+  - 1
+  - 2
+  - 3

data/README.md

@@ -29,7 +29,7 @@ require 'maxcdn'
 api = MaxCDN::Client.new("myalias", "consumer_key", "consumer_secret")
 
 ####
-# Turn on debugging for underlying Curl::Easy and CurbFu modules
+# Turn on debugging outputs
 #
 # api.debug = true
 
@@ -98,6 +98,15 @@ bundle exec ruby ./test/integration.rb # requires host's IP be whitelisted
 
 # Change Log
 
+##### 0.3.0
+
+* Replace CurbFu with Faraday (#10).
+
+##### 0.2.1
+
+* Upgrade signet gem to allow for use with the faraday 0.9.x series (#7).
+* See https://rubygems.org/gems/maxcdn/versions/0.2.1 for gem.
+
 ##### 0.1.5
 
 * Issue #4: Fixing purge files by array to return a hash of status results.

data/lib/maxcdn.rb

@@ -1,5 +1,4 @@
 require "signet/oauth_1/client"
-require "curb-fu"
 require "json"
 require "ext/hash"
 require "pp" # for debug
@@ -49,46 +48,32 @@ module MaxCDN
       request = @request_signer.generate_authenticated_request(req_opts)
 
       # crazyness for headers
-      headers = options.delete(:headers) || {}
+      headers = {"Content-Type" => options[:body] ? "application/json" : "application/x-www-form-urlencoded"}
+      headers.case_indifferent_merge(options.delete(:headers) || {})
       headers["User-Agent"] = "Ruby MaxCDN API Client"
 
-      # because CurbFu overwrites 'content-type' header, strip it
-      # to set it later
-      content_type = headers.case_indifferent_delete("Content-Type") || (options[:body] ? "application/json" : "application/x-www-form-urlencoded")
-
       # merge headers with request headers
       request.headers.case_indifferent_merge(headers)
 
       begin
-        curb_opts = {
-          :url => req_opts[:uri],
-          :headers => request.headers
-        }
-
-        CurbFu.debug = debug
-
-        response = CurbFu.send method, curb_opts, request.body do |curb|
-          curb.verbose = debug
-
-          # Because CurbFu overwrites the content-type header passed
-          # to it. so we'll be setting our own.
-          #
-          # First, remove any existing 'Content-Type' header.
-          curb.headers.case_indifferent_delete("Content-Type")
+        url, path = req_opts[:uri].match(%r"^(https://[^/]+)(/.+)$")[1, 2]
+        conn = Faraday.new(:url => url) do |faraday|
+          faraday.adapter :net_http_persistent
+        end
 
-          # Second, set 'Content-Type' to our desired value.
-          curb.headers["Content-Type"] = content_type
+        response = conn.send(method, path) do |req|
+          req.headers = request.headers
+          req.body = request.body
         end
 
         return response if options[:debug_request]
         pp response if debug
 
         response_json = JSON.load(response.body)
-
         return response_json if options[:debug_json]
         pp response_json if debug
 
-        unless response.success? or response.redirect?
+        unless response.success?
           error_message = response_json["error"]["message"]
           raise MaxCDN::APIException.new("#{response.status}: #{error_message}")
         end

data/lib/maxcdn/version.rb

@@ -1,3 +1,3 @@
 module MaxCDN
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/maxcdn.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |gem|
   gem.email = "joshua@mervine.net"
   gem.authors = ["Joshua P. Mervine"]
   gem.add_dependency 'json' if RUBY_VERSION.start_with? "1.8"
-  gem.add_dependency 'signet', '~> 0.5.1'
-  gem.add_dependency 'curb-fu', '~> 0.6.2'
+  gem.add_dependency 'signet', '~> 0.7'
+  gem.add_dependency 'faraday', '~> 0.9'
+  gem.add_dependency 'net-http-persistent', '~> 2.9'
 end

data/test/maxcdn_test.rb

@@ -15,7 +15,6 @@ expected_headers = {
   'Authorization' => /.+/,
   'Cache-Control' => /.+/,
   'Content-Type'  => "application/json",
-  'Expect'        => /.*/,
   'User-Agent'    => "Ruby MaxCDN API Client"
 }
 
@@ -101,7 +100,7 @@ class Client < Minitest::Test
 
   def test__response_as_json_debug_request
     res = @max._response_as_json("post", "zones/pull.json", { :body => true, :debug_request => true }, { "foo"=> "bar", "bar" => "foo" })
-    assert_equal(CurbFu::Response::Base, res.class)
+    assert_equal(Faraday::Response, res.class)
   end
 
   def test_custom_header

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maxcdn
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Joshua P. Mervine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: signet
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: curb-fu
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
 description: A Rest Client For MaxCDN Rest Web Services
 email: joshua@mervine.net
 executables: []
@@ -83,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Rest Client For MaxCDN Rest Web Services