stream-ruby 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8757c05fed372cb56e4d9dcbf069a1b66b5694e9
-  data.tar.gz: da8df5451cfa86a3262353c4489a1d9781180bb0
+  metadata.gz: 38a1b1607ab0d444d3d58655a0dc2b5808a89fa4
+  data.tar.gz: a5e31bb866bc8f48ad01054d1f70045cf84d746b
 SHA512:
-  metadata.gz: 4b888ce839da9e422acdf519e8f15d6f246b5b5431ea4d778de0327818300d58c9c50a3fd073c439d3524df92e83ccb83c755bc8aef5f48d0c31682fee2557f5
-  data.tar.gz: 3e0eb7eb9f1165ba071a16fa2d941616054e5f5c7985f5356d4be0bc6af2ce63dabf571f75aacb2e3a7a0e738421907ee1f0725cda1c7108da3d48017cbea538
+  metadata.gz: 6c5bfcff26cf14b563cf4017ebb6082b6c6cad08472b95b0a9c809bec15698d600a4b2727bff5a13d0e0c51d402ea2c420bd8350f296f86ea07c259261a5bdb7
+  data.tar.gz: 9cbfebfe0e27f2d80619eee4dcc907e6019312d6f778a6f76993224fc8d82e5ceffa53758c32d7c556b1b933e23615a029a091836c555ded0edcff95243bb128

data/lib/stream/client.rb

@@ -8,13 +8,13 @@ module Stream
     STREAM_URL_RE = /https\:\/\/(?<key>\w+)\:(?<secret>\w+).*app_id=(?<app_id>\d+)/i
 
     class Client
-        @@http_client = nil
         attr_reader :api_key
         attr_reader :api_secret
         attr_reader :app_id
         attr_reader :api_version
+        attr_reader :location
 
-        def initialize(api_key='', api_secret='', app_id=nil)
+        def initialize(api_key='', api_secret='', app_id=nil, opts={})
             if ENV['STREAM_URL'] =~ Stream::STREAM_URL_RE and (api_key.nil? || api_key.empty?)
                 matches = Stream::STREAM_URL_RE.match(ENV['STREAM_URL'])
                 api_key = matches['key']
@@ -29,6 +29,8 @@ 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')
             @signer = Stream::Signer.new(api_secret)
         end
 
@@ -42,7 +44,7 @@ module Stream
         end
 
         def get_http_client
-            @@http_client ||= StreamHTTPClient.new
+            StreamHTTPClient.new(@api_version, @location)
         end
 
         def make_request(method, relative_url, signature, params=nil, data=nil)
@@ -59,9 +61,17 @@ module Stream
     class StreamHTTPClient
 
         include HTTParty
-        base_uri 'https://api.getstream.io/api/v1.0'
         default_timeout 3
 
+        def initialize(api_version='v1.0', location=nil)
+            if location.nil?
+                location_name = "api"
+            else
+                location_name = "#{location}-api"
+            end
+            self.class.base_uri "https://#{location_name}.getstream.io/api/#{api_version}"
+        end
+
         def make_http_request(method, relative_url, params=nil, data=nil, headers=nil)
             headers['Content-Type'] = 'application/json'
             headers['User-Agent'] = "stream-ruby-#{Stream::VERSION}"

data/lib/stream/version.rb

@@ -1,3 +1,3 @@
 module Stream
-  VERSION = "2.0.6"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stream-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - Tommaso Barbugli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty