knjrbfw 0.0.7 → 0.0.8

data/lib/knj/erb/include.rb

@@ -164,7 +164,7 @@ class KnjEruby < Erubis::Eruby
 			end
 			
 			if !args[:custom_io]
-				print self.print_headers if !args.has_key?(:with_headers) or args[:with_headers]
+				print self.print_headers if !args.key?(:with_headers) or args[:with_headers]
 				tmp_out.rewind
 				print tmp_out.read
 			end
@@ -216,7 +216,7 @@ class KnjEruby < Erubis::Eruby
 			rescue Exception => e
 				#An error occurred while trying to run the on-error-block - show this as an normal error.
 				print "\n\n<pre>\n\n"
-				print "<b>#{CGI.escapeHTML(e.class.name)}: #{CGI.escapeHTML(e.message)}</b>\n\n"
+				print "<b>#{Knj::Web.html(e.class.name)}: #{Knj::Web.html(e.message)}</b>\n\n"
 				
 				#Lets hide all the stuff in what is not the users files to make it easier to debug.
 				bt = e.backtrace
@@ -224,14 +224,14 @@ class KnjEruby < Erubis::Eruby
 				#bt = bt[0..to]
 				
 				bt.each do |line|
-					print CGI.escapeHTML(line) + "\n"
+					print Knj::Web.html(line) + "\n"
 				end
 				
 				print "</pre>"
 			end
 			
 			print "\n\n<pre>\n\n"
-			print "<b>#{CGI.escapeHTML(e.class.name)}: #{CGI.escapeHTML(e.message)}</b>\n\n"
+			print "<b>#{Knj::Web.html(e.class.name)}: #{Knj::Web.html(e.message)}</b>\n\n"
 			
 			#Lets hide all the stuff in what is not the users files to make it easier to debug.
 			bt = e.backtrace
@@ -239,7 +239,7 @@ class KnjEruby < Erubis::Eruby
 			bt = bt[0..to]
 			
 			bt.each do |line|
-				print CGI.escapeHTML(line) + "\n"
+				print Knj::Web.html(line) + "\n"
 			end
 			
 			KnjEruby.printcont(tmp_out, args)

data/lib/knj/errors.rb

@@ -4,13 +4,16 @@ module Knj::Errors
 	class InvalidData < StandardError; end
 	class Retry < StandardError; end
 	class NoAccess < StandardError; end
+	class Exists < StandardError; end
 	
 	def self.error_str(err, args = {})
+    str = ""
+    
 		if args[:html]
 			str += "<b>#{err.class.name}</b>: #{err.message}<br />\n<br />\n"
 			str += err.backtrace.join("<br />\n")
 		else
-			str = "#{err.class.name}: #{err.message}\n\n"
+			str += "#{err.class.name}: #{err.message}\n\n"
 			str += err.backtrace.join("\n")
 		end
 		

data/lib/knj/eruby.rb

@@ -1,6 +1,6 @@
 class Knj::Eruby
   attr_reader :fcgi
-  attr_reader :connects, :headers
+  attr_reader :connects, :headers, :cookies
   
   def initialize(args = {})
     @args = args
@@ -26,6 +26,7 @@ class Knj::Eruby
     end
     
     if @cache_mode == :compile_knj
+      require "knj/compiler"
       @compiler = Knj::Compiler.new(:cache_hash => @cache)
     end
     
@@ -46,7 +47,7 @@ class Knj::Eruby
         Knj::Eruby::Handler.load_file(filename, {:cachename => cachename})
         cachetime = File.mtime(cachename)
         reload_cache = true
-      elsif !@cache.has_key?(cachename)
+      elsif !@cache.key?(cachename)
         reload_cache = true
       end
       
@@ -60,7 +61,7 @@ class Knj::Eruby
           if reload_cache or @cache[cachename][:time] < cachetime
             @cache[cachename] = {
               :inseq => RubyVM::InstructionSequence.compile(File.read(cachename), filename, nil, 1),
-              :time => Time.new
+              :time => Time.now
             }
           end
           
@@ -79,13 +80,15 @@ class Knj::Eruby
   def destroy
     @connects.clear if @connects.is_a?(Hash)
     @headers.clear if @headers.is_a?(Array)
+    @cookies.clear if @cookies.is_a?(Array)
     
-    @cache.clear if @cache.is_a?(Hash) and @args and !@args.has_key?(:cache_hash)
+    @cache.clear if @cache.is_a?(Hash) and @args and !@args.key?(:cache_hash)
     @args.clear if @args.is_a?(Hash)
     @args = nil
     @cache = nil
     @connects = nil
     @headers = nil
+    @cookies = nil
   end
   
   def print_headers(args = {})
@@ -95,6 +98,10 @@ class Knj::Eruby
       header_str += "#{header[0]}: #{header[1]}\n"
     end
     
+    @cookies.each do |cookie|
+      header_str += "Set-Cookie: #{Knj::Web.cookie_str(cookie)}\n"
+    end
+    
     header_str += "\n"
     self.reset_headers if @fcgi
     return header_str
@@ -114,14 +121,19 @@ class Knj::Eruby
   
   def reset_headers
     @headers = []
+    @cookies = []
   end
   
   def header(key, value)
     @headers << [key, value]
   end
   
+  def cookie(cookie_data)
+    @cookies << cookie_data
+  end
+  
   def connect(signal, &block)
-    @connects[signal] = [] if !@connects.has_key?(signal)
+    @connects[signal] = [] if !@connects.key?(signal)
     @connects[signal] << block
   end
   
@@ -139,7 +151,7 @@ class Knj::Eruby
       end
       
       if !args[:custom_io]
-        print self.print_headers if !args.has_key?(:with_headers) or args[:with_headers]
+        print self.print_headers if !args.key?(:with_headers) or args[:with_headers]
         tmp_out.rewind
         print tmp_out.read
       end
@@ -186,7 +198,7 @@ class Knj::Eruby
   
   def handle_error(e)
     begin
-      if @connects and @connects.has_key?("error")
+      if @connects and @connects.key?("error")
         @connects["error"].each do |block|
           block.call(e)
         end
@@ -196,7 +208,7 @@ class Knj::Eruby
     rescue Exception => e
       #An error occurred while trying to run the on-error-block - show this as an normal error.
       print "\n\n<pre>\n\n"
-      print "<b>#{CGI.escapeHTML(e.class.name)}: #{CGI.escapeHTML(e.message)}</b>\n\n"
+      print "<b>#{Knj::Web.html(e.class.name)}: #{Knj::Web.html(e.message)}</b>\n\n"
       
       #Lets hide all the stuff in what is not the users files to make it easier to debug.
       bt = e.backtrace
@@ -204,18 +216,20 @@ class Knj::Eruby
       #bt = bt[0..to]
       
       bt.each do |line|
-        print CGI.escapeHTML(line) + "\n"
+        print Knj::Web.html(line) + "\n"
       end
       
       print "</pre>"
     end
     
     print "\n\n<pre>\n\n"
-    print "<b>#{CGI.escapeHTML(e.class.name)}: #{CGI.escapeHTML(e.message)}</b>\n\n"
+    print "<b>#{Knj::Web.html(e.class.name)}: #{Knj::Web.html(e.message)}</b>\n\n"
     
     e.backtrace.each do |line|
-      print CGI.escapeHTML(line) + "\n"
+      print Knj::Web.html(line) + "\n"
     end
+    
+    print "</pre>"
   end
 end
 

data/lib/knj/event_filemod.rb

@@ -6,7 +6,7 @@ class Knj::Event_filemod
 		@run = true
 		@mutex = Mutex.new
 		
-		@args[:wait] = 1 if !@args.has_key?(:wait)
+		@args[:wait] = 1 if !@args.key?(:wait)
 		
 		@mtimes = {}
 		args[:paths].each do |path|
@@ -18,31 +18,32 @@ class Knj::Event_filemod
 				break if !@args or !@args[:paths] or @args[:paths].empty?
 				
 				@mutex.synchronize do
-				@args[:paths].each do |path|
-					changed = false
-					
-					if @mtimes and !@mtimes.has_key?(path) and @mtimes.is_a?(Hash)
-						@mtimes[path] = File.mtime(path)
-					end
-					
-					begin
-						newdate = File.mtime(path)
-					rescue Errno::ENOENT
-						#file does not exist.
-						changed = true
-					end
-					
-					if !changed and newdate and @mtimes and newdate > @mtimes[path]
-						changed = true
-					end
-					
-					if changed
-						block.call(self, path)
-						@args[:paths].delete(path) if @args and @args[:break_when_changed]
-					end
-				end
-				
-				sleep @args[:wait] if @args and @run
+          @args[:paths].each do |path|
+            changed = false
+            
+            if @mtimes and !@mtimes.key?(path) and @mtimes.is_a?(Hash)
+              @mtimes[path] = File.mtime(path)
+            end
+            
+            begin
+              newdate = File.mtime(path)
+            rescue Errno::ENOENT
+              #file does not exist.
+              changed = true
+            end
+            
+            if !changed and newdate and @mtimes and newdate > @mtimes[path]
+              changed = true
+            end
+            
+            if changed
+              block.call(self, path)
+              @args[:paths].delete(path) if @args and @args[:break_when_changed]
+            end
+          end
+          
+          sleep @args[:wait] if @args and @run
+        end
 			end
 		end
 	end

data/lib/knj/event_handler.rb

@@ -7,7 +7,7 @@ class Knj::Event_handler
 	def add_event(event)
 		raise "No name given." if !event[:name]
 		
-		@events[event[:name]] = [] if !@events.has_key?(event[:name])
+		@events[event[:name]] = [] if !@events.key?(event[:name])
 		@events[event[:name]] = {
 			:event => event,
 			:callbacks => {},
@@ -22,11 +22,11 @@ class Knj::Event_handler
 	end
 	
 	def connect(name, &block)
-		raise "No such event: '#{name}'." if !@events.has_key?(name)
+		raise "No such event: '#{name}'." if !@events.key?(name)
 		
 		event = @events[name]
 		
-		if event[:event].has_key?(:connections_max) and event[:callbacks].length >= event[:event][:connections_max].to_i
+		if event[:event].key?(:connections_max) and event[:callbacks].length >= event[:event][:connections_max].to_i
 			raise "The event '#{name}' has reached its maximum connections of '#{event[:event][:connections_max]}'"
 		end
 		
@@ -40,24 +40,24 @@ class Knj::Event_handler
 	end
 	
 	def disconnect(name, callback_id)
-		raise "No such event: '#{name}'." if !@events.has_key?(name)
-		raise "No such connection: '#{name}' --> '#{callback_id}'" if !@events[name].has_key?(callback_id)
+		raise "No such event: '#{name}'." if !@events.key?(name)
+		raise "No such connection: '#{name}' --> '#{callback_id}'" if !@events[name].key?(callback_id)
 		@events[name][callback_id].clear
 		@events[name].delete(callback_id)
 	end
 	
 	def count_connects(name)
-		raise "No such event." if !@events.has_key?(name)
+		raise "No such event." if !@events.key?(name)
 		return @events[name][:callbacks].length
 	end
 	
 	def connected?(name)
-		raise "No such event." if !@events.has_key?(name)
+		raise "No such event." if !@events.key?(name)
 		return !@events[name][:callbacks].empty?
 	end
 	
 	def call(name, *args)
-		raise "No such event: '#{name}'." if !@events.has_key?(name)
+		raise "No such event: '#{name}'." if !@events.key?(name)
 		event = @events[name]
 		ret = nil
 		event[:callbacks].clone.each do |callback_id, callback_hash|

data/lib/knj/exchangerates.rb

@@ -22,7 +22,7 @@ class Knj::Exchangerates
 		floatval = floatval.to_f
 		locale = locale.to_s
 		
-		raise "No such locale: '#{locale}' in '#{@rates.keys.join(",")}'." if !@rates.has_key?(locale)
+		raise "No such locale: '#{locale}' in '#{@rates.keys.join(",")}'." if !@rates.key?(locale)
 		
 		base_rate = @rates[@base][:rate].to_f
 		cur_rate = @rates[locale][:rate].to_f

data/lib/knj/facebook_connect.rb

@@ -0,0 +1,37 @@
+class Knj::Facebook_connect
+  def initialize(args)
+    @args = args
+    
+    raise "No app-ID given." if !@args[:app_id]
+    raise "No app-secret given." if !@args[:app_secret]
+  end
+  
+  def login(args)
+    hash = {}
+    Knj::Php.parse_str(args[:token], hash)
+    hash = Knj::Php.ksort(hash)
+    
+    payload = ""
+    hash.each do |key, val|
+      next if key == "sig"
+      payload += "#{key}=#{val}"
+    end
+    
+    raise "Invalid payload or signature." if Digest::MD5.hexdigest("#{payload}#{@args[:app_secret]}") != hash["sig"]
+    
+    http = Knj::Http.new(
+      "host" => "graph.facebook.com",
+      "ssl" => true
+    )
+    data = http.get("/me?access_token=#{hash["access_token"]}")
+    data = {:access_token => JSON.parse(data["data"])}
+    
+    if args[:profile_picture]
+      pic_data = http.get("/#{data[:access_token]["id"]}/picture?type=large")
+      pic_obj = Magick::Image.from_blob(pic_data["data"].to_s)[0]
+      data[:pic] = pic_obj
+    end
+    
+    return data
+  end
+end

data/lib/knj/gettext_threadded.rb

@@ -40,11 +40,11 @@ class Knj::Gettext_threadded
 		locale = locale.to_s
 		str = str.to_s
 		
-		if !@langs.has_key?(locale)
+		if !@langs.key?(locale)
 			raise "Locale was not found: '#{locale}' in '#{@langs.keys.join(", ")}'."
 		end
 		
-		return str if !@langs[locale].has_key?(str)
+		return str if !@langs[locale].key?(str)
 		return @langs[locale][str]
 	end
 	
@@ -53,6 +53,7 @@ class Knj::Gettext_threadded
     return trans(locale, str)
 	end
 	
+	#Returns a hash with the language ID string as key and the language human-readable-title as value.
 	def lang_opts
 		langs = {}
 		@langs.keys.sort.each do |lang|
@@ -63,7 +64,7 @@ class Knj::Gettext_threadded
 				if File.exists?(title_file_path)
 					title = File.read(title_file_path).to_s.strip
 				else
-					title = lang.strip
+					title = lang.to_s.strip
 				end
 				
 				break if title

data/lib/knj/google_sitemap.rb

@@ -25,7 +25,7 @@ class Knj::Google_sitemap
 		end
 		
 		lm = el.add_element("lastmod")
-		if @args.has_key?(:date_min) and @args[:date_min] > lastmod_value
+		if @args.key?(:date_min) and @args[:date_min] > lastmod_value
       lastmod_value = @args[:date_min]
     end
 		

data/lib/knj/hash_methods.rb

@@ -28,7 +28,7 @@ class Knj::Hash_methods
 	end
 	
 	def method_missing(method, *paras)
-		if !@data.has_key?(method)
+		if !@data.key?(method)
 			raise "No such method '#{method}' on class '#{self.class.name}'"
 		end
 		

data/lib/knj/http.rb

@@ -45,7 +45,7 @@ class Knj::Http
 		@http.set_debug_output($stderr) if @opts["debug"]
 		@http.use_ssl = true if @opts["ssl"]
 		
-		if @opts.has_key?("validate") and !@opts["validate"]
+		if @opts.key?("validate") and !@opts["validate"]
 			@http.verify_mode = OpenSSL::SSL::VERIFY_NONE
 		end
 		
@@ -59,49 +59,65 @@ class Knj::Http
 	def cookiestr
 		cookiestr = ""
 		@cookies.each do |key, value|
-			if cookiestr != ""
-				cookiestr += "; "
-			end
-			
-			cookiestr += value.to_s
+			cookiestr += "; " if cookiestr != ""
+			cookiestr += "#{Knj::Php.urlencode(key)}=#{Knj::Php.urlencode(value.to_s)}"
 		end
 		
 		return cookiestr
 	end
 	
 	def cookie_add(cgi_cookie)
-		@cookies[cgi_cookie.name] = cgi_cookie
+    if cgi_cookie.class.name == "CGI::Cookie"
+      @cookies[cgi_cookie.name] = cgi_cookie.value
+    elsif cgi_cookie.is_a?(Hash)
+      @cookies[cgi_cookie["name"]] = cgi_cookie["value"]
+    else
+      raise "Unknown object: '#{cgi_cookie.class.name}'."
+    end
 	end
 	
 	def headers
 		tha_headers = {"User-Agent" => @useragent}
 		tha_headers["Referer"] = @lasturl if @lasturl
-		tha_headers["Cookie"] = self.cookiestr if cookiestr != ""
+		tha_headers["Cookie"] = cookiestr if cookiestr != ""
 		return tha_headers
 	end
 	
 	def setcookie(set_data)
-    if @opts["skip_webrick"]
-      print "SetData: #{set_data}\n"
-    else
-      WEBrick::Cookie.parse_set_cookies(set_data.to_s).each do |cookie|
-        @cookies[cookie.name] = cookie
+    return nil if !set_data
+    
+    set_data.each do |cookie_str|
+      Knj::Web.parse_set_cookies(cookie_str.to_s).each do |cookie|
+        @cookies[cookie["name"]] = cookie["value"]
       end
     end
 	end
 	
+	#Shortcut to spawn a new Http-object and running get on the path.
+	def self.get(url)
+    data = URI.parse(url)
+    
+    args = {"host" => data.host}
+    args["ssl"] = true if data.scheme == "https"
+    args["port"] = data.port if data.port
+    
+    http = Knj::Http.new(args)
+    return http.get(data.path)
+	end
+	
 	def get(addr)
 		check_connected
 		
 		@mutex.synchronize do
 			resp, data = @http.get(addr, self.headers)
-			self.setcookie(resp.response["set-cookie"])
-			
-			raise "Could not find that page: '#{addr}'." if resp.is_a?(Net::HTTPNotFound)
+			self.setcookie(resp.response.to_hash["set-cookie"])
+			raise Knj::Errors::NotFound, "Could not find that page: '#{addr}'." if resp.is_a?(Net::HTTPNotFound)
 			
 			#in some cases (like in IronRuby) the data is set like this.
 			data = resp.body if !data
 			
+			return Knj::Http.get(resp["location"]) if resp["location"]
+      
 			return {
 				"response" => resp,
 				"data" => data
@@ -113,7 +129,7 @@ class Knj::Http
     check_connected
     @mutex.synchronize do
       resp, data = @http.head(addr, self.headers)
-      self.setcookie(resp.response["set-cookie"])
+      self.setcookie(resp.response.to_hash["set-cookie"])
       
       raise "Could not find that page: '#{addr}'." if resp.is_a?(Net::HTTPNotFound)
       
@@ -141,7 +157,7 @@ class Knj::Http
 		
 		@mutex.synchronize do
 			resp, data = @http.post2(addr, postdata, self.headers)
-			self.setcookie(resp.response["set-cookie"])
+			self.setcookie(resp.response.to_hash["set-cookie"])
 			
 			return {
 				"response" => resp,
@@ -179,7 +195,7 @@ class Knj::Http
 			request["Content-Type"] = "multipart/form-data, boundary=#{boundary}"
 			
 			resp, data = @http.request(request)
-			self.setcookie(resp.response["set-cookie"])
+			self.setcookie(resp.response.to_hash["set-cookie"])
 			
 			return {
 				"response" => resp,