dockerapi 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dae8acdc54de9fd88a68b472829ddef47db3884414ded58ad098babd4a786c58
-  data.tar.gz: 4828f010ed6a3e32ee80d2e9e11ef68ef1375df988928a3d5c856aaa2791a7ed
+  metadata.gz: f437d91a99a54403c5f945d2f9814d21cdf4ddde861a9aa6a0cb5fc8733407db
+  data.tar.gz: d80832f6576d633db58dc546496604fa30b94e4f1dd3020cfabcd61df538ec99
 SHA512:
-  metadata.gz: d30c788f83b0cfc1e88bf1441a7b48037820573f4817490e490cf6811e07b88baf67fe52f68418ffc80213631364db61f2739bf40ea50f90617ef9a2da3a322d
-  data.tar.gz: 623f2a33c84a423bd8ee38a5b98a62e8ccb04f6212d03a07c18005b501b812e88d2bfd03de384965ccb857aba53f539516b93e37885c547779ea20db08376bda
+  metadata.gz: 2620eb13fad97f0f6529db6f3d6501351790e1d6ca90200c24ed7aef34db1179d3e6c8f6cb4d780dc046c0bc6a45c0ed23f2dff75f336ddfd6c17c33e699ee2a
+  data.tar.gz: 8b757f7abb03f9fe449caadc09407beac250a9c605ed493e6aabdae2be0471666003ffb9f58fb67fba42fcc201b549b803748a0089865086abd7c3262f3a1898

data/.github/workflows/cd.yml

@@ -1,7 +1,8 @@
 name: CD
 on:
   push:
-    branches: [ main ]
+    tags:
+      - 'v*.*.*'
 
 jobs:
   release:
@@ -12,9 +13,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby
-      uses: ruby/setup-ruby@21351ecc0a7c196081abca5dc55b08f085efe09a
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.3
     - name: Setup to RubyGems
       run: |
         mkdir -p $HOME/.gem
@@ -23,13 +24,11 @@ jobs:
         printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
     - name: Install dependencies
       run: |
-        gem update --system 3.2.3
+        gem update --system 3.5.11
         bundle install
     - name: Release
       run: |
         TAG=$(bundle exec rake version | tr -d '"')
-        git tag $TAG
-        git push --tags
         gh release create $TAG --generate-notes
         bundle exec rake build
         gem push pkg/*

data/.github/workflows/ci.yml

@@ -10,44 +10,12 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
-      uses: ruby/setup-ruby@21351ecc0a7c196081abca5dc55b08f085efe09a
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
-    - name: Install Docker
-      run: curl https://get.docker.com | sh
+        ruby-version: 3.3
     - name: Install dependencies
-      run: |
-        bin/setup 
-        sudo bin/setup
-    - name: Test misc
-      run: rspec spec/misc/*.rb
-    - name: Test Image
-      run: rspec spec/endpoints/image_spec.rb:1
-    - name: Test Image authentication
-      run: rspec spec/endpoints/image_spec.rb:196
-      continue-on-error: true
-    - name: Test Container
-      run: rspec spec/endpoints/container_spec.rb
-    - name: Test Volume
-      run: rspec spec/endpoints/volume_spec.rb
-    - name: Test Network
-      run: rspec spec/endpoints/network_spec.rb
-    - name: Test System
-      run: rspec spec/endpoints/system_spec.rb
-    - name: Test Exec
-      run: rspec spec/endpoints/exec_spec.rb
-    - name: Test Swarm
-      run: rspec spec/endpoints/swarm_spec.rb
-    - name: Test Node
-      run: rspec spec/endpoints/node_spec.rb
-    - name: Test Service
-      run: rspec spec/endpoints/service_spec.rb
-    - name: Test Task
-      run: rspec spec/endpoints/task_spec.rb
-    - name: Test Secret
-      run: rspec spec/endpoints/secret_spec.rb
-    - name: Test Config
-      run: rspec spec/endpoints/config_spec.rb
-    - name: Test Plugin
-      run: rspec spec/endpoints/plugin_spec.rb
-  
+      run: bundle install
+    - name: Run unit tests
+      run: rspec
+    - name: Run E2E tests
+      run: rspec --tag e2e

data/Gemfile

@@ -3,5 +3,5 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in dockerapi.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
+gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"

data/Gemfile.lock

@@ -1,36 +1,39 @@
 PATH
   remote: .
   specs:
-    dockerapi (0.20.0)
-      excon (~> 0.79)
+    dockerapi (0.21.0)
+      base64
+      excon (>= 0.97, < 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
-    excon (0.79.0)
-    rake (12.3.3)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    base64 (0.2.0)
+    diff-lcs (1.5.1)
+    excon (1.1.1)
+    rake (13.2.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
 
 PLATFORMS
+  arm64-darwin-23
   ruby
 
 DEPENDENCIES
   dockerapi!
-  rake (~> 12.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.4.16
+   2.5.11

data/README.md

@@ -143,6 +143,29 @@ container = Docker::API::Container.new
 # Create container
 container.create( {name: "nginx"}, {Image: "nginx:latest", HostConfig: {PortBindings: {"80/tcp": [ {HostIp: "0.0.0.0", HostPort: "80"} ]}}})
 
+# A more complex container creation
+container.create(                    
+    {name: "nginx"}, 
+    {
+        Image: "nginx:latest", 
+        HostConfig: {
+            PortBindings: {
+                "80/tcp": [ {HostIp: "0.0.0.0", HostPort: "80"} ]
+            }
+        },
+        Env: ["DOCKER=nice", "DOCKERAPI=awesome"],
+        Cmd: ["echo", "hello from test"],
+        Entrypoint: ["sh"],
+        NetworkingConfig: { 
+            EndpointsConfig: {
+                EndpointSettings: {
+                    IPAddress: "192.172.0.100"
+                }
+            }
+        }
+    }
+)
+
 # Start container
 container.start("nginx")
 
@@ -529,12 +552,6 @@ response.success?
 => true
 ```
 
-### Error handling
-
-`Docker::API::InvalidParameter` and `Docker::API::InvalidRequestBody` may be raised when an invalid option is passed as argument (ie: an option not described in Docker API documentation for request query parameters nor request body (json) parameters). Even if no errors were raised, consider validating the status code and/or message of the response to check if the Docker daemon has fulfilled the operation properly.
-
-To completely skip the validation process, add `:skip_validation => true` in the hash to be validated.
-
 ### Blocks
 
 Some methods can receive a block to alter the default execution:
@@ -563,13 +580,14 @@ The default blocks can be found in `Docker::API::Base`.
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Run `rspec` to run the unit tests. Run `rspec --tag e2e` to run End-to-End tests (requires Docker locally). 
+
+Run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ### Release new version
 
-* Update CHANGELOG.
 * Update README as needed.
 * Update version.
 * Run tests.

data/dockerapi.gemspec

@@ -10,11 +10,10 @@ Gem::Specification.new do |spec|
   spec.description   = "Interact with Docker API directly from Ruby code. Comprehensive implementation (all available endpoints), no local Docker installation required, easily manipulated http responses."
   spec.homepage      = "https://github.com/nu12/dockerapi"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = ">= 3.2"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/nu12/dockerapi.git"
-  spec.metadata["changelog_uri"] = "https://github.com/nu12/dockerapi/blob/master/CHANGELOG.md"
   spec.metadata["documentation_uri"] = "https://www.rubydoc.info/gems/dockerapi"
 
   # Specify which files should be added to the gem when it is released.
@@ -26,5 +25,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency("excon", "~> 0.79")
+  spec.add_dependency("base64")
+  spec.add_dependency("excon", ">= 0.97", "< 2")
 end

data/lib/docker/api/base.rb

@@ -7,9 +7,8 @@ class Docker::API::Base
     #
     # @param connection [Docker::API::Connection]: Connection to be used.
     def initialize connection = nil
-        raise Docker::API::Error.new("Expected connection to be a Docker::API::Connection class") if connection != nil && !connection.is_a?(Docker::API::Connection)
+        raise StandardError.new("Expected connection to be a Docker::API::Connection class") if connection != nil && !connection.is_a?(Docker::API::Connection)
         @connection = connection || Docker::API::Connection.new
-        set_automated_validation
     end
     
     private
@@ -18,7 +17,7 @@ class Docker::API::Base
     # Output to stdout.
     def default_streamer
         streamer = lambda do |chunk, remaining_bytes, total_bytes|
-            p chunk.to_s.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?') if Docker::API::PRINT_TO_STDOUT
+            p chunk.to_s.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?') if Docker::API.print_to_stdout
         end
         streamer
     end
@@ -59,18 +58,6 @@ class Docker::API::Base
         Base64.urlsafe_encode64(authentication.to_json.to_s).chomp
     end
 
-    ##
-    # Validate a Hash object comparing its keys with a given Array of permitted values. Raise an error if the validation fail.
-    #
-    # @param error [Error]: Error to be raised of the validation fail.
-    # @param permitted [Array]: List of permitted keys.
-    # @param params [Hash]: Hash object to be validated.
-    def validate error, permitted, params
-        return if params[:skip_validation]
-        unpermitted = params.keys.map(&:to_s) - permitted.map(&:to_s)
-        raise error.new(permitted, unpermitted) if unpermitted.size > 0
-    end
-
     ##
     # Convert Ruby Hash into URL query parameters.
     #
@@ -79,7 +66,7 @@ class Docker::API::Base
     # @param hash [Hash]: Hash object to be converted in a query parameter-like string.
     def hash_to_params hash
         p = []
-        hash.delete_if{ | k, v | k.to_s == "skip_validation" }.each { |k,v| p.push( v.is_a?(Hash) ? "#{k}=#{v.to_json}" : "#{k}=#{v}") }
+        hash.each { |k,v| p.push( v.is_a?(Hash) ? "#{k}=#{v.to_json}" : "#{k}=#{v}") }
         p.join("&").gsub(" ","")
     end
 
@@ -89,22 +76,8 @@ class Docker::API::Base
     # @param path [String]: Base URL string.
     # @param hash [Hash]: Hash object to be appended to the URL as query parameters.
     def build_path path, params = {}
+        path = "/v#{Docker::API::API_VERSION}#{path}"
         params.size > 0 ? [path, hash_to_params(params)].join("?") : path
     end
 
-    ##
-    # Set the validation to happen automatically when method parameters include "params" or "body".
-    def set_automated_validation
-        (self.methods - Object.methods).each do |method|
-            params_index = method(method).parameters.map{|ar| ar[1]}.index(:params)
-            body_index = method(method).parameters.map{|ar| ar[1]}.index(:body)
-
-            define_singleton_method(method) do |*args, &block|
-                validate Docker::API::InvalidParameter, Docker::API::VALID_PARAMS["#{self.class.name}"]["#{method}"], (args[params_index] || {}) if params_index
-                validate Docker::API::InvalidRequestBody, Docker::API::VALID_BODY["#{self.class.name}"]["#{method}"], (args[body_index] || {}) if body_index
-                super(*args,&block)
-            end
-        end
-    end
-
 end

data/lib/docker/api/config.rb

@@ -24,7 +24,7 @@ class Docker::API::Config < Docker::API::Base
     #
     # @param body [Hash]: Request body to be sent as json.
     def create body = {}
-        @connection.request(method: :post, path: "/configs/create", headers: {"Content-Type": "application/json"}, body: body.to_json)
+        @connection.request(method: :post, path: "/v#{Docker::API::API_VERSION}/configs/create", headers: {"Content-Type": "application/json"}, body: body.to_json)
     end
 
     # Inspect a config
@@ -35,7 +35,7 @@ class Docker::API::Config < Docker::API::Base
     #
     # @param name [String]: The ID or name of the config.
     def details name
-        @connection.get("/configs/#{name}")
+        @connection.get("/v#{Docker::API::API_VERSION}/configs/#{name}")
     end
 
     # Update a config
@@ -50,7 +50,7 @@ class Docker::API::Config < Docker::API::Base
     #
     # @param body [Hash]: Request body to be sent as json.
     def update name, params = {}, body = {}
-        @connection.request(method: :post, path: build_path("/configs/#{name}/update",params), headers: {"Content-Type": "application/json"}, body: body.to_json)
+        @connection.request(method: :post, path: build_path("/v#{Docker::API::API_VERSION}/configs/#{name}/update",params), headers: {"Content-Type": "application/json"}, body: body.to_json)
     end
 
     # Delete a config
@@ -61,6 +61,6 @@ class Docker::API::Config < Docker::API::Base
     #
     # @param name [String]: The ID or name of the config.
     def delete name
-        @connection.delete("/configs/#{name}")
+        @connection.delete("/v#{Docker::API::API_VERSION}/configs/#{name}")
     end
 end

data/lib/docker/api/connection.rb

@@ -11,7 +11,8 @@ class Docker::API::Connection
     # @param params [Hash]: Request parameters.
     def request params
         response = Docker::API::Response.new(@connection.request(params).data)
-        p response if Docker::API::PRINT_RESPONSE_TO_STDOUT 
+        response.request_params = params
+        p response if Docker::API.print_response_to_stdout 
         response
     end
     
@@ -20,9 +21,9 @@ class Docker::API::Connection
     #
     # @param url [String]: URL for the connection.
     # @param params [String]: Additional parameters.
-    def initialize url = nil, params = nil
-        return @connection = Excon.new('unix:///', {socket: '/var/run/docker.sock'}) unless url
-        @connection = Excon.new(url, params || {})
+    def initialize url = nil, params = {}
+        return @connection = Excon.new('unix:///', params.merge({socket: '/var/run/docker.sock'})) unless url
+        @connection = Excon.new(url, params)
     end
 
 end

data/lib/docker/api/container.rb

@@ -46,7 +46,7 @@ class Docker::API::Container < Docker::API::Base
     #
     # @param name [String]: The ID or name of the container.
     def changes name
-        @connection.get("/containers/#{name}/changes")
+        @connection.get(build_path("/containers/#{name}/changes"))
     end
 
     ##
@@ -118,7 +118,8 @@ class Docker::API::Container < Docker::API::Base
     # @param name [String]: The ID or name of the container.
     # @param body [Hash]: Request body to be sent as json.
     def update name, body = {}
-        @connection.request(method: :post, path: "/containers/#{name}/update", headers: {"Content-Type": "application/json"}, body: body.to_json)
+        
+        @connection.request(method: :post, path: build_path("/containers/#{name}/update"), headers: {"Content-Type": "application/json"}, body: body.to_json)
     end
 
     ##
@@ -164,7 +165,7 @@ class Docker::API::Container < Docker::API::Base
     #
     # @param name [String]: The ID or name of the container.
     def pause name
-        @connection.post("/containers/#{name}/pause")
+        @connection.post(build_path("/containers/#{name}/pause"))
     end
 
     ##
@@ -175,7 +176,7 @@ class Docker::API::Container < Docker::API::Base
     #
     # @param name [String]: The ID or name of the container.
     def unpause name
-        @connection.post("/containers/#{name}/unpause")
+        @connection.post(build_path("/containers/#{name}/unpause"))
     end
 
     ##

data/lib/docker/api/exec.rb

@@ -12,7 +12,7 @@ class Docker::API::Exec < Docker::API::Base
     # @param name [String]: The ID or name of the container.
     # @param body [Hash]: Request body to be sent as json.
     def create name, body = {}
-        @connection.request(method: :post, path: "/containers/#{name}/exec", headers: {"Content-Type": "application/json"}, body: body.to_json )
+        @connection.request(method: :post, path: build_path("/containers/#{name}/exec"), headers: {"Content-Type": "application/json"}, body: body.to_json )
     end
 
     ##
@@ -25,7 +25,7 @@ class Docker::API::Exec < Docker::API::Base
     # @param body [Hash]: Request body to be sent as json.
     # @param &block: Replace the default output to stdout behavior.
     def start name, body = {}, &block
-        @connection.request(method: :post, path: "/exec/#{name}/start", headers: {"Content-Type": "application/json"},  body: body.to_json, 
+        @connection.request(method: :post, path: build_path("/exec/#{name}/start"), headers: {"Content-Type": "application/json"},  body: body.to_json, 
             response_block: block_given? ? block : default_streamer )
     end
 
@@ -49,7 +49,7 @@ class Docker::API::Exec < Docker::API::Base
     #
     # @param name [String]: Exec instance ID.
     def details name
-        @connection.get("/exec/#{name}/json")
+        @connection.get(build_path("/exec/#{name}/json"))
     end
 
 end

data/lib/docker/api/image.rb

@@ -11,7 +11,7 @@ class Docker::API::Image < Docker::API::Base
     #
     # @param name [String]: The ID or name of the image.
     def details name
-        @connection.get("/images/#{name}/json")
+        @connection.get(build_path("/images/#{name}/json"))
     end
 
     ##
@@ -23,7 +23,7 @@ class Docker::API::Image < Docker::API::Base
     # @param name [String]: The ID or name of the image.
     # @param authentication [Hash]: Authentication parameters.
     def distribution name, authentication = {}
-        request = {method: :get, path: "/distribution/#{name}/json"}
+        request = {method: :get, path: build_path("/distribution/#{name}/json")}
         request[:headers] = {"X-Registry-Auth" => auth_encoder(authentication)} if authentication.any?
         @connection.request(request)
     end
@@ -36,7 +36,7 @@ class Docker::API::Image < Docker::API::Base
     #
     # @param name [String]: The ID or name of the image.
     def history name
-        @connection.get("/images/#{name}/history")
+        @connection.get(build_path("/images/#{name}/history"))
     end
 
     ##
@@ -133,7 +133,7 @@ class Docker::API::Image < Docker::API::Base
     # @param params [Hash]: Parameters that are appended to the URL.
     # @param authentication [Hash]: Authentication parameters.
     def push name, params = {}, authentication = {}
-        raise Docker::API::Error.new("Provide authentication parameters to push an image") unless authentication.any?
+        raise StandardError.new("Provide authentication parameters to push an image") unless authentication.any?
         @connection.request(method: :post, path: build_path("/images/#{name}/push", params), headers: { "X-Registry-Auth" => auth_encoder(authentication) } )
     end
 
@@ -146,7 +146,7 @@ class Docker::API::Image < Docker::API::Base
     # @param params [Hash]: Parameters that are appended to the URL.
     # @param body [Hash]: Request body to be sent as json.
     def commit params = {}, body = {}
-        container = Docker::API::Container.new.details(params[:container])
+        container = Docker::API::Container.new(@connection).details(params[:container])
         return container if [404, 301].include? container.status
         @connection.request(method: :post, path: build_path("/commit", params), headers: {"Content-Type": "application/json"}, body: container.json["Config"].merge(body).to_json)
     end
@@ -185,7 +185,7 @@ class Docker::API::Image < Docker::API::Base
     def build path, params = {}, authentication = {}, &block
         raise Docker::API::Error.new("Expected path or params[:remote]") unless path || params[:remote] 
 
-        headers = {"Content-type": "application/x-tar"}
+        headers = {"Content-type" => "application/x-tar"}
         headers.merge!({"X-Registry-Config": auth_encoder(authentication) }) if authentication.any?
 
         if path == nil and params.has_key? :remote

data/lib/docker/api/network.rb

@@ -34,7 +34,7 @@ class Docker::API::Network < Docker::API::Base
     #
     # @param body [Hash]: Request body to be sent as json.
     def create body = {}
-        @connection.request(method: :post, path: "/networks/create", headers: {"Content-Type": "application/json"}, body: body.to_json)
+        @connection.request(method: :post, path: build_path("/networks/create"), headers: {"Content-Type" => "application/json"}, body: body.to_json)
     end
 
     ##
@@ -45,7 +45,7 @@ class Docker::API::Network < Docker::API::Base
     #
     # @param name [String]: The ID or name of the network.
     def remove name
-        @connection.delete("/networks/#{name}")
+        @connection.delete(build_path("/networks/#{name}"))
     end
 
     ##
@@ -68,7 +68,7 @@ class Docker::API::Network < Docker::API::Base
     # @param name [String]: The ID or name of the network.
     # @param body [Hash]: Request body to be sent as json.
     def connect name, body = {}
-        @connection.request(method: :post, path: "/networks/#{name}/connect", headers: {"Content-Type": "application/json"}, body: body.to_json)
+        @connection.request(method: :post, path: build_path("/networks/#{name}/connect"), headers: {"Content-Type" => "application/json"}, body: body.to_json)
     end
 
     ##
@@ -80,7 +80,7 @@ class Docker::API::Network < Docker::API::Base
     # @param name [String]: The ID or name of the network.
     # @param body [Hash]: Request body to be sent as json.
     def disconnect name, body = {}
-        @connection.request(method: :post, path: "/networks/#{name}/disconnect", headers: {"Content-Type": "application/json"}, body: body.to_json)
+        @connection.request(method: :post, path: build_path("/networks/#{name}/disconnect"), headers: {"Content-Type" => "application/json"}, body: body.to_json)
     end
 
 end

data/lib/docker/api/node.rb

@@ -25,7 +25,7 @@ class Docker::API::Node < Docker::API::Base
     # @param params [Hash]: Parameters that are appended to the URL.
     # @param body [Hash]: Request body to be sent as json.
     def update name, params = {}, body = {}
-        @connection.request(method: :post, path: build_path("nodes/#{name}/update", params), headers: {"Content-Type": "application/json"}, body: body.to_json)
+        @connection.request(method: :post, path: build_path("/nodes/#{name}/update", params), headers: {"Content-Type" => "application/json"}, body: body.to_json)
     end
 
     ##
@@ -48,6 +48,6 @@ class Docker::API::Node < Docker::API::Base
     #
     # @param name [String]: The ID or name of the node.
     def details name
-        @connection.get("/nodes/#{name}")
+        @connection.get(build_path("/nodes/#{name}"))
     end
 end

data/lib/docker/api/plugin.rb

@@ -39,7 +39,7 @@ class Docker::API::Plugin < Docker::API::Base
     #
     # @param authentication [Hash]: Authentication parameters.
     def install params = {}, privileges = [], authentication = {}
-        headers = {"Content-Type": "application/json"}
+        headers = {"Content-Type" => "application/json"}
         headers.merge!({"X-Registry-Auth" => Base64.urlsafe_encode64(authentication.to_json.to_s)}) if authentication.keys.size > 0
         @connection.request(method: :post, path: build_path("/plugins/pull", params), headers: headers, body: privileges.to_json )
     end
@@ -52,7 +52,7 @@ class Docker::API::Plugin < Docker::API::Base
     #
     # @param name [String]: The ID or name of the plugin.
     def details name 
-        @connection.get("/plugins/#{name}/json")
+        @connection.get(build_path("/plugins/#{name}/json"))
     end
 
     # Remove a plugin
@@ -89,7 +89,7 @@ class Docker::API::Plugin < Docker::API::Base
     #
     # @param name [String]: The ID or name of the plugin.
     def disable name
-        @connection.post("/plugins/#{name}/disable")
+        @connection.post(build_path("/plugins/#{name}/disable"))
     end
 
     # Upgrade a plugin
@@ -106,7 +106,7 @@ class Docker::API::Plugin < Docker::API::Base
     #
     # @param authentication [Hash]: Authentication parameters.
     def upgrade name, params = {}, privileges = [], authentication = {}
-        headers = {"Content-Type": "application/json"}
+        headers = {"Content-Type" => "application/json"}
         headers.merge!({"X-Registry-Auth" => Base64.urlsafe_encode64(authentication.to_json.to_s)}) if authentication.keys.size > 0
         @connection.request(method: :post, path: build_path("/plugins/#{name}/upgrade", params), headers: headers, body: privileges.to_json )
     end
@@ -122,7 +122,7 @@ class Docker::API::Plugin < Docker::API::Base
     # @param path [String]: Path to tar file that contains rootfs folder and config.json file.
     def create name, path
         file = File.open( File.expand_path( path ) , "r")
-        response = @connection.request(method: :post, path: "/plugins/create?name=#{name}", body: file.read.to_s )
+        response = @connection.request(method: :post, path: build_path("/plugins/create?name=#{name}"), body: file.read.to_s )
         file.close        
         response
     end
@@ -138,9 +138,9 @@ class Docker::API::Plugin < Docker::API::Base
     # @param authentication [Hash]: Authentication parameters.
     def push name, authentication = {}
         if authentication.keys.size > 0
-            @connection.request(method: :post, path: "/plugins/#{name}/push", headers: {"X-Registry-Auth" => Base64.urlsafe_encode64(authentication.to_json.to_s)})
+            @connection.request(method: :post, path: build_path("/plugins/#{name}/push"), headers: {"X-Registry-Auth" => Base64.urlsafe_encode64(authentication.to_json.to_s)})
         else
-            @connection.post("/plugins/#{name}/push")
+            @connection.post(build_path("/plugins/#{name}/push"))
         end
     end
 
@@ -154,7 +154,7 @@ class Docker::API::Plugin < Docker::API::Base
     #
     # @param config [Array]: Plugin configuration to be sent as json in request body.
     def configure name, config
-        @connection.request(method: :post, path: "/plugins/#{name}/set", headers: {"Content-Type": "application/json"}, body:config.to_json)
+        @connection.request(method: :post, path: build_path("/plugins/#{name}/set"), headers: {"Content-Type" => "application/json"}, body:config.to_json)
     end
 
 end

data/lib/docker/api/response.rb

@@ -2,6 +2,7 @@
 # Reponse class.
 class Docker::API::Response < Excon::Response
     attr_reader(:json, :path)
+    attr_accessor(:request_params)
 
     ##
     # Initialize a new Response object.