stream-ruby 2.5.2 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ce02081ea1f17035579e108bba1cbdf7c9a7bbb
-  data.tar.gz: 7ba8024cea61c62d3a5d96258c5898d0f5736743
+  metadata.gz: 323fa2b0fe0631721c6675a2858af90cb02e6489
+  data.tar.gz: 4d8d2885ca77326b1fc712ed9f18fba3b9bcc150
 SHA512:
-  metadata.gz: 6ec05500fda1558b24ae2ae768c4165b0e267dfbd9a6a5ad7f8799c80209bb17907f124fe75dcfb7709f4c591ce7649620f5923377b901b5301a1ea7b359404b
-  data.tar.gz: 57c513a2c7b9920c1cdfd593959fe35d2458ee1b8288bf9f385be96fc0acf17f64854cad502cfb18b5685122c917dc75c861abb90d4b5b1fbc0b11bf8f4073cc
+  metadata.gz: 57d7d87fc03bec734879219985a41ac4e102bad75c661d6579c5ed2061eb0a8d22f851cac75bc9808098eb05bd5a0c0f6c700d9264dac4ed56a623f51e58d62e
+  data.tar.gz: 2982e5270d7fe5848fa892cdc80afcfb778ac6f1c8d65a423a69b48c0a3865c012d999c328fdd9f8a7db43bbd9aa39821c18645e84309f0a3015ee7f54462256

data/LICENSE

@@ -1,27 +1,27 @@
-Copyright (c) 2014, Stream.io Inc
+Copyright (c) 2014-2017 Stream.io Inc, and individual contributors.
+
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without modification, are permitted
+provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
+    1. Redistributions of source code must retain the above copyright notice, this list of
+    conditions and the following disclaimer.
 
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+    2. Redistributions in binary form must reproduce the above copyright notice, this list of
+    conditions and the following disclaimer in the documentation and/or other materials
+    provided with the distribution.
 
-* Neither the name of the {organization} nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
+    3. Neither the name of the copyright holder nor the names of its contributors may
+    be used to endorse or promote products derived from this software without specific prior
+    written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -114,3 +114,9 @@ client.add_to_many(activity, feeds)
 ```
 
 Docs are available on [GetStream.io](http://getstream.io/docs/).
+
+### Copyright and License Information
+
+Copyright (c) 2014-2017 Stream.io Inc, and individual contributors. All rights reserved.
+
+See the file "LICENSE" for information on the history of this software, terms & conditions for usage, and a DISCLAIMER OF ALL WARRANTIES.

data/lib/stream/client.rb

@@ -112,13 +112,18 @@ module Stream
         location_name = "#{client_params[:location]}-api"
       end
 
-      protocol = "https"
-      if @options[:location] == "qa"
-        protocol = "http"
+      protocol = 'https'
+      port = ':443'
+      if @options[:location] == "qa" || @options[:location] == "localhost"
+        protocol = 'http'
+        port = ':80'
+        if @options[:location] == 'localhost'
+          port = ':8000'
+        end
       end
 
       @base_path = "/api/#{@options[:api_version]}"
-      base_url = "#{protocol}://#{location_name}.getstream.io#{@base_path}"
+      base_url = "#{protocol}://#{location_name}.getstream.io#{port}#{@base_path}"
 
       @conn = Faraday.new(:url => base_url) do |faraday|
         # faraday.request :url_encoded
@@ -163,11 +168,12 @@ module Stream
         when 404
           raise StreamApiResponseException, error_message(response, "url not found")
         when 204...600
-          raise StreamApiResponseException, error_message(response, "something else")
+          raise StreamApiResponseException, error_message(response, _build_error_message(response.body))
         end
       end
     end
 
+
     def initialize(app)
       super app
       @parser = nil
@@ -175,22 +181,19 @@ module Stream
 
     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)
+    def _build_error_message(response)
+      response = JSON.parse(response)
+      msg = "#{response['exception']} details: #{response['detail']}"
+      if response.key?("exception_fields")
+        response["exception_fields"].map do |field, messages|
+          msg << "\n#{field}: #{messages}"
+        end
       end
+      msg
+    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
+    def error_message(response, body = nil)
+      "#{response[:method].to_s.upcase} #{response[:url]}: #{[response[:status].to_s + ':', body].compact.join(' ')}"
     end
   end
 end

data/lib/stream/version.rb

@@ -1,3 +1,3 @@
 module Stream
-  VERSION = "2.5.2".freeze
+  VERSION = "2.5.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stream-ruby
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.4
 platform: ruby
 authors:
 - Tommaso Barbugli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-19 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -135,9 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A gem that provides a client interface for getstream.io
 test_files: []
-has_rdoc: true