kollus 0.0.2 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d03c57fdb66105f69580c74847d1a3666b11e76d
-  data.tar.gz: e5cf76f368fe15178f647d5f0fe9f680efbba22b
+  metadata.gz: 27e0a6be514de4da5bf042caf193b8b3cc8f6d20
+  data.tar.gz: d4fdc2b8df76cea9bbfc8cc0251cfce545e0adf3
 SHA512:
-  metadata.gz: 9a87b79bac244ff79b3b3ba66b9aae2a9941e54d4d526ec6f096304dcc8a7dfe724d40130f4a5c9ff5c0a2721df12bd51d6406f65d75abd514cd2c47fe4d8fd4
-  data.tar.gz: ab32e0e3e5b253add4b66e9db99f2ea97466fd79a2712dc0666aa46dba7a7b0858ae60c9b357a2a9c1dd34d6816d1bce096a8e3ae5058d89758cb2e3b388cd86
+  metadata.gz: 22cdbc84db3b6ad6a2b858edeb48c88bb5f9671052324480a2c449ab93df9662de253631d01f5a4a3ae15fcb40ae39fbf0ac28b5bef989cfce0554e63e0a1277
+  data.tar.gz: 913b596a88ac0f2955c417835da72a351111af951d0779143ed16dcf04b54eed029242ba4d6ae44a32156f31ffd48703041c96a7657c1bd0179c38a6b2257bc0

data/lib/kollus.rb

@@ -1,23 +1,40 @@
+# Copyright 2015-2016 Hyeon Kim
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
 require 'net/http'
 require 'json'
 
 class Kollus
-  def initialize(account_id, account_key, api_token)
-    @id = account_id
+  def initialize(account_key, api_token)
     @key = account_key
     @token = api_token
   end
 
-  def media(media_content_key, media_profile_key = nil, awt_code = nil, expire_time = 7200, play_list = nil)
+  def detail(upload_key)
+    api_uri = URI("http://api.kr.kollus.com/0//media/library/media_content/#{upload_key}?access_token=#{@token}")
+
+    response = Net::HTTP.get(api_uri)
+    response = JSON.parse response
+
+    return nil unless response['error'] == 0
+    return response['result']
+  end
+
+  def media(media_content_key, client_user_id, media_profile_key = nil, awt_code = nil, expire_time = 7200, playlist_flag = nil)
     api_uri = URI('http://api.kr.kollus.com/0/media_auth/media_token/get_media_link_by_userid?access_token=' + @token)
     params = {
-      client_user_id: @id,
+      client_user_id: client_user_id,
       security_key: @key,
       media_content_key: media_content_key,
       media_profile_key: media_profile_key,
       awt_code: awt_code,
       expire_time: expire_time,
-      play_list: play_list
+      playlist_flag: playlist_flag
     }
 
     response = Net::HTTP.post_form(api_uri, params)
@@ -51,13 +68,14 @@ class Kollus
   end
 
 
-  def upload(title = nil, expire_time = 600, encrypted = true, audio = false)
+  def upload(category_key = nil, title = nil, expire_time = 600, encrypted = true, audio = false)
+    tries ||= 3
     api_uri = URI('http://api.kr.kollus.com/0/media_auth/upload/create_url.json?access_token=' + @token)
     params = {
       # 값의 범위는 0 < expire_time <= 21600 입니다. 빈값을 보내거나 항목 자체를 제거하면 기본 600초로 설정됩니다.
       expire_time: expire_time,
       # 업로드한 파일이 속할 카테고리의 키(API를 이용하여 확득 가능)입니다. 빈값을 보내 거나 항목 자체를 제거하면 '없음'에 속합니다.
-      category_key: 'bw2z2ngbkatkqx77',
+      category_key: category_key,
       # 입력한 제목을 컨텐츠의 제목으로 강제지정합니다. 이 값을 보내지 않거나 빈값으로 보내면 기본 적으로 파일명이 제목으로 사용됩니다.
       title: title,
       # 0은 일반 업로드, 1은 암호화 업로드입니다. 암호화 업로드시 파일이 암호화 되어 Kollus의 전용 플레이어로만 재생됩니다.
@@ -74,12 +92,12 @@ class Kollus
     response = JSON.parse response.body
     # TODO: Error handling
 
-    unless response['error'] == 0
-      # TODO: Error handling
-      return nil
-    end
+    raise KollusError, response unless response['error'] == 0
 
     UploadSession.new response['result']
+  rescue KollusError => e
+    retry unless (tries -= 1).zero?
+    raise e
   end
 
   class UploadSession
@@ -94,3 +112,9 @@ class Kollus
     def expires_at; @expires_at end
   end
 end
+
+class KollusError < StandardError
+  def initialize(msg = 'Error with Kollus')
+    super(msg)
+  end
+end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: kollus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.2
 platform: ruby
 authors:
 - Hyeon Kim
+- Yi Sang-won Leo
+- Gyumin Sim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2016-12-10 00:00:00.000000000 Z
 dependencies: []
 description: Kollus API written in ruby.
 email: simnalamburt@gmail.com
@@ -19,6 +21,7 @@ files:
 - lib/kollus.rb
 homepage: https://github.com/simnalamburt/kollus-ruby
 licenses:
+- Apache-2.0
 - MIT
 metadata: {}
 post_install_message: 
@@ -37,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Kollus API written in ruby