webclient 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e556a9e6949903368d71f7b0eec721c772edbf5
-  data.tar.gz: bf7fa4bf5f66eba5a31d1b5be692d09b4693ee7e
+  metadata.gz: 5691c3a408aba34be572800dcaacef7426b49c49
+  data.tar.gz: 80e99652e7a014a159b5d307afc9cae9cd9aa602
 SHA512:
-  metadata.gz: 575883f59d791b4326d9dc88184875fb2e120a5676d946088dffc59aa9f4e493412621dc7b77e9b15c9cbb8edd611f0ad0ce25fdeae33b6248f574f9d3962a28
-  data.tar.gz: 40a53603700a3d12a55bca74071d8dbd48ebfea04bda68b0889c5cac135aca17e82aab9ab08cdf5c24f0c749fb9f24ea3a7ca64ad154d267881ef3406897dae2
+  metadata.gz: 80882b99915833bc9d42083c2252af6a3205ead8c1c6ddf22d2e9d7467f93379a94e005f2d6788f8731d64398b363a0b82e9a0bb50918179b5f5a3322a960c10
+  data.tar.gz: ebdf4df154cb51815280a753b1f26791d2d99dce586c1b3b2e037ab1b64dfdd7cea668c06736a9fc28a1ce32d6f04a84a850f7a439d3e3af5394947cf330fedd

data/lib/webclient/version.rb

@@ -1,8 +1,8 @@
 
 class Webclient
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
-  MINOR = 1
-  PATCH = 1
+  MINOR = 2
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/webclient/webclient.rb

@@ -8,16 +8,37 @@ class Webclient
     def raw() @response; end
 
 
-    def text
+    ## todo/check: rename encoding to html/http-like charset - why? why not?
+    def text( encoding: 'UTF-8' )
       # note: Net::HTTP will NOT set encoding UTF-8 etc.
       # will be set to ASCII-8BIT == BINARY == Encoding Unknown; Raw Bytes Here
       # thus, set/force encoding to utf-8
       text = @response.body.to_s
-      text = text.force_encoding( Encoding::UTF_8 )
+      if encoding.downcase == 'utf-8'
+         text = text.force_encoding( Encoding::UTF_8 )
+      else
+    ## [debug] GET=http://www.football-data.co.uk/mmz4281/0405/SC0.csv
+    ##    Encoding::UndefinedConversionError: "\xA0" from ASCII-8BIT to UTF-8
+    ##     note:  0xA0 (160) is NBSP (non-breaking space) in Windows-1252
+
+    ## note: assume windows encoding (for football-data.uk)
+    ##   use "Windows-1252" for input and convert to utf-8
+    ##
+    ##    see https://www.justinweiss.com/articles/3-steps-to-fix-encoding-problems-in-ruby/
+    ##    see https://en.wikipedia.org/wiki/Windows-1252
+    ## txt = txt.force_encoding( 'Windows-1252' )
+    ## txt = txt.encode( 'UTF-8' )
+    ##   Encoding::UTF_8 => 'UTF-8'
+        puts " [debug] converting response.text encoding from >#{encoding}< to >UTF-8<"
+
+        text = text.force_encoding( encoding )
+        text = text.encode( Encoding::UTF_8 )
+      end
+
       text
     end
 
-    ## convenience helper; returns parsed json data
+    ## convenience helper; returns parsed json data; note: always assume utf-8 (text) encoding
     def json() JSON.parse( text ); end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webclient
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc