cassieq-client 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44fa66a4e5b3e55e2fa4b3f67bc576d95261b00a
-  data.tar.gz: 7df246d7d9387f30687197ea370fa928b6730642
+  metadata.gz: 368becc1f022878ebdaac4104ab18c52f0681b5f
+  data.tar.gz: 4a4f2827658f85159a6ffbbb143404028510b4ad
 SHA512:
-  metadata.gz: 89940a3442a03d42d06fc737a51ddf083305767d39d26771ac982dea1ccf0d3f2cd88ed6fa9f7b9e1e0ec574481b777621f2f0eabb0973ad92110c723de86e54
-  data.tar.gz: 1df1f4a1d76024814d3398bc72f681c5d86c56fb7513327b326c7113c2c5acdc4325e333a802ce1414da473eb0a2830b1dab10579acd07dbbe4a34055287adaf
+  metadata.gz: 2be00340ef8a8dab45b5beff7f42f7ce1ca7bec3bf67453836383a9ffbf0142c915453ebc9f2ff963d030acf2edbb6be4a808d4c5395b513029db84141aa483a
+  data.tar.gz: 08b7d747bd26480050f93e7862bc4a4f19e184cd3e708e15dd5669a132aaa92d49d2b94624c4e577c46f8bd98a6c375d140c52a664e83bd5067e4362989575e9

data/lib/cassieq/authentication.rb

@@ -0,0 +1,13 @@
+require "base64"
+require "openssl"
+
+module Cassieq
+  module Authentication
+    def generate_signature_from_key(key, request_method, account, request_path, request_time)
+      key_bytes = Base64.urlsafe_decode64("#{key}==")
+      string_to_sign = [account, request_method, request_path, request_time].join("\n")
+      hmac = OpenSSL::HMAC.digest("sha256", key_bytes, string_to_sign)
+      Base64.urlsafe_encode64(hmac).gsub(/=+$/, "")
+    end
+  end
+end

data/lib/cassieq/client/messages.rb

@@ -1,21 +1,25 @@
+require "json"
+
 module Cassieq
   class Client
     module Messages
       def create_message(queue_name, message)
-        post("queues/#{queue_name}/messages", message)
+        request(:post, "queues/#{queue_name}/messages", message)
       end
 
       def next_message(queue_name)
-        get("queues/#{queue_name}/messages/next")
+        request(:get, "queues/#{queue_name}/messages/next")
       end
 
       def edit_message(queue_name, pop_receipt, options)
         body = camelize_and_stringify_keys(options).to_json
-        put("queues/#{queue_name}/messages", body, { popReceipt: pop_receipt })
+        params = { popReceipt: pop_receipt }
+        request(:put, "queues/#{queue_name}/messages", body, params)
       end
 
       def delete_message(queue_name, pop_receipt)
-        delete("queues/#{queue_name}/messages", popReceipt: pop_receipt)
+        params = { popReceipt: pop_receipt }
+        request(:delete, "queues/#{queue_name}/messages", nil, params)
       end
     end
   end 

data/lib/cassieq/client/queues.rb

@@ -1,21 +1,23 @@
+require "json"
+
 module Cassieq
   class Client
     module Queues
       def queues
-        get("queues")
+        request(:get, "queues")
       end
 
       def create_queue(options)
         body = camelize_and_stringify_keys(options).to_json
-        post("queues", body)
+        request(:post, "queues", body)
       end
 
       def queue(queue_name)
-        get("queues/#{queue_name}")
+        request(:get, "queues/#{queue_name}")
       end
 
       def delete_queue(queue_name)
-        delete("queues/#{queue_name}")
+        request(:delete, "queues/#{queue_name}")
       end
     end
   end 

data/lib/cassieq/client/statistics.rb

@@ -2,7 +2,7 @@ module Cassieq
   class Client
     module Statistics
       def statistics(queue_name)
-        get("queues/#{queue_name}/statistics")
+        request(:get, "queues/#{queue_name}/statistics")
       end
     end
   end 

data/lib/cassieq/client.rb

@@ -1,5 +1,6 @@
 require "faraday"
 require "faraday_middleware"
+require "cassieq/authentication"
 require "cassieq/client/messages"
 require "cassieq/client/statistics"
 require "cassieq/client/queues"
@@ -11,15 +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, :auth, :sig
+    attr_accessor :host, :account, :port, :key, :provided_params
 
     def initialize(params = {})
       @host = params.fetch(:host, nil)
       @key = params.fetch(:key, nil)
-      @auth = params.fetch(:auth, nil)
-      @sig = params.fetch(:sig, nil)
+      @provided_params = params.fetch(:provided_params, nil)
       @account = params.fetch(:account, nil)
       @port = params.fetch(:port, 8080)
       yield(self) if block_given?
@@ -38,43 +39,30 @@ module Cassieq
         conn.host = host
         conn.port = port
         conn.path_prefix = path_prefix
-        conn.headers["Authorization"] = "Key #{key}" unless key.nil?
-        unless auth.nil? || sig.nil?
-          conn.params["auth"] = auth
-          conn.params["sig"] = sig
-        end
+        conn.params.merge_query(provided_params) unless provided_params.nil?
         conn.response :json, :content_type => /\bjson$/
       end
     end
 
-    def get(path)
-      handle_response do
-        connection.run_request(:get, path, nil, nil)
-      end
-    end
-
-    def post(path, body)
+    def request(method, path, body = nil, params = nil)
       handle_response do
-        connection.run_request(:post, path, body, nil) do |req|
-          req.headers.merge!("Content-Type" => "application/json")
+        auth_headers = generate_auth_headers(method, path)
+        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?
         end
       end
     end
 
-    def put(path, body, params = {})
-      handle_response do
-        connection.run_request(:put, path, body, nil) do |req|
-          req.params.merge!(params)
-          req.headers.merge!("Content-Type" => "application/json")
-        end
-      end
-    end
+    def generate_auth_headers(method, path)
+      unless key.nil?
+        request_time = formated_time_now
+        request_path = "#{path_prefix}/#{path}"
+        auth_signature = generate_signature_from_key(key, method.to_s.upcase, account, request_path, request_time)
 
-    def delete(path, params = {})
-      handle_response do
-        connection.run_request(:delete, path, nil, nil) do |req|
-          req.params.merge!(params)
-        end
+        { "X-Cassieq-Request-Time" => request_time, "Authorization" => "Signed #{auth_signature}" }
+      else
+        nil
       end
     end
 

data/lib/cassieq/utils.rb

@@ -1,5 +1,6 @@
 require "active_support/core_ext/hash/keys"
 require "active_support/inflector"
+require "time"
 
 module Cassieq
   module Utils
@@ -11,6 +12,10 @@ module Cassieq
       transform_keys_in_structure(data) { |key| key.to_s.camelize(:lower) }
     end
 
+    def formated_time_now
+      Time.now.utc.iso8601
+    end
+
     private
 
     def transform_keys_in_structure(data)
@@ -24,4 +29,4 @@ module Cassieq
       end
     end
   end
-end
+end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassieq-client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Tom Conroy
@@ -52,12 +52,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-description: A simple wrapper for the CassieQ API
+description: A Ruby API wrapper for CassieQ
 email: tbconroy@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/cassieq/authentication.rb
 - lib/cassieq/client.rb
 - lib/cassieq/client/messages.rb
 - lib/cassieq/client/queues.rb
@@ -76,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="