knjrbfw 0.0.8 → 0.0.9

data/lib/knj/http2.rb

@@ -1,10 +1,15 @@
 class Knj::Http2
   attr_reader :cookies
   
-  def initialize(args)
+  def initialize(args = {})
+    args = {:host => args} if args.is_a?(String)
+    raise "Arguments wasnt a hash." if !args.is_a?(Hash)
+    require "#{$knjpath}web"
+    
     @args = args
     @cookies = {}
     @debug = @args[:debug]
+    @mutex = Mutex.new
     
     if !@args[:port]
       if @args[:ssl]
@@ -27,15 +32,68 @@ class Knj::Http2
     end
     
     raise "No host was given." if !@args[:host]
+    self.reconnect
+  end
+  
+  def socket_working?
+    return false if !@sock or @sock.closed?
+    
+    if @keepalive_timeout and @request_last
+      between = Time.now.to_i - @request_last.to_i
+      if between >= @keepalive_timeout
+        print "Http2: We are over the keepalive-wait - returning false for socket_working?.\n" if @debug
+        return false
+      end
+    end
+    
+    return true
+  end
+  
+  #Reconnects to the host.
+  def reconnect
+    print "Http2: Reconnect.\n" if @debug
+    
+    #Reset variables.
+    @keepalive_max = nil
+    @keepalive_timeout = nil
+    @connection = nil
+    @contenttype = nil
+    @charset = nil
     
-    @sock_plain = TCPSocket.new(@args[:host], @args[:port])
+    #Open connection.
+    if @args[:proxy]
+      print "Http2: Initializing proxy stuff.\n" if @debug
+      @sock_plain = TCPSocket.new(@args[:proxy][:host], @args[:proxy][:port])
+      @sock = @sock_plain
+      
+      @sock.write("CONNECT #{@args[:host]}:#{@args[:port]} HTTP/1.0#{@nl}")
+      @sock.write("User-Agent: #{@uagent}#{@nl}")
+      
+      if @args[:proxy][:user] and @args[:proxy][:passwd]
+        credential = ["#{@args[:proxy][:user]}:#{@args[:proxy][:passwd]}"].pack("m")
+        credential.delete!("\r\n")
+        @sock.write("Proxy-Authorization: Basic #{credential}#{@nl}")
+      end
+      
+      @sock.write(@nl)
+      
+      res = @sock.gets
+      if res.to_s.downcase != "http/1.0 200 connection established#{@nl}"
+        raise res
+      end
+      
+      res_empty = @sock.gets
+      raise "Empty res wasnt empty." if res_empty != @nl
+    else
+      @sock_plain = TCPSocket.new(@args[:host], @args[:port])
+    end
     
     if @args[:ssl]
+      print "Http2: Initializing SSL.\n" if @debug
       require "openssl"
       
       ssl_context = OpenSSL::SSL::SSLContext.new
       #ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      #ssl_context.ca_file = CA_FILE
       
       @sock_ssl = OpenSSL::SSL::SSLSocket.new(@sock_plain, ssl_context)
       @sock_ssl.sync_close = true
@@ -47,94 +105,207 @@ class Knj::Http2
     end
   end
   
-  def get(addr)
-    header_str = "GET /#{addr} HTTP/1.1#{@nl}"
-    header_str += self.header_str(
-      "Host" => @args[:host],
-      "Connection" => "Keep-Alive",
-      "User-Agent" => @uagent
-    )
-    header_str += "#{@nl}"
-    
-    @sock.puts(header_str)
-    return self.read_response
+  def get(addr, args = {})
+    @mutex.synchronize do
+      header_str = "GET /#{addr} HTTP/1.1#{@nl}"
+      header_str << self.header_str(self.default_headers(args), args)
+      header_str << "#{@nl}"
+      
+      print "Http2: Writing headers.\n" if @debug
+      self.write(header_str)
+      
+      print "Http2: Reading response.\n" if @debug
+      resp = self.read_response(args)
+      
+      print "Http2: Done with get request.\n" if @debug
+      return resp
+    end
   end
   
-  def post(addr, pdata = {})
-    praw = ""
-    pdata.each do |key, val|
-      praw += "&" if praw != ""
-      praw += "#{Knj::Web.urlenc(key)}=#{Knj::Web.urlenc(val)}"
+  #Tries to write a string to the socket. If it fails it reconnects and tries again.
+  def write(str)
+    #Reset variables.
+    @length = nil
+    @encoding = nil
+    self.reconnect if !self.socket_working?
+    
+    begin
+      raise Errno::EPIPE, "The socket is closed." if !@sock or @sock.closed?
+      @sock.puts(str)
+    rescue Errno::EPIPE #this can also be thrown by puts.
+      self.reconnect
+      @sock.puts(str)
     end
     
