cassieq-client 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d4483c9c6138064c314afabc79c0977d1bed821
-  data.tar.gz: c7cb4237be5e6b38f596ce012af2e6ad90c3da95
+  metadata.gz: ccb1bf9d217348ce9f96c072173cd3a5a403a8c9
+  data.tar.gz: a69c0ccc5d7b1dc49a873e5ce132b338580457ba
 SHA512:
-  metadata.gz: 9a99389780258976d1707a6e8d7554a6c3ee746dcbb2ffa4f456fe0e890d5bece8b9af46378eac5ae45199a5822a9e204852429d62eb56f3280f2fcb9fb2047b
-  data.tar.gz: d5b9b27e3b6fa728f25c5fa92f45ac73e186ce36de830529478891ba435bf8eeeae1489f44878d2afb9715169df9eebc95ae4fc3faf8df3a382afa802cba5e3b
+  metadata.gz: a9c61c987b6119314622da59e6f12e87ef75d534aff680b2aa2d62f5e5dc843418a0ece534de89e2ee570e4f559383bfded633de6f66ce1d51f3845eeeefb57b
+  data.tar.gz: 91b118383123db8969db63b0dbfea77287ecb047338a6fd8dcf4fdad0880bc7434974876fedbf2c66fbf56ac1541a919fa63dd1ab88df837e11b6e1220944610

data/lib/cassieq/authentication.rb

@@ -3,23 +3,33 @@ require "openssl"
 require "time"
 
 module Cassieq
-  module Authentication
-    private
+  class Authentication
+    attr_reader :key, :account
+
+    def self.generate_auth_headers(key, account, method, path)
+      new(key, account).auth_headers(method, path)
+    end
 
-    def generate_auth_headers(request_method, request_path)
-      request_time = formated_time_now
-      auth_signature = generate_signature_from_key(request_method.to_s.upcase, request_path, request_time)
+    def initialize(key, account)
+      @key = key
+      @account = account
+    end
+
+    def auth_headers(method, path, request_time = formated_time_now)
+      auth_signature = signature_from_key(method, path, request_time)
 
       { "X-Cassieq-Request-Time" => request_time, "Authorization" => "Signed #{auth_signature}" }
     end
 
-    def generate_signature_from_key(request_method, request_path, request_time)
+    def signature_from_key(method, path, request_time = formated_time_now)
       key_bytes = Base64.urlsafe_decode64("#{key}==")
-      string_to_sign = [account, request_method, request_path, request_time].join("\n")
+      string_to_sign = [account, method.to_s.upcase, path, request_time].join("\n")
       hmac = OpenSSL::HMAC.digest("sha256", key_bytes, string_to_sign)
       Base64.urlsafe_encode64(hmac).gsub(/=+$/, "")
     end
 
+    private
+
     def formated_time_now
       Time.now.utc.iso8601
     end

data/lib/cassieq/client.rb

@@ -12,16 +12,15 @@ module Cassieq
     include Cassieq::Client::Queues
     include Cassieq::Client::Messages
     include Cassieq::Client::Statistics
-    include Cassieq::Authentication
     include Cassieq::Utils
 
     attr_accessor :host, :account, :port, :key, :provided_params
 
     def initialize(params = {})
-      @host = params.fetch(:host, nil)
-      @key = params.fetch(:key, nil)
-      @provided_params = params.fetch(:provided_params, nil)
-      @account = params.fetch(:account, nil)
+      @host = params[:host]
+      @key = params[:key]
+      @provided_params = params[:provided_params]
+      @account = params[:account]
       @port = params.fetch(:port, 8080)
       yield(self) if block_given?
     end
@@ -43,21 +42,21 @@ module Cassieq
       "/api/v1/accounts/#{account}"
     end
 
-    def request_path(path)
-      "#{path_prefix}/#{path}"
-    end
-
-    def request(method, path, body = nil, params = nil)
+    def request(method, path, body = nil, params = {})
       handle_response do
-        path = request_path(path)
-        auth_headers = generate_auth_headers(method, path) unless key.nil?
-        connection.run_request(method, path, body, auth_headers) do |req|
-          req.params.merge!(params) unless params.nil?
-          req.headers["Content-Type"] = "application/json" unless body.nil?
+        request_path = "#{path_prefix}/#{path}"
+        connection.run_request(method, request_path, body, nil) do |req|
+          req.params.merge!(params)
+          req.headers.merge!(generate_auth_headers(method, request_path)) unless key.nil?
+          req.headers.merge!("Content-Type" => "application/json") unless body.nil?
         end
       end
     end
 
+    def generate_auth_headers(method, path)
+      Cassieq::Authentication.generate_auth_headers(key, account, method, path)
+    end
+
     def handle_response(&request_block)
       response = request_block.call
       Cassieq::Error.from_status_and_body(response)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassieq-client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Tom Conroy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport