sportsflix 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d52a51b76a3464f486e020e8b17878451454e044
-  data.tar.gz: e561a1dc515827b6d979444596a10f0e97f2e175
+  metadata.gz: f30e7c7fc0b7de5e6fb2083ff704984c4de93764
+  data.tar.gz: 78c8aae468eddd0c85d90a2362134f69a0b8c854
 SHA512:
-  metadata.gz: ddf28e970279ee9cdc9509b076f847c1eda8b107594716451b18c2d4a141f515a1bb9299fb7c745770af7edabb26df884f194ed3c2355a60ce49ec6cab9da43a
-  data.tar.gz: 894d0dbe5a0b408dfe5bb5712208655e91de36cc70ce8de89b6301cddb887226e5b8cacb25df3d64f46257be65c141aa18464831a14bdd82e71c1eefd47f28de
+  metadata.gz: 1485abed1a5e0d5bf1f630edc5190a441fc4289f5740fad1687f0104da1ee410ed854222f1c91c913986e8b7faa48c03e5dbb9621d5ef466e2527e07e7459b69
+  data.tar.gz: fe4ce15d3f4caf0fc8792b18d2cf21868f33bafc322f78a62587efdbd61458603b8f077c54f59a21e0b3ddd0fa12d71ea2673ca814d6cde5012d8fdb2927d7db

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sportsflix (1.2.2)
+    sportsflix (1.2.3)
       execjs-fastnode (~> 0.2.0)
       oga (~> 2.8)
       thor (~> 0.19.4)

data/lib/sportsflix/utils/http.rb

@@ -57,20 +57,8 @@ module Sportsflix
 
       private
       def with_cf_bypass(res, req_lambda)
-        if res.is_a?(Net::HTTPRedirection)
-          puts "Redirecting from #{res.uri.to_s} to #{res['location']}."
-          res
-        elsif res.is_a?(Net::HTTPServiceUnavailable) &&
-            res['Server'] == 'cloudflare-nginx' &&
-            res.body.include?('jschl_vc') &&
-            res.body.include?('jschl_answer')
-
-          url = "#{res.uri.scheme}://#{res.uri.hostname}"
-          if res.uri.port
-            url = "#{url}:#{res.uri.port}"
-          end
-
-          url = "#{url}/cdn-cgi/l/chk_jschl"
+        if needs_cf_answer(res)
+          url = "#{res.uri.scheme}://#{res.uri.hostname}:#{res.uri.port}/cdn-cgi/l/chk_jschl"
 
           @headers = @headers.merge({Referer: res.uri.to_s})
           @params  = @params.merge(
@@ -84,10 +72,21 @@ module Sportsflix
           redirect = req_lambda.call(url)
           req_lambda.call(redirect['location'])
         else
+          if res.is_a?(Net::HTTPRedirection)
+            puts "Redirecting from #{res.uri} to #{res['location']}."
+          end
+
           res
         end
       end
 
+      def needs_cf_answer(res)
+        res.is_a?(Net::HTTPServiceUnavailable) &&
+            res['Server'] == 'cloudflare-nginx' &&
+            res.body.include?('jschl_vc') &&
+            res.body.include?('jschl_answer')
+      end
+
       def solve_challenge(body)
         begin
           js = /setTimeout\(function\(\){\s+(var s,t,o,p,b,r,e,a,k,i,n,g,f.+?\r?\n[\s\S]+?a\.value =.+?)\r?\n/.match(body)

data/lib/sportsflix/version.rb

@@ -1,3 +1,3 @@
 module Sportsflix
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportsflix
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Rodrigo Fernandes