matterhorn_whymper 0.6.1 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YThhYTkwNmIxYTc2ZjExOWI3YWE0NDA2OGNhNWE0ZTRjOWEzNjUzZA==
+    Zjk0MThiN2Q1MzMyZjExNGMzZWM1ZjIxZGI1ZDY3NTEwMGRmNTk0MQ==
   data.tar.gz: !binary |-
-    ZjkwYWE0OGY5YWUwOGJlOWM0NjUwZWY2MmI2YTgyNmRjZTdjYjY0Yw==
+    NDVhNjlhNWQwYWZjMGI1MzdlZDUxYjcxMWY0ZWM3OGU1Mzg2ZDkwZA==
 SHA512:
   metadata.gz: !binary |-
-    NGM4ZGVmZDQ3NzRhMjAyZDk4ZjMwMDlhM2QxMTc2YTdiODA0ZGE1OTZmYjk1
-    MDg1NmFiZGI0YjRiYTZhZDMwNmVjNjliZmUzYTZmMjZjZDRiOTQyMzVkMzVh
-    MGViZWZjNzZiMzE4ZDBjOWZkYThiYjlkYWFjYWRmNjdjMDAzNTc=
+    NjM3ZmQ5OTEwODQ1ZDI4Yjg5NGMyYzc0NzM0ZDFlNjk0MmMwYjA3MmI1YzNk
+    NzM1NTIxNmU4NjU4MmY4YTBiZGVhMWRmYjdjMzM5YTMwZDI5MWFhZTk1ODMz
+    Y2ExNjlmNGUzODhkMzNkYTA5OTBiYWFjOTcwMDE2MTMxYzE2Yzg=
   data.tar.gz: !binary |-
-    NGQ0MDYxOTViOTNkNDZmY2Y1ZTljYWYyMzhkZjIzZjAwOGQxM2YzOWQ1ZWE0
-    Njk1YmNmNTQzNjI3YzUwYzE4OWU0MjM5NGM2ZmRhMTU0NzFiOWFmZTFhZjE1
-    ODc0NWRkZGQ5YWU4Y2QyOWI2OGFjNDFlZjVhODc2Nzk0YjZlMDc=
+    MTcxMzY1NjcyYzMwYzAyMTU5MzRiNWYzYjE4YjZhYjJlMjI0MDgwMDM1NGU0
+    MjI1M2E1YmIwZDVmNjA0YmY0NGQxYjdiMTM5ZjllYWNkN2E1NDkxNTJiNTQ4
+    YjVjZjhhOGRlNzcyNzA4MzMxZGEzNTI3YTk5NTkxNGRkNTFkZTg=

data/lib/matterhorn/dublin_core.rb

@@ -72,6 +72,11 @@ class Matterhorn::DublinCore
   end
 
   
+  def each_dcterms_element(&block)
+    each_element('dcterms', &block)
+  end
+
+
   def save(file)
     File.open(file, 'w') do |file|
       file.write(@document.to_xml)
@@ -166,6 +171,13 @@ class Matterhorn::DublinCore
     end
     elem.content
   end
+ 
 
+  def each_element(ns, &block) 
+    @document.xpath("/xmlns:dublincore/#{ns}:*").each do |elem|
+      yield elem.name, elem.content
+    end
+  end
   
+
 end # --------------------------------------------------------------- end Matterhorn::DublinCore ---

data/lib/matterhorn/endpoint/event.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 # ================================================================== Matterhorn::Endpoint::Event ===
 
 # This endpoint is not a pure wrapper of the admin endpoint.
@@ -15,27 +17,89 @@ class Matterhorn::Endpoint::Event < Matterhorn::Endpoint
   # --------------------------------------------------------------------------------------- read ---
 
   def read_media_package(media_package_id)
-    media_package_xml = nil
+    media_package = nil
     begin
-      split_response http_client.get(
+      split_response http_endpoint_client.get(
         "archive/archive/mediapackage/#{media_package_id}"
       )
-      media_package_xml = response_body
+      media_package = Matterhorn::MediaPackage.new(response_body)
     rescue => ex
       exception_handler('read_media_package', ex, {
           404 => "The media package of event[#{media_package_id}] could not be found."
         }
       )
     end
-    media_package_xml
+    media_package
+  end
+
+
+  def read_dublin_core(media_package_id)
+    dublin_core = nil
+    begin
+      mp = read_media_package(media_package_id)
+      if !mp.nil?
+        dc_uri = URI.parse(mp.dc_catalog_url)
+        split_response http_endpoint_client.get(dc_uri.request_uri)
+        dublin_core = Matterhorn::DublinCore.new(response_body)
+      end
+    rescue => ex
+      exception_handler('read_dublin_core', ex, {
+          404 => "The media package of event[#{media_package_id}] could not be found."
+        }
+      )
+    end
+    dublin_core
   end
 
 
   # ------------------------------------------------------------------------------------- update ---
 
+  def changeable_element?(element_name)
+    ['title', 'subject', 'description', 'language', 'license',
+     'contributer', 'source'].include?(element_name)
+  end 
+
+
+  def update_dublin_core(media_package_id, dublin_core)
+    updated = false
+    begin
+      dc_field_arr = []
+      dublin_core.each_dcterms_element do |name, content|
+        if changeable_element?(name) && !content.blank?
+          dc_field_arr << {
+            'id'    => name,
+            'value' => content
+          }
+        end
+      end
+      split_response http_api_client.put(
+        "api/events/#{media_package_id}/metadata?type=dublincore/episode",
+        { 'metadata' => dc_field_arr.to_json }
+      )
+      updated = true
+    rescue => ex
+      exception_handler('update_dublin_core', ex, {
+          400 => "The request is invaldi or inconsistent.",
+          404 => "The media package of event[#{media_package_id}] could not be found."
+        }
+      )
+    end
+    updated
+  end
+
 
   # ------------------------------------------------------------------------------------- delete ---
 
+  def delete(media_package_id)
+    begin
+      split_response http_endpoint_client.delete(
+        "archive/delete/#{media_package_id}"
+      )
+    rescue => ex
+      exception_handler('delete', ex, {})
+    end
+  end
+
 
   # ---------------------------------------------------------------------------- private section ---
   private

data/lib/matterhorn/endpoint/ingest.rb

@@ -9,7 +9,7 @@ class Matterhorn::Endpoint::Ingest < Matterhorn::Endpoint
     unless @media_pkg_xml_remote then raise(Matterhorn::Error, "No media package is available!"); end
     @media_pkg_local.add_attachment(file, flavor)    if @media_pkg_local
     begin
-      spit_response http_client.post(
+      spit_response http_endpoint_client.post(
         "ingest/addAttachment",
         { 'flavor' => flavor,
           'mediaPackage' => @media_pkg_xml_remote,
@@ -32,7 +32,7 @@ class Matterhorn::Endpoint::Ingest < Matterhorn::Endpoint
     unless @media_pkg_xml_remote then raise(Matterhorn::Error, "No media package is available!"); end
     @media_pkg_local.add_catalog(file, flavor)    if @media_pkg_local
     begin
-      split_response http_client.post(
+      split_response http_endpoint_client.post(
         "ingest/addCatalog",
         { 'flavor' => flavor,
           'mediaPackage' => @media_pkg_xml_remote,
@@ -55,7 +55,7 @@ class Matterhorn::Endpoint::Ingest < Matterhorn::Endpoint
     unless @media_pkg_xml_remote then raise(Matterhorn::Error, "No media package is available!"); end
     @media_pkg_local.add_dc_catalog(dublin_core)    if @media_pkg_local
     begin
-      split_response http_client.post(
+      split_response http_endpoint_client.post(
         "ingest/addDCCatalog",
         { 'flavor' => 'dublincore/episode',
           'mediaPackage' => @media_pkg_xml_remote,
@@ -80,7 +80,7 @@ class Matterhorn::Endpoint::Ingest < Matterhorn::Endpoint
     @media_pkg_local.add_track(file_or_url, flavor) if @media_pkg_local
     begin
       if HTTP_PROTOCOL_RE =~ file_or_url
-        split_response http_client.post(
+        split_response http_endpoint_client.post(
           "ingest/addTrack",
           { 'flavor' => flavor,
             'mediaPackage' => @media_pkg_xml_remote,
@@ -88,7 +88,7 @@ class Matterhorn::Endpoint::Ingest < Matterhorn::Endpoint
           }
         )
       else
-        split_response http_client.post(
+        split_response http_endpoint_client.post(
           "ingest/addTrack",
           { 'flavor' => flavor,
             'mediaPackage' => @media_pkg_xml_remote,
@@ -120,7 +120,7 @@ class Matterhorn::Endpoint::Ingest < Matterhorn::Endpoint
                          nil
                        end
     begin
-      split_response http_client.get(
+      split_response http_endpoint_client.get(
         "ingest/createMediaPackage"
       )
       @media_pkg_xml_remote = response_body
@@ -137,7 +137,7 @@ class Matterhorn::Endpoint::Ingest < Matterhorn::Endpoint
     @media_pkg_local.save    if @media_pkg_local
     options['mediaPackage'] = @media_pkg_xml_remote
     begin
-      split_response http_client.post(
+      split_response http_endpoint_client.post(
         "ingest/ingest/#{wdID}",
         options
       )

data/lib/matterhorn/endpoint/series.rb

@@ -17,7 +17,7 @@ class Matterhorn::Endpoint::Series < Matterhorn::Endpoint
   def create(dublin_core, acl = nil)
     dc = nil
     begin
-      split_response http_client.post(
+      split_response http_endpoint_client.post(
         "series",
         { 'series' => dublin_core.to_xml, 'acl' => acl ? acl.to_xml : '' }
       )
@@ -39,7 +39,7 @@ class Matterhorn::Endpoint::Series < Matterhorn::Endpoint
   def read(series_id)
     dc_model = nil
     begin
-      split_response http_client.get(
+      split_response http_endpoint_client.get(
         "series/#{series_id}.xml"
       )
       dc_model = Matterhorn::DublinCore.new(response_body)
@@ -59,7 +59,7 @@ class Matterhorn::Endpoint::Series < Matterhorn::Endpoint
   def read_acl(series_id)
     acl_model = nil
     begin
-      split_response http_client.get(
+      split_response http_endpoint_client.get(
         "series/#{series_id}/acl.xml"
       )
       acl_model = Matterhorn::Acl.new(response_body)
@@ -76,7 +76,7 @@ class Matterhorn::Endpoint::Series < Matterhorn::Endpoint
   def find(options)
     dc_models = []
     begin
-      split_response http_client.get(
+      split_response http_endpoint_client.get(
         "series/series.xml#{build_query_str(options)}"
       )
       Nokogiri::XML(response_body).
@@ -97,7 +97,7 @@ class Matterhorn::Endpoint::Series < Matterhorn::Endpoint
   def count
     count = 0
     begin
-      split_response http_client.get(
+      split_response http_endpoint_client.get(
         "series/count"
       )
       count = response_body.to_i
@@ -132,7 +132,7 @@ class Matterhorn::Endpoint::Series < Matterhorn::Endpoint
   def update_acl(series_id, acl)
     acl_updated = false
     begin
-      split_response http_client.post(
+      split_response http_endpoint_client.post(
         "series/#{series_id}/accesscontrol", { 'acl' => acl.to_xml }
       )
       acl_updated = true
@@ -154,7 +154,7 @@ class Matterhorn::Endpoint::Series < Matterhorn::Endpoint
   def delete(series_id)
     deleted = false
     begin
-      split_response http_client.delete(
+      split_response http_endpoint_client.delete(
         "series/#{series_id}"
       )
       deleted = true

data/lib/matterhorn/endpoint/workflow.rb

@@ -8,7 +8,7 @@ class Matterhorn::Endpoint::Workflow < Matterhorn::Endpoint
   def instance(wi_id)
     wi = nil
     begin
-      split_response http_client.get(
+      split_response http_endpoint_client.get(
         "workflow/instance/#{wi_id}.xml"
       )
       wi = response_body
@@ -25,7 +25,7 @@ class Matterhorn::Endpoint::Workflow < Matterhorn::Endpoint
   def remove(wi_id)
     wi_removed = false
     begin
-      split_response http_client.delete(
+      split_response http_endpoint_client.delete(
         "workflow/remove/#{wi_id}"
       )
       wi_removed = true
@@ -42,7 +42,7 @@ class Matterhorn::Endpoint::Workflow < Matterhorn::Endpoint
   def resume(wi_id)
     wi = nil
     begin
-      split_response http_client.post(
+      split_response http_endpoint_client.post(
         "workflow/resume",
         { 'id' => wi_id }
       )
@@ -61,7 +61,7 @@ class Matterhorn::Endpoint::Workflow < Matterhorn::Endpoint
   def stop(wi_id)
     wi = nil
     begin
-      split_response http_client.post(
+      split_response http_endpoint_client.post(
         "workflow/stop",
         { 'id' => wi_id }
       )

data/lib/matterhorn/endpoint.rb

@@ -9,14 +9,15 @@ class Matterhorn::Endpoint
 
   # ----------------------------------------------------------------------------- initialization ---
 
-  def self.create(endpoint)
+  def self.create(endpoint, org_domain = '', mh_instance = :default)
     if endpoint.respond_to? 'to_s'
       endpoint = endpoint.to_s.capitalize
     else
       raise(Matterhorn::Error, "Matterhorn::Endpoint::open | " +
                                "#{endpoint.inspect} does not respond to 'to_s'")
     end
-    endpoint = Object.const_get('Matterhorn').const_get('Endpoint').const_get(endpoint).new
+    endpoint = Object.const_get('Matterhorn').const_get('Endpoint').
+                      const_get(endpoint).new(org_domain, mh_instance)
     if endpoint.nil? || !endpoint.kind_of?(Matterhorn::Endpoint)
       raise(Matterhorn::Error, "Matterhorn::Endpoint::open | " +
                                "#{endpoint ? endpoint.class.name : 'nil'} is not a sub class " +
@@ -26,8 +27,8 @@ class Matterhorn::Endpoint
   end
 
 
-  def self.open(endpoint)
-    endpoint = create(endpoint)
+  def self.open(endpoint, org_domain = '', mh_instance = :default)
+    endpoint = create(endpoint, mh_instance)
     begin
       yield endpoint
     ensure
@@ -36,12 +37,33 @@ class Matterhorn::Endpoint
   end  
 
 
-  def initialize
-    @http_client = Matterhorn::HttpClient.new(
-      MatterhornWhymper.configuration.uri,
-      MatterhornWhymper.configuration.http_timeout,
-      MatterhornWhymper.configuration.ssl_dont_verify_cert
+  def initialize(org_domain = '', mh_instance = :default)
+    @http_endpoint_client = Matterhorn::HttpClient.new(
+      MatterhornWhymper.configuration.endpoint(mh_instance)[:protocol],
+      MatterhornWhymper.configuration.endpoint(mh_instance)[:domain],
+      org_domain,
+      MatterhornWhymper.configuration.endpoint(mh_instance)[:user],
+      MatterhornWhymper.configuration.endpoint(mh_instance)[:password],
+      MatterhornWhymper.configuration.endpoint(mh_instance)[:auth_mode],
+      MatterhornWhymper.configuration.endpoint(mh_instance)[:http_timeout],
+      MatterhornWhymper.configuration.endpoint(mh_instance)[:ssl_dont_verify_cert],
+      MatterhornWhymper.configuration.endpoint(mh_instance)[:multi_tenand] 
     )
+    @http_api_client = if !MatterhornWhymper.configuration.api(mh_instance).nil?
+      Matterhorn::HttpClient.new(
+        MatterhornWhymper.configuration.api(mh_instance)[:protocol],
+        MatterhornWhymper.configuration.api(mh_instance)[:domain],
+        org_domain,
+        MatterhornWhymper.configuration.api(mh_instance)[:user],
+        MatterhornWhymper.configuration.api(mh_instance)[:password],
+        MatterhornWhymper.configuration.api(mh_instance)[:auth_mode],
+        MatterhornWhymper.configuration.api(mh_instance)[:http_timeout],
+        MatterhornWhymper.configuration.api(mh_instance)[:ssl_dont_verify_cert],
+        MatterhornWhymper.configuration.api(mh_instance)[:multi_tenand] 
+      )
+    else
+      nil
+    end
     @response_code = 200
     @response_body = nil
     @error_msg = ''
@@ -66,15 +88,21 @@ class Matterhorn::Endpoint
 
 
   def close
-    http_client.close
+    http_endpoint_client.close
+    http_api_client.close
   end
 
 
   # ---------------------------------------------------------------------- *** protected section ***
   protected
   
-  def http_client
-    @http_client
+  def http_endpoint_client
+    @http_endpoint_client
+  end
+
+
+  def http_api_client
+    @http_api_client
   end
 
 

data/lib/matterhorn/http_client.rb

@@ -2,6 +2,7 @@ require 'net/http/post/multipart'
 require 'net/http/digest_auth'
 require 'mime/types'
 
+
 # =================================================================================== Matterhorn ===
 
 module Matterhorn
@@ -11,27 +12,26 @@ module Matterhorn
 
   class HttpClient
     
-    # ------------------------------------------------------------------------------- attributes ---
-  
-    attr_reader :base_uri, :host, :port, :ssl, :ssl_dont_verify_cert, :timeout
-  
-
     # --------------------------------------------------------------------------- initialization ---
   
-    def initialize(base_uri, http_timeout = nil, ssl_dont_verify_cert = false)
-      @base_uri  = URI.parse(base_uri)
-      @host      = @base_uri.host
-      @port      = @base_uri.port
-      @ssl       = @port == 443 ? true : false
-      @timeout   = http_timeout
+    def initialize(protocol, domain, org_domain, user, password, auth_mode,
+                   http_timeout = nil, ssl_dont_verify_cert = false, multi_tenand = true)
+      @sub_domain   = org_domain.split('.').first
+      @uri          = URI.parse("#{protocol}://#{domain}")
+      @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_tenand = multi_tenand
     end  
   
 
     # ---------------------------------------------------------------------------- http methodes ---
   
     def get(url)
-      request = Net::HTTP::Get.new(base_uri.request_uri + url)
+      request = Net::HTTP::Get.new(assemble_url(url))
       execute_request(request)
     end
   
@@ -45,9 +45,16 @@ module Matterhorn
       execute_request(request)
     end
   
+
+    def put(url, params = {})
+      request = Net::HTTP::Put.new(assemble_url(url))
+      request.set_form_data(params)
+      execute_request(request)
+    end
   
+
     def delete(url)
-      request = Net::HTTP::Delete.new(base_uri.request_uri + url)
+      request = Net::HTTP::Delete.new(assemble_url(url))
       execute_request(request)
     end
   
@@ -62,19 +69,28 @@ module Matterhorn
   
     def http_socket
       return @http_socket   if !@http_socket.nil? && @http_socket.started?
-      @http_socket = Net::HTTP.new(host, port)
-      @http_socket.use_ssl = ssl
-      @http_socket.verify_mode = OpenSSL::SSL::VERIFY_NONE    if ssl && ssl_dont_verify_cert
-      if !timeout.nil?
-        @http_socket.open_timeout = timeout
-        @http_socket.read_timeout = timeout
+      @http_socket = Net::HTTP.new(@uri.host, @uri.port)
+      @http_socket.use_ssl = @ssl
+      @http_socket.verify_mode = OpenSSL::SSL::VERIFY_NONE    if @ssl && @ssl_dont_verify_cert
+      if !@timeout.nil?
+        @http_socket.open_timeout = @timeout
+        @http_socket.read_timeout = @timeout
       end
       @http_socket.start
     end
   
+   
+    def assemble_url(url)
+      if @multi_tenand && !@sub_domain.blank?
+        @uri.request_uri + "#{@sub_domain}/" + url
+      else
+        @uri.request_uri + url
+      end
+    end
   
+
     def singlepart_post(url, params)
-      request = Net::HTTP::Post.new(base_uri.request_uri + url)
+      request = Net::HTTP::Post.new(assemble_url(url))
       request.set_form_data(params)
       request
     end
@@ -102,18 +118,23 @@ 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(base_uri.request_uri + url, params)
+      Net::HTTP::Post::Multipart.new(assemble_url(url), params)
     end
   
   
     def execute_request(request)
-      head = Net::HTTP::Head.new(request.path)
-      head['X-REQUESTED-AUTH'] = 'Digest'
-      head['X-Opencast-Matterhorn-Authorization'] = 'true'
-      digest_result = http_socket.request(head)
-      digest_auth = Net::HTTP::DigestAuth.new
-      auth = digest_auth.auth_header(base_uri, digest_result['www-authenticate'], request.method)
-      request.add_field('Authorization', auth)
+      case @auth_mode
+      when 'basic'
+        request.basic_auth(@uri.user, @uri.password)
+      when 'digest'
+        head = Net::HTTP::Head.new(@uri.request_uri + request.path)
+        head['X-REQUESTED-AUTH'] = 'Digest'
+        head['X-Opencast-Matterhorn-Authorization'] = 'true'
+        digest_result = http_socket.request(head)
+        digest_auth = Net::HTTP::DigestAuth.new
+        auth = digest_auth.auth_header(@uri, digest_result['www-authenticate'], request.method)
+        request.add_field('Authorization', auth)
+      end
       response = http_socket.request(request)
       case response.code.to_i
       when 200..299

data/lib/matterhorn/media_package.rb

@@ -98,6 +98,17 @@ class Matterhorn::MediaPackage
   end
 
 
+  def dc_catalog_url
+    url_elem = @document.at_xpath('//xmlns:catalog[@type="dublincore/episode"]/xmlns:url',
+                                  {'xmlns' => XML_NS_MEDIAPACKAGE})
+    if url_elem
+      url_elem.content
+    else
+      nil
+    end
+  end
+
+
   # <media>
   #   <track type="presenter/source+partial">
   #     <tags/>
@@ -115,6 +126,17 @@ class Matterhorn::MediaPackage
   end
 
 
+  def track_url(flavor)
+    url_elem = @document.at_xpath("//xmlns:track[contains(@type, \"#{flavor}\")]/xmlns:url",
+                                  {'xmlns' => Matterhorn::MediaPackage::XML_NS_MEDIAPACKAGE})
+    if url_elem
+      url_elem.content
+    else
+      nil
+    end
+  end
+
+
   # Returns the id attribute of mediapackage element.
   # <mediapackage xmlns="http://mediapackage.opencastproject.org" id="1" duration="2704016" start="2014-04-23T12:35:00Z">
   #

data/lib/matterhorn_whymper/version.rb

@@ -5,7 +5,7 @@ module MatterhornWhymper
 
   # -------------------------------------------------------------------------- const definitions ---
 
-  VERSION = "0.6.1"
+  VERSION = "1.0.0"
 
 
 end # -------------------------------------------------------------------- end MatterhornWhymper ---

data/lib/matterhorn_whymper.rb

@@ -46,7 +46,6 @@ module MatterhornWhymper
       require 'logger'
       self.logger = Logger.new(STDOUT)
     end
-    self.configuration.http_timeout = nil
     yield(configuration)    if block_given?
   end
  
@@ -56,16 +55,62 @@ module MatterhornWhymper
 
   class Configuration
 
-    # ------------------------------------------------------------------------------- attributes --- 
+    # --------------------------------------------------------------------------------- methodes ---
 
-    attr_accessor :system_account_user, :system_account_password, :system_domain, :system_protocol,
-                  :http_timeout, :ssl_dont_verify_cert
+    def initialize
+      @mhw_config = {}
+    end
 
+    def add_matterhorn_instance(name = 'default')
+      @mhw_config[name.to_sym] = {}
+    end
 
-    # --------------------------------------------------------------------------------- methodes ---
+    def add_endpoint(options, mh_i = 'default')
+      @mhw_config[mh_i.to_sym][:endpoint] = validate_options(options)
+    end
+
+    def add_api(options, mh_i = 'default')
+      @mhw_config[mh_i.to_sym][:api] = validate_options(options)
+    end
+
+    def set_default_matterhorn_instance(mh_i)
+      unless @mhw_config[mh_i.to_sym].nil?
+        @mhw_config[:default] = @mhw_config[mh_i.to_sym]
+      end
+    end
+    
+
+    def endpoint(mh_i = :default)
+      @mhw_config[mh_i][:endpoint]
+    end
+
+    def api(mh_i = :default)
+      @mhw_config[mh_i][:api]
+    end
 
-    def uri
-      "#{system_protocol}://#{system_account_user}:#{system_account_password}@#{system_domain}"
+    
+    # -------------------------------------------------------------------------- private section ---
+    private
+
+    def validate_options(opt)
+      valid_keys = [:protocol, :domain, :user, :password, :auth_mode,
+                    :http_timeout, :ssl_dont_verify_cert, :multi_tenand]
+      options = {
+        :protocol  => 'http',
+        :domain    => 'example.org',
+        :user      => 'admin',
+        :password  => '',
+        :auth_mode => 'basic',
+        :http_timeout         => nil,
+        :ssl_dont_verify_cert => false,
+        :multi_tenand => true
+      }
+      opt.each do |key, value|
+        if valid_keys.include? key.to_sym
+          options[key.to_sym] = value
+        end
+      end
+      options
     end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matterhorn_whymper
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Daniel Fritschi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post