pili 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdaa7674765c108d9c5188d267b4bc6c52a6ed82
-  data.tar.gz: fed41e06d022b17ac10951ec91a9ff293d3b2d66
+  metadata.gz: bf5d334a509a06baeeb43e0d89f0937f4e96a3db
+  data.tar.gz: 04bcbfcffe3cb15134b1aadb2db0ecc59a8166c7
 SHA512:
-  metadata.gz: afaf9fe81e1fe2670820ca592b6ff7a917b972b7a1d7abda20cc58a7b810cb5389ea43709984217c589010a41740f4ca634b100c95762fc01f4417118a9c56d6
-  data.tar.gz: dfea20eb80debda99461065a384f983aa8f5db98df1999200fe8fe6017b3a3c14b76be3e47dbfc36630e2cab605fa99e47740152c06ddf5169ee308c68caa3f2
+  metadata.gz: 460b40e5b5a7fa7088d87faf4e89b0f57e1203c676f4e5947fc621bcb3f4cb0f6915d3edb52918c862e51c45db366ffec5a3f9a9a61383d3c8c3194b992989f2
+  data.tar.gz: a4638145b882b29acb14e6f39119fa80e20919bbbfa6a9d47f78fbfcab31e6e494c260a094de9160b6913dbe7e20343140d77f3946f6a2f1b3e125018ecde243

data/lib/pili/config.rb

@@ -6,11 +6,11 @@ module Pili
       DEFAULT_OPTIONS = {
         :api_version        => "v1",
         :api_scheme         => "http",
-        :api_host           => "pili.qiniuapi.com",
+        :api_host           => "pili.qiniuapi.com"
 
-        :rtmp_publish_host  => "pub.z1.glb.pili.qiniup.com",
-        :rtmp_play_host     => "live.z1.glb.pili.qiniucdn.com",
-        :hls_play_host      => "hls.z1.glb.pili.qiniuapi.com"#,
+        # :rtmp_publish_host  => "pub.z1.glb.pili.qiniup.com",
+        # :rtmp_play_host     => "live.z1.glb.pili.qiniucdn.com",
+        # :hls_play_host      => "hls.z1.glb.pili.qiniuapi.com",
 
         # :access_key         => "",
         # :secret_key         => ""
@@ -40,18 +40,6 @@ module Pili
         settings[:secret_key]
       end
 
-      def rtmp_publish_host
-        settings[:rtmp_publish_host]
-      end
-
-      def rtmp_play_host
-        settings[:rtmp_play_host]
-      end
-
-      def hls_play_host
-        settings[:hls_play_host]
-      end
-
     end
   end
 end

data/lib/pili/utils.rb

@@ -8,6 +8,11 @@ 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 = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/pili.rb

@@ -85,54 +85,50 @@ module Pili
     end
 
 
-    def get_stream_publish_url(stream_id, publish_key, publish_security, nonce = nil)
+    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
 
-      a = stream_id.split(".")
-      hub, title = a[1], a[2]
+      hub, title = Utils.get_stream_hub_and_title(stream_id)
 
       if publish_security == "static"
-        return "rtmp://#{Config.rtmp_publish_host}/#{hub}/#{title}?key=#{publish_key}"
+        return "rtmp://#{publish_host}/#{hub}/#{title}?key=#{publish_key}"
       else
         token = Auth.sign(publish_key, "/#{hub}/#{title}?nonce=#{nonce}")
-        return "rtmp://#{Config.rtmp_publish_host}/#{hub}/#{title}?nonce=#{nonce}&token=#{token}"
+        return "rtmp://#{publish_host}/#{hub}/#{title}?nonce=#{nonce}&token=#{token}"
       end
     end
 
 
-    def get_stream_rtmp_live_url(stream_id, preset = nil)
-      a = stream_id.split(".")
-      hub, title = a[1], a[2]
+    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://#{Config.rtmp_play_host}/#{hub}/#{title}"
+        return "rtmp://#{play_host}/#{hub}/#{title}"
       else
-        return "rtmp://#{Config.rtmp_play_host}/#{hub}/#{title}@#{preset}"
+        return "rtmp://#{play_host}/#{hub}/#{title}@#{preset}"
       end
     end
 
 
-    def get_stream_hls_live_url(stream_id, preset = nil)
-      a = stream_id.split(".")
-      hub, title = a[1], a[2]
+    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://#{Config.hls_play_host}/#{hub}/#{title}.m3u8"
+        return "http://#{play_host}/#{hub}/#{title}.m3u8"
       else
-        return "http://#{Config.hls_play_host}/#{hub}/#{title}@#{preset}.m3u8"
+        return "http://#{play_host}/#{hub}/#{title}@#{preset}.m3u8"
       end
     end
 
 
-    def get_stream_hls_playback_url(stream_id, start_second, end_second, preset = nil)
-      a = stream_id.split(".")
-      hub, title = a[1], a[2]
+    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://#{Config.hls_play_host}/#{hub}/#{title}.m3u8?start=#{start_second}&end=#{end_second}"
+        return "http://#{play_host}/#{hub}/#{title}.m3u8?start=#{start_second}&end=#{end_second}"
       else
-        return "http://#{Config.hls_play_host}/#{hub}/#{title}@#{preset}.m3u8?start=#{start_second}&end=#{end_second}"
+        return "http://#{play_host}/#{hub}/#{title}@#{preset}.m3u8?start=#{start_second}&end=#{end_second}"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pili
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Miclle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler