triton-internal 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2912604c505dbd1db3661a1b84e6134e2305a71
-  data.tar.gz: 12177d339bf2a21df7fe071db9efa54dd31c9d4d
+  metadata.gz: b16b7be1a4301ff1ce59645470043e7f28aad14d
+  data.tar.gz: 9412ab5e44e030236f71089ae01302ee2f36ac0f
 SHA512:
-  metadata.gz: 96f7c458feaa86cc933ac6ad3802637ed149f73876d55a0383ef1b70e7f6cbf3c417aa3b4524a6b384ab049714f2612228680b07b0314da50bcc8c5442c1486d
-  data.tar.gz: 76865f0adc315e88aeb92ad88cdc49927dc9946754d7864f8b9aaf2151806a7b71259abc7dc5ff5520c5b8a219f127cec04b1b58d8bc9f2224e187cef5df4487
+  metadata.gz: 9411f1c5c59af68ae14401e73ccc5fa91bec0472bc9fba707d30662c13f014580d7e05cfe9d440c0bbcadfa43659545096bf942345e56c8fd7a5e62808f4f77c
+  data.tar.gz: fb7c1d776e78832fa0e85a47a47ae31b96b082494901482868abd74862be61ebd6c518940141b9919be70e8bf96443d843fd546dbb0124c4360942c5e8742293

data/lib/triton/api_base.rb

@@ -47,12 +47,34 @@ module Triton
       end
     end
 
+
+    attr_reader :path
+
     def initialize(name, params={})
       @name = name
+      @params = params.dup || {}
       @call = DefinedMethods[self.class][name]
-      @params = params
-
       raise UnknownCall, "#{@name} isn't a known API method." unless @call
+
+      @method = @call.fetch(:method, :get).intern
+      @path = @call[:path]
+      @body_param = @call[:body_param] && @params.delete(@call[:body_param])
+
+      @params.each do |k,v|
+        @path = @path.gsub(":#{k.to_s}") do |_|
+          @params.delete(k)
+          CGI.escape(v.to_s)
+        end
+      end
+
+      @query_string_params = if @method == :get || !!@body_param
+        @params
+      else
+        [@call.fetch(:querystring, [])].flatten.map do |key|
+          value = @params.delete(key.to_s)
+          [key, value] if value
+        end.compact
+      end
     end
 
     def execute
@@ -60,7 +82,7 @@ module Triton
         raise Triton::TestModeLeak, "Request '#{@name}' leaked when in test mode\n#{request.method.upcase} #{URI.parse(request.url).path}\n#{JSON.pretty_generate(@params)}"
       end
       Triton.logger.debug("#{self.class.name}/#{@name}: #{request.method.upcase} #{URI.parse(request.url).path}\n#{JSON.pretty_generate(@params)}")
-      object =  JSON.parse(request.execute)
+      object = parse(request.execute)
       if object.is_a?(Hash)
         IndifferentHash.new.merge!(object)
       else
@@ -75,37 +97,47 @@ module Triton
       end
     end
 
-    def request
-      @request ||= begin
-        request_method = @call.fetch(:method, :get).intern
-        path = @call[:path]
-
-        @params.each do |k,v|
-          path = path.gsub(":#{k.to_s}") do |_|
-            @params.delete(k)
-            CGI.escape(v.to_s)
-          end
+    def parse(body)
+      parser = @call.fetch(:response, :json)
+      if parser.respond_to?(:call)
+        parser.call(body)
+      else
+        case parser
+        when :json_lines
+          body.split("\n").map { |a| JSON.parse(a) }
+        when :json
+          JSON.parse(body)
+        else
+          raise ArgumentError, "Unknown parser '#{parser}'"
         end
+      end
+    end
 
-        body_param = @call[:body_param] && @params.delete(@call[:body_param])
+    def request
+      @request ||= begin
 
-        if request_method == :get || !!body_param
-          payload = !!body_param && JSON.generate(body_param)
-          query = @params.map { |k,v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join("&")
+        # Now generate the payload, unless it's a GET
+        payload = if @method == :get
+          nil
+        elsif !!@body_param
+          JSON.generate(@body_param)
         else
-          query = nil
-          payload = JSON.dump(@params)
+          JSON.generate(@params)
         end
 
+        query = @query_string_params.map { |k,v| [CGI.escape(k.to_s), CGI.escape(v.to_s)].join("=")}.join("&")
+
         url = URI.parse("http://#{self.class.hostname}#{path}")
-        url.query = if url.query
-          "#{url.query}&#{query}"
-        else
-          query
+        if query.length > 0
+          url.query = if url.query
+            url.query = "#{url.query}&#{query}"
+          else
+            query
+          end
         end
 
         RestClient::Request.new({
-          :method => request_method,
+          :method => @method,
           :url    => url.to_s,
           :headers => {
             'Accept'       => 'application/json',

data/lib/triton/imgapi.rb

@@ -26,7 +26,7 @@ module Triton
     call('UpdateImage', :method => :post, :path => '/images/:uuid?action=update')
     call('AdminImportImage', :method => :post, :path => '/images/:uuid?action=import')
     call('AdminImportRemoteImage', :method => :post, :path => '/images/:uuid?action=import-remote')
-    call('AdminImportDockerImage', :method => :post, :path => '/images?action=import-docker-image')
+    call('AdminImportDockerImage', :method => :post, :path => '/images?action=import-docker-image', :querystring => ['tag', 'repo', 'digest'], :response => :json_lines)
     call('AdminChangeImageStor', :method => :post, :path => '/images/:uuid?action=change-stor&stor=:newstor')
     call('ListImageJobs', :method => :get, :path => '/images/:uuid/jobs')
     call('ListChannels', :method => :get, :path => '/channels')

data/lib/triton/version.rb

@@ -1,3 +1,3 @@
 module Triton
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: triton-internal
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Thomas Haggett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Library to wrap the Triton internal APIs