matterhorn_whymper 0.2.2 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2ExMTYzYjRiZTg1YjQzZGY4NmI5MDhjOTIwNDE3YWQ2ODgyYTk3Ng==
+    Njg3OGRhNTBkYTBhNWY2MWJiM2Y4NzUyZGMyYTQ2NmExMTI4MzNjNA==
   data.tar.gz: !binary |-
-    MGVhNWYyNmM1MzQ4ODRhYmIwZTYxMDZlYTA3NzMzYzNjMmUyZmRlOQ==
+    Y2RiNzg1OWE5OGI5ZWZkMGFjOGU5MDljY2ViMDNjYjQ3NDAwNjE4YQ==
 SHA512:
   metadata.gz: !binary |-
-    MTNiNDI2Mjg0YzY4OWViYWMzMWFhNWNjZTRmMzVlNjU4YzhiZjYwOTEyNGU5
-    NTYzNDg1NTIyZDI5NDczYTY4ODNiZDMxMzFiYzZiNzJjMzgxNDg4MzgzOWM1
-    NDYzOGZjMmNkZjAwN2RmYmYzYWFkYzUwNmRkNjM5OWMzZDg1N2I=
+    YzgwM2RlZGQ3ZGE3MDY1YzFlYzdlMDBlOTRmYzRhMTFjN2E5OTU5MzBlN2Y2
+    NDg1ZTBmZGMwMDM1NTU2OWFjMGM0MzBlYmFhYzc4ZDg2ODMzZTc0ZWM2YTg4
+    ZDViMGNmNGEyZmU5NGE3OGYyNzgxN2NlNGQyZGZlYTJjMmFmNDM=
   data.tar.gz: !binary |-
-    MmY2NTA4Y2NiZDFmYjM4YjAyYjk1NGNjOGZhZjEzZWRkZGQ2MTM3ZmE2MTYx
-    Nzc3Nzc1NDAyOTM2NmEyZDlkNWViMWYxNDM2MmY3ZTBhMGEyN2NhNTI3NGIx
-    NTlmNWMxMzFlN2UzNGQzNjc4ZDc3NWJmMWFhMTUwNmVhNTliZGI=
+    ODAyNDUzMzg0Y2JhMmY0NTBiMGZkYzgwZThhODkxOTMwMjY0ZDU1MjllMGJh
+    NDMwMDA0NGQwMThiNjQwYzMyMTYxNzcwYzE2ODVmMmZjNmZkNGZhYWNmMzYy
+    YmE3OTI4OTE5MjhiZDM4OTM0Y2ZiODQ5OTc2NzBhYzJjZjlhNzk=

data/.gitignore

@@ -16,6 +16,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+log
 *.bundle
 *.so
 *.o

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in matterhorn-endpoint_api.gemspec
+# Specify your gem's dependencies in matterhorn_whymper.gemspec
 gemspec

data/lib/matterhorn/endpoint/ingest.rb

@@ -76,18 +76,32 @@ class Matterhorn::Endpoint::Ingest < Matterhorn::Endpoint
     @media_pkg_remote
   end
 
-     
-  def addTrack(file, flavor)
+  HTTP_PROTOCOL_RE = /^https?:/
+
+  def addTrack(file_or_url, flavor)
     unless @media_pkg_remote then raise(Matterhorn::Error, "No media package is available!"); end
-    @media_pkg_local.add_track(file, flavor)    if @media_pkg_local
+    @media_pkg_local.add_track(file_or_url, flavor) if @media_pkg_local
     begin
-      @media_pkg_remote = http_client.post(
-        "ingest/addTrack",
-        { 'flavor' => flavor,
-          'mediaPackage' => @media_pkg_remote,
-          'BODY' => file
-        }
-      ).body
+      @media_pkg_remote = 
+        if HTTP_PROTOCOL_RE =~ file_or_url
+          http_client.post(
+            "ingest/addTrack",
+            {
+              'flavor' => flavor,
+              'mediaPackage' => @media_pkg_remote,
+              'url' => file_or_url
+            }
+          ).body
+        else
+          http_client.post(
+            "ingest/addTrack",
+            {
+              'flavor' => flavor,
+              'mediaPackage' => @media_pkg_remote,
+              'BODY' => file_or_url
+            }
+          ).body
+        end
     rescue Matterhorn::HttpClientError => ex
       MatterhornWhymper.logger.error { "#{self.class.name}::addTrack | " +
                                  "Media package not valid! / media package:\n#{@media_pkg_remote}" }

data/lib/matterhorn/http_client.rb

@@ -1,6 +1,6 @@
 require 'net/http/post/multipart'
 require 'net/http/digest_auth'
-
+require 'mime/types'
 
 # =================================================================================== Matterhorn ===
 

data/lib/matterhorn_whymper/version.rb

@@ -5,7 +5,7 @@ module MatterhornWhymper
 
   # -------------------------------------------------------------------------- const definitions ---
 
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 
 
 end # -------------------------------------------------------------------- end MatterhornWhymper ---

data/matterhorn_whymper.gemspec

@@ -22,8 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "multipart-post", "~> 2.0"
   spec.add_runtime_dependency "net-http-digest_auth", "~> 1.4"
   spec.add_runtime_dependency "nokogiri", "~> 1.6"
+  spec.add_runtime_dependency "mime-types", "> 1.25"
   
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.3"
   spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "webmock", "~> 1.18"
 end

data/spec/files/empty_media_package.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<mediapackage xmlns="http://mediapackage.opencastproject.org" start="2014-06-16T14:20:42Z" id="188d25d5-c93d-4b09-80ab-95e13a352b14">
+  <media/>
+  <metadata/>
+  <attachments/>
+  <publications/>
+</mediapackage>

data/spec/files/media_package_with_one_track.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<mediapackage xmlns="http://mediapackage.opencastproject.org" start="2014-06-16T14:20:42Z" id="188d25d5-c93d-4b09-80ab-95e13a352b14">
+  <media>
+    <track type="source/raw" id="beef711f-6519-4cf6-8af5-8eac5aaa50c5"><tags/><url>http://mh-int-admin.bcc.switch.ch/files/mediapackage/188d25d5-c93d-4b09-80ab-95e13a352b14/beef711f-6519-4cf6-8af5-8eac5aaa50c5/isforAto1953.avi?AWSAccessKeyId=K8Z3D0TTLAO4O55WKZDD&amp;Expires=1403528601&amp;Signature=HShVG9L3lNeOOjffM9RuZ997oeo%3D</url></track>
+  </media>
+  <metadata/>
+  <attachments/>
+  <publications/>
+</mediapackage>

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

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+if endpoint_configured?
+
+  describe Matterhorn::Endpoint::Ingest, "when talking to the remote server" do
+    include Support::RemoteHelpers
+
+    it "creates a mediapackage" do
+      Matterhorn::Endpoint.open(:ingest) do |ingest_endpoint|
+        ingest_endpoint.createMediaPackage()
+        mp_local = ingest_endpoint.media_package
+        mp_remote = ingest_endpoint.media_package('remote')
+        expect(mp_local).not_to be nil
+        expect(mp_remote).not_to be nil
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -3,9 +3,16 @@ require 'yaml'
 
 Bundler.setup
 
-require 'matterhorn_whymper' # and any other gems you need
+require 'matterhorn_whymper'
+require 'webmock/rspec'
+
+require 'fileutils'
+
+Dir.glob(File.expand_path('../support/**/*.rb', __FILE__)).each { |lib| require lib }
 
 RSpec.configure do |config|
+  config.include Support::FixtureHelpers
+
   MatterhornWhymper.configure do |mh_config|
     mh_yml = YAML::load_file( "./spec/matterhorn.yml" )
     mh_config.system_account_user     = mh_yml['matterhorn']['system_account_user']
@@ -13,4 +20,16 @@ RSpec.configure do |config|
     mh_config.system_domain           = mh_yml['matterhorn']['system_domain']
     mh_config.system_protocol         = mh_yml['matterhorn']['system_protocol']
   end
+
+  logfile_path = File.expand_path('../../log/test.log', __FILE__)
+  FileUtils.mkdir_p(File.dirname(logfile_path))
+  MatterhornWhymper.logger = Logger.new(File.open(logfile_path, 'a'))
+end
+
+module Kernel
+  private
+
+  def endpoint_configured?
+    MatterhornWhymper.configuration.system_domain.to_s.strip != ''
+  end
 end

data/spec/support/fixture_helpers.rb

@@ -0,0 +1,15 @@
+module Support
+  module FixtureHelpers
+    def file_fixture_base_path
+      File.expand_path('../../files', __FILE__)
+    end
+
+    def file_fixture_filename(path)
+      File.join(file_fixture_base_path, path)
+    end
+
+    def file_fixture_contents(path)
+      File.read(file_fixture_filename(path))
+    end
+  end
+end

data/spec/support/remote_helpers.rb

@@ -0,0 +1,15 @@
+module Support
+  module RemoteHelpers
+    def self.included(context)
+      context.before do
+        MatterhornWhymper.logger.level = Logger::DEBUG
+        WebMock.allow_net_connect!
+      end
+
+      context.after do
+        WebMock.disable_net_connect!
+        MatterhornWhymper.logger.level = Logger::WARN
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'tempfile'
+
+describe Matterhorn::Endpoint::Ingest do
+  before do
+    @ingest = Matterhorn::Endpoint::Ingest.new
+    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
+
+  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
+    tempfile = Tempfile.new('source')
+    tempfile.close
+    begin
+      response_body = @ingest.addTrack(tempfile.path, 'source/raw')
+      expect(response_body).to start_with('<?xml')
+    ensure
+      tempfile.unlink
+    end
+  end
+
+  it "adds a source URL 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
+    response_body = @ingest.addTrack('http://example.com/path/to/file', 'source/raw')
+    expect(response_body).to start_with('<?xml')
+  end
+end

data/spec/{endpoints_spec.rb → unit/matterhorn/endpoints_spec.rb}

@@ -1,34 +1,17 @@
 require 'spec_helper'
 
 describe Matterhorn::Endpoint do
-
-  it "does ingest endpoint available" do
+  it "sets up an ingest endpoint" do
     Matterhorn::Endpoint.open(:ingest) do |ingest_endpoint|
       expect(ingest_endpoint).not_to be nil
       expect(ingest_endpoint.class.name).to eq 'Matterhorn::Endpoint::Ingest'
     end
   end
 
-  it "does workflow endpoint available" do
+  it "sets up a workflow endpoint" do
     Matterhorn::Endpoint.open(:workflow) do |workflow_endpoint|
       expect(workflow_endpoint).not_to be nil
       expect(workflow_endpoint.class.name).to eq 'Matterhorn::Endpoint::Workflow'
     end
   end
-
 end
-
-
-describe "Ingest Mediapackages" do
-  
-  it "creates a mediapackage" do
-    Matterhorn::Endpoint.open(:ingest) do |ingest_endpoint|
-      ingest_endpoint.createMediaPackage()
-      mp_local = ingest_endpoint.media_package
-      mp_remote = ingest_endpoint.media_package('remote')
-      expect(mp_local).not_to be nil
-      expect(mp_remote).not_to be nil
-    end
-  end
-  
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matterhorn_whymper
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Fritschi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '1.25'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.18'
 description: ! "This Ruby wrapper is designed to write some ruby scripts against the\n
   \                         Matterhorn Endpoint API"
 email:
@@ -120,10 +148,16 @@ files:
 - lib/matterhorn_whymper.rb
 - lib/matterhorn_whymper/version.rb
 - matterhorn_whymper.gemspec
-- spec/Matterhorn_whymper_spec.rb
-- spec/endpoints_spec.rb
+- spec/files/empty_media_package.xml
+- spec/files/media_package_with_one_track.xml
 - spec/matterhorn.yml.sample
+- spec/remote/matterhorn/endpoint/ingest_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixture_helpers.rb
+- spec/support/remote_helpers.rb
+- spec/unit/Matterhorn_whymper_spec.rb
+- spec/unit/matterhorn/endpoint/ingest_spec.rb
+- spec/unit/matterhorn/endpoints_spec.rb
 homepage: https://github.com/switch-ch/matterhorn_whymper
 licenses:
 - MIT
@@ -149,7 +183,13 @@ signing_key:
 specification_version: 4
 summary: Ruby wrapper around the Matterhorn Endpoint API
 test_files:
-- spec/Matterhorn_whymper_spec.rb
-- spec/endpoints_spec.rb
+- spec/files/empty_media_package.xml
+- spec/files/media_package_with_one_track.xml
 - spec/matterhorn.yml.sample
+- spec/remote/matterhorn/endpoint/ingest_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixture_helpers.rb
+- spec/support/remote_helpers.rb
+- spec/unit/Matterhorn_whymper_spec.rb
+- spec/unit/matterhorn/endpoint/ingest_spec.rb
+- spec/unit/matterhorn/endpoints_spec.rb