azure_media_service 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8b1cc2602183b260b0389ad4a9f6da1d21fb938
-  data.tar.gz: 75ca46d2ccf85b28010f37d197202f10de7fad01
+  metadata.gz: 71f4bc0b6d12e836eaa7e2c95f1344a3a90eff01
+  data.tar.gz: 8ff7876544613206adf74cb817640b7832d8712f
 SHA512:
-  metadata.gz: bf98544b08cc46f3e979cb2147c0a606d41418d88ac34d4ed578d2070e0cb41f92c5ce863e039cdfc66943b4c1980b9354ed9dd23969ed17fecdecedb282869a
-  data.tar.gz: 049d17df5aa0e214ec389485a0cd1e275a4132ebc12f6b6aeb419d5c88772fbce233bfff34ceef160e6d16cf5b9a73edd9dc5d6662f67be3330c7fb38a963a3e
+  metadata.gz: edf416e36b0e34be8285b65449c3f1ad6fca45c68a2e42e88aa2a5d8c124b361872535e4a7aa1744f4e674b78d1904bfdd812ad8eeb0460951916284e8136524
+  data.tar.gz: 8682d8330056f87c8fb3a76be508cdf6f0599cb2fe9b3d8391fa354b62d0fba0108cd4e3351d7ceaa6076461c229ab09501eda2729ee606424e3e3884151c860

data/README.md

@@ -24,6 +24,9 @@ Or install it yourself as:
 AzureMediaService.configure do |config|
  cofig.id = 'xxxxxxxx'
  config.secret = 'xxxxxxxxxxxxxxxxxx'
+ config.token_uri = 'https://login.microsoft.com/{tenant_id}/oauth2/token'
+ config.media_uri = 'https://{service}.restv2.{region}.media.azure.net/api/'
+ config.api_version = '2.xx' # Defaults to 2.9
 end
 
 # upload file

data/lib/azure_media_service.rb

@@ -21,33 +21,24 @@ module AzureMediaService
   @@tasks = {}
 
   class << self
+    attr_accessor :id
+    attr_accessor :token_uri
+    attr_accessor :media_uri
+    attr_accessor :api_version
+    attr_accessor :secret
 
     def configure
       yield self
     end
 
     def request
-      @@request ||= Request.new(client_id:@@id, client_secret:@@secret)
+      @request ||= Request.new(
+        client_id: @id, client_secret: @secret, tokenURI: @token_uri, mediaURI: @media_uri, api_version: @api_version
+      )
     end
 
     def service
-      @@service ||= Service.new
-    end
-
-    def id=(v)
-      @@id = v
-    end
-
-    def id
-      @@id
-    end
-
-    def secret=(v)
-      @@secret = v
-    end
-
-    def secret
-      @@secret
+      @service ||= Service.new
     end
 
     def add_encode_task(name, task)

data/lib/azure_media_service/config.rb

@@ -3,8 +3,6 @@ module AzureMediaService
     UPLOAD_LIMIT_SIZE = 4194304 # 4MB
     READ_BUFFER_SIZE       = 4000000
 
-    MEDIA_URI = "https://media.windows.net/api/"
-    TOKEN_URI = "https://wamsprodglobal001acs.accesscontrol.windows.net/v2/OAuth2-13"
-
+    API_VERSION = "2.9"
   end
 end

data/lib/azure_media_service/request.rb

@@ -123,17 +123,17 @@ module AzureMediaService
 
       @config = config || {}
       # @config[:mediaURI] = "https://media.windows.net/API/"
-      @config[:mediaURI] = Config::MEDIA_URI
-      @config[:tokenURI] = Config::TOKEN_URI
-      @config[:client_id] ||= ''
-      @config[:client_secret] ||= ''
+      @config[:mediaURI] || raise(MediaServiceError.new('Media URI missing, please specify in config'))
+      @config[:tokenURI] || raise(MediaServiceError.new('Token URI missing, please specify in config'))
+      @config[:client_id] || raise(MediaServiceError.new('Client ID missing, please specify in config'))
+      @config[:client_secret] || raise(MediaServiceError.new('Client secret missing, please specify in config'))
 
       @default_headers = {
         "Content-Type"          => "application/json;odata=verbose",
         "Accept"                => "application/json;odata=verbose",
         "DataServiceVersion"    => "3.0",
         "MaxDataServiceVersion" => "3.0",
-        "x-ms-version"          => "2.9"
+        "x-ms-version"          => @config[:api_version] || Config::API_VERSION
       }
     end
 
@@ -156,7 +156,7 @@ module AzureMediaService
           client_id: @config[:client_id], 
           client_secret: @config[:client_secret],
           grant_type: 'client_credentials',
-          scope: 'urn:WindowsAzureMediaServices'
+          resource: 'https://rest.media.azure.net'
         }
       end
 

data/lib/azure_media_service/version.rb

@@ -1,3 +1,3 @@
 module AzureMediaService
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/spec/azure_media_service_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe AzureMediaService do
+  context '#configure should allow to set' do
+    it 'id' do
+      AzureMediaService.configure do |config|
+        config.id = 'client_id'
+      end
+
+      expect(AzureMediaService.id).to eq('client_id')
+    end
+
+    it 'secret' do
+      AzureMediaService.configure do |config|
+        config.secret = 'client_secret'
+      end
+
+      expect(AzureMediaService.secret).to eq('client_secret')
+    end
+
+    it 'token_uri' do
+      AzureMediaService.configure do |config|
+        config.token_uri = 'https://login.microsoft.com/tenant-id-goes-here/oauth2/token'
+      end
+
+      expect(AzureMediaService.token_uri).to eq('https://login.microsoft.com/tenant-id-goes-here/oauth2/token')
+    end
+
+    it 'media_uri' do
+      AzureMediaService.configure do |config|
+        config.media_uri = 'https://media-service-name.restv2.westeurope.media.azure.net/api/'
+      end
+
+      expect(AzureMediaService.media_uri).to eq('https://media-service-name.restv2.westeurope.media.azure.net/api/')
+    end
+
+    it 'api_version' do
+      AzureMediaService.configure do |config|
+        config.api_version = '2.17'
+      end
+
+      expect(AzureMediaService.api_version).to eq('2.17')
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'azure_media_service_ruby'
-
+require 'azure_media_service'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azure_media_service
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - murayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,7 +139,7 @@ files:
 - lib/azure_media_service/request.rb
 - lib/azure_media_service/service.rb
 - lib/azure_media_service/version.rb
-- spec/azure_media_service_ruby_spec.rb
+- spec/azure_media_service_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/murayama/azure_media_service_ruby
 licenses:
@@ -161,10 +161,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Azure Media Service SDK for ruby
 test_files:
-- spec/azure_media_service_ruby_spec.rb
+- spec/azure_media_service_spec.rb
 - spec/spec_helper.rb

data/spec/azure_media_service_ruby_spec.rb

@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe hoge do
-
-end