pili 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d391f0a344f58f8005ca7d9280ada460e944985a
-  data.tar.gz: fd7f36ef373fb59bfd12dfb85852e040b046ba50
+  metadata.gz: cb22831f58fe2ba275e403086a5d6f582db1b276
+  data.tar.gz: 666a132c978cca3be0e787d7e5ce71c408019d52
 SHA512:
-  metadata.gz: 7787e2bbd30689fcb4b30ee4490a799df75d572ec7070c66aa3605fa4a24d4e230c051c72e90749c280465ebdf912de8c0556606d894bab2e8982d82b0bc3425
-  data.tar.gz: d10c030ea7a1be5f76cf9f13d4c52c522e9244e95bd23d3dac0d24faf2fb3d0187a097e3ead8cde07bd16e6afae896948f04a5f8ba5495c7d036e9f8327036d6
+  metadata.gz: 2f502768f7388d7bff3fa9af451282fcdc3080266ca13581cb3c51e4c8592e71fde7bde1be864d081cb4038c235b82596ee4f339acc6b33a049124925be3f55d
+  data.tar.gz: 185233ddbda8853da59537e5ce5f87f720cc40e33b05c71ac1fa3cb713d3db4eca2ceaf970a4e6de02e87faba0483fe1f6823bed6fcfcc97098d88d35fb1f2b3

data/README.md

