knjrbfw 0.0.71 → 0.0.72

data/VERSION

@@ -1 +1 @@
-0.0.71
+0.0.72

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.71"
+  s.version = "0.0.72"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-07-27}
+  s.date = %q{2012-07-28}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [

data/lib/knj/php.rb

@@ -374,28 +374,27 @@ module Knj::Php
     filepath = filepath.to_s
     
     if http_match = filepath.match(/^http(s|):\/\/([A-z_\d\.]+)(|:(\d+))(\/(.+))$/)
-      if http_match[4].to_s.length > 0
-        port = http_match[4].to_i
-      end
+      port = http_match[4].to_i if http_match[4].to_s.length > 0
       
       args = {
-        "host" => http_match[2]
+        :host => http_match[2]
       }
       
       if http_match[1] == "s"
-        args["ssl"] = true
-        args["validate"] = false
+        args[:ssl] = true
+        args[:validate] = false
         
         if !port
           port = 443
         end
       end
       
-      args["port"] = port if port
+      args[:port] = port if port
       
-      http = Knj::Http.new(args)
-      data = http.get(http_match[5])
-      return data["data"]
+      require "http2"
+      Http2.new(args) do |http|
+        return http.get(http_match[5]).body
+      end
     end
     
     return File.read(filepath.untaint)

data/spec/php_spec.rb

@@ -63,6 +63,11 @@ describe "Php" do
     raise "Invalid value for hash-trala2." if hash["hash"]["trala2"] != "wtf"
   end
   
+  it "file_get_contents - http" do
+    cont = Knj::Php.file_get_contents("https://www.kaspernj.org/myip.php")
+    raise "Not IP: '#{cont}'." if !cont.to_s.match(/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/)
+  end
+  
   #Moved from "knjrbfw_spec.rb".
   it "should be able to execute various Knj::Php functions correctly." do
     str = "Kasper Johansen"

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.71
+  version: 0.0.72
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-27 00:00:00 +02:00
+date: 2012-07-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -385,7 +385,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1335178365550765429
+      hash: 1397295611010009906
       segments: 
       - 0
       version: "0"