stream-ruby 2.4.5 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bde83576879380bf5f3848870da027f0b5b0a5a5
-  data.tar.gz: 7bd36e4dbea7d4785ca87b2ed47d450f8c132be5
+  metadata.gz: 1398099d6f288e0c5bad1cd13bc9b63def1464b2
+  data.tar.gz: c9f19bcff3c6c6012c04b692e9e90194aaf2f905
 SHA512:
-  metadata.gz: d53897246c37a211d955dfe7910f31b138205a4053f07af088e2d8aadda81bccad02be733622930b9f52ea19b43cd66f0e02d7e689bbfb8339289dd575a5a58b
-  data.tar.gz: 72b993e91b9956494f13db0e74592c2bf6f08fae6856e2280c01e5542eca1c43603df2cf628498e156a3ccf5b37d6c0801443b437af8a2df4338341823f0a963
+  metadata.gz: 576e0e4b71ef340081a9f87d1165434ee88c773ca7ae42a156d57fd5ba1e8eb10f3ffedeb8d3411eeaa9de8190da976b0e5672ab7d4567a6d71c30e55f04afcf
+  data.tar.gz: fea36c574fc895385b1549b29099478f6609e51309b8cfbfb9ff2131fd4de26342e3d7096a847f1cb39e077d418113c0a1d925c5901378bcf0b00714342f47c6

data/lib/stream/client.rb

@@ -1,4 +1,4 @@
-require "httparty"
+require "faraday"
 require "stream/errors"
 require "stream/feed"
 require "stream/signer"
@@ -10,9 +10,7 @@ module Stream
     attr_reader :api_key
     attr_reader :api_secret
     attr_reader :app_id
-    attr_reader :api_version
-    attr_reader :location
-    attr_reader :default_timeout
+    attr_reader :client_options
 
     if RUBY_VERSION.to_f >= 2.1
       require "stream/batch"
@@ -49,13 +47,16 @@ module Stream
       @api_key = api_key
       @api_secret = api_secret
       @app_id = app_id
-      @location = opts[:location]
-      @api_version = opts.fetch(:api_version, "v1.0")
-      @default_timeout = opts.fetch(:default_timeout, 3)
       @signer = Stream::Signer.new(api_secret)
+
+      @client_options = {
+        :api_version => opts.fetch(:api_version, "v1.0"),
+        :location => opts.fetch(:location, nil),
+        :default_timeout => opts.fetch(:default_timeout, 3),
+        :api_key => @api_key
+      }
     end
 
-    #
     # Creates a feed instance
     #
     # @param [string] feed_slug the feed slug (eg. flat, aggregated...)
@@ -82,7 +83,7 @@ module Stream
     end
 
     def get_http_client
-      @http_client ||= StreamHTTPClient.new(@api_version, @location, @default_timeout)
+      @http_client ||= StreamHTTPClient.new(@client_options)
     end
 
     def make_query_params(params)
@@ -98,48 +99,92 @@ module Stream
   end
 
   class StreamHTTPClient
-    include HTTParty
+    require "faraday"
 
+    attr_reader :conn
+    attr_reader :options
     attr_reader :base_path
 
-    def initialize(api_version = "v1.0", location = nil, default_timeout = 3)
+    def initialize(client_params)
+      @options = client_params
       location_name = "api"
-      unless location.nil?
-        location_name = "#{location}-api"
+      unless client_params[:location].nil?
+        location_name = "#{client_params[:location]}-api"
       end
-      @base_path = "/api/#{api_version}"
 
       protocol = "https"
-      if location == "qa"
+      if @options[:location] == "qa"
         protocol = "http"
       end
 
-      self.class.base_uri "#{protocol}://#{location_name}.getstream.io#{@base_path}"
-      self.class.default_timeout default_timeout
-    end
-
-    def _build_error_message(response)
-      msg = "#{response['exception']} details: #{response['detail']}"
+      @base_path = "/api/#{@options[:api_version]}"
+      base_url = "#{protocol}://#{location_name}.getstream.io#{@base_path}"
 
-      if response.key?("exception_fields")
-        response["exception_fields"].map do |field, messages|
-          msg << "\n#{field}: #{messages}"
-        end
+      @conn = Faraday.new(:url => base_url) do |faraday|
+        # faraday.request :url_encoded
+        faraday.adapter Faraday.default_adapter
+        faraday.use RaiseHttpException
+        faraday.options[:open_timeout] = @options[:default_timeout]
+        faraday.options[:timeout] = @options[:default_timeout]
       end
-
-      msg
+      @conn.path_prefix = @base_path
     end
 
     def make_http_request(method, relative_url, params = nil, data = nil, headers = nil)
       headers["Content-Type"] = "application/json"
       headers["X-Stream-Client"] = "stream-ruby-client-#{Stream::VERSION}"
-      body = data.to_json if ["post", "put"].include? method.to_s
-      response = self.class.send(method, relative_url, :headers => headers, :query => params, :body => body)
-      case response.code
+
+      params["api_key"] = @options[:api_key]
+      relative_url = "#{@base_path}#{relative_url}?#{URI.encode_www_form(params)}"
+      response = @conn.run_request(method, relative_url, data.to_json, headers)
+
+      case response[:status].to_i
       when 200..203
-        return response
-      when 204...600
-        raise StreamApiResponseException, _build_error_message(response)
+        return ::JSON.parse(response[:body])
+      end
+    end
+  end
+
+  class RaiseHttpException < Faraday::Middleware
+    def call(env)
+      @app.call(env).on_complete do |response|
+        case response[:status].to_i
+        when 200..203
+          return response
+        when 401
+          raise StreamApiResponseException, error_message(response, "Bad feed")
+        when 403
+          raise StreamApiResponseException, error_message(response, "Bad auth/headers")
+        when 404
+          raise StreamApiResponseException, error_message(response, "url not found")
+        when 204...600
+          raise StreamApiResponseException, error_message(response, "something else")
+        end
+      end
+    end
+
+    def initialize(app)
+      super app
+      @parser = nil
+    end
+
+    private
+
+    def error_message(response, body = nil)
+      "#{response[:method].to_s.upcase} #{response[:url]}: #{[response[:status].to_s + ':', body].compact.join(' ')}"
+    end
+
+    def error_body(body)
+      if !body.nil? && !body.empty? && body.is_a?(String)
+        body = ::JSON.parse(body)
+      end
+
+      if body.nil?
+        nil
+      elsif body["meta"] && body["meta"]["error_message"] && !body["meta"]["error_message"].empty?
+        ": #{body['meta']['error_message']}"
+      elsif body["error_message"] && !body["error_message"].empty?
+        ": #{body['error_type']}: #{body['error_message']}"
       end
     end
   end

data/lib/stream/version.rb

@@ -1,3 +1,3 @@
 module Stream
-  VERSION = "2.4.5".freeze
+  VERSION = "2.5.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stream-ruby
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.5.0
 platform: ruby
 authors:
 - Tommaso Barbugli
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: http_signatures
   requirement: !ruby/object:Gem::Requirement
@@ -53,20 +53,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.5.2
-- !ruby/object:Gem::Dependency
-  name: persistent_httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement