client.rb in testdroid-api-client-0.3.0

- old
+ new
@@ -1,126 +1,169 @@
 module TestdroidAPI
 
-	class Client
-		attr_reader :config
-		attr_accessor :logger
-		attr_reader :token
+class Client
+    attr_reader :config
+    attr_accessor :logger
+    attr_reader :token
 
-		API_VERSION = 'api/v2'
-		CLOUD_ENDPOINT='https://cloud.testdroid.com'
-		ACCEPT_HEADERS={'Accept' => 'application/json'}
+    API_VERSION = 'api/v2'
+    CLOUD_ENDPOINT='https://cloud.testdroid.com'
+    ACCEPT_HEADERS={'Accept' => 'application/json'}
 
-		def initialize(username, password, cloud_url = CLOUD_ENDPOINT, logger = nil)
-			# Instance variables
-			@username = username
-			@password = password
-			@cloud_url = cloud_url
-			@logger = logger
+    def initialize(username, password, cloud_url = CLOUD_ENDPOINT, logger = nil)
+      # Instance variables
+      @username = username
+      @password = password
+      @cloud_url = cloud_url
+      @logger = logger
 
-			if @logger.nil?
-				@logger = Logger.new(STDOUT)
-				@logger.info("Logger is not defined => output to STDOUT")
-			end
-		end
-		def label_groups
-			label_groups = TestdroidAPI::LabelGroups.new( "/#{API_VERSION}/label-groups", self )
-			label_groups.list
-			label_groups
-		end
-		def devices
-			devices = TestdroidAPI::Devices.new( "/#{API_VERSION}/devices", self )
-			devices.list
-			devices
-		end
-		def authorize
+      if @logger.nil?
+        @logger = Logger.new(STDOUT)
+        @logger.info("Logger is not defined => output to STDOUT")
+      end
+    end
+    def label_groups
+      label_groups = TestdroidAPI::LabelGroups.new( "/#{API_VERSION}/label-groups", self )
+      label_groups.list
+      label_groups
+    end
+    def devices
+      devices = TestdroidAPI::Devices.new( "/#{API_VERSION}/devices", self )
+      devices.list
+      devices
+    end
+    def authorize
 
-			@client = OAuth2::Client.new('testdroid-cloud-api', nil, :site => @cloud_url, :authorize_url    => 'oauth/authorize',
-			:token_url        => 'oauth/token',  :headers => ACCEPT_HEADERS)  do |faraday|
-				faraday.request  :multipart
-				faraday.request  :url_encoded
-				faraday.response :logger, @logger
-				faraday.adapter  Faraday.default_adapter
-			end
+      @client = OAuth2::Client.new('testdroid-cloud-api', nil, :site => @cloud_url, :authorize_url    => 'oauth/authorize',
+      :token_url        => 'oauth/token',  :headers => ACCEPT_HEADERS)  do |faraday|
+        faraday.request  :multipart
+        faraday.request  :url_encoded
+        faraday.response :logger, @logger
+        faraday.adapter  Faraday.default_adapter
+      end
 
-			@token = @client.password.get_token(@username, @password, :headers => ACCEPT_HEADERS)
+      @token = @client.password.get_token(@username, @password, :headers => ACCEPT_HEADERS)
 
-			if (@cloud_user.nil?)
-				@cloud_user = TestdroidAPI::User.new( "/#{API_VERSION}/me", self ).refresh
-				@cloud_user = TestdroidAPI::User.new( "/#{API_VERSION}/users/#{@cloud_user.id}", self ).refresh
+      if (@cloud_user.nil?)
+        @cloud_user = TestdroidAPI::User.new( "/#{API_VERSION}/me", self ).refresh
+        @cloud_user = TestdroidAPI::User.new( "/#{API_VERSION}/users/#{@cloud_user.id}", self ).refresh
 
-			end
-			@cloud_user
-		end
-		def upload(uri, filename, file_type)
-			begin
-				@token = @token.refresh!(:headers => ACCEPT_HEADERS) if @token.expired?
-				connection = @token.client.connection
-				payload = {:file  => Faraday::UploadIO.new(filename, file_type) }
-				headers = ACCEPT_HEADERS.merge(@token.headers)
-				response = connection.post(@cloud_url+"#{uri}",payload, headers)
-			rescue => e
-				@logger.error e
-				return nil
-			end
-			JSON.parse(response.body)
-		end
-		def post(uri, params)
+      end
+      @cloud_user
+    end
 
-			@token = @token.refresh!(:headers => ACCEPT_HEADERS) if  @token.expired?
+    def mime_for(path)
+        mime = MIME::Types.type_for path
+        mime.empty? ? 'text/plain' : mime[0].content_type
+    end
 
-			begin
-				resp = @token.post("#{@cloud_url}#{uri}", params.merge(:headers => ACCEPT_HEADERS))
-			rescue => e
-				@logger.error "Failed to post resource #{uri} #{e}"
-				return nil
-			end
-			
-			if resp.body.nil? || resp.body.length == 0
-				return nil
-			end
-			
-			JSON.parse(resp.body)
-		end
-		def get(uri, params={})
+    def upload(uri, filename)
+      begin
+        @token = @token.refresh!(:headers => ACCEPT_HEADERS) if @token.expired?
+        connection = @token.client.connection
+        payload = {:file  => Faraday::UploadIO.new(filename, mime_for(filename)) }
+        headers = ACCEPT_HEADERS.merge(@token.headers)
+        response = connection.post(@cloud_url+"#{uri}",payload, headers)
+      rescue => e
+        @logger.error e
+        return nil
+      end
+      JSON.parse(response.body)
+    end
+    def post(uri, params)
 
-			@token = @token.refresh!(:headers => ACCEPT_HEADERS) if  @token.expired?
+      @token = @token.refresh!(:headers => ACCEPT_HEADERS) if  @token.expired?
 
-			begin
-				resp = @token.get(@cloud_url+"#{uri}", params.merge(:headers => ACCEPT_HEADERS))
-			rescue => e
-				@logger.error "Failed to get resource #{uri} #{e}"
-				return nil
-			end
-			JSON.parse(resp.body)
-		end
-		def delete(uri)
+      begin
+        resp = @token.post("#{@cloud_url}#{uri}", params.merge(:headers => ACCEPT_HEADERS))
+      rescue => e
+        @logger.error "Failed to post resource #{uri} #{e}"
+        return nil
+      end
+      
+      if resp.body.nil? || resp.body.length == 0
+        return nil
+      end
+      
+      JSON.parse(resp.body)
+    end
+    def get(uri, params={})
 
-			@token = @token.refresh!(:headers => ACCEPT_HEADERS) if  @token.expired?
+      @token = @token.refresh!(:headers => ACCEPT_HEADERS) if  @token.expired?
 
-			begin
-				resp = @token.delete(@cloud_url+"#{uri}",  :headers => ACCEPT_HEADERS )
-			rescue => e
-				@logger.error "Failed to delete resource #{uri} #{e}"
-				return nil
-			end
+      begin
+        resp = @token.get(@cloud_url+"#{uri}", params.merge(:headers => ACCEPT_HEADERS))
+      rescue => e
+        @logger.error "Failed to get resource #{uri} #{e}"
+        return nil
+      end
+      JSON.parse(resp.body)
+    end
+    def delete(uri)
 
-			if (resp.status != 204)
-				@logger.error "Failed to delete resource #{uri} #{e}"
-				return nil
-			else
-				@logger.info "response: #{resp.status}"
-			end
-		end
-		def download(uri, file_name)
-			begin
-				@token = @token.refresh!(:headers => ACCEPT_HEADERS) if  @token.expired?
-				File.open(file_name, "w+b") do |file|
-					resp = @token.get("#{@cloud_url}/#{uri}", :headers => ACCEPT_HEADERS)
-					file.write(resp.body)
-				end
-			rescue => e
-				@logger.error "Failed to get resource #{uri} #{e}"
-				return nil
-			end
-		end
-	end
+      @token = @token.refresh!(:headers => ACCEPT_HEADERS) if  @token.expired?
+
+      begin
+        resp = @token.delete(@cloud_url+"#{uri}",  :headers => ACCEPT_HEADERS )
+      rescue => e
+        @logger.error "Failed to delete resource #{uri} #{e}"
+        return nil
+      end
+
+      if (resp.status != 204)
+        @logger.error "Failed to delete resource #{uri} #{e}"
+        return nil
+      else
+        @logger.info "response: #{resp.status}"
+      end
+    end
+    def download(uri, file_name)
+      begin
+        @token = @token.refresh!(:headers => ACCEPT_HEADERS) if  @token.expired?
+        File.open(file_name, "w+b") do |file|
+          resp = @token.get("#{@cloud_url}/#{uri}", :headers => ACCEPT_HEADERS)
+          file.write(resp.body)
+        end
+      rescue => e
+        @logger.error "Failed to get resource #{uri} #{e}"
+        return nil
+      end
+    end
+
+# Resources
+
+    # public read-only
+
+    def info
+      TestdroidAPI::CloudResource.new("/#{API_VERSION}/info", self, "info")
+    end
+
+    def devices
+      TestdroidAPI::Devices.new("/#{API_VERSION}/devices", self)
+    end
+
+    def label_groups
+      TestdroidAPI::LabelGroups.new("/#{API_VERSION}/label-groups", self)
+    end
+
+    # user read-write
+
+    def me
+      TestdroidAPI::User.new("/#{API_VERSION}/me", self).load
+    end
+
+    def properties
+      TestdroidAPI::Properties.new("/#{API_VERSION}/properties", self)
+    end
+
+    def device_session_connections
+      TestdroidAPI::DeviceSessionConnections.new("/#{API_VERSION}/device-session-connections", self)
+    end
+
+    # admin only
+
+    def admin
+      TestdroidAPI::Admin.new("/#{API_VERSION}/admin", self)
+    end
+
+  end
 end