-    header_str = "POST /#{addr} HTTP/1.1#{@nl}"
-    header_str += self.header_str(
+    @request_last = Time.now
+  end
+  
+  def default_headers(args = {})
+    return args[:default_headers] if args[:default_headers]
+    
+    headers = {
       "Host" => @args[:host],
       "Connection" => "Keep-Alive",
-      "User-Agent" => @uagent,
-      "Content-Length" => praw.length
-    )
-    header_str += "#{@nl}"
-    header_str += praw
+      "User-Agent" => @uagent
+    }
+    
+    if !@args.key?(:encoding_gzip) or @args[:encoding_gzip]
+      headers["Accept-Encoding"] = "gzip"
+    else
+      headers["Accept-Encoding"] = "none"
+    end
     
-    @sock.puts(header_str)
-    return self.read_response
+    return headers
   end
   
-  def header_str(headers_hash)
-    if @cookies.length > 0
+  def post(addr, pdata = {}, args = {})
+    @mutex.synchronize do
+      praw = ""
+      pdata.each do |key, val|
+        praw << "&" if praw != ""
+        praw << "#{Knj::Web.urlenc(key)}=#{Knj::Web.urlenc(val)}"
+      end
+      
+      header_str = "POST /#{addr} HTTP/1.1#{@nl}"
+      header_str << self.header_str(self.default_headers(args).merge("Content-Length" => praw.length), args)
+      header_str << "#{@nl}"
+      header_str << praw
+      
+      self.write(header_str)
+      return self.read_response(args)
+    end
+  end
+  
+  def post_multipart(addr, pdata, args = {})
+    @mutex.synchronize do
+      boundary = Digest::MD5.hexdigest(Time.now.to_f.to_s)
+      
+      praw = ""
+      pdata.each do |key, val|
+        praw << "--#{boundary}#{@nl}"
+        
+        if val.class.name == "Tempfile" and val.respond_to?("original_filename")
+          praw << "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{val.original_filename}\";#{@nl}"
+        else
+          praw << "Content-Disposition: form-data; name=\"#{key}\";#{@nl}"
+        end
+        
+        praw << "Content-Type: text/plain#{@nl}"
+        praw << "Content-Length: #{val.length}#{@nl}"
+        praw << @nl
+        
+        if val.is_a?(StringIO)
+          praw << val.read
+        else
+          praw << val.to_s
+        end
+        
+        praw << @nl
+      end
+      
+      header_str = "POST /#{addr} HTTP/1.1#{@nl}"
+      header_str << "Content-Type: multipart/form-data; boundary=#{boundary}#{@nl}"
+      header_str << self.header_str(self.default_headers(args).merge("Content-Length" => praw.length), args)
+      header_str << "#{@nl}"
+      header_str << praw
+      header_str << "--#{boundary}--"
+      
+      self.write(header_str)
+      return self.read_response(args)
+    end
+  end
+  
+  def header_str(headers_hash, args = {})
+    if @cookies.length > 0 and (!args.key?(:cookies) or args[:cookies])
       cstr = ""
       
       first = true
       @cookies.each do |cookie_name, cookie_data|
-        cstr += "; " if !first
+        cstr << "; " if !first
         first = false if first
         
-        cstr += "#{Knj::Web.urlenc(cookie_data["name"])}=#{Knj::Web.urlenc(cookie_data["value"])}"
+        cstr << "#{Knj::Web.urlenc(cookie_data["name"])}=#{Knj::Web.urlenc(cookie_data["value"])}"
       end
       
       headers_hash["Cookie"] = cstr
     end
     
     headers_str = ""
-    
     headers_hash.each do |key, val|
-      headers_str += "#{key}: #{val}#{@nl}"
+      headers_str << "#{key}: #{val}#{@nl}"
     end
     
     return headers_str
   end
   
-  def read_response
+  def on_content_call(args, line)
+    args[:on_content].call(line) if args.key?(:on_content)
+  end
+  
+  def read_response(args = {})
     @mode = "headers"
     @resp = Knj::Http2::Response.new
     
     loop do
-      print "Reading next line.\n" if @debug
-      line = @sock.gets
+      begin
+        if @length and @length > 0 and @mode == "body"
+          line = @sock.read(@length)
+        else
+          line = @sock.gets
+        end
+      rescue Errno::ECONNRESET
+        print "Http2: The connection was reset while reading - breaking gently...\n" if @debug
+        line = ""
+        @sock = nil
+      end
+      
       break if line.to_s == ""
       
       if @mode == "headers" and line == @nl
-        break if @resp.header("content-length") == "0"
+        break if @length == 0
         @mode = "body"
         next
       end
       
       if @mode == "headers"
-        self.parse_header(line)
+        self.parse_header(line, args)
       elsif @mode == "body"
-        stat = self.parse_body(line)
+        self.on_content_call(args, "\r\n")
+        stat = self.parse_body(line, args)
         break if stat == "break"
         next if stat == "next"
       end
     end
     
+    
+    #Check if we should reconnect based on keep-alive-max.
+    if @keepalive_max == 1 or @connection == "close"
+      @sock.close if !@sock.closed?
+      @sock = nil
+    end
+    
+    
+    #Check if the content is gzip-encoded - if so: decode it!
+    if @encoding == "gzip"
+      require "zlib"
+      require "iconv"
+      io = StringIO.new(@resp.args[:body])
+      gz = Zlib::GzipReader.new(io)
+      untrusted_str = gz.read
+      ic = Iconv.new("UTF-8//IGNORE", "UTF-8")
+      valid_string = ic.iconv(untrusted_str + " ")[0..-2]
+      @resp.args[:body] = valid_string
+    end
+    
+    
     #Release variables.
     resp = @resp
     @resp = nil
     @mode = nil
     
-    if resp.args[:code] == "302" and resp.header?("location")
+    raise "No status-code was received from the server.\n\nHeaders:\n#{Knj::Php.print_r(resp.headers)}\n\nBody:\n#{resp.args[:body]}" if !resp.args[:code]
+    
+    if resp.args[:code].to_s == "302" and resp.header?("location") and (!@args.key?(:follow_redirects) or @args[:follow_redirects])
       uri = URI.parse(resp.header("location"))
       
       args = {:host => uri.host}
@@ -147,12 +318,14 @@ class Knj::Http2
         http = Knj::Http2.new(args)
         return http.get(uri.path)
       end
+    elsif resp.args[:code].to_s == "500"
+      raise "500 - Internal server error."
     else
       return resp
     end
   end
   
-  def parse_header(line)
+  def parse_header(line, args)
     if match = line.match(/^(.+?):\s*(.+)#{@nl}$/)
       key = match[1].to_s.downcase
       
@@ -160,6 +333,36 @@ class Knj::Http2
         Knj::Web.parse_set_cookies(match[2]).each do |cookie_data|
           @cookies[cookie_data["name"]] = cookie_data
         end
+      elsif key == "keep-alive"
+        if ka_max = match[2].to_s.match(/max=(\d+)/)
+          @keepalive_max = ka_max[1].to_i
+          print "Http2: Keepalive-max set to: '#{@keepalive_max}'.\n" if @debug
+        end
+        
+        if ka_timeout = match[2].to_s.match(/timeout=(\d+)/)
+          @keepalive_timeout = ka_timeout[1].to_i
+          print "Http2: Keepalive-timeout set to: '#{@keepalive_timeout}'.\n" if @debug
+        end
+      elsif key == "connection"
+        @connection = match[2].to_s.downcase
+      elsif key == "content-encoding"
+        @encoding = match[2].to_s.downcase
+      elsif key == "content-length"
+        @length = match[2].to_i
+      elsif key == "content-type"
+        ctype = match[2].to_s
+        if match_charset = ctype.match(/\s*;\s*charset=(.+)/i)
+          @charset = match_charset[1].downcase
+          @resp.args[:charset] = @charset
+          ctype.gsub!(match_charset[0], "")
+        end
+        
+        @ctype = ctype
+        @resp.args[:contenttype] = @ctype
+      end
+      
+      if key != "transfer-encoding" and key != "content-length" and key != "connection" and key != "keep-alive"
+        self.on_content_call(args, line)
       end
       
       @resp.headers[key] = [] if !@resp.headers.key?(key)
@@ -172,25 +375,20 @@ class Knj::Http2
     end
   end
   
-  def parse_body(line)
+  def parse_body(line, args)
     if @resp.args[:http_version] = "1.1"
-      return "break" if @resp.header("content-length") == "0"
+      return "break" if @length == 0
       
       if @resp.header("transfer-encoding").to_s.downcase == "chunked"
         len = line.strip.hex
         
-        print "Content-Length: #{@resp.header("content-length")}\n" if @debug
-        print "Current body length: #{@resp.args[:body].length}\n" if @debug
-        print "Chunk length: #{len}\n" if @debug
-        
-        print "Reading chunked.\n" if @debug
         if len > 0
           read = @sock.read(len)
           return "break" if read == "" or read == @nl
-          @resp.args[:body] += read
+          @resp.args[:body] << read
+          self.on_content_call(args, read)
         end
         
-        print "Reading trailing NL.\n" if @debug
         nl = @sock.gets
         if len == 0
           if nl == @nl
@@ -200,10 +398,10 @@ class Knj::Http2
           end
         end
         
-        #print "Test: '#{nl}'\n"
         raise "Should have read newline but didnt: '#{nl}'." if nl != @nl
       else
-        @resp.args[:body] += line.to_s
+        @resp.args[:body] << line.to_s
+        self.on_content_call(args, line)
         return "break" if @resp.header?("content-length") and @resp.args[:body].length >= @resp.header("content-length").to_i
       end
     else
@@ -246,4 +444,12 @@ class Knj::Http2::Response
   def body
     return @args[:body]
   end
+  
+  def charset
+    return @args[:charset]
+  end
+  
+  def contenttype
+    return @args[:contenttype]
+  end
 end

data/lib/knj/image.rb

@@ -1,8 +1,8 @@
 class Knj::Image
   #This function can make rounded transparent corners on an image with a given radius. Further more it can also draw borders around the entire image in a given color and take the border into account.
   def self.rounded_corners(args)
-    raise "No or invalid ':img' given." if !args[:img]
-    raise "No or invalid ':radius' given." if args[:radius].to_i <= 0
+    raise "No or invalid ':img' given: '#{args}'." if !args[:img]
+    raise "No or invalid ':radius' given: '#{args}'." if !args[:radius].respond_to?("to_i") or args[:radius].to_i <= 0
     
     pic = args[:img]
     

data/lib/knj/includes/appserver_cli.rb

@@ -1,30 +1,30 @@
 require "knj/autoload"
-require "knj/web"
+require "#{$knjpath}web"
 
 class Appserver_cli
-	def self.loadfile(filepath)
-		require filepath
-	end
-	
-	def self._(str)
-		return str
-	end
-	
-	def self.gettext
-		return self
-	end
-	
-	def self.lang_opts
-		return []
-	end
+  def self.loadfile(filepath)
+    require filepath
+  end
+  
+  def self._(str)
+    return str
+  end
+  
+  def self.gettext
+    return self
+  end
+  
+  def self.lang_opts
+    return []
+  end
 end
 
 def _kas
-	return Appserver_cli
+  return Appserver_cli
 end
 
 def _db
-	return $db
+  return $db
 end
 
 def _ob

data/lib/knj/includes/require_info.rb

@@ -0,0 +1,15 @@
+$knj_require_info = {}
+
+class Object
+  alias_method :require_knj, :require
+  
+  def require(path)
+    stat = require_knj(path)
+    
+    if stat and !$knj_require_info.key?(path)
+      $knj_require_info[path] = {:caller => caller}
+    end
+    
+    return stat
+  end
+end

data/lib/knj/ip2location.rb

@@ -1,22 +1,22 @@
 class Knj::Ip2location
-	def initialize(args = {})
-		@args = args
-		@http = Knj::Http.new(
-			"host" => "www.ip2location.com",
-			"port" => 80
-		)
-	end
-	
-	def lookup(ip)
-		raise "Invalid IP: #{ip}." if !ip.to_s.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/)
-		
-		html = @http.get("/#{ip}")["data"]
-		ret = {}
-		
-		html.scan(/<span id="dgLookup__ctl2_lblI(.+?)">(.+?)<\/span>/) do |match|
-			ret[match[0]] = match[1]
-		end
-		
-		return ret
-	end
+  def initialize(args = {})
+    @args = args
+    @http = Knj::Http.new(
+      "host" => "www.ip2location.com",
+      "port" => 80
+    )
+  end
+  
+  def lookup(ip)
+    raise "Invalid IP: #{ip}." if !ip.to_s.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/)
+    
+    html = @http.get("/#{ip}")["data"]
+    ret = {}
+    
+    html.scan(/<span id="dgLookup__ctl2_lblI(.+?)">(.+?)<\/span>/) do |match|
+      ret[match[0]] = match[1]
+    end
+    
+    return ret
+  end
 end

data/lib/knj/ironruby-gtk2/button.rb

@@ -1,19 +1,19 @@
 Gtk.events["Gtk"]["Button"] = {
-	"clicked" => "clicked"
+  "clicked" => "clicked"
 }
 
 class Gtk::Button
-	def initialize(title = "")
-		if Gtk.takeob
-			@ob = Gtk.takeob
-			Gtk.takeob = nil
-		else
-			splitted = self.class.to_s.split("::")
-			@ob = RealGtk.const_get(splitted.last).new(title)
-		end
-		
-		if !@ob
-			raise "Object was not spawned: #{self.class.to_s}"
-		end
-	end
+  def initialize(title = "")
+    if Gtk.takeob
+      @ob = Gtk.takeob
+      Gtk.takeob = nil
+    else
+      splitted = self.class.to_s.split("::")
+      @ob = RealGtk.const_get(splitted.last).new(title)
+    end
+    
+    if !@ob
+      raise "Object was not spawned: #{self.class.to_s}"
+    end
+  end
 end

data/lib/knj/ironruby-gtk2/dialog.rb

@@ -1,44 +1,44 @@
 class Gtk::Dialog
-	RESPONSE_OK = RealGtk::ResponseType.Ok
-	RESPONSE_YES = RealGtk::ResponseType.Yes
-	RESPONSE_NO = RealGtk::ResponseType.No
-	RESPONSE_CANCEL = RealGtk::ResponseType.Cancel
-	RESPONSE_CLOSE = RealGtk::ResponseType.Close
-	RESPONSE_DELETE_EVENT = RealGtk::ResponseType.DeleteEvent
-	MODAL = 0
-	
-	def initialize(*paras)
-		if Gtk.takeob
-			@ob = Gtk.takeob
-			Gtk.takeob = nil
-		else
-			splitted = self.class.to_s.split("::")
-			@ob = RealGtk.const_get(splitted.last).new(*paras)
-		end
-		
-		if paras.length > 3
-			3.upto(paras.length) do |count|
-				data = paras[count]
-				
-				if data.is_a?(Array)
-					@ob.method(:add_button).overload(System::String, RealGtk::ResponseType).call(data[0], data[1])
-				elsif data.is_a?(NilClass)
-					#do nothing.
-				else
-					#raise "Unhandeled data: #{data.class.to_s}"
-				end
-			end
-		end
-		
-		if !@ob
-			raise "Object was not spawned: #{self.class.to_s}"
-		end
-	end
-	
-	def vbox
-		Gtk.takeob = @ob.VBox
-		conv_widget = Gtk::VBox.new
-		
-		return conv_widget
-	end
+  RESPONSE_OK = RealGtk::ResponseType.Ok
+  RESPONSE_YES = RealGtk::ResponseType.Yes
+  RESPONSE_NO = RealGtk::ResponseType.No
+  RESPONSE_CANCEL = RealGtk::ResponseType.Cancel
+  RESPONSE_CLOSE = RealGtk::ResponseType.Close
+  RESPONSE_DELETE_EVENT = RealGtk::ResponseType.DeleteEvent
+  MODAL = 0
+  
+  def initialize(*paras)
+    if Gtk.takeob
+      @ob = Gtk.takeob
+      Gtk.takeob = nil
+    else
+      splitted = self.class.to_s.split("::")
+      @ob = RealGtk.const_get(splitted.last).new(*paras)
+    end
+    
+    if paras.length > 3
+      3.upto(paras.length) do |count|
+        data = paras[count]
+        
+        if data.is_a?(Array)
+          @ob.method(:add_button).overload(System::String, RealGtk::ResponseType).call(data[0], data[1])
+        elsif data.is_a?(NilClass)
+          #do nothing.
+        else
+          #raise "Unhandeled data: #{data.class.to_s}"
+        end
+      end
+    end
+    
+    if !@ob
+      raise "Object was not spawned: #{self.class.to_s}"
+    end
+  end
+  
+  def vbox
+    Gtk.takeob = @ob.VBox
+    conv_widget = Gtk::VBox.new
+    
+    return conv_widget
+  end
 end