cloud-queues 1.0.0 → 1.0.1

data/lib/cloud-queues/client.rb

@@ -4,6 +4,9 @@ module CloudQueues
     attr_accessor :client_id
     attr_accessor :token
     attr_accessor :tenant
+
+    attr :default_region
+    attr :api_host
   
     def initialize(options = {})
       [:username, :api_key].each do |arg|
@@ -50,25 +53,26 @@ module CloudQueues
         response = request(method: :post, path: "/v2.0/tokens", body: request)
       end
 
+      @default_region = response.body["access"]["user"]["RAX-AUTH:defaultRegion"]
+
       url_type = @internal ? "internalURL" : "publicURL"
       queues = response.body["access"]["serviceCatalog"].select{|service| service["name"] == "cloudQueues" }
       endpoints = queues[0]["endpoints"]
 
-      url = if @region.nil?
-              # pick the first region
-              # TODO when cloud queues goes GA, change this to response.body["access"]["user"]["RAX-AUTH:defaultRegion"]
-              endpoints[0][url_type].split('/')
-            else
-              endpoint = endpoints.select { |endpoint| endpoint["region"] == @region.to_s.upcase }
-              raise ArgumentError.new "Region #{@region.to_s.upcase} does not exist!" if endpoint.count == 0
-              endpoint[0][url_type].split('/')
-            end
-  
-      host = url[0..2].join('/')
+      # default to the account's preferred region
+      unless @region
+        @region = @default_region
+      end
+
+      endpoint = endpoints.select { |endpoint| endpoint["region"] == @region.to_s.upcase }
+      raise ArgumentError.new "Region #{@region.to_s.upcase} does not exist!" if endpoint.count == 0
+      url = endpoint[0][url_type].split('/')
+
+      @api_host = url[0..2].join('/')
       @base_path = "/" + url[3..-1].join('/')
       @tenant = url[-1]
   
-      @client = Excon.new(host)
+      @client = Excon.new(@api_host, tcp_nodelay: true)
     end
   
     def request(options = {}, second_try = false)
@@ -85,7 +89,6 @@ module CloudQueues
       options[:headers]["X-Auth-Token"] = @token if @token
       options[:headers]["X-Project-ID"] = @tenant
   
-      options[:tcp_nodelay] = true if options[:tcp_nodelay].nil?
       options[:expects] ||= 200
   
       puts options if @debug

data/lib/cloud-queues/version.rb

@@ -1,3 +1,3 @@
 module CloudQueues
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-queues
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2013-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 0.25.0
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 0.25.0
 - !ruby/object:Gem::Dependency