rasper_client 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e095ad00114767244b0b647545500383c9b1ed138934afd5cb0d0aad3ca3334d
-  data.tar.gz: 94d5c03f652b4e7044d7a95118ed18069f3d23a327ada852df25dac0e5181129
+  metadata.gz: 5c4a041873bc25ff2131ace5c3c375ff3982a28af94541d4486d9e6a9c43d6a8
+  data.tar.gz: c84ffdf095ca4ca14e4c9c256cdfcd61acf22ef85a6df9e680147662df0428df
 SHA512:
-  metadata.gz: 4b37451fddf6dcb7dc397f966331c1509645d1652e58bb7f50012e39ed32bd1006781ef4e8b0fde5f041cb208db728b924e52753bb8008c206e9e2ba1a842259
-  data.tar.gz: a3947cbe7e623c748f75b829a5a57d1877d06a87d2a3b032f51ed5e3cff9b350d393efde588aba6f40ef9437108bc224bf0137ac9b1ea5a5599d25559c8bf168
+  metadata.gz: aeacb357e4fd2859c1616e41e912c7586ab5f60bfb18eaf1a307888a0ab8286353c0d7fbc41d27935881ce69da5294c72fff0e1ddc78c29087efa1dbd1605bee
+  data.tar.gz: be28beb6432db0dd655b895c570848918f6fdadce4ad49fa040abcf5a6cfcc38c88267612d33cc4800ffce2247d6339080a49c2adb3f1f85b456dd23cd3941fa

data/lib/rasper_client.rb

@@ -3,5 +3,5 @@ require "rasper_client/version"
 module RasperClient
   autoload :Client, 'rasper_client/client'
   autoload :FakeServer, 'rasper_client/fake_server'
-  autoload :ConnectionRefusedError, 'rasper_client/errors'
-end
+  autoload :Error, 'rasper_client/error'
+end

data/lib/rasper_client/client.rb

@@ -4,12 +4,17 @@ require 'json'
 
 module RasperClient
   class Client
-    def initialize(host:, port:, timeout: nil, empty_nil_values: false)
+    def initialize(host:, port: nil, timeout: nil, path_prefix: nil,
+                   secure: true, empty_nil_values: false,
+                   username: nil, password: nil)
       @host = host
       @port = port
       @timeout = timeout
       @empty_nil_values = empty_nil_values
-      @request_params = build_request_params
+      @path_prefix = path_prefix
+      @secure = secure
+      @username = username
+      @password = password
     end
 
     def add(options)
@@ -17,8 +22,6 @@ module RasperClient
       encode_options(options)
       response = execute_request(:add, options)
       JSON.parse(response.body) == { 'success' => true }
-    rescue Errno::ECONNREFUSED, Errno::EADDRNOTAVAIL
-      raise ConnectionRefusedError
     end
 
     def generate(options)
@@ -33,17 +36,21 @@ module RasperClient
     private
 
     def execute_request(action, options)
-      Net::HTTP.start(*@request_params) do |http|
+      response = Net::HTTP.start(*build_request_params) do |http|
         request = Net::HTTP::Post.new(uri_for(action))
         request.body = options.to_json
+        request.basic_auth(@username, @password) if @username && @password
         http.request(request)
       end
+      check_for_errors(response)
+      response
     end
 
     def build_request_params
-      params = [@host, @port]
-      params << { read_timeout: @timeout } if @timeout
-      params
+      options = {}
+      options[:read_timeout] = @timeout if @timeout
+      options[:use_ssl] = true if @secure
+      [@host, @port, options].compact
     end
 
     def symbolize_keys(options)
@@ -59,7 +66,7 @@ module RasperClient
     end
 
     def symbolize_key(hash, key)
-      hash[key.to_sym] = hash.delete(key.to_s) if hash.has_key?(key.to_s)
+      hash[key.to_sym] = hash.delete(key.to_s) if hash.key?(key.to_s)
     end
 
     def encode_options(options)
@@ -88,7 +95,21 @@ module RasperClient
     end
 
     def uri_for(action)
-      "http://#{@host}:#{@port}/#{action}"
+      uri_build_class
+        .build(
+          host: @host,
+          port: @port,
+          path: "#{@path_prefix}/#{action}"
+        )
+        .to_s
+    end
+
+    def uri_build_class
+      @secure ? URI::HTTPS : URI::HTTP
+    end
+
+    def check_for_errors(response)
+      raise RasperClient::Error.invalid_credentials if response.code.to_i == 401
     end
   end
 end

data/lib/rasper_client/error.rb

@@ -0,0 +1,11 @@
+module RasperClient
+  class Error < ::RuntimeError
+    INVALID_CREDENTIALS = 'Invalid credentials'.freeze
+
+    class << self
+      def invalid_credentials
+        new(INVALID_CREDENTIALS)
+      end
+    end
+  end
+end

data/lib/rasper_client/fake_server.rb

@@ -10,8 +10,12 @@ module RasperClient
       attr_accessor :last_added_report, :last_generated_report
     end
 
-    def start(port)
-      @thread = Thread.new { FakeApp.run! :port => port }
+    def start(port, username, password)
+      @thread = Thread.new do
+        FakeAppCreator
+          .create(username: username, password: password)
+          .run!(port: port, quiet: true)
+      end
       sleep 1
       self
     end
@@ -22,18 +26,26 @@ module RasperClient
     end
   end
 
-  class FakeApp < Sinatra::Application
-    post '/add' do
-      content_type :json
-      FakeServer.last_added_report = JSON.parse(request.body.read)
-      { success: true }.to_json
-    end
+  class FakeAppCreator < Sinatra::Application
+    def self.create(username: nil, password: nil)
+      Class.new(Sinatra::Application) do
+        use Rack::Auth::Basic, "Protected Area" do |user, pass|
+          username == user && password == pass
+        end if username && password
+
+        post '/add' do
+          content_type :json
+          FakeServer.last_added_report = JSON.parse(request.body.read)
+          { success: true }.to_json
+        end
 
-    post '/generate' do
-      content_type :json
-      FakeServer.last_generated_report =
-        JSON.parse(Base64.decode64(JSON.parse(request.body.read)['data']))
-      { content: Base64.encode64(File.read(resource('dummy.pdf'))) }.to_json
+        post '/generate' do
+          content_type :json
+          FakeServer.last_generated_report =
+            JSON.parse(Base64.decode64(JSON.parse(request.body.read)['data']))
+          { content: Base64.encode64(File.read(resource('dummy.pdf'))) }.to_json
+        end
+      end
     end
   end
-end
+end

data/lib/rasper_client/version.rb

@@ -1,3 +1,3 @@
 module RasperClient
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rasper_client
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Rodrigo Manhães
@@ -93,7 +93,7 @@ files:
 - Rakefile
 - lib/rasper_client.rb
 - lib/rasper_client/client.rb
-- lib/rasper_client/errors.rb
+- lib/rasper_client/error.rb
 - lib/rasper_client/fake_server.rb
 - lib/rasper_client/version.rb
 homepage: https://github.com/rodrigomanhaes/rasper_client
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: JRuby client to RasperServer.

data/lib/rasper_client/errors.rb

@@ -1,4 +0,0 @@
-module RasperClient
-  class ConnectionRefusedError < RuntimeError
-  end
-end