matterhorn_whymper 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGRjZTNkNjYwM2M0OGJlMGJiZGJjMTBiYTk3YjIwNmNmMTlkMjViMg==
+    M2I1YmJhN2YxZWYzZjE3ZDE0NzdkYjNmZGE4ZDY3NTdhODczY2Y4MA==
   data.tar.gz: !binary |-
-    MzQ4MTkwNGMyNDQyZmVmZDJlODJjYWUwNjJiNDY5MDAwOGY0ZjI0Mg==
+    N2Y5NTM0NTkwMWUyYzI4NDgwODZlMjkyZTRkNDcxM2FkNDk0NmE3YQ==
 SHA512:
   metadata.gz: !binary |-
-    NWU4MmJjN2MyYzg0NzZjNDU1NTQ0YTA3NDJjZjQ5OGNhNDdjYTY3OTA2OWU0
-    ZTlmMzZlZTlhNGEyNGEyNGUzOWZmNDI4YmE0MDdiODA1ZGJkNWVmMDMzZjQ1
-    NWEyYTBkNzE4MTY3ZDgxNjViNmFiYWM2ZGYyM2Y3YTEzYmJlOTc=
+    MzA5MmI5NDI5MWMxOGIyZjRkYjkwYmQxZWZhNzAyZGNiY2M2MTdkYzRkNjg1
+    NWE5ODg4ZTUwODVmYzJiOTNmZTUzNzZkMzQ1OTQ2Nzg3NzZiMmY0NzRmNmE0
+    OWE3NTk4MTIwNjY4ZTk3NjM5Yzc0Zjc2MWQzODAwMTI3MWUyNzk=
   data.tar.gz: !binary |-
-    ZmU1M2RkODAzMDVkYWM2ZjhmZmI4OWQ3N2IwYTM1MGJmOTRmYzZkNDk2MDg5
-    NWI3MDlkYjQxYjlmMDViMjU1N2I2YTgwYjNmNTFhNWRlMzZjOWJiN2ZlMGM5
-    MTJjYzA0ZDdhODZkYWYyMDRjZWFlMDMyODEyNmVlMDdhZjA0ZDE=
+    YjE3MzU2OGM1ODA0ZmM1MzJjNDQyYjJlZGY2ZTUzOWU3NWRmMDcwNmI2ZWM3
+    OGM0ZWQzOWI3NzFjNjY2OWEyOWNlMWUwMTVkNjE4MTkwZTAzMzY2Y2U0YjM0
+    NDcxM2ZkYzY2MDIwODFjOGI1ZWIwMjYyNzA5MzUzOTA4Yzc4NGQ=

data/lib/matterhorn/dublin_core.rb

@@ -142,16 +142,16 @@ class Matterhorn::DublinCore
   def get_value(ns, key)
     elem = @document.xpath("/xmlns:dublincore/#{ns}:#{key}").first
     return nil    if elem.nil?
-    elem.content
+    elem.content.to_s.strip
   end
 
 
   def set_value(ns, key, value)
     if !(elem = @document.at_xpath("/xmlns:dublincore/#{ns}:#{key}")).nil?
-      elem.content = value
+      elem.content = value.to_s.strip
     else
       elem = Nokogiri::XML::Element.new(key, @document)
-      elem.content = value
+      elem.content = value.to_s.strip
       elem.namespace = get_ns(ns)    unless ns.nil?
       @document.root << elem
     end
@@ -162,7 +162,7 @@ class Matterhorn::DublinCore
   def add_value(ns, key, value)
     sibling = @document.xpath("/xmlns:dublincore/#{ns}:#{key}").last
     elem = Nokogiri::XML::Element.new(key, @document)
-    elem.content = value
+    elem.content = value.to_s.strip
     elem.namespace = get_ns(ns)    unless ns.nil?
     if !sibling.nil?
       sibling.after(elem)
@@ -175,7 +175,7 @@ class Matterhorn::DublinCore
 
   def each_element(ns, &block) 
     @document.xpath("/xmlns:dublincore/#{ns}:*").each do |elem|
-      yield elem.name, elem.content
+      yield elem.name, elem.content.to_s.strip
     end
   end
   

data/lib/matterhorn/endpoint/event.rb

@@ -65,7 +65,7 @@ class Matterhorn::Endpoint::Event < Matterhorn::Endpoint
     begin
       dc_field_arr = []
       dublin_core.each_dcterms_element do |name, content|
-        if changeable_element?(name) && !content.blank?
+        if changeable_element?(name) && !content.empty?
           dc_field_arr << {
             'id'    => name,
             'value' => content

data/lib/matterhorn/endpoint/series.rb

@@ -119,7 +119,7 @@ class Matterhorn::Endpoint::Series < Matterhorn::Endpoint
     series_id = dublin_core.dcterms_identifier
     dc_to_update = read(dublin_core.dcterms_identifier)
     if dc_to_update.nil?
-      raise(Matterhorn::Matterhorn::Error.new("Series[#{series_id}] was not found on Matterhorn"))
+      raise(Matterhorn::Error.new("Series[#{series_id}] was not found on Matterhorn"))
     end
     dc = create(dublin_core, acl)
     if response_code == 204

data/lib/matterhorn/http_client.rb

@@ -16,7 +16,7 @@ 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.split('.').first
+      @sub_domain   = org_domain.to_s.split('.').first.to_s.strip
       @uri          = URI.parse("#{protocol}://#{domain}")
       @uri.user     = user
       @uri.password = password 
@@ -81,7 +81,7 @@ module Matterhorn
   
    
     def assemble_url(url)
-      if @multi_tenant && !@sub_domain.blank?
+      if @multi_tenant && !@sub_domain.empty?
         @uri.request_uri + "#{@sub_domain}/" + url
       else
         @uri.request_uri + url

data/lib/matterhorn_whymper/version.rb

@@ -5,7 +5,7 @@ module MatterhornWhymper
 
   # -------------------------------------------------------------------------- const definitions ---
 
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 
 
 end # -------------------------------------------------------------------- end MatterhornWhymper ---

data/spec/files/series_dublin_core.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<dublincore xmlns="http://www.opencastproject.org/xsd/1.0/dublincore/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:oc="http://www.opencastproject.org/matterhorn/" xsi:schemaLocation="http://www.opencastproject.org http://www.opencastproject.org/schema.xsd">
+  <dcterms:title>Space is Awesome</dcterms:title>
+  <dcterms:description>The Great Space Race was hotly anticipated as the follow-up to Legend's popular and influential graphic adventure Valhalla. Pre-release publicity boasted that the game contained "technical effects never before seen in home computer software", with "true solid 3D graphics".[2] The game was actually coded largely in BASIC.[3]&#xD;
+&#xD;
+After its release, the game was described by Sinclair User as "one of the most vacuous products we have seen."[4] The graphics also did not impress, as Big K magazine panned "Graphics are great - by 1982 standards. In 1985 they look amateurish and unprofessional".[5] Despite the heavy criticism at launch, the game has gained a cult status through the use of emulators in recent years.</dcterms:description>
+  <dcterms:created>2015-05-11</dcterms:created>
+  <dcterms:source>SWITCHtube_Channel_1</dcterms:source>
+  <dcterms:contributor>Ste&#x301;phane Kielholz</dcterms:contributor>
+  <dcterms:subject>Arts &amp; Culture</dcterms:subject>
+  <dcterms:publisher>Universit&#xE4;t Bern</dcterms:publisher>
+</dublincore>

data/spec/matterhorn.yml.sample

@@ -1,8 +1,29 @@
 test:
-  protocol:  http
-  domain: admin.example.com
-  user: inser_system_user_name_here
-  password: insert_system_user_password_here
-  auth_mode: digest
-  ssl_dont_verify_cert: false
-  multi_tenant: false
+  p1:
+    endpoint:
+      protocol:  https
+      domain:    cast-ng-test.switch.ch
+      user:      <user>
+      password:  <password>
+      auth_mode: digest
+      ssl_dont_verify_cert: true
+      multi_tenant:         false
+  p2:
+    endpoint:
+      protocol:  https
+      domain:    cast-ng-test.switch.ch
+      user:      <user>
+      password:  <password>
+      auth_mode: digest
+      ssl_dont_verify_cert: true
+      multi_tenant:         true
+    api:
+      protocol:  https
+      domain:    cast-ng-test.switch.ch
+      user:      <user>
+      password:  <password>
+      auth_mode: basic
+      ssl_dont_verify_cert: true
+      multi_tenant:         true
+  default: p2
+

data/spec/spec_helper.rb

@@ -10,10 +10,22 @@ require 'fileutils'
 
 Dir.glob(File.expand_path('../support/**/*.rb', __FILE__)).each { |lib| require lib }
 
-test_configuration = YAML::load_file(File.expand_path('../matterhorn.yml', __FILE__))
-MatterhornWhymper.configure do |config|
-  config.add_matterhorn_instance
-  config.add_endpoint(test_configuration['test'])
+
+MatterhornWhymper.configure do |mhw_config|
+  mhw_yml = YAML::load_file(File.expand_path('../matterhorn.yml', __FILE__))['test']
+  mhw_yml.each do |mh_name, mh_config|
+    if mh_name != 'default'
+      mhw_config.add_matterhorn_instance(mh_name)
+      if !mh_config['endpoint'].nil?
+        mhw_config.add_endpoint(mh_config['endpoint'], mh_name)
+      end
+      if !mh_config['api'].nil?
+        mhw_config.add_api(mh_config['api'], mh_name)
+      end
+    else
+      mhw_config.set_default_matterhorn_instance(mh_config)
+    end
+  end
 end
 
 logfile_path = File.expand_path('../../log/test.log', __FILE__)

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

@@ -3,11 +3,16 @@ require 'tempfile'
 
 describe Matterhorn::Endpoint::Ingest do
   before do
-    @ingest = Matterhorn::Endpoint::Ingest.new
+    @ingest = Matterhorn::Endpoint::create(:ingest)
     stub_request(:head, %r{}).to_return(status: 200, body: '', headers: { 'WWW-Authenticate' => 'Basic realm="Matterhorn"' })
     stub_request(:get, %r{/ingest/createMediaPackage}).to_return(status: 200, body: file_fixture_contents('empty_media_package.xml'))
   end
 
+  after do
+    @ingest.close
+  end
+  
+
   it "adds a local file to its media package with addTrack" do
     stub_request(:post, %r{/ingest/addTrack}).to_return(status: 200, body: file_fixture_contents('media_package_with_one_track.xml'))
     @ingest.createMediaPackage

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

@@ -0,0 +1,38 @@
+require 'spec_helper'
+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"' })
+  end
+
+  after do
+    @series.close
+  end
+
+  
+  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'))
+
+    dublin_core = @series.read(series_id)
+    expect(dublin_core.dcterms_title).to eq('Space is Awesome')
+  end
+
+  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: '')
+
+    dublin_core = @series.read(series_id)
+    expect(dublin_core).to be_nil
+  end
+
+  describe "initialization" do
+    it "creates an endpoint instance with open" do
+      Matterhorn::Endpoint.open(:series) do |client|
+        expect(client).to be_kind_of(Matterhorn::Endpoint::Series)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matterhorn_whymper
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Daniel Fritschi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -154,6 +154,7 @@ files:
 - matterhorn_whymper.gemspec
 - spec/files/empty_media_package.xml
 - spec/files/media_package_with_one_track.xml