@@ -1,7 +1,36 @@
-# pili-ruby
-=========
-
-Pili SDK for Ruby.
+# Pili server-side library for Ruby
+
+## Features
+
+- [x] Stream operations (Create, Delete, Update, Get)
+- [x] Get Streams list
+- [x] Get Stream status
+- [x] Get Stream segments
+- [x] Generate RTMP publish URL
+- [x] Generate RTMP / HLS live play URL
+- [x] Generate HLS playback URL
+
+## Content
+
+- [Installation](#installation)
+- [Usage](#usage)
+  - [Configuration](#configuration)
+  - [Client](#client)
+    - [Create a Pili client](#create-a-pili-client)
+    - [Create a stream](#create-a-stream)
+    - [Get a stream](#get-a-stream)
+    - [List streams](#list-streams)
+  - [Stream](#stream)
+    - [Update a stream](#update-a-stream)
+    - [Delete a stream](#delete-a-stream)
+    - [Get stream segments](#get-stream-segments)
+    - [Get stream status](#get-stream-status)
+    - [Generate RTMP publish URL](#generate-rtmp-publish-url)
+    - [Generate RTMP live play URL](#generate-rtmp-live-play-urls)
+    - [Generate HLS live play URL](#generate-hls-live-play-url)
+    - [Generate HLS playback URL](#generate-hls-playback-url)
+    - [To JSON String](#to-json-string)
+- [History](#history)
 
 ## Installation
 
@@ -17,6 +46,7 @@ Or install it yourself as:
 
     $ gem install pili
 
+
 ## Usage
 
 ### Configuration
@@ -24,134 +54,160 @@ Or install it yourself as:
 ```ruby
 require 'pili'
 
-Pili.setup! access_key: '<YOUR_APP_ACCESS_KEY>',
-			secret_key: '<YOUR_APP_SECRET_KEY>'
-```
-
-#### with rails:
+ACCESS_KEY = 'qiniu_access_key'
+SECRETE_KEY = 'qiniu_secret_key'
 
-You'll need to configure it in config/initializes/pili.rb
+HUB_NAME = 'hub_name'
+```
 
+### Client
 
-### Example
+#### Create a Pili client
 
 ```ruby
-# Replace with your customized domains
-RTMP_PUBLISH_HOST = "xxx.pub.z1.pili.qiniup.com"
-RTMP_PLAY_HOST 	  = "xxx.live1.z1.pili.qiniucdn.com"
-HLS_PLAY_HOST     = "xxx.hls1.z1.pili.qiniucdn.com"
-
-# Replace with your hub name
-HUB_NAME = "hub_name"
+client = Pili::Client.new(ACCESS_KEY, SECRETE_KEY, HUB_NAME)
+# return client object...
 ```
 
-
-#### Create Stream
+#### Create a stream
 
 ```ruby
-# HUB_NAME: string, required
 # title: optional, default is auto-generated
 # publish_key: optional, a secret key for signing the <publishToken>
 # publish_security: optional, can be "dynamic" or "static", default is "dynamic"
-Pili.create_stream(HUB_NAME, title: "test", publish_key: "werqwedsf", publish_security: "static")
+client.create_stream(title: "title", publish_key: "publish_key", publish_security: "static")
+# return stream object...
 ```
 
-#### Get Stream
+#### Get a stream
 
 ```ruby
 # stream_id: string, required
-Pili.get_stream(stream_id)
+client.get_stream(stream_id)
+# return stream object...
 ```
 
-#### Get Stream Status
+#### List streams
 
 ```ruby
-# stream_id: string, required
-Pili.get_stream_status(stream_id)
+# marker: string, optional
+# limit: integer, optional
+client.list_streams(marker: "marker", limit: 1000)
 ```
 
-#### Update Stream
+### Stream
+
+#### Update a stream
 
 ```ruby
-# stream_id: string, required
 # publish_key: optional, a secret key for signing the <publishToken>
 # publish_security: optional, can be "dynamic" or "static", default is "dynamic"
 # disabled: optional, can be true or false
-Pili.update_stream(stream_id, publish_key: "new_key", publish_security: "dynamic", disabled: true)
+stream.update(publish_key: "new_key", publish_security: "dynamic", disabled: true)
+# return updated stream object...
 ```
 
-#### Get Stream List
+#### Delete a stream
 
 ```ruby
-# HUB_NAME: string, required
-# marker: string, optional
-# limit: integer, optional
-Pili.stream_list(HUB_NAME, marker: "marker", limit: 50)
+stream.delete()
 ```
 
-#### Delete Stream
+#### Get stream segments
 
 ```ruby
-# stream_id: string, required
-Pili.delete_stream(stream_id)
+# start_second: integer, optional
+# end_second: integer, optional
+stream.segments(start_second, end_second)
+
+# [
+#   {
+#     "start": <StartSecond>,
+#     "end": <EndSecond>
+#   },
+#   {
+#     "start": <StartSecond>,
+#     "end": <EndSecond>
+#   },
+#   ...
+# ]
 ```
 
-#### Get Stream Segments
+#### Get stream status
 
 ```ruby
-# stream_id: string, required
-# start_second, end_second: integer, optional
-Pili.get_stream_segments(stream_id, start_second: 1429678551, end_second: 1429689551)
+stream.status()
+# {
+#   "addr": "106.187.43.211:51393",
+#   "status": "disconnected"
+# }
 ```
 
-#### Get Stream Publish URL
+#### Generate RTMP publish URL
 
 ```ruby
-# RTMP_PUBLISH_HOST, string, required
-# stream_id: string, required
-# publish_key: string, required
-# publish_security: string, required
-# nonce: unix timestamp, optional
-Pili.get_stream_publish_url(RTMP_PUBLISH_HOST, stream_id, publish_key, publish_security, nonce)
+stream.rtmp_publish_url()
+# return a rtmp publish url, eg. "rtmp://test.qiniucdn.com/hubname/test?key=publish_test_key"
 ```
 
-#### Get Stream RTMP Live URL
+#### Generate RTMP live play URLs
 
 ```ruby
-# RTMP_PLAY_HOST, string, required
-# stream_id: string, required
-# profile: string, optional
-Pili.get_stream_rtmp_live_url(RTMP_PLAY_HOST, stream_id, profile)
+stream.rtmp_live_urls()
+# return rtmp live play urls, eg.
+# {
+#   "ORIGIN" => "rtmp://test.qiniucdn.com/hubname/test",
+#   "240p" => "rtmp://test.qiniucdn.com/hubname/test@240p",
+#   ...
+# }
 ```
 
-#### Get Stream HLS Live URL
+#### Generate HLS live play URLs
 
 ```ruby
-# HLS_PLAY_HOST, string, required
-# stream_id: string, required
-# profile: string, optional
-Pili.get_stream_hls_live_url(HLS_PLAY_HOST, stream_id, profile)
+stream.hls_live_urls()
+# return hls live play urls, eg.
+# {
+#   "ORIGIN" => "http://test.qiniucdn.com/hubname/test.m3u8",
+#   "240p" => "http://test.qiniucdn.com/hubname/test@240p.m3u8"
+#   ...
+# }
 ```
 
-#### Get Stream HLS Playback URL
+#### Generate HLS playback URLs
 
 ```ruby
-# HLS_PLAY_HOST, string, required
-# stream_id: string, required
-# start_second, end_second: integer, required
-# profile: string, optional
-Pili.get_stream_hls_playback_url(HLS_PLAY_HOST, stream_id, start_second, end_second, profile)
+stream.hls_playback_urls(start_second, end_second)
+# return hls playback urls, eg.
+# {
+#   "ORIGIN" => "http://test.qiniucdn.com/hubname/test.m3u8?start=1436843430&end=1436846938",
+#   "240p" => "http://test.qiniucdn.com/hubname/test@240p.m3u8?start=1436843430&end=1436846938"
+#   ...
+# }
 ```
 
+#### To JSON String
+```ruby
+stream.to_json()
+```
 
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## Contributors
-
-See the [Contributors List](https://github.com/pili-io/pili-sdk-ruby/graphs/contributors).
+## History
+
+- 2.0.0
+  - Add Client, Stream class
+- 1.0.1
+  - Add get stream status method.
+  - Update update_stream method.
+- 1.0.0
+  - Update README create stream example code.
+- 0.1.3
+  - Update README create stream example code.
+- 0.1.2
+  - Fix stream list method parameter type.
+- 0.1.0
+  - Update README
+  - Update get milliseconds method
+- 0.0.1
+  - Init SDK
+  - Add Stream API
+  - Add publish and play policy

data/lib/pili/api.rb

@@ -0,0 +1,74 @@
+# coding: utf-8
+require 'httparty'
+
+module Pili
+  module API
+    class << self
+
+      def get(access_key, secret_key, url)
+        signature_options = {
+          :url => url,
+          :method => "GET"
+        }
+
+        encoded_sign = Auth.sign(secret_key, Auth.generate_signature(signature_options))
+
+        headers = { "Authorization" => "Qiniu #{access_key}:#{encoded_sign}" }
+
+        response = HTTParty.get(url, :headers => headers)
+
+        if response.code == 200
+          response.parsed_response
+        else
+          raise ResponseError.new("Pili API Request Error", response)
+        end
+      end
+
+
+      def post(access_key, secret_key, url, body)
+        signature_options = {
+          :url => url,
+          :content_type => "application/json",
+          :method => "POST",
+          :body => body
+        }
+
+        encoded_sign = Auth.sign(secret_key, Auth.generate_signature(signature_options))
+
+        headers = {
+          "Authorization" => "Qiniu #{access_key}:#{encoded_sign}",
+          "Content-Type"  => "application/json"
+        }
+
+        response = HTTParty.post(url, :headers => headers, :body => body.to_json)
+
+        if response.code == 200
+          response.parsed_response
+        else
+          raise ResponseError.new("Pili API Request Error", response)
+        end
+      end
+
+
+      def delete(access_key, secret_key, url)
+        signature_options = {
+          :url => url,
+          :method => "DELETE"
+        }
+
+        encoded_sign = Auth.sign(secret_key, Auth.generate_signature(signature_options))
+
+        headers = { "Authorization" => "Qiniu #{access_key}:#{encoded_sign}" }
+
+        response = HTTParty.delete(url, :headers => headers)
+
+        if response.code == 204
+          response.parsed_response
+        else
+          raise ResponseError.new("Pili API Request Error", response)
+        end
+      end
+
+    end
+  end
+end

data/lib/pili/client.rb

@@ -0,0 +1,48 @@
+# coding: utf-8
+module Pili
+  class Client
+
+    attr_reader :access_key, :secret_key, :hub_name
+
+
+    def initialize(access_key, secret_key, hub_name)
+      @access_key = access_key
+      @secret_key = secret_key
+      @hub_name   = hub_name
+    end
+
+
+    def create_stream(options = {})
+      url = Config.api_base_url + "/streams"
+
+      body = {
+        :hub              => @hub_name,
+        :title            => options[:title],
+        :publishKey       => options[:publish_key],
+        :publishSecurity  => options[:publish_security] == "static" ? "static" : "dynamic",
+        :clientIp         => options[:client_ip]
+      }
+
+      body.delete_if { |k, v| v.nil? }
+
+      Stream.new self, API.post(@access_key, @secret_key, url, body)
+    end
+
+
+    def get_stream(stream_id)
+      url = Config.api_base_url + "/streams/" + stream_id
+      Stream.new self, API.get(@access_key, @secret_key, url)
+    end
+
+
+    def list_streams(options = {})
+      url = Config.api_base_url + "/streams?hub=#{@hub_name}"
+
+      url += "&marker=#{options[:marker]}" unless Utils.blank?(options[:marker])
+      url += "&limit=#{options[:limit]}"   if options[:limit].is_a?(Fixnum)
+
+      API.get(@access_key, @secret_key, url)
+    end
+
+  end
+end

data/lib/pili/config.rb

@@ -3,34 +3,20 @@ module Pili
   module Config
     class << self
 
-      DEFAULT_OPTIONS = {
-        :api_version        => "v1",
-        :api_scheme         => "http",
-        :api_host           => "pili.qiniuapi.com"
-      }
-
-      REQUIRED_OPTION_KEYS = [:access_key, :secret_key]
-
-      attr_reader :settings
-
-      def init(options = {})
-        @settings = DEFAULT_OPTIONS.merge!(options)
-        REQUIRED_OPTION_KEYS.each do |opt|
-          raise("You did not provide both required args. Please provide the #{opt}.") unless @settings.has_key?(opt)
-        end
-        @settings
-      end
+      API_SCHEME  = "http"
+      API_HOST    = "pili.qiniuapi.com"
+      API_VERSION = "v1"
+
+      # def init(options = {})
+      #   @settings = DEFAULT_OPTIONS.merge!(options)
+      #   REQUIRED_OPTION_KEYS.each do |opt|
+      #     raise("You did not provide both required args. Please provide the #{opt}.") unless @settings.has_key?(opt)
+      #   end
+      #   @settings
+      # end
 
       def api_base_url
-        "#{settings[:api_scheme]}://#{settings[:api_host]}/#{settings[:api_version]}"
-      end
-
-      def access_key
-        settings[:access_key]
-      end
-
-      def secret_key
-        settings[:secret_key]
+        "#{API_SCHEME}://#{API_HOST}/#{API_VERSION}"
       end
 
     end

data/lib/pili/exceptions.rb

@@ -0,0 +1,28 @@
+# coding: utf-8
+module Pili
+  class ResponseError < Exception
+
+    attr_reader :response
+
+    def initialize(message, response = nil)
+      @response = response
+      super(message)
+    end
+
+    def http_code
+      @response.code if @response
+    end
+
+    def error_code
+      @response.parsed_response["error"] if @response
+    end
+
+    def error_message
+      @response.parsed_response["message"] if @response
+    end
+
+    def http_body
+      @response.body if @response
+    end
+  end
+end

data/lib/pili/stream.rb

@@ -0,0 +1,141 @@
+# coding: utf-8
+module Pili
+  class Stream
+
+    LIVE_URL_ORIGIN_KEY = "ORIGIN"
+
+    attr_reader :client
+    attr_reader :id, :created_at, :updated_at, :title, :hub, :profiles, :hosts
+
+    attr_accessor :publish_key, :publish_security, :disabled
+
+
+    def initialize(client, options = {})
+      @client           = client
+      @id               = options["id"]
+      @title            = options["title"]
+      @hub              = options["hub"]
+      @profiles         = options["profiles"] || []
+      @publish_key      = options["publishKey"]
+      @publish_security = options["publishSecurity"]
+      @disabled         = options["disabled"]
+      @hosts            = options["hosts"]
+
+      @created_at       = options["createdAt"]
+      @updated_at       = options["updatedAt"]
+    end
+
+
+    def status
+      url = Config.api_base_url + "/streams/#{@id}/status"
+      API.get(@client.access_key, @client.secret_key, url)
+    end
+
+
+    def update(options = {})
+      url = Config.api_base_url + "/streams/" + @id
+
+      body = {}
+      body[:publishKey]      = options[:publish_key]
+      body[:publishSecurity] = options[:publish_security] == "static" ? "static" : "dynamic"
+      body[:disabled]        = options[:disabled]
+
+      body.delete_if { |k, v| v.nil? }
+
+      stream = API.post(@client.access_key, @client.secret_key, url, body)
+
+      @publish_key      = stream["publishKey"]
+      @publish_security = stream["publishSecurity"]
+      @disabled         = stream["disabled"]
+      @updated_at       = stream["updatedAt"]
+
+      self
+    end
+
+
+    def delete
+      url = Config.api_base_url + "/streams/" + @id
+      API.delete(@client.access_key, @client.secret_key, url)
+    end
+
+
+    def segments(options = {})
+      url = Config.api_base_url + "/streams/#{@id}/segments"
+
+      url += "?start=#{options[:start]}" if options[:start].is_a?(Fixnum)
+      url += "&end=#{options[:end]}"     if options[:end].is_a?(Fixnum)
+
+      response = API.get(@client.access_key, @client.secret_key, url)
+      response["segments"] || []
+    end
+
+
+    def rtmp_publish_url
+      rtmp_publish_host = @hosts["publish"]["rtmp"]
+
+      if @publish_security == "static"
+        return "rtmp://#{rtmp_publish_host}/#{@hub}/#{@title}?key=#{@publish_key}"
+      else
+        nonce = (Time.now.to_f * 1000.0).to_i
+        token = Auth.sign(publish_key, "/#{@hub}/#{@title}?nonce=#{nonce}")
+        return "rtmp://#{rtmp_publish_host}/#{@hub}/#{@title}?nonce=#{nonce}&token=#{token}"
+      end
+    end
+
+
+    def rtmp_live_urls
+      rtmp_play_host = @hosts["play"]["rtmp"]
+
+      urls = { LIVE_URL_ORIGIN_KEY => "rtmp://#{rtmp_play_host}/#{@hub}/#{@title}" }
+
+      @profiles.each do |profile|
+        urls[profile] = "rtmp://#{rtmp_play_host}/#{@hub}/#{@title}@#{profile}"
+      end
+
+      urls
+    end
+
+
+    def hls_live_urls
+      hls_play_host = @hosts["play"]["hls"]
+
+      urls = { LIVE_URL_ORIGIN_KEY => "http://#{hls_play_host}/#{@hub}/#{@title}.m3u8" }
+
+      @profiles.each do |profile|
+        urls[profile] = "http://#{hls_play_host}/#{@hub}/#{@title}@#{profile}.m3u8"
+      end
+
+      urls
+    end
+
+
+    def hls_playback_urls(start_second, end_second)
+      hls_play_host = @hosts["play"]["hls"]
+
+      urls = { LIVE_URL_ORIGIN_KEY => "http://#{hls_play_host}/#{@hub}/#{@title}.m3u8?start=#{start_second}&end=#{end_second}" }
+
+      @profiles.each do |profile|
+        urls[profile] = "http://#{hls_play_host}/#{@hub}/#{@title}@#{profile}.m3u8?start=#{start_second}&end=#{end_second}"
+      end
+
+      urls
+    end
+
+
+    def to_json
+      {
+        id: @id,
+        title: @title,
+        hub: @hub,
+        profiles: @profiles,
+        publish_key: @publish_key,
+        publish_security: @publish_security,
+        disabled: @disabled,
+        hosts: @hosts,
+        created_at: @created_at,
+        updated_at: @updated_at
+      }.to_json
+    end
+
+  end
+end

data/lib/pili/utils.rb

@@ -8,11 +8,6 @@ module Pili
         arg.to_s.strip.length == 0
       end
 
-      def get_stream_hub_and_title(stream_id)
-        a = stream_id.split(".")
-        [a[1], a[2]]
-      end
-
     end
   end
 end

data/lib/pili/version.rb

@@ -1,3 +1,3 @@
 module Pili
-  VERSION = "1.0.1"
+  VERSION = "1.2.0"
 end

data/lib/pili.rb

@@ -4,143 +4,12 @@ require 'httparty'
 require "pili/version"
 
 module Pili
-  autoload :Auth,   'pili/auth'
-  autoload :Config, 'pili/config'
-  autoload :HTTP,   'pili/http'
-  autoload :Utils,  'pili/utils'
-
-  class << self
-
-    def setup!(options = {})
-      Config.init(options)
-    end
-
-
-    def stream_list(hub, options = {})
-      url = Config.api_base_url + "/streams?hub=#{hub}"
-
-      url += "&marker=#{options[:marker]}" unless Utils.blank?(options[:marker])
-      url += "&limit=#{options[:limit]}"   if options[:limit].is_a?(Fixnum)
-
-      response = HTTP.api_get(url)
-      response.parsed_response
-    end
-
-
-    def create_stream(hub, options = {})
-      url = Config.api_base_url + "/streams"
-
-      body = {
-        :hub              => hub,
-        :title            => options[:title],
-        :publishKey       => options[:publish_key],
-        :publishSecurity  => options[:publish_security] == "static" ? "static" : "dynamic",
-        :clientIp         => options[:client_ip]
-      }
-
-      body.delete_if { |k, v| v.nil? }
-
-      response = HTTP.api_post(url, body)
-      response.parsed_response
-    end
-
-
-    def get_stream(stream_id)
-      url = Config.api_base_url + "/streams/" + stream_id
-      response = HTTP.api_get(url)
-      response.parsed_response
-    end
-
-
-    def get_stream_status(stream_id)
-      url = Config.api_base_url + "/streams/#{stream_id}/status"
-      response = HTTP.api_get(url)
-      response.parsed_response
-    end
-
-
-    def update_stream(stream_id, options = {})
-      url = Config.api_base_url + "/streams/" + stream_id
-
-      body = {
-        :publishKey       => options[:publish_key],
-        :publishSecurity  => options[:publish_security] == "static" ? "static" : "dynamic",
-        :disabled         => options[:disabled]
-      }
-
-      body.delete_if { |k, v| v.nil? }
-
-      response = HTTP.api_post(url, body)
-      response.parsed_response
-    end
-
-
-    def delete_stream(stream_id)
-      url = Config.api_base_url + "/streams/" + stream_id
-      response = HTTP.api_delete(url)
-      response.parsed_response
-    end
-
-
-    def get_stream_segments(stream_id, options = {})
-      url = Config.api_base_url + "/streams/#{stream_id}/segments"
-
-      url += "?start=#{options[:start]}" if options[:start].is_a?(Fixnum)
-      url += "&end=#{options[:end]}"     if options[:end].is_a?(Fixnum)
-
-      response = HTTP.api_get(url)
-      response.parsed_response
-    end
-
-
-    def get_stream_publish_url(publish_host, stream_id, publish_key, publish_security, nonce = nil)
-      nonce = nonce.to_i
-      nonce = (Time.now.to_f * 1000.0).to_i if nonce == 0
-
-      hub, title = Utils.get_stream_hub_and_title(stream_id)
-
-      if publish_security == "static"
-        return "rtmp://#{publish_host}/#{hub}/#{title}?key=#{publish_key}"
-      else
-        token = Auth.sign(publish_key, "/#{hub}/#{title}?nonce=#{nonce}")
-        return "rtmp://#{publish_host}/#{hub}/#{title}?nonce=#{nonce}&token=#{token}"
-      end
-    end
-
-
-    def get_stream_rtmp_live_url(play_host, stream_id, preset = nil)
-      hub, title = Utils.get_stream_hub_and_title(stream_id)
-
-      if Utils.blank? preset
-        return "rtmp://#{play_host}/#{hub}/#{title}"
-      else
-        return "rtmp://#{play_host}/#{hub}/#{title}@#{preset}"
-      end
-    end
-
-
-    def get_stream_hls_live_url(play_host, stream_id, preset = nil)
-      hub, title = Utils.get_stream_hub_and_title(stream_id)
-
-      if Utils.blank? preset
-        return "http://#{play_host}/#{hub}/#{title}.m3u8"
-      else
-        return "http://#{play_host}/#{hub}/#{title}@#{preset}.m3u8"
-      end
-    end
-
-
-    def get_stream_hls_playback_url(play_host, stream_id, start_second, end_second, preset = nil)
-      hub, title = Utils.get_stream_hub_and_title(stream_id)
-
-      if Utils.blank? preset
-        return "http://#{play_host}/#{hub}/#{title}.m3u8?start=#{start_second}&end=#{end_second}"
-      else
-        return "http://#{play_host}/#{hub}/#{title}@#{preset}.m3u8?start=#{start_second}&end=#{end_second}"
-      end
-    end
-
-
-  end
-
-end
+  autoload :Auth,          'pili/auth'
+  autoload :Config,        'pili/config'
+  autoload :API,           'pili/api'
+  autoload :Utils,         'pili/utils'
+  autoload :ResponseError, 'pili/exceptions'
+
+  autoload :Client,        'pili/client'
+  autoload :Stream,        'pili/stream'
+end

data/pili.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Miclle"]
   spec.email         = ["pili@qiniu.com"]
   spec.summary       = %q{Pili SDK for Ruby.}
-  spec.description   = %q{Pili SDK for Ruby. https://github.com/pili-io/pili-sdk-ruby}
-  spec.homepage      = "https://github.com/pili-io/pili-sdk-ruby"
+  spec.description   = %q{Pili SDK for Ruby. https://github.com/pili-engineering/pili-sdk-ruby}
+  spec.homepage      = "https://github.com/pili-engineering/pili-sdk-ruby"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pili
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Miclle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.3
-description: Pili SDK for Ruby. https://github.com/pili-io/pili-sdk-ruby
+description: Pili SDK for Ruby. https://github.com/pili-engineering/pili-sdk-ruby
 email:
 - pili@qiniu.com
 executables: []
@@ -66,13 +66,16 @@ files:
 - README.md
 - Rakefile
 - lib/pili.rb
+- lib/pili/api.rb
 - lib/pili/auth.rb
+- lib/pili/client.rb
 - lib/pili/config.rb
-- lib/pili/http.rb
+- lib/pili/exceptions.rb
+- lib/pili/stream.rb
 - lib/pili/utils.rb
 - lib/pili/version.rb
 - pili.gemspec
-homepage: https://github.com/pili-io/pili-sdk-ruby
+homepage: https://github.com/pili-engineering/pili-sdk-ruby
 licenses:
 - MIT
 metadata: {}

data/lib/pili/http.rb

@@ -1,62 +0,0 @@
-# coding: utf-8
-require 'httparty'
-
-module Pili
-  class HTTP
-
-    include HTTParty
-    format :json
-
-    class << self
-
-      def api_get(url)
-        signature_options = {
-          :url => url,
-          :method => "GET"
-        }
-
-        encoded_sign = Auth.sign(Config.secret_key, Auth.generate_signature(signature_options))
-
-        headers = { "Authorization" => "Qiniu #{Config.access_key}:#{encoded_sign}" }
-
-        get(url, :headers => headers)
-      end
-
-
-      def api_post(url, body)
-        signature_options = {
-          :url => url,
-          :content_type => "application/json",
-          :method => "POST",
-          :body => body
-        }
-
-        encoded_sign = Auth.sign(Config.secret_key, Auth.generate_signature(signature_options))
-
-        headers = {
-          "Authorization" => "Qiniu #{Config.access_key}:#{encoded_sign}",
-          "Content-Type"  => "application/json"
-        }
-
-        post(url, :headers => headers, :body => body.to_json)
-      end
-
-
-      def api_delete(url)
-        signature_options = {
-          :url => url,
-          :method => "DELETE"
-        }
-
-        encoded_sign = Auth.sign(Config.secret_key, Auth.generate_signature(signature_options))
-
-        headers = { "Authorization" => "Qiniu #{Config.access_key}:#{encoded_sign}" }
-
-        delete(url, :headers => headers)
-      end
-
-
-    end
-
-  end
-end