occi-api 4.3.1 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60f141c28fb0f5f43599d5d6787fa671a498cc27
-  data.tar.gz: c96268b68de1c1eee4efce68c168089d846d6d11
+  metadata.gz: 04565e23e7e47439f4b835dbdf574dd2a8fb9745
+  data.tar.gz: 377f670ffdae197276a7ea3feb1894bfad184868
 SHA512:
-  metadata.gz: 229b33eff53318cd8814d35ab47451142d8a24b530b59f65053fad6293d19045a92aa6b2d3eaaa668ed2f0c0aaa323baf2fc45630675a63709e56c3ba2e45eaa
-  data.tar.gz: 7b6a872941e7b101609f9adedc5c6d5dc7d9c8cddf8d9b3a9424bbce5c37da7e62dc88d424b9988c719a962ba2693da55ab6ecdb57168c0d642410cfe581707c
+  metadata.gz: 8d1ec06ab28e2583f83a1ab6e3ec481ada11473970475fed1cd96f9968849f5d5c65ef725962e1db9d38e8617b5cfa5ca7901c498334782ff243afb9983ed9e9
+  data.tar.gz: 6d13444e919da595cd14731ea04303525849c95cf7e9d5f95e0a80d2a274b5d7455344b92435be3d6cf77d9569c68b0e0cd94de27228abade63d3530f0d2431e

data/lib/occi/api/client/base/protected_helpers.rb

@@ -38,6 +38,7 @@ module Occi::Api::Client
         # normalize URIs, remove trailing slashes
         endpoint = URI(endpoint)
         endpoint.path = endpoint.path.gsub(/\/+/, '/').chomp('/')
+        endpoint.query = nil
 
         endpoint
       end
@@ -76,4 +77,4 @@ module Occi::Api::Client
     end
 
   end
-end
+end

data/lib/occi/api/client/client_http.rb

@@ -47,11 +47,13 @@ module Occi::Api::Client
 
       # set a global base URI for all subsequent requests
       # must be done after authN calls
-      self.class.base_uri @endpoint.to_s
+      endpoint_base_uri = "#{@endpoint.scheme}://#{@endpoint.host}"
+      endpoint_base_uri << ":#{@endpoint.port}" unless @endpoint.port == @endpoint.default_port
+      self.class.base_uri endpoint_base_uri
 
       # get model information from the endpoint
       # and create Occi::Model instance
-      model_collection = get('/-/')
+      model_collection = get("#{@endpoint.path}/-/")
       @model = get_model(model_collection)
 
       # auto-connect?

data/lib/occi/api/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Api
-    VERSION = "4.3.1" unless defined?(::Occi::Api::VERSION)
+    VERSION = "4.3.2" unless defined?(::Occi::Api::VERSION)
   end
 end

data/spec/occi/api/client/client_http_spec.rb

@@ -9,6 +9,11 @@ module Occi
     vcr_options = { :record => :none }
     describe ClientHttp, :vcr => vcr_options do
 
+      context "endpoint handling" do
+        it "removes query string from endpoint"
+        it "correctly handles endpoint with path"
+      end
+
       context "using media type text/plain" do
 
         before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-api
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.3.2
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-core
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: OCCI development library providing a high-level client API