circuit_client 0.0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8ede2c67d6007b81a374d34013c55ecb6031aca0aabd1cbd15685882dbc10a7
-  data.tar.gz: c750950b29ed485c4c662ac2593b07ac005271b42103d640c2cb71a0fd72900f
+  metadata.gz: 21c82b46e11989d8d28d5f9ca959539eaf86417891312711c21aec8667f1dedb
+  data.tar.gz: ece2b2b67d64439021dbf0d8dd82e8593fab954cbde8782b973e40c8a5bc2963
 SHA512:
-  metadata.gz: f6dea096242a5d412dbe09773b2e31135bbd98e31d375475eb7b4f337d2cebe0c242dae5a7bfd401bee00ec969d6383e636ed0ebb10957e00e6916516a3a7543
-  data.tar.gz: cd95a588cd1f2a65e0a22838f12183e2e281bf3fb0a8e080c6d8095d8e4d2654ecd0d50d46dca0c3a0d2bb4ebea534c6c91b93f5866d4e2bd940a2e285ba316e
+  metadata.gz: 475b935dbd2d708664d3099ee15d8e0cbf411b30e6f289989f88dd22ea6309dc81d3b6cb4adba9fc049f3c66a7a0fca7f27d5becc83e6f9e92e092d4fed6476e
+  data.tar.gz: 90c7c822a5338db5eb240de788c66035bc7d07115887ba8d6f3aef3b08b5acfb9922d0df0d8df361366b8f83e84e066ac2975223e951cca20485f207731ca1b6

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# CircuitClient Changelog
+
+## v1.0.0
+
+Changes:
+
+* Upgrades to faraday v1.0
+* No longer depend on typhoeus as faraday adapter
+
+## v0.0.4
+
+...
+

data/Gemfile.lock

@@ -0,0 +1,25 @@
+PATH
+  remote: .
+  specs:
+    circuit_client (1.0.0)
+      faraday (~> 1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    faraday (1.0.0)
+      multipart-post (>= 1.2, < 3)
+    multipart-post (2.1.1)
+    rake (12.3.3)
+    rdoc (6.2.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  circuit_client!
+  rake (~> 12)
+  rdoc (~> 6)
+
+BUNDLED WITH
+   2.0.1

data/lib/circuit_client/client.rb

@@ -1,6 +1,4 @@
 require 'faraday'
-require 'typhoeus'
-require 'typhoeus/adapters/faraday'
 require 'uri'
 require 'json'
 
@@ -66,10 +64,10 @@ module CircuitClient
 
     # The faraday http connection object
     def connection
-      @connection ||= Faraday.new(url: base_uri.to_s) do |faraday|
-        faraday.response :logger if @trace
-        faraday.use CircuitClient::ErrorMiddleware
-        faraday.adapter :typhoeus
+      @connection ||= Faraday.new(url: base_uri.to_s) do |c|
+        c.response :logger if @trace
+        c.use CircuitClient::ErrorMiddleware
+        c.adapter Faraday.default_adapter
       end
     end
 
@@ -86,14 +84,19 @@ module CircuitClient
 
     # Authenticate using client_credentials method
     def auth_client_credentials
-      raise "client_id parameter required" if @client_id.nil?
-      raise "client_secret parameter required" if @client_secret.nil?
-      response = connection.post(build_uri('/oauth/token'), {
-        client_id: @client_id,
-        client_secret: @client_secret,
-        grant_type: 'client_credentials',
-        scope: @auth_scope,
-      } )
+      raise 'client_id parameter required' if @client_id.nil?
+      raise 'client_secret parameter required' if @client_secret.nil?
+
+      response = connection.post(build_uri('/oauth/token')) do |req|
+        req.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+        req.body = URI.encode_www_form(
+          client_id: @client_id,
+          client_secret: @client_secret,
+          grant_type: 'client_credentials',
+          scope: @auth_scope
+        )
+      end
+
       data = JSON.parse(response.body)
       data['access_token']
     end
@@ -138,37 +141,45 @@ module CircuitClient
       path = "/conversations/#{conv}/messages"
       path += "/#{item_id}" unless item_id.nil?
       options.delete(:item_id)
-      call(:post, path, {
-        'content' => text,
-        **options,
-      } )
+      call(
+        :post,
+        path,
+        content: text,
+        **options
+      )
     end
 
     # List all conversation of the user
     def list_conversations
-      call(:get, "/conversations")
+      call(:get, '/conversations')
     end
 
     # Create a new group conversation
     def create_group_conversation(participants, topic)
-      call(:post, '/conversations/group', {
+      call(
+        :post,
+        '/conversations/group',
         participants: participants,
-        topic: topic,
-      } )
+        topic: topic
+      )
     end
 
     # Create a new 1:1 conversation
     def create_direct_conversation(participant)
-      call(:post, '/conversations/direct', {
-        participant: participant,
-      } )
+      call(
+        :post,
+        '/conversations/direct',
+        participant: participant
+      )
     end
 
     # Remove participants from a conversation
     def delete_group_conversation_participants(conv, participants)
-      call(:delete, "/conversations/group/#{conv}/participants", {
-        participants: participants,
-      } )
+      call(
+        :delete,
+        "/conversations/group/#{conv}/participants",
+        participants: participants
+      )
     end
 
     # Remove the current_user from a conversation
@@ -178,7 +189,7 @@ module CircuitClient
 
     # Get the profile of the connections user
     def get_user_profile
-      call(:get, "/users/profile")
+      call(:get, '/users/profile')
     end
 
     # A cached version of the current connections user profile

data/lib/circuit_client/error_middleware.rb

@@ -1,23 +1,16 @@
 require 'circuit_client/errors'
 
 module CircuitClient
-  class ErrorMiddleware < Faraday::Response::Middleware
-    ClientErrorStatuses = 400...600
+  class ErrorMiddleware < Faraday::Response::RaiseError
+    CLIENT_ERROR_STATUSES = (400...500).freeze
 
     def on_complete(env)
       case env[:status]
-      when 404
-        raise Faraday::Error::ResourceNotFound, response_values(env)
-      when 407
-        # mimic the behavior that we get with proxy requests with HTTPS
-        raise Faraday::Error::ConnectionFailed, %{407 "Proxy Authentication Required "}
-      when ClientErrorStatuses
+      when CLIENT_ERROR_STATUSES
         raise CircuitClient::ClientError, response_values(env)
       end
-    end
 
-    def response_values(env)
-      {:status => env.status, :headers => env.response_headers, :body => env.body}
+      super
     end
-  end 
+  end
 end

data/lib/circuit_client/errors.rb

@@ -1,13 +1,13 @@
 require 'json'
 
 module CircuitClient
-  class ClientError < Faraday::Error::ClientError
+  class ClientError < Faraday::ClientError
     def initialize(ex, response = nil)
       content_type = ex[:headers]['Content-Type']
       if !content_type.nil? && content_type.match(/application\/json/)
         begin
           error = JSON.parse(ex[:body])
-          super("server response: #{error['errorDescription'] || error} (status: #{ex[:status]})")
+          super("server response: #{error.to_json} (status: #{ex[:status]})")
         rescue JSON::ParserError
           super("server response with status #{ex[:status]} and malformed JSON")
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circuit_client
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Markus Benning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,36 +38,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -87,8 +59,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Dockerfile
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bin/send-circuit