printreleaf 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 486b2cb5c05b402a052003a10bc002bf87fbaf52
-  data.tar.gz: 10d5cf04397909af9b2728aae27ca10b6db3ad4c
+  metadata.gz: f8493e94acd1e6a129764c830e31111088ecdde7
+  data.tar.gz: 7f2919d25338b5d908e957d21a161eef3907ab35
 SHA512:
-  metadata.gz: 4228e9b32e587d3436ce0d0b96c639a9fa16a97d0666d3d5e15ccef4a817637431c807c53fbf1ecd50156eba95b7289acf6266e229ac19fad3c7948243d1394b
-  data.tar.gz: d0010720154d6d3b0275d00cd15fdc0f400a960d3bd58c7e7887f63b8b87a3104ac4fd5a216be3c90b336e17524b7ffce474fc81a486a7eb76c0a21bf13f4c32
+  metadata.gz: ce220e933e0b3acc6b2109bfc69278582800170d21d3206a03d7063149fb88e617fb0200c6c1f48006863b3be447c3652aea0e75142b42d71d8410dcbcb9e9dc
+  data.tar.gz: c9ff6bde14c21eabc7c62db359916cfca3681fa5a6ed453d6e40b08bcf81fcac167e88cbd7ba712b800ad7ec74f1df6b4b14c3863a392795af53fbe2fcd4a7ce

data/lib/printreleaf/api.rb

@@ -4,6 +4,7 @@ module PrintReleaf
 
     ENDPOINT = "api.printreleaf.com/v1/"
     PROTOCOL = "https"
+    USER_AGENT = "PrintReleaf Ruby/#{PrintReleaf::VERSION}"
     MAX_RETRY_COUNT = 2
     RETRY_DELAY_BASE = 1.5 # Base for exponential delay
 
@@ -27,6 +28,7 @@ module PrintReleaf
     attr_writer :api_key
     attr_writer :endpoint
     attr_writer :protocol
+    attr_writer :user_agent
     attr_accessor :logger
 
     def api_key
@@ -45,6 +47,10 @@ module PrintReleaf
       @protocol || PROTOCOL
     end
 
+    def user_agent
+      @user_agent || USER_AGENT
+    end
+
     def get(uri="/", params={})
       request :get, uri, params
     end
@@ -64,18 +70,30 @@ module PrintReleaf
     def request(verb, uri, params={})
       perform_request do
         uri = Util.join_uri(endpoint, uri)
-        url = "#{protocol}://#{api_key}:@#{uri}"
+        url = "#{protocol}://#{uri}"
+
+        request_params = {
+          method: verb,
+          url: url,
+          headers: {
+            accept: :json,
+            :Authorization => "Bearer #{api_key}",
+            :user_agent => user_agent
+          }
+        }
+
+        if verb == :get || verb == :delete
+          request_params[:headers][:params] = params unless params.empty?
+        else
+          request_params[:payload] = params.to_json
+          request_params[:headers][:content_type] = :json
+        end
 
         unless logger.nil?
           logger.info "[PrintReleaf] #{verb.upcase} #{uri}"
         end
 
-        response = case verb
-        when :get;    RestClient.get url, params: params, accept: :json
-        when :post;   RestClient.post url, params.to_json, accept: :json, content_type: :json
-        when :patch;  RestClient.patch url, params.to_json, accept: :json, content_type: :json
-        when :delete; RestClient.delete url
-        end
+        response = RestClient::Request.execute(request_params)
 
         JSON.parse(response.body)
       end

data/lib/printreleaf/version.rb

@@ -1,3 +1,3 @@
 module PrintReleaf
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: printreleaf
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Casey O'Hara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie