Merge pull request #16 from MaxCDN/jmervine-updates

Removing support for ruby 1.9.3

Author: jmervine

.gitignore

@@ -15,7 +15,6 @@ vendor
 # jeweler generated
 pkg
 *.gem
-*.lock
 .DS_Store
 npm-debug.log
 

.travis.yml

@@ -4,6 +4,5 @@ sudo: false
 before_install:
   - gem update bundler
 rvm:
-  - 1
-  - 2.3.3
-  - 2.4.0
+  - 2.3
+  - 2.4

Gemfile.lock

@@ -0,0 +1,63 @@
+PATH
+  remote: .
+  specs:
+    maxcdn (0.4.0)
+      addressable (~> 2.4)
+      faraday (~> 0.9)
+      net-http-persistent (~> 2.9)
+      signet (~> 0.7)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    ansi (1.5.0)
+    builder (3.2.3)
+    coderay (1.1.2)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    faraday (0.15.0)
+      multipart-post (>= 1.2, < 3)
+    hashdiff (0.3.7)
+    jwt (2.1.0)
+    method_source (0.9.0)
+    minitest (5.11.3)
+    minitest-reporters (1.2.0)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    multi_json (1.13.1)
+    multipart-post (2.0.0)
+    net-http-persistent (2.9.4)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.2)
+    rake (12.3.1)
+    ruby-progressbar (1.9.0)
+    safe_yaml (1.0.4)
+    signet (0.8.1)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    webmock (3.4.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  maxcdn!
+  minitest
+  minitest-reporters
+  pry
+  rake
+  webmock
+
+BUNDLED WITH
+   1.16.1

README.md

@@ -8,7 +8,7 @@
 gem install maxcdn
 ```
 
-> Requires Ruby 1.9.2+ (see: [Travis](https://travis-ci.org/MaxCDN/ruby-maxcdn) for passing Ruby versions.)
+> Requires Ruby 2.3+ (see: [Travis](https://travis-ci.org/MaxCDN/ruby-maxcdn) for passing Ruby versions.)
 
 #### With Bundler
 

Rakefile

@@ -19,3 +19,4 @@ task :benchmark do
   require "./test/benchmark"
 end
 
+task :default => :test

lib/maxcdn.rb

@@ -15,40 +15,37 @@ def initialize(company_alias, key, secret, server="rws.maxcdn.com", secure_conne
       @company_alias = company_alias
       @server = server
       @request_signer = Signet::OAuth1::Client.new(
-        :client_credential_key => key,
-        :client_credential_secret => secret,
-        :two_legged => true
+        client_credential_key: key,
+        client_credential_secret: secret,
+        two_legged: true
       )
     end
 
     def _connection_type
-      return "http" unless @secure_connection
-      "https"
+      @secure_connection ? "https" : "http"
     end
 
     def _get_url uri, params={}
       url = "#{_connection_type}://#{@server}/#{@company_alias}/#{uri.gsub(/^\//, "")}"
-      if params and not params.empty?
-        url += "?#{params.to_params}"
-      end
-
+      url += "?#{params.to_params}" if params && !params.empty?
       url
     end
 
     def _response_as_json method, uri, options={}, data={}
       puts "Making #{method.upcase} request to #{_get_url uri}" if debug
 
-      req_opts = {
-        :method => method
-      }
+      req_opts = { method: method }
 
       req_opts[:uri]  = _get_url(uri, (options[:body] ? {} : data))
       req_opts[:body] = data.to_params if options[:body]
 
       request = @request_signer.generate_authenticated_request(req_opts)
 
       # crazyness for headers
-      headers = {"Content-Type" => options[:body] ? "application/json" : "application/x-www-form-urlencoded"}
+      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"
 
@@ -63,7 +60,7 @@ def _response_as_json method, uri, options={}, data={}
 
         response = conn.send(method, path) do |req|
           req.headers = request.headers
-          req.body = request.body
+          req.body    = request.body
         end
 
         return response if options[:debug_request]

lib/maxcdn/version.rb

@@ -1,3 +1,3 @@
 module MaxCDN
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

maxcdn.gemspec

@@ -12,7 +12,6 @@ Gem::Specification.new do |gem|
   gem.description = %Q{A Rest Client For MaxCDN Rest Web Services}
   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.7'
   gem.add_dependency 'faraday', '~> 0.9'
   gem.add_dependency 'net-http-persistent', '~> 2.9'