matterhorn_whymper 1.0.6 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmE3YjA5Y2E5NjhkZDk4YWM5NTY0ZWE1MjFlOGUwZGUzMGZjMTg2Yw==
+    YWFhZWEwMGU0NzA2ZmNlMTJlNzA5Y2EyZmRiZWM4ZDY2MGEyODI3OA==
   data.tar.gz: !binary |-
-    ZDI3ZGU3YTI4NTYyOWYzNjUyZDAwZDhiODRiMDc3MWQ5NTQ5Mzg4Nw==
+    ZDcyYThhMzQwMzg5OGEyYTIwZTMxNDYzMjk5NzU1ZGI0ZmNmOWQ0Mw==
 SHA512:
   metadata.gz: !binary |-
-    M2UzODYxMGYzNDVmMWZkYzk1ODRkZGFjZWZlNTcyOTgxMzNhMzQ5YTBmNzVh
-    MDRjMTlmYjhhZjAxMmMzMjFiZTM0NDA3NTY5YmM4ZGU1MDIyM2Q5ODY5OTM0
-    NmFlZDE1N2M3MDc1YzM2MTMxZGQwZDY1YjRjNWY5YTFkMDM0YWE=
+    NGU0NThiMWRlNmU1NzNkZjI5NDY1MmY5ZTc3MGY3MDI2MzBhZjQ2NmNhYjQx
+    OTczMzMwYjZjZWJhNzRkMWMzNTk1YmNlMmY3NmEwNGM2ODkxNDIxMWE5NTVh
+    MjI3MGViYzgwYzIzYzRhM2RkOGE4MDA5MDRmZmUzN2U1NTk5MWY=
   data.tar.gz: !binary |-
-    MTk1OWE1NTRmZjYwNzUzYWE4MTA2Y2MzYTI5ZjcxMmRlNzQyMzMwZjg0Yzg5
-    MWVjNTIxMzUzMjgwMDYxYzRmY2FkNGI2Zjg0MjM5OWQ3NGZjNWMxOWUzNzAw
-    NDRkZTY0NWIxMTNlODhhZmY0N2I5N2Q5YWRlNGFhYzY4Zjk4N2Y=
+    MzgxMzhiM2JiNDg5ZWM5ZTAzYjVkZDdjOWQ1MGZmZGFiNmU3ZWMyODE0NzI1
+    MDU1NGNjYWU0MjI5NmY1NDI0ZTY3MTIxNDQ0ODVhMWVmYjM0ZGZjY2Y2N2M5
+    OGQwODE4NDYzMzhlMmU2Y2I1ZmY5YjJmMDU0MjMyZjU2YzE4ZDY=

data/lib/matterhorn/http_client.rb

@@ -16,22 +16,25 @@ module Matterhorn
   
     def initialize(protocol, domain, org_domain, user, password, auth_mode,
                    http_timeout = nil, ssl_dont_verify_cert = false, multi_tenant = true)
-      @sub_domain   = org_domain.to_s.split('.').first.to_s.strip
-      @uri          = URI.parse("#{protocol}://#{domain}")
+      @multi_tenant = multi_tenant
+      @uri = if @multi_tenant
+               URI.parse("#{protocol}://#{org_domain.gsub(/\./, '-')}.#{domain}")
+             else
+               URI.parse("#{protocol}://#{domain}")
+             end
       @uri.user     = user
       @uri.password = password 
       @auth_mode    = auth_mode
       @ssl          = @uri.port == 443 ? true : false
       @timeout      = http_timeout
       @ssl_dont_verify_cert = ssl_dont_verify_cert
-      @multi_tenant = multi_tenant
     end  
   
 
     # ---------------------------------------------------------------------------- http methodes ---
   
     def get(url)
-      request = Net::HTTP::Get.new(assemble_url(url))
+      request = Net::HTTP::Get.new(@uri.request_uri + url)
       execute_request(request)
     end
   
@@ -47,14 +50,14 @@ module Matterhorn
   
 
     def put(url, params = {})
-      request = Net::HTTP::Put.new(assemble_url(url))
+      request = Net::HTTP::Put.new(@uri.request_uri + url)
       request.set_form_data(params)
       execute_request(request)
     end
   
 
     def delete(url)
-      request = Net::HTTP::Delete.new(assemble_url(url))
+      request = Net::HTTP::Delete.new(@uri.request_uri + url)
       execute_request(request)
     end
   
@@ -80,17 +83,8 @@ module Matterhorn
     end
   
    
-    def assemble_url(url)
-      if @multi_tenant && !@sub_domain.empty?
-        @uri.request_uri + "#{@sub_domain}/" + url
-      else
-        @uri.request_uri + url
-      end
-    end
-  
-
     def singlepart_post(url, params)
-      request = Net::HTTP::Post.new(assemble_url(url))
+      request = Net::HTTP::Post.new(@uri.request_uri + url)
       request.set_form_data(params)
       request
     end
@@ -118,7 +112,7 @@ module Matterhorn
         mime_type = MIME::Types.type_for(File.basename(file.path)).first
       end
       params['BODY'] = UploadIO.new(file, mime_type, filename)
-      Net::HTTP::Post::Multipart.new(assemble_url(url), params)
+      Net::HTTP::Post::Multipart.new(@uri.request_uri + url, params)
     end
   
   

data/lib/matterhorn_whymper/version.rb

@@ -5,7 +5,7 @@ module MatterhornWhymper
 
   # -------------------------------------------------------------------------- const definitions ---
 
-  VERSION = "1.0.6"
+  VERSION = "1.1.0"
 
 
 end # -------------------------------------------------------------------- end MatterhornWhymper ---

data/spec/matterhorn.yml.sample

@@ -2,7 +2,7 @@ test:
   p1:
     endpoint:
       protocol:  https
-      domain:    cast-ng-test.switch.ch
+      domain:    admin.cast-test.switch.ch
       user:      <user>
       password:  <password>
       auth_mode: digest
@@ -11,7 +11,7 @@ test:
   p2:
     endpoint:
       protocol:  https
-      domain:    cast-ng-test.switch.ch
+      domain:    producer.cast-test.switch.ch
       user:      <user>
       password:  <password>
       auth_mode: digest
@@ -19,11 +19,10 @@ test:
       multi_tenant:         true
     api:
       protocol:  https
-      domain:    cast-ng-test.switch.ch
+      domain:    api-ng.cast-test.switch.ch
       user:      <user>
       password:  <password>
       auth_mode: basic
       ssl_dont_verify_cert: true
       multi_tenant:         true
   default: p2
-

data/spec/remote/matterhorn/endpoint/ingest_spec.rb

@@ -6,7 +6,7 @@ if endpoint_configured?
     include Support::RemoteHelpers
 
     it "creates a mediapackage" do
-      Matterhorn::Endpoint.open(:ingest) do |ingest_endpoint|
+      Matterhorn::Endpoint.open(:ingest, nil, :p1) do |ingest_endpoint|
         ingest_endpoint.createMediaPackage()
         mp_local = ingest_endpoint.media_package
         mp_remote = ingest_endpoint.media_package('remote')

data/spec/unit/matterhorn/endpoint/series_spec.rb

@@ -4,7 +4,7 @@ require 'tempfile'
 describe Matterhorn::Endpoint::Series do
   before do
     @series = Matterhorn::Endpoint::create(:series, 'enil.ch')
-    stub_request(:head, %r{}).to_return(status: 200, body: '', headers: { 'WWW-Authenticate' => 'Basic realm="Matterhorn"' })
+    stub_request(:head, %r()).to_return(status: 200, body: '', headers: { 'WWW-Authenticate' => 'Basic realm="Matterhorn"' })
   end
 
   after do
@@ -14,7 +14,7 @@ describe Matterhorn::Endpoint::Series do
   
   it "reads a Dublin Core document for a series" do
     series_id = SecureRandom.uuid
-    stub_request(:get, %r(/enil/series/#{series_id}.xml)).to_return(status: 200, body: file_fixture_contents('series_dublin_core.xml'))
+    stub_request(:get, %r(https://enil-ch.producer.cast-test.switch.ch/series/#{series_id}.xml)).to_return(status: 200, body: file_fixture_contents('series_dublin_core.xml'))
 
     dublin_core = @series.read(series_id)
     expect(dublin_core.dcterms_title).to eq('Space is Awesome')
@@ -22,7 +22,7 @@ describe Matterhorn::Endpoint::Series do
 
   it "returns an error when reading a Dublin Core document for a non-existent series" do
     series_id = SecureRandom.uuid
-    stub_request(:get, %r(/enil/series/#{series_id}.xml)).to_return(status: 404, body: '')
+    stub_request(:get, %r(https://enil-ch.producer.cast-test.switch.ch/series/#{series_id}.xml)).to_return(status: 404, body: '')
 
     dublin_core = @series.read(series_id)
     expect(dublin_core).to be_nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matterhorn_whymper
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Daniel Fritschi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post