+- spec/files/series_dublin_core.xml
 - spec/matterhorn.yml.sample
 - spec/remote/matterhorn/endpoint/ingest_spec.rb
 - spec/spec_helper.rb
@@ -161,6 +162,7 @@ files:
 - spec/support/remote_helpers.rb
 - spec/unit/Matterhorn_whymper_spec.rb
 - spec/unit/matterhorn/endpoint/ingest_spec.rb
+- spec/unit/matterhorn/endpoint/series_spec.rb
 - spec/unit/matterhorn/endpoints_spec.rb
 homepage: https://github.com/switch-ch/matterhorn_whymper
 licenses:
@@ -189,6 +191,7 @@ summary: Ruby wrapper around the Matterhorn Endpoint API
 test_files:
 - spec/files/empty_media_package.xml
 - spec/files/media_package_with_one_track.xml
+- spec/files/series_dublin_core.xml
 - spec/matterhorn.yml.sample
 - spec/remote/matterhorn/endpoint/ingest_spec.rb
 - spec/spec_helper.rb
@@ -196,4 +199,5 @@ test_files:
 - spec/support/remote_helpers.rb
 - spec/unit/Matterhorn_whymper_spec.rb
 - spec/unit/matterhorn/endpoint/ingest_spec.rb
+- spec/unit/matterhorn/endpoint/series_spec.rb
 - spec/unit/matterhorn/endpoints_spec.rb