radiospieler 0.3.8 → 0.3.10

data/VERSION

@@ -1 +1 @@
-0.3.8
+0.3.10

data/lib/extensions/http.rb

@@ -25,6 +25,11 @@ module Http
   end
   
   def get(url, max_age = nil)
+    body, headers = get_body_and_headers(url, max_age)
+    reencode body, (headers["content-type"] || []).join(";")
+  end
+
+  def get_binary(url, max_age = nil)
     body, headers = get_body_and_headers(url, max_age)
     body
   end
@@ -57,8 +62,7 @@ module Http
 
     case response
     when Net::HTTPSuccess then
-      body, headers = response.body, response.to_hash
-      [ reencode(body, response["Content-Type"]), headers ]
+      [ response.body, response.to_hash ]
     when Net::HTTPRedirection then
       location = response['location']
       App.logger.debug "redirected to #{location}"
@@ -73,6 +77,7 @@ module Http
 
     encodings.unshift($1)                   if content_type =~ /; charset=(\S+)/
     encodings.unshift(html_encoding(body))  if content_type =~ /html/
+    encodings.unshift(xml_encoding(body))   if content_type =~ /xml/
 
     force_valid_encoding body, *encodings
   end
@@ -98,4 +103,8 @@ module Http
     return unless node &&  node["content"] =~ /; charset=(\S+)/
     $1
   end
+  
+  def xml_encoding(xml)
+    Nokogiri.XML(xml).encoding
+  end
 end

data/radiospieler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "radiospieler"
-  s.version = "0.3.8"
+  s.version = "0.3.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["radiospiel"]
-  s.date = "2012-05-03"
+  s.date = "2012-05-04"
   s.description = "Some basics that your application could benefit from."
   s.email = "eno@open-lab.org"
   s.extra_rdoc_files = [

data/test/fixtures-vcr/http_test.yml

@@ -386,4 +386,299 @@ http_interactions:
         cmlwdD4=
     http_version: '1.1'
   recorded_at: Tue, 03 Apr 2012 11:11:07 GMT
-recorded_with: VCR 2.0.1
+- request:
+    method: get
+    uri: http://nowhere.test/9162.xml
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: !binary |-
+        T0s=
+    headers:
+      !binary "U2VydmVy":
+      - !binary |-
+        bmdpbngvMC43LjY1
+      !binary "RGF0ZQ==":
+      - !binary |-
+        VGh1LCAwMyBNYXkgMjAxMiAxNDoxNjoyMiBHTVQ=
+      Content-Type:
+      - !binary |-
+        dGV4dC94bWw=
+      Content-Length:
+      - !binary |-
+        MTA4OTU=
+      Last-Modified:
+      - !binary |-
+        VGh1LCAwMyBNYXkgMjAxMiAwODoxMDoyNCBHTVQ=
+      !binary "Q29ubmVjdGlvbg==":
+      - !binary |-
+        a2VlcC1hbGl2ZQ==
+      !binary "VmFyeQ==":
+      - !binary |-
+        QWNjZXB0LUVuY29kaW5n
+      !binary "RXhwaXJlcw==":
+      - !binary |-
+        VGh1LCAzMSBEZWMgMjAzNyAyMzo1NTo1NSBHTVQ=
+      Cache-Control:
+      - !binary |-
+        bWF4LWFnZT0zMTUzNjAwMDA=
+      Accept-Ranges:
+      - !binary |-
+        Ynl0ZXM=
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48Y2luZW1h
+        PjxjaW5lbWEtZGV0YWlscz48bmFtZT48IVtDREFUQVtPZGVvbl1dPjwvbmFt
+        ZT48c3RyZWV0PjwhW0NEQVRBW0hhdXB0c3RyLiAxMTZdXT48L3N0cmVldD48
+        emlwLWNvZGU+PCFbQ0RBVEFbMTA4MjddXT48L3ppcC1jb2RlPjxjaXR5Pjwh
+        W0NEQVRBW0Jlcmxpbl1dPjwvY2l0eT48dGVsZXBob25lPjwhW0NEQVRBWzAg
+        MzAvNzggNzAgNDAgMTldXT48L3RlbGVwaG9uZT48ZmF4PjwhW0NEQVRBWzAg
+        MzAvMjEgMjkgODAgOTldXT48L2ZheD48ZW1haWw+PCFbQ0RBVEFbWW9yY2tA
+        eW9yY2suZGVdXT48L2VtYWlsPjx3ZWJzaXRlPjwhW0NEQVRBW2h0dHA6Ly93
+        d3cueW9yY2suZGVdXT48L3dlYnNpdGU+PC9jaW5lbWEtZGV0YWlscz48bW92
+        aWU+PHRpdGxlPjwhW0NEQVRBW015IFdlZWsgd2l0aCBNYXJpbHluXV0+PC90
+        aXRsZT48b3JpZ2luYWwtdGl0bGU+PCFbQ0RBVEFbTXkgV2VlayB3aXRoIE1h
+        cmlseW5dXT48L29yaWdpbmFsLXRpdGxlPjx1cmw+PCFbQ0RBVEFbaHR0cDov
+        L3d3dy5tb3ZpZXBpbG90LmRlL21vdmllcy9teS13ZWVrLXdpdGgtbWFyaWx5
+        bl1dPjwvdXJsPjxhdmVyYWdlLWNvbW11bml0eS1yYXRpbmc+Njg8L2F2ZXJh
+        Z2UtY29tbXVuaXR5LXJhdGluZz48cmF0aW5ncy1jb3VudD4yMDU8L3JhdGlu
+        Z3MtY291bnQ+PGNpbmVtYS1zdGFydC1kYXRlPjIwMTItMDQtMTk8L2NpbmVt
+        YS1zdGFydC1kYXRlPjxwcm9kdWN0aW9uLXllYXI+MjAxMTwvcHJvZHVjdGlv
+        bi15ZWFyPjxydW50aW1lPjEwNDwvcnVudGltZT48cHJvZHVjdGlvbi1jb3Vu
+        dHJpZXM+PC9wcm9kdWN0aW9uLWNvdW50cmllcz48Z2VucmVzPjxnZW5yZT48
+        IVtDREFUQVtCaW9waWNdXT48L2dlbnJlPjwvZ2VucmVzPjxkZXNjcmlwdGlv
+        bj48IVtDREFUQVtNeSBXZWVrIHdpdGggTWFyaWx5biBlcnrDpGhsdCB2b24g
+        ZWluZW0gZ2FueiBiZXNvbmRlcmVuIFNvbW1lciBpbSBMZWJlbiBkZXMgV2Vs
+        dHN0YXJzIE1hcmlseW4gTW9ucm9lIChNaWNoZWxsZSBXaWxsaWFtcykuIEVz
+        IGlzdCBkYXMgSmFociAxOTU2IHVuZCBzaWUgYmVmaW5kZXQgc2ljaCBnZXJh
+        ZGUgaW4gR3Jvw59icml0dGFubmllbiwgdW0gYW4gZGVyIFNlaXRlIHZvbiBM
+        YXVyZW5jZSBPbGl2aWVyIChLZW5uZXRoIEJyYW5hZ2gpIGlocmVuIGVyc3Rl
+        biBTZWxic3Rwcm9kdXppZXJ0ZW4gRmlsbSBEZXIgUHJpbnogdW5kIGRpZSBU
+        w6RuemVyaW4genUgZHJlaGVuLiBBbSBTZXQgYmVmaW5kZXQgc2ljaCBhdWNo
+        IGRlciBqdW5nZSBPeGZvcmQtQWJnw6RuZ2VyIENvbGluIENsYXJrIChFZGRp
+        ZSBSZWRtYXluZSksIGRlciDDvGJlciBlaW5lbiBKb2IgYWxzIFJlZ2llYXNz
+        aXN0ZW50IGlucyBTaG93YnVzc2luZXNzIGVpbnN0ZWlnZW4gd2lsbC4gSGF1
+        dG5haCBrYW5uIGVyIHNvIG1pdGVybGViZW4sIHdpZSBkaWUgYWxrb2hvbC0g
+        dW5kIG1lZGlrYW1lbnRhbmFiaMOkbmdpZ2UgTWFyaWx5biBNb25yb2UgaWhy
+        ZSBLb25mbGlrdGUgbWl0IGRlbSB0cmFkaXRpb25hbGlzdGlzY2hlbiBMYXVy
+        ZW5jZSBPbGl2aWVyIHVuZCBtaXQgaWhyZW0gZnJpc2NodmVybcOkaGx0ZW4g
+        RWhlbWFubiBBcnRodXIgTWlsbGVyIChEb3VncmF5IFNjb3R0KSBhdXN0cmFn
+        ZW4gbXVzcy4gRGEgZXJnaWJ0IHNpY2ggZsO8ciBpaG4gZGllIENoYW5jZSwg
+        YWxsZWluIG1pdCBNYXJpbHluIE1vbnJpZSBxdWVyIGR1cmNoIEdyb8OfYnJp
+        dHRhbm5pZW4genUgcmVpc2VuLiBXw6RocmVuZCBkaWVzZXIgV29jaGUgZmVy
+        bmFiIGRlcyBTZXRzIGxlcm50IGVyIGRlbiBXZWx0c3RhciB2b24gaWhyZSBw
+        ZXJzw7ZubGljaGVuIHVuZCB2ZXJsZXR6bGljaGVuIFNlaXRlIGtlbm5lbi4K
+        CiAgICBIaW50ZXJncnVuZCB1bmQgSW5mb3MgenUgTXkgV2VlayB3aXRoIE1h
+        cmlseW5NeSBXZWVrIHdpdGggTWFyaWx5biBiYXNpZXJ0IGF1ZiBkZW4gTWVt
+        b2lyZW4gdm9uIENvbGluIENsYXJrLCBkZXIgbWl0IHNlaW5lbSBCdWNoIOKA
+        mFRoZSBQcmluY2UsIHRoZSBTaG93Z2lybCBhbmQgTWXigJkgZWluZW4gYmVl
+        aW5kcnVja2VuZGVuIEVpbmJsaWNrIGluIGRpZSBBcmJlaXQgYW4gRGVyIFBy
+        aW56IHVuZCBkaWUgVMOkbnplcmluIGxpZWZlcnRlLiBWaWVsZSB3dW5kZXJ0
+        ZSBiZWltIEVyc2NoZWluZW4gZGVzIEJ1Y2hlcywgZGFzcyBpbiBkZW4gbWlu
+        dXRpw7ZzZW4gQXVmemVpY2hudW5nZW4gZWluZSBrb21wbGV0dGUgV29jaGUg
+        ZmVobHRlLiBFcnN0IEphaHJlIHNww6R0ZXIgbGllZmVydGUgQ29saW4gQ2xh
+        cmsgbWl0IHNlaW5lbSBCdWNoIOKAmE15IFdlZWsgd2l0aCBNYXJpbHlu4oCZ
+        IGRpZXNlIGZlaGxlbmRlIFBhc3NhZ2UgbmFjaC4gRGVtbmFjaCBiZWthbSBl
+        ciBkaWUgR2VsZWdlbmhlaXQgZsO8ciBzZWluZSBSZWlzZSBtaXQgTWFyaWx5
+        biBNb25yb2UsIGRhIGVyIGFscyBBYmvDtm1tbGluZyBlaW5lciBlaW5mbHVz
+        c3JlaWNoZW4gYnJpdGlzY2hlbiBGYW1pbGllIFp1Z2FuZyB6dSBzb25zdCB1
+        bnp1Z8OkbmdsaWNoZW4gS3VsdHVyZGVua23DpGxlcm4gd2llIFdpbmRzb3Ig
+        Q2FzdGxlIHVuZCBFdG9uIENvbGxlZ2UgaGF0dGUuIEF1ZiBpaHJlciBnZW1l
+        aW5zYW1lbiBSZWlzZSBlbnR3aWNrZWx0ZSBzaWNoIHp3aXNjaGVuIGJlaWRl
+        biBlaW5lIGludGltZSBGcmV1bmRzY2hhZnQsIGRpZSBzb3dvaGwgdm9uIFZl
+        cnRyYXVlbiBhbHMgYXVjaCBlcm90aXNjaGVtIFByaWNrZWxuIGdlcHLDpGd0
+        IHdhci4gTXkgV2VlayB3aXRoIE1hcmlseW4gYmFzaWVydCBhdWYgYmVpZGVu
+        IELDvGNoZXJuIHZvbiBDb2xpbiBDbGFyaywgZGllIHZvbiBBZHJpYW4gSG9k
+        Z2VzIGbDvHIgZGVuIEZpbG0gYWRhcHRpZXJ0IHd1cmRlbi4gKFNUKV1dPjwv
+        ZGVzY3JpcHRpb24+PGRheSBkYXRlPSIyMDEyLTA1LTAzIj48c2hvd3RpbWUg
+        aXMtM2Q9ImZhbHNlIiBpcy1vdj0iZmFsc2UiIGlzLW9tdT0idHJ1ZSI+MTg6
+        MDA8L3Nob3d0aW1lPjxzaG93dGltZSBpcy0zZD0iZmFsc2UiIGlzLW92PSJm
+        YWxzZSIgaXMtb211PSJ0cnVlIj4yMDozMDwvc2hvd3RpbWU+PC9kYXk+PGRh
+        eSBkYXRlPSIyMDEyLTA1LTA0Ij48c2hvd3RpbWUgaXMtM2Q9ImZhbHNlIiBp
+        cy1vdj0iZmFsc2UiIGlzLW9tdT0idHJ1ZSI+MTg6MDA8L3Nob3d0aW1lPjxz
+        aG93dGltZSBpcy0zZD0iZmFsc2UiIGlzLW92PSJmYWxzZSIgaXMtb211PSJ0
+        cnVlIj4yMDozMDwvc2hvd3RpbWU+PHNob3d0aW1lIGlzLTNkPSJmYWxzZSIg
+        aXMtb3Y9ImZhbHNlIiBpcy1vbXU9InRydWUiPjIyOjUwPC9zaG93dGltZT48
+        L2RheT48ZGF5IGRhdGU9IjIwMTItMDUtMDUiPjxzaG93dGltZSBpcy0zZD0i
+        ZmFsc2UiIGlzLW92PSJmYWxzZSIgaXMtb211PSJ0cnVlIj4xNTo0NTwvc2hv
+        d3RpbWU+PHNob3d0aW1lIGlzLTNkPSJmYWxzZSIgaXMtb3Y9ImZhbHNlIiBp
+        cy1vbXU9InRydWUiPjE4OjAwPC9zaG93dGltZT48c2hvd3RpbWUgaXMtM2Q9
+        ImZhbHNlIiBpcy1vdj0iZmFsc2UiIGlzLW9tdT0idHJ1ZSI+MjA6MzA8L3No
+        b3d0aW1lPjxzaG93dGltZSBpcy0zZD0iZmFsc2UiIGlzLW92PSJmYWxzZSIg
+        aXMtb211PSJ0cnVlIj4yMjo1MDwvc2hvd3RpbWU+PC9kYXk+PGRheSBkYXRl
+        PSIyMDEyLTA1LTA2Ij48c2hvd3RpbWUgaXMtM2Q9ImZhbHNlIiBpcy1vdj0i
+        ZmFsc2UiIGlzLW9tdT0idHJ1ZSI+MTU6NDU8L3Nob3d0aW1lPjxzaG93dGlt
+        ZSBpcy0zZD0iZmFsc2UiIGlzLW92PSJmYWxzZSIgaXMtb211PSJ0cnVlIj4x
+        ODowMDwvc2hvd3RpbWU+PHNob3d0aW1lIGlzLTNkPSJmYWxzZSIgaXMtb3Y9
+        ImZhbHNlIiBpcy1vbXU9InRydWUiPjIwOjMwPC9zaG93dGltZT48L2RheT48
+        ZGF5IGRhdGU9IjIwMTItMDUtMDciPjxzaG93dGltZSBpcy0zZD0iZmFsc2Ui
+        IGlzLW92PSJmYWxzZSIgaXMtb211PSJ0cnVlIj4xODowMDwvc2hvd3RpbWU+
+        PHNob3d0aW1lIGlzLTNkPSJmYWxzZSIgaXMtb3Y9ImZhbHNlIiBpcy1vbXU9
+        InRydWUiPjIwOjMwPC9zaG93dGltZT48L2RheT48ZGF5IGRhdGU9IjIwMTIt
+        MDUtMDgiPjxzaG93dGltZSBpcy0zZD0iZmFsc2UiIGlzLW92PSJmYWxzZSIg
+        aXMtb211PSJ0cnVlIj4xODowMDwvc2hvd3RpbWU+PHNob3d0aW1lIGlzLTNk
+        PSJmYWxzZSIgaXMtb3Y9ImZhbHNlIiBpcy1vbXU9InRydWUiPjIwOjMwPC9z
+        aG93dGltZT48L2RheT48ZGF5IGRhdGU9IjIwMTItMDUtMDkiPjxzaG93dGlt
+        ZSBpcy0zZD0iZmFsc2UiIGlzLW92PSJmYWxzZSIgaXMtb211PSJ0cnVlIj4x
+        ODowMDwvc2hvd3RpbWU+PHNob3d0aW1lIGlzLTNkPSJmYWxzZSIgaXMtb3Y9
+        ImZhbHNlIiBpcy1vbXU9InRydWUiPjIwOjMwPC9zaG93dGltZT48L2RheT48
+        aW1hZ2VzPjxwb3N0ZXI+PHRodW1ibmFpbD48IVtDREFUQVtodHRwOi8vd3d3
+        Lm1vdmllcGlsb3QuZGUvZmlsZXMvaW1hZ2VzLzA2NTkvMDQ4Mi9NeV9XZWVr
+        X1dpdGhfbWFyaWx5bl90aHVtYl9pcGhvbmUuanBnXV0+PC90aHVtYm5haWw+
+        PGZ1bGxzaXplPjwhW0NEQVRBW2h0dHA6Ly93d3cubW92aWVwaWxvdC5kZS9m
+        aWxlcy9pbWFnZXMvMDY1OS8wNDgyL015X1dlZWtfV2l0aF9tYXJpbHluLmpw
+        Z11dPjwvZnVsbHNpemU+PC9wb3N0ZXI+PGltYWdlPjx0aHVtYm5haWw+PCFb
+        Q0RBVEFbaHR0cDovL3d3dy5tb3ZpZXBpbG90LmRlL2ZpbGVzL2ltYWdlcy8w
+        NTk0LzAxMzAvTmVpZ2hib3ItMjAwOV90aHVtYl9pcGhvbmUuanBnXV0+PC90
+        aHVtYm5haWw+PGZ1bGxzaXplPjwhW0NEQVRBW2h0dHA6Ly93d3cubW92aWVw
+        aWxvdC5kZS9maWxlcy9pbWFnZXMvMDU5NC8wMTMwL05laWdoYm9yLTIwMDku
+        anBnXV0+PC9mdWxsc2l6ZT48L2ltYWdlPjxpbWFnZT48dGh1bWJuYWlsPjwh
+        W0NEQVRBW2h0dHA6Ly93d3cubW92aWVwaWxvdC5kZS9maWxlcy9pbWFnZXMv
+        MDY4Ni80NDQ4L215LXdlZWstd2l0aC1tYXJpbHluLTE2X3RodW1iX2lwaG9u
+        ZS5qcGddXT48L3RodW1ibmFpbD48ZnVsbHNpemU+PCFbQ0RBVEFbaHR0cDov
+        L3d3dy5tb3ZpZXBpbG90LmRlL2ZpbGVzL2ltYWdlcy8wNjg2LzQ0NDgvbXkt
+        d2Vlay13aXRoLW1hcmlseW4tMTYuanBnXV0+PC9mdWxsc2l6ZT48L2ltYWdl
+        PjxpbWFnZT48dGh1bWJuYWlsPjwhW0NEQVRBW2h0dHA6Ly93d3cubW92aWVw
+        aWxvdC5kZS9maWxlcy9pbWFnZXMvMDY4Ni80NDM0L215LXdlZWstd2l0aC1t
+        YXJpbHluLTE1X3RodW1iX2lwaG9uZS5qcGddXT48L3RodW1ibmFpbD48ZnVs
+        bHNpemU+PCFbQ0RBVEFbaHR0cDovL3d3dy5tb3ZpZXBpbG90LmRlL2ZpbGVz
+        L2ltYWdlcy8wNjg2LzQ0MzQvbXktd2Vlay13aXRoLW1hcmlseW4tMTUuanBn
+        XV0+PC9mdWxsc2l6ZT48L2ltYWdlPjxpbWFnZT48dGh1bWJuYWlsPjwhW0NE
+        QVRBW2h0dHA6Ly93d3cubW92aWVwaWxvdC5kZS9maWxlcy9pbWFnZXMvMDY4
+        Ni80NDA2L215LXdlZWstd2l0aC1tYXJpbHluLTE0X3RodW1iX2lwaG9uZS5q
+        cGddXT48L3RodW1ibmFpbD48ZnVsbHNpemU+PCFbQ0RBVEFbaHR0cDovL3d3
+        dy5tb3ZpZXBpbG90LmRlL2ZpbGVzL2ltYWdlcy8wNjg2LzQ0MDYvbXktd2Vl
+        ay13aXRoLW1hcmlseW4tMTQuanBnXV0+PC9mdWxsc2l6ZT48L2ltYWdlPjxp
+        bWFnZT48dGh1bWJuYWlsPjwhW0NEQVRBW2h0dHA6Ly93d3cubW92aWVwaWxv
+        dC5kZS9maWxlcy9pbWFnZXMvMDY4Ni80MzkyL215LXdlZWstd2l0aC1tYXJp
+        bHluLTEzX3RodW1iX2lwaG9uZS5qcGddXT48L3RodW1ibmFpbD48ZnVsbHNp
+        emU+PCFbQ0RBVEFbaHR0cDovL3d3dy5tb3ZpZXBpbG90LmRlL2ZpbGVzL2lt
+        YWdlcy8wNjg2LzQzOTIvbXktd2Vlay13aXRoLW1hcmlseW4tMTMuanBnXV0+
+        PC9mdWxsc2l6ZT48L2ltYWdlPjwvaW1hZ2VzPjx2aWRlb3M+PHZpZGVvPjx0
+        aXRsZT48IVtDREFUQVtTdGV2ZW4gbGllYnQgS2lubyEgLSBTZW5kdW5nIHZv
+        bSAxNS4wNC4yMDEyXV0+PC90aXRsZT48dGh1bWJuYWlsPjwhW0NEQVRBW2h0
+        dHA6Ly9icmlnaHRjb3ZlMDEuYnJpZ2h0Y292ZS5jb20vMTcvMzc3OTUyNzkw
+        MDEvMzc3OTUyNzkwMDFfMTU2NDYxNzAzMjAwMV9zdGV2ZW4tMTctMDQtMjAx
+        Mi5qcGc/cHViSWQ9Mzc3OTUyNzkwMDFdXT48L3RodW1ibmFpbD48YnJpZ2h0
+        Y292ZS1pZD4xNTYzNzU4NTgyMDAxPC9icmlnaHRjb3ZlLWlkPjwvdmlkZW8+
+        PC92aWRlb3M+PGNhc3Q+PGRpcmVjdG9ycz48bmFtZT48IVtDREFUQVtTaW1v
+        biBDdXJ0aXNdXT48L25hbWU+PC9kaXJlY3RvcnM+PGFjdG9ycz48YWN0b3I+
+        PG5hbWU+PCFbQ0RBVEFbTWljaGVsbGUgV2lsbGlhbXNdXT48L25hbWU+PHJv
+        bGU+PCFbQ0RBVEFbTWFyaWx5biBNb25yb2VdXT48L3JvbGU+PC9hY3Rvcj48
+        YWN0b3I+PG5hbWU+PCFbQ0RBVEFbRWRkaWUgUmVkbWF5bmVdXT48L25hbWU+
+        PHJvbGU+PCFbQ0RBVEFbQ29saW4gQ2xhcmtdXT48L3JvbGU+PC9hY3Rvcj48
+        YWN0b3I+PG5hbWU+PCFbQ0RBVEFbSnVsaWEgT3Jtb25kXV0+PC9uYW1lPjxy
+        b2xlPjwhW0NEQVRBW1ZpdmllbiBMZWlnaF1dPjwvcm9sZT48L2FjdG9yPjxh
+        Y3Rvcj48bmFtZT48IVtDREFUQVtLZW5uZXRoIEJyYW5hZ2hdXT48L25hbWU+
+        PHJvbGU+PCFbQ0RBVEFbU2lyIExhdXJlbmNlIE9saXZpZXJdXT48L3JvbGU+
+        PC9hY3Rvcj48YWN0b3I+PG5hbWU+PCFbQ0RBVEFbRW1tYSBXYXRzb25dXT48
+        L25hbWU+PHJvbGU+PCFbQ0RBVEFbTHVjeV1dPjwvcm9sZT48L2FjdG9yPjwv
+        YWN0b3JzPjwvY2FzdD48Y29tbWVudHM+PGNvbW1lbnQ+PHVzZXI+PCFbQ0RB
+        VEFbRWxtYW4gU21pdGhlZV1dPjwvdXNlcj48cmF0aW5nPjgwPC9yYXRpbmc+
+        PHRleHQ+PCFbQ0RBVEFbQXVjaCB3ZW5uIE1pY2hlbGxlIFdpbGxpYW1zIE1h
+        cmlseW4gTW9ucm9lIGluIE15IFdlZWsgd2l0aCBNYXJpbHluIHNwaWVsdCwg
+        c29sbHRlIG1hbiBuaWNodCBlcndhcnRlbiwgZGFzcyBzaWUgTWFyaWx5biBN
+        b25yb2UgaXN0LiBJc3Qgc2llIG5pY2h0LiBVbmQgZG9jaCBpc3Qgc2llIGVp
+        bmUgZ3Jvw59hcnRpZ2UgU2NoYXVzcGllbGVyaW4uIE9obmUgc2llIGJsb8Of
+        IHp1IGtvcGllcmVuLCBsw6Rzc3Qgc2llIGRhcywgd2FzIE1hcmlseW4gTW9u
+        cm9lIGF1cy0gdW5kIHp1bSBXZWx0c3RhciwgenVtIFBow6Rub21lbiBtYWNo
+        dGUsIGF1ZnNjaGVpbmVuOiBpaHJlIHVuc2NodWxkaWdlIFNleHVhbGl0w6R0
+        LCBpaHIgU2VobmVuIG5hY2ggTGllYmUgdW0gaWhyZXIgc2VsYnN0IHdpbGxl
+        bi4gRGFzIGFsbGVzIHNpZWh0IG1hbiBnZWbDpHJidCBkdXJjaCBkaWUgQnJp
+        bGxlIGRlcyAyM2rDpGhyaWdlbiBDb2xpbiwgZGVyIGlociB1bmQgaWhyZXIg
+        QXVzc3RyYWhsdW5nLCB3aWUgc28gdmllbGUgWmVpdGdlbm9zc2VuLCB2ZXJm
+        w6RsbHQsIGxldHp0bGljaCBhYmVyIGFuIGlociByZWlmdC4gRGllcyBpc3Qg
+        c2Now7ZuIG1pdCBhbnp1c2VoZW4sIHRlaWxzIGJlcsO8aHJlbmQsIGFiZXIg
+        aGF1cHRzw6RjaGxpY2ggYW3DvHNhbnQsIHdlaWwgZGVyIEh5cGUgdW0gaWhy
+        ZSBQZXJzb24gZWluZmFjaCBkYXp1IGVubMOkZHQuIEdyb8OfZW4gQW50ZWls
+        IGFuIGRlbSBWZXJnbsO8Z2VuLCBkYXMgTXkgV2VlayB3aXRoIE1hcmlseW4g
+        YmVyZWl0ZXQsIGhhdCBuaWNodCB6dWxldHp0IEtlbm5ldGggQnJhbmFnaCBh
+        bHMgTGF1cmVuY2UgT2xpdmllciwgZGVyIGFuIGRlbiBBbGzDvHJlbiBzZWlu
+        ZXMgU3RhcnMgc2ljaHRsaWNoIHp1IGxlaWRlbiBoYXQuIEtlaW4gZ3Jvw59h
+        cnRpZ2VzIEJpb3BpYywgYWJlciBkYXJhdWYgaGF0IGRlciBGaWxtIGVzIGF1
+        ZmdydW5kIGRlciBnZXfDpGhsdGVuIFBlcnNwZWt0aXZlIGF1Y2ggbmljaHQg
+        YW5nZWxlZ3QuIEFiZXIgZWluIHNlaHIgbmV0dGVyLCBicml0aXNjaGVyIEZp
+        bG0uICBdXT48L3RleHQ+PC9jb21tZW50Pjxjb21tZW50Pjx1c2VyPjwhW0NE
+        QVRBW2RlbmlzZV1dPjwvdXNlcj48cmF0aW5nPjc1PC9yYXRpbmc+PHRleHQ+
+        PCFbQ0RBVEFbV2lsbGlhbXMgaXN0IGdyb8OfYXJ0aWcgYWxzIE1hcmlseW4g
+        dW5kIHNpZSBzaW5ndCBzb2dhciBzZWxic3QhIEF1Y2ggd2VubiBpaHJlIGVo
+        ZXIgbcOkZGNoZW5oYWZ0ZW4gWsO8Z2UgdW5kIEZpZ3VyIG5pY2h0IGdhbnog
+        ZGVtIFZvcmJpbGQgZW50c3ByaWNodCwgYWxsZXMgYW5kZXJlIHRyaWZmdCBz
+        aWUgZ2VuYXUgYXVmIGRlbiBQdW5rdCEKCkRlciBGaWxtIGhhdCBkZW4gc2No
+        w7ZuZW4gUmFobWVuIGVpbmVyIEF1dG9iaW9ncmFmaWUgdW5kIHNvIHNpZWh0
+        IG1hbiBkZW4gU3RhciBkZXMgRmlsbXMgYXVzIGRlciBTaWNodCBhbGwgaWhy
+        ZXIgQmV3dW5kZXJlciB1bmQgS29sbGVnZW4uIAoKRGllIGhhYmVuIGRhbm4g
+        YXVjaCBuaWNodCB2aWVsIG1laHIgenUgdHVuLCBhdcOfZXIgSnVkaSBEZW5j
+        aCwgZGllIGFuZmFuZ3MgZGllIHZlcnN0w6RuZG5pc3ZvbGxlIExhZHkgdW5k
+        IEtlbm5ldGggQnJhbmFnaCwgZGVyIGRlbiB2ZXJ6d2VpZmVsbmRlbiBzYXJr
+        YXN0aXNjaGVuIE9saXZpZXIgc3BpZWxlbiBkYXJmLiAKCkRpZSBUcmFnw7Zk
+        aWUsIGRlciBSdWhtLCBkZXIgTXl0aG9zIHVuZCBkZXIgWmF1YmVyIGRlciBN
+        b25yb2Ugc2luZCBoaWVyIGRlciBGb2N1cyAtIHVuZCBtYWNoZW4gZGVuIHph
+        dWJlcmhhZnRlbiBGaWxtIHp1IGVpbmVtIGplbmVyIFdlcmtlLCBkaWUgZWlu
+        ZW0gZWluIEzDpGNoZWxuIGlucyBHZXNpY2h0IHphdWJlcm4uXV0+PC90ZXh0
+        PjwvY29tbWVudD48Y29tbWVudD48dXNlcj48IVtDREFUQVtQZXJjaWxpdG9y
+        XV0+PC91c2VyPjxyYXRpbmc+ODA8L3JhdGluZz48dGV4dD48IVtDREFUQVtF
+        aW4gc2VociBzY2jDtm5lciB1bmQgaHVtb3J2b2xsZXIgRWluYmxpY2sgaW4g
+        ZGllIFdlbHQgZGVyIE1hcmlseW4gTW9ucm9lLiBdXT48L3RleHQ+PC9jb21t
+        ZW50Pjxjb21tZW50Pjx1c2VyPjwhW0NEQVRBW3F1YWR6YXJdXT48L3VzZXI+
+        PHJhdGluZz44MDwvcmF0aW5nPjx0ZXh0PjwhW0NEQVRBW0dyb8OfYXJ0aWdl
+        ciBGaWxtLCBhYmVyIG5pY2h0IHVuYmVkaW5ndCBkdXJjaCBkaWUgU3TDpHJr
+        ZW4gc2VpbmVzIFBsb3RzLiBNaWNoZWxsZSBXaWxsaWFtcyDDvGJlcnpldWd0
+        ZSBtaWNoIHNvIHZvbiBNYXJpbHluIE1vbnJvZXMgVW53aWRlcnN0ZWhsaWNo
+        a2VpdCwgZGFzcyBpY2ggbmljaHQgYW5kZXJzIGtvbm50ZSwgYWxzIG1pY2gg
+        ZWluIGJpw59jaGVuIGluIHNpZSB6dSB2ZXJsaWViZW4uIEhhYmUgbmllIGVp
+        bmVuIE1vbnJvZS1GaWxtIGdlc2VoZW4gdW5kIHdpbGwgZXMgYXVjaCBnYXIg
+        bmljaHQgKG1hY2hlIGVzIGFiZXIgdHJvdHpkZW0pLCB1bSBtaXIgZGllc2Ug
+        SWxsdXNpb24gdm9uIGVpbmVyIHNvICh0YWt0aXNjaCkgdmVyZsO8aHJlcmlz
+        Y2hlbiwgYWJlciBnbGVpY2h6ZWl0aWcgc2Nod2VyIHVtZ8OkbmdsaWNoZW4s
+        IHZvbiBpbm5lcmVuIFp3ZWlmZWxuIHplcnJpc3NlbmVuIEZyYXUgenUgYmV3
+        YWhyZW4uIEFtIEVuZGUgd3Vzc3RlIGljaCBuaWNodCwgd2lldmllbCBtZWlu
+        ZXIgWnVuZWlndW5nIGR1cmNoIGJpbGxpZ2VuIEJlc2Now7x0emVyaW5zdGlu
+        a3QgdW5kIGlocmVuIGdlc3BpZWx0ZW4sIG5haXZlbiBDaGFybWUgaGVydm9y
+        Z2Vob2x0IHd1cmRlLiBJaHIga2F1bSBkdXJjaHNjaGF1YmFyZXMgU3BpZWwg
+        YXVmIHZpZWxlbiB2ZXJzY2hpZWRlbmVuIENoYXJha3RlcmViZW5lbiBow6R0
+        dGUgbWVpbmVyIE1laW51bmcgbmFjaCBzZWluZW4gT3NjYXIgdmVyZGllbnQg
+        Z2VoYWJ0Lg0KDQrDhGhubGljaGVzIExvYiBnZWh0IGFuIEtlbm5ldGggQnJh
+        bmFnaCBhbHMgTGF1cmVuY2UgT2xpdmllciB1bmQgRWRkaWUgUmVkbWF5bmUg
+        YWxzIENvbGluIENsYXJrLCBkaWUgYmVpZGUgYW4gaWhyZXIgRmFzemluYXRp
+        b24gZsO8ciBNb25yb2UgemVyYnJlY2hlbiwgdW0gbWl0IG5ldWVyIGlubmVy
+        ZXIgT3JkbnVuZyAob2RlciBVbm9yZG51bmcpIGF1cyBkZW0gRmlsbSBoZXJ2
+        b3J6dWdlaGVuLiBXw6RocmVuZCB2aWVsIGR1cmNoIERpYWxvZ2UgZ2VzY2hh
+        ZmZ0IHdpcmQsIHNwcmljaHQgdm9yIGFsbGVtIGRlciBlaW5lIEJsaWNrIHZv
+        biBDb2xpbiBpbiBkaWVzZXIgZWluZW4sIGJlc3RpbW10ZW4gU3plbmUgQsOk
+        bmRlLiBBbGxlcyBpbiBhbGxlbSBlaW4gbWVociBhbHMgZ2VsdW5nZW5lcyBS
+        ZWdpZWRlYsO8dCBmw7xyIFNpbW9uIEN1cnRpcywgZGVyIHNlaW5lIERhcnN0
+        ZWxsZXIgZ2VuYXUgcmljaHRpZyBnZXfDpGhsdCBoYXQuIF1dPjwvdGV4dD48
+        L2NvbW1lbnQ+PGNvbW1lbnQ+PHVzZXI+PCFbQ0RBVEFbYW5uYWJlcmxpbl1d
+        PjwvdXNlcj48cmF0aW5nPjgwPC9yYXRpbmc+PHRleHQ+PCFbQ0RBVEFbTWlj
+        aGVsbGUgV2lsbGlhbXMgaXN0IGVpbmUgaGlucmVpc3NlbmRlIFNjaGF1c3Bp
+        ZWxlcmluIHVuZCBoYXQgZWluIHVuZ2xhdWJsaWNoZXMgR2VzcMO8ciBmw7xy
+        IFJvbGxlbiB1bmQgV2Vya2UuIFNpZSBzcGllbHQgZWJlbnNvIGhpbnJlaXNz
+        ZW5kIGluIGRpZXNlbSBGaWxtLCBzY2hhZmZ0IGVzIGFiZXIgZGVubm9jaCBu
+        aWNodCwgZXMgZWluZXIgTWFyaWx5biBNb25yb2UgZ2xlaWNoenVtYWNoZW4u
+        IE1vbnJvZSB3YXIgbnVuIG1hbCBlaW5lIHVuZ2xhdWJsaWNoIGF0dHJha3Rp
+        dmUsIHNleHkgU2NoYXVzcGllbGVyaW4gdW5kIGZsYXR0ZXJ0ZSBzdGV0cyB6
+        d2lzY2hlbiBlaW5lbSBuYWl2ZW4gS2luZCB1bmQgZWluZXIgRXJvdGlraWtv
+        bmUgaGluLSB1bmQgaGVyLiBNaWNoZWxsZSBXaWxsaWFtcyBzY2hhZmZ0IGRp
+        ZXMgbGVpZGVyIG5pY2h0IGltbWVyLCBpY2ggbW9jaHRlIGF1Y2ggbmljaHQg
+        d2lya2xpY2ggZGVuIHBhdXNiw6Rja2lnZW4gRWRkaWUgUmVkbWF5bmUgdW5k
+        IGRlbiBQbG90IGRlcyBGaWxtcy4gRXMgaW50ZXJlc3NpZXJ0IG1pY2ggZWlu
+        ZmFjaCBuaWNodCB3aXJrbGljaCwgd2FzIGRhIHp3aXNjaGVuIGRlbSBCdWJp
+        IHVuZCBkZW0gU2VzeW1ib2wgcGFzc2llcnQuIFVtIE1hcmlseW4gTW9ucm9l
+        IHp1IHZlcnN0ZWhlbiwgd8O8cmRlIGljaCB3aXJrbGljaCBsaWViZXIgbm9j
+        aG1hbCBlaW5lbiBGaWxtIG1pdCBpaHIgYW5zZWhlbiwgYXVjaCB3ZW5uIGlj
+        aCBNeSBXZWVrIHdpdGggTWFyaWx5biBhbHMgZ3V0ZW4gRmlsbSBlcmFjaHRl
+        LiBdXT48L3RleHQ+PC9jb21tZW50PjwvY29tbWVudHM+PC9tb3ZpZT48L2Np
+        bmVtYT4=
+    http_version: 
+  recorded_at: Thu, 03 May 2012 14:16:22 GMT
+recorded_with: VCR 2.1.1

data/test/http_test.rb

@@ -18,10 +18,24 @@ class HttpTest < Test::Unit::TestCase
 
   def test_get_body_and_headers
     VCR.use_cassette('http_test') do
-      body, headers = Http.get_body_and_headers("http://google.de", 0)
+      body, headers = Http.get("http://google.de", 0)
       assert body.starts_with?("<!doctype html>")
-      assert_equal ["text/html; charset=ISO-8859-1"], headers["content-type"]
       assert_equal "UTF-8", body.encoding.name
     end
   end
+
+  def test_xml_url
+    VCR.use_cassette('http_test', :record => :new_episodes) do
+      body, headers = Http.get("http://nowhere.test/9162.xml", 0)
+      assert body =~ /Tänzerin/, "Encoding should accept UTF-8 umlauts"
+      assert_equal "UTF-8", body.encoding.name
+    end
+  end
+
+  def test_get_binaty
+    VCR.use_cassette('http_test', :record => :new_episodes) do
+      body, headers = Http.get_binary("http://nowhere.test/9162.xml", 0)
+      assert_equal "ASCII-8BIT", body.encoding.name
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiospieler
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &70261390331080 !ruby/object:Gem::Requirement
+  requirement: &70261663798980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70261390331080
+  version_requirements: *70261663798980
 - !ruby/object:Gem::Dependency
   name: simple_cache_rs
-  requirement: &70261390330540 !ruby/object:Gem::Requirement
+  requirement: &70261663798280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70261390330540
+  version_requirements: *70261663798280
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70261390329900 !ruby/object:Gem::Requirement
+  requirement: &70261663797160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70261390329900
+  version_requirements: *70261663797160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70261390329360 !ruby/object:Gem::Requirement
+  requirement: &70261663796000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261390329360
+  version_requirements: *70261663796000
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70261390328680 !ruby/object:Gem::Requirement
+  requirement: &70261663794260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261390328680
+  version_requirements: *70261663794260
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70261390327980 !ruby/object:Gem::Requirement
+  requirement: &70261663793180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261390327980
+  version_requirements: *70261663793180
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70261390326640 !ruby/object:Gem::Requirement
+  requirement: &70261663792640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261390326640
+  version_requirements: *70261663792640
 - !ruby/object:Gem::Dependency
   name: psych
-  requirement: &70261390325880 !ruby/object:Gem::Requirement
+  requirement: &70261663791640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261390325880
+  version_requirements: *70261663791640
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70261390325340 !ruby/object:Gem::Requirement
+  requirement: &70261663790980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261390325340
+  version_requirements: *70261663790980
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70261390324680 !ruby/object:Gem::Requirement
+  requirement: &70261663790200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261390324680
+  version_requirements: *70261663790200
 - !ruby/object:Gem::Dependency
   name: simple_cov
-  requirement: &70261390324020 !ruby/object:Gem::Requirement
+  requirement: &70261663789380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261390324020
+  version_requirements: *70261663789380
 description: Some basics that your application could benefit from.
 email: eno@open-lab.org
 executables: []
@@ -198,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -453988988338308160
+      hash: 3228294531460670923
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: