hktv 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 480088f574c5b62191b13bf05b158af33316b6a0
-  data.tar.gz: b8cde4170b9e46f412663028818720cea5a21c51
+  metadata.gz: a2c34f24b4c46d0c380d837409d3f7d27780a880
+  data.tar.gz: 000e23229b54648023fdf792cdd3c9563fde8b68
 SHA512:
-  metadata.gz: db2ea07db61ffa58cdd23dd7043072bcf02d41f5c03c943c03a33c5cce3b34bfb6e8424118d893c48b881b290af38b16316fded9d69ecf0e3f065defba45f006
-  data.tar.gz: ded7e980b52a9555b8320c573dd02c7231be9d0360e66fe462f967c0f401d25bd0eb9eaa087b48b534016ad2624310a832e5a16624f52f485b4859026b8edc06
+  metadata.gz: bd45546215d8d851721bd3f4f8892164981d212dd3833ee82c3e9072e566906c7598df4693be9b99c20d89626f4ecc27083022208ef0ef6b58dca0540e6165e3
+  data.tar.gz: d2d062538db56b4922a90ec2b0e6bb9c39c3f203f73b35daa22aa5b0831156aeb1f5650bcba0f7682c4d5ce11d0d13a7b1ba0d5cf46b554bc25c47845fcdffde

data/README.md

@@ -7,7 +7,7 @@ Command line utilities to find and download HKTV videos.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'hktv', github: "siuying/ruby-hktv"
+gem 'hktv'
 ```
 
 And then execute:

data/lib/hktv.rb

@@ -53,7 +53,7 @@ class HKTV
 
   # return true if client has authenticated, false otherwise
   def authenticated?
-    if @expires_date && Time.now > @expires_date
+    if expired?
       @access_token = nil
       @expires_date = nil
       @refresh_token = nil
@@ -62,6 +62,10 @@ class HKTV
     !@access_token.nil?
   end
 
+  def expired?
+   !@expires_date || Time.now > @expires_date
+  end
+
   # return true if client needs ott token
   def needs_ott_token?
     return @ott_token.nil? || (@ott_expires_date && Time.now > @ott_expires_date)
@@ -76,7 +80,7 @@ class HKTV
       "password" => password
     }
 
-    auth = post_json("https://www.hktvmall.com:443/hktvwebservices/oauth/token?rand=#{Time.now.to_i}", body: options, basic_auth: {username: API_USERNAME, password: API_PASSWORD})
+    auth = self.class.post("https://www.hktvmall.com:443/hktvwebservices/oauth/token?rand=#{Time.now.to_i}", body: options, basic_auth: {username: API_USERNAME, password: API_PASSWORD})
     @access_token = auth["access_token"]
     @expires_date = Time.now + auth["expires_in"]
     @refresh_token = auth["refresh_token"]
@@ -90,7 +94,7 @@ class HKTV
     # hktv api just fail for unknown reason, retry to workaround it
     Retriable.retriable(tries: 20, base_interval: 1.0) do
       if authenticated?
-        result = get_json("https://www.hktvmall.com:443/hktvwebservices/v1/hktv/ott/token?rand=#{Time.now.to_i}", headers: headers)
+        result = self.class.get("https://www.hktvmall.com:443/hktvwebservices/v1/hktv/ott/token?rand=#{Time.now.to_i}", headers: headers)
       else
         ts = Time.now.to_i
         options = {
@@ -223,18 +227,6 @@ class HKTV
     end
   end
 
-  def post_json(path, options={})
-    response = self.class.post(path, options)
-    data = response.body
-    JSON.parse(data)
-  end
-
-  def get_json(path, options={})
-    response = self.class.get(path, options)
-    data = response.body
-    JSON.parse(data)
-  end
-
   def sign_request(path, timestamp, params=[])
     return Digest::MD5.hexdigest(path + params.join("") + API_SECRET + timestamp.to_s)
   end

data/lib/hktv/command.rb

@@ -106,6 +106,11 @@ class HKTV
 
         c.action do |args, options|
           hktv = self.load
+          
+          if hktv.expired?
+            puts "Login expired! Run \"hktv login\" first."
+            raise "Login Expired"
+          end
 
           unless hktv.authenticated?
             puts "You have not login! Try \"hktv login\"" 
@@ -118,7 +123,7 @@ class HKTV
 
           filename = filename_with_title(title, ".mp4") if filename.nil?
           programs = extract_root_videos(hktv.programs)
-          programs = programs.select {|program| program["title"].include?(title) }
+          programs = programs.select {|program| program["title"].start_with?(title) } || programs.select {|program| program["title"].include?(title) }
 
           if programs.size == 0
             puts "No video matching \"#{title}\""

data/lib/hktv/version.rb

@@ -1,3 +1,3 @@
 class HKTV
-  VERSION = "1.0.1"
+  VERSION = "1.0.3"
 end

data/spec/spec_helper.rb

@@ -14,12 +14,15 @@ VCR.configure do |c|
     i.request.uri.sub!(/:\/\/.*#{Regexp.escape(u.host)}/, "://#{u.host}" )
   end
 
+  username = ENV["HKTV_USER_NAME"] ? ENV["HKTV_USER_NAME"] : "<username>"
+  password = ENV["HKTV_PASSWORD"] ? ENV["HKTV_PASSWORD"] : "<password>"
+
   c.filter_sensitive_data('<HKTV_PASSWORD>') do
-    CGI.escape ENV['HKTV_PASSWORD']
+    CGI.escape password
   end
 
   c.filter_sensitive_data('<HKTV_USER_NAME>') do
-    CGI.escape ENV['HKTV_USER_NAME']
+    CGI.escape username
   end
 
   # Matches authenticated requests regardless of their Basic auth string (https://user:pass@domain.tld)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hktv
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Francis Chong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler