knjrbfw 0.0.23 → 0.0.24

data/VERSION

@@ -1 +1 @@
-0.0.23
+0.0.24

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.23"
+  s.version = "0.0.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-03-16}
+  s.date = %q{2012-04-26}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -173,6 +173,7 @@ Gem::Specification.new do |s|
     "lib/knj/knjdb/libknjdb_row.rb",
     "lib/knj/knjdb/libknjdb_sqlite3_ironruby.rb",
     "lib/knj/knjdb/revision.rb",
+    "lib/knj/kvm.rb",
     "lib/knj/libqt.rb",
     "lib/knj/libqt_window.rb",
     "lib/knj/locale_strings.rb",
@@ -180,6 +181,7 @@ Gem::Specification.new do |s|
     "lib/knj/maemo/fremantle-calendar/fremantle-calendar.rb",
     "lib/knj/mail.rb",
     "lib/knj/mailobj.rb",
+    "lib/knj/memory_analyzer.rb",
     "lib/knj/mount.rb",
     "lib/knj/mutexcl.rb",
     "lib/knj/notify.rb",
@@ -200,11 +202,11 @@ Gem::Specification.new do |s|
     "lib/knj/process_meta.rb",
     "lib/knj/rand.rb",
     "lib/knj/retry.rb",
-    "lib/knj/rhodes/delegate.rb",
     "lib/knj/rhodes/mutex.rb",
     "lib/knj/rhodes/rhodes.js",
     "lib/knj/rhodes/rhodes.rb",
-    "lib/knj/rhodes/weakref.rb",
+    "lib/knj/rhodes/youtube_embed.erb",
+    "lib/knj/rhodes/youtube_open.erb",
     "lib/knj/rsvgbin.rb",
     "lib/knj/scripts/degulesider.rb",
     "lib/knj/scripts/filesearch.rb",
@@ -244,6 +246,7 @@ Gem::Specification.new do |s|
     "lib/knjrbfw.rb",
     "spec/amixer_spec.rb",
     "spec/cmd_parser_spec.rb",
+    "spec/datet_spec.rb",
     "spec/db_spec.rb",
     "spec/db_spec_encoding_test_file.txt",
     "spec/http2_spec.rb",

data/lib/knj/autoload.rb

@@ -2,71 +2,10 @@ $knjpath = File.dirname(__FILE__) + "/" if !$knjpath
 require "#{$knjpath}/knj"
 
 module Knj
-  autoload :Amixer, $knjpath + "amixer"
-  autoload :ArrayExt, $knjpath + "arrayext"
-  autoload :Datestamp, $knjpath + "datestamp"
-  autoload :Datet, $knjpath + "datet"
-  autoload :Cmd_gen, $knjpath + "cmd_gen"
-  autoload :Cmd_parser, $knjpath + "cmd_parser"
-  autoload :Compiler, $knjpath + "compiler"
-  autoload :Cpufreq, $knjpath + "cpufreq"
-  autoload :Csv, $knjpath + "csv"
-  autoload :Datarow, $knjpath + "datarow"
-  autoload :Db, $knjpath + "knjdb/libknjdb"
   autoload :Db_row, $knjpath + "knjdb/libknjdb_row"
-  autoload :Degulesider, $knjpath + "degulesider"
-  autoload :Errors, $knjpath + "errors"
-  autoload :Eruby, $knjpath + "eruby"
-  autoload :Event_filemod, $knjpath + "event_filemod"
-  autoload :Event_handler, $knjpath + "event_handler"
-  autoload :Exchangerates, $knjpath + "exchangerates"
-  autoload :Facebook_connect, $knjpath + "facebook_connect"
   autoload :Fs, $knjpath + "fs/fs"
-  autoload :Filesystem, $knjpath + "filesystem"
-  autoload :Gettext_threadded, $knjpath + "gettext_threadded"
-  autoload :Hash_methods, $knjpath + "hash_methods"
-  autoload :Http, $knjpath + "http"
-  autoload :Http2, $knjpath + "http2"
-  autoload :Image, $knjpath + "image"
-  autoload :Ip2location, $knjpath + "ip2location"
-  autoload :Jruby_compiler, $knjpath + "jruby_compiler"
-  autoload :Locales, $knjpath + "locales"
-  autoload :Objects, $knjpath + "objects"
-  autoload :Opts, $knjpath + "opts"
-  autoload :Mail, $knjpath + "mail"
-  autoload :Mailobj, $knjpath + "mailobj"
-  autoload :Mutexcl, $knjpath + "mutexcl"
-  autoload :Mount, $knjpath + "mount"
-  autoload :Mplayer, $knjpath + "mplayer"
-  autoload :Notify, $knjpath + "notify"
-  autoload :Nvidia_settings, $knjpath + "nvidia_settings"
-  autoload :Web, $knjpath + "web"
-  autoload :Google_sitemap, $knjpath + "google_sitemap"
-  autoload :Process, $knjpath + "process"
-  autoload :Process_meta, $knjpath + "process_meta"
-  autoload :Sms, $knjpath + "sms"
-  autoload :Os, $knjpath + "os"
-  autoload :Gtk2, $knjpath + "gtk2"
-  autoload :Php, $knjpath + "php"
   autoload :Php_parser, $knjpath + "php_parser/php_parser"
-  autoload :Power_manager, $knjpath + "power_manager"
-  autoload :Rand, $knjpath + "rand"
-  autoload :Retry, $knjpath + "retry"
-  autoload :RSVGBIN, $knjpath + "rsvgbin"
-  autoload :Strings, $knjpath + "strings"
   autoload :SSHRobot, $knjpath + "sshrobot/sshrobot"
-  autoload :Sysuser, $knjpath + "sysuser"
-  autoload :Table_writer, $knjpath + "table_writer"
-  autoload :Thread, $knjpath + "thread"
-  autoload :Thread2, $knjpath + "thread2"
-  autoload :Threadpool, $knjpath + "threadpool"
-  autoload :Threadhandler, $knjpath + "threadhandler"
-  autoload :Translations, $knjpath + "translations"
-  autoload :X11VNC, $knjpath + "x11vnc"
-  autoload :Unix_proc, $knjpath + "unix_proc"
-  autoload :YouTube, $knjpath + "youtube"
-  autoload :Win, $knjpath + "win"
-  autoload :Wref, $knjpath + "wref"
   autoload :Wref_map, $knjpath + "wref"
 end
 
@@ -84,6 +23,7 @@ autoload :IPAddr, "ipaddr"
 autoload :JSON, $knjpath + "autoload/json"
 autoload :GD2, $knjpath + "autoload/gd2"
 autoload :Magick, $knjpath + "autoload/magick"
+autoload :Monitor, "monitor"
 autoload :Mutex, "thread"
 autoload :Mysql, $knjpath + "autoload/mysql"
 autoload :Open3, "open3"

data/lib/knj/datarow.rb

@@ -212,15 +212,8 @@ class Knj::Datarow
   def self.load_columns(d)
     @ob = d.ob if !@ob
     
-    if !@classname
-      if match = self.name.match(/($|::)([A-z\d_]+?)$/)
-        @classname = match[2].to_sym 
-      else
-        @classname = self.name.to_sym
-      end
-    end
-    
-    @mutex = Mutex.new if !@mutex
+    @classname = self.name.split("::").last if !@classname
+    @mutex = Monitor.new if !@mutex
     
     @mutex.synchronize do
       inst_methods = self.instance_methods(false)
@@ -532,7 +525,7 @@ class Knj::Datarow
     raise "Key was not a symbol: '#{key.class.name}'." if !key.is_a?(Symbol)
     raise "No data was loaded on the object? Maybe you are trying to call a deleted object?" if !@data
     return @data[key] if @data.key?(key)
-    raise "No such key: '#{key}'."
+    raise "No such key: '#{key}' on '#{self.class.name}'."
   end
   
   #Writes/updates a keys value on the object.
@@ -543,10 +536,14 @@ class Knj::Datarow
   
   #Returns the objects ID.
   def id
+    raise "This object has been deleted." if self.deleted?
     raise "No data on object." if !@data
     return @data[:id]
   end
   
+  #This enable Knj::Wref to not return the wrong object.
+  alias __object_unique_id__ id
+  
   #Tries to figure out, and returns, the possible name or title for the object.
   def name
     if @data.key?(:title)

data/lib/knj/datarow_custom.rb

@@ -72,10 +72,10 @@ class Knj::Datarow_custom
     if data.is_a?(Hash)
       @data = Knj::ArrayExt.hash_sym(data)
     else
-      data = d.data
       raise "No 'data_from_id'-event connected to class." if !self.class.events.connected?(:data_from_id)
       data = self.class.events.call(:data_from_id, Knj::Hash_methods.new(:id => data))
       raise "No data was received from the event: 'data_from_id'." if !data
+      raise "Data expected to be a hash but wasnt: '#{data.class.name}'." if !data.is_a?(Hash)
       @data = Knj::ArrayExt.hash_sym(data)
     end
   end
@@ -84,15 +84,25 @@ class Knj::Datarow_custom
     return self.class.events.call(:update, Knj::Hash_methods.new(:object => self, :data => data))
   end
   
+  #Returns a key from the hash that this object is holding or raises an error if it doesnt exist.
   def [](key)
-    raise "No such key: '#{key}'." if !@data or !@data.key?(key)
+    if !@data
+      raise "No data spawned on object."
+    end
+    
+    if !@data.key?(key)
+      raise "No such key: '#{key}'. Available keys are: '#{@data.keys.sort.join(", ")}'."
+    end
+    
     return @data[key]
   end
   
+  #Returns the ID of the object.
   def id
     return self[:id]
   end
   
+  #Returns the name of the object, which can be taken from various data or various defined methods.
   def name
     if @data.key?(:title)
       return @data[:title]

data/lib/knj/datet.rb

@@ -272,6 +272,7 @@ class Knj::Datet
   
   def add_something(val)
     val = -val if @addmode == "-"
+    return self.add_years(val) if @mode == :years
     return self.add_hours(val) if @mode == :hours
     return self.add_days(val) if @mode == :days
     return self.add_months(val) if @mode == :months
@@ -309,6 +310,11 @@ class Knj::Datet
     return self
   end
   
+  def years
+    @mode = :years
+    return self
+  end
+  
   def stamp(args)
     vars = {:year => @time.year, :month => @time.month, :day => @time.day, :hour => @time.hour, :min => @time.min, :sec => @time.sec}
     
@@ -621,4 +627,105 @@ class Knj::Datet
   def localtime_str
     return "#{"%04d" % @time.year}-#{"%02d" % @time.month}-#{"%02d" % @time.day} #{"%02d" % @time.hour}:#{"%02d" % @time.min}:#{"%02d" % @time.sec} #{self.offset_str}"
   end
+  
+  #Returns a human readable string based on the difference from the current time and date.
+  def ago_str(args = {})
+    args = {
+      :year_ago_str => "%s year ago",
+      :years_ago_str => "%s years ago",
+      :month_ago_str => "%s month ago",
+      :months_ago_str => "%s months ago",
+      :day_ago_str => "%s day ago",
+      :days_ago_str => "%s days ago",
+      :hour_ago_str => "%s hour ago",
+      :hours_ago_str => "%s hours ago",
+      :min_ago_str => "%s minute ago",
+      :mins_ago_str => "%s minutes ago",
+      :sec_ago_str => "%s second ago",
+      :secs_ago_str => "%s seconds ago",
+      :right_now_str => "right now"
+    }.merge(args)
+    
+    secs_ago = Time.now.to_i - @time.to_i
+    mins_ago = secs_ago.to_f / 60.0
+    hours_ago = mins_ago / 60.0
+    days_ago = hours_ago / 24.0
+    months_ago = days_ago / 30.0
+    years_ago = months_ago / 12.0
+    
+    if years_ago > 0.9 and years_ago < 1.5
+      return sprintf(args[:year_ago_str], years_ago.to_i)
+    elsif years_ago >= 1.5
+      return sprintf(args[:years_ago_str], years_ago.to_i)
+    elsif months_ago > 0.9 and months_ago < 1.5
+      return sprintf(args[:month_ago_str], months_ago.to_i)
+    elsif months_ago >= 1.5
+      return sprintf(args[:months_ago_str], months_ago.to_i)
+    elsif days_ago > 0.9 and days_ago < 1.5
+      return sprintf(args[:day_ago_str], days_ago.to_i)
+    elsif days_ago >= 1.5
+      return sprintf(args[:days_ago_str], days_ago.to_i)
+    elsif hours_ago > 0.9 and hours_ago < 1.5
+      return sprintf(args[:hour_ago_str], hours_ago.to_i)
+    elsif hours_ago >= 1.5
+      return sprintf(args[:hours_ago_str], hours_ago.to_i)
+    elsif mins_ago > 0.9 and mins_ago < 1.5
+      return sprintf(args[:min_ago_str], mins_ago.to_i)
+    elsif mins_ago >= 1.5
+      return sprintf(args[:mins_ago_str], mins_ago.to_i)
+    elsif secs_ago >= 0.1 and secs_ago < 1.5
+      return sprintf(args[:sec_ago_str], secs_ago.to_i)
+    elsif secs_ago >= 1.5
+      return sprintf(args[:secs_ago_str], secs_ago.to_i)
+    end
+    
+    return args[:right_now_str]
+  end
+  
+  def human_str(args = {})
+    args = {
+      :time => true,
+      :number_endings => {
+        0 => "th",
+        1 => "st",
+        2 => "nd",
+        3 => "rd",
+        4 => "th",
+        5 => "th",
+        6 => "th",
+        7 => "th",
+        8 => "th",
+        9 => "th"
+      }
+    }.merge(args)
+    
+    now = Time.now
+    
+    #Generate normal string.
+    date_str = ""
+    
+    if now.day != @time.day and now.month == @time.month and now.year == @time.year
+      last_digit = @time.day.to_s[-1, 1].to_i
+      
+      if ending = args[:number_endings][last_digit]
+        #ignore.
+      else
+        ending = "."
+      end
+      
+      date_str << "#{@time.day}#{ending} "
+    elsif now.day != @time.day or now.month != @time.month or now.year != @time.year
+      date_str << "#{@time.day}/#{@time.month} "
+    end
+    
+    if now.year != @time.year
+      date_str << "#{@time.year} "
+    end
+    
+    if args[:time]
+      date_str << "#{@time.hour}:#{"%02d" % @time.min}"
+    end
+    
+    return date_str
+  end
 end

data/lib/knj/eruby.rb

@@ -4,8 +4,7 @@ class Knj::Eruby
   def initialize(args = {})
     @args = args
     
-    require "tmpdir"
-    @tmpdir = "#{Dir.tmpdir}/knj_erb"
+    @tmpdir = "#{Knj::Os.tmpdir}/knj_erb"
     Dir.mkdir(@tmpdir, 0777) if !File.exists?(@tmpdir)
     
     
@@ -20,7 +19,8 @@ class Knj::Eruby
       @cache_mode = :code_eval
       #@cache_mode = :compile_knj
     elsif RUBY_VERSION.slice(0..2) == "1.9" and RubyVM::InstructionSequence.respond_to?(:compile_file)
-      @cache_mode = :inseq
+      @cache_mode = :code_eval
+      #@cache_mode = :inseq
       #@cache_mode = :compile_knj
     end
     
@@ -45,6 +45,7 @@ class Knj::Eruby
     begin
       if !File.exists?(cachename) or filetime > cachetime
         Knj::Eruby::Handler.load_file(filename, {:cachename => cachename})
+        File.chmod(0777, cachename)
         cachetime = File.mtime(cachename)
         reload_cache = true
       elsif !@cache.key?(cachename)
@@ -55,8 +56,15 @@ class Knj::Eruby
         when :compile_knj
           @compiler.eval_file(:filepath => cachename, :fileident => filename)
         when :code_eval
+          if @args[:binding_callback]
+            binding_use = @args[:binding_callback].call
+          else
+            eruby_binding = Knj::Eruby::Binding.new
+            binding_use = eruby_binding.get_binding
+          end
+          
           @cache[cachename] = File.read(cachename) if reload_cache
-          eval(@cache[cachename], nil, filename)
+          eval(@cache[cachename], binding_use, filename)
         when :inseq
           if reload_cache or @cache[cachename][:time] < cachetime
             @cache[cachename] = {
@@ -212,13 +220,8 @@ class Knj::Eruby
       print "\n\n<pre>\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
-      #to = bt.length - 9
-      #bt = bt[0..to]
-      
-      bt.each do |line|
-        print Knj::Web.html(line) + "\n"
+      e.backtrace.each do |line|
+        print "#{Knj::Web.html(line)}\n"
       end
       
       print "</pre>"
@@ -228,7 +231,7 @@ class Knj::Eruby
     print "<b>#{Knj::Web.html(e.class.name)}: #{Knj::Web.html(e.message)}</b>\n\n"
     
     e.backtrace.each do |line|
-      print Knj::Web.html(line) + "\n"
+      print "#{Knj::Web.html(line)}\n"
     end
     
     print "</pre>"
@@ -237,4 +240,10 @@ end
 
 class Knj::Eruby::Handler < Erubis::Eruby
   include Erubis::StdoutEnhancer
+end
+
+class Knj::Eruby::Binding
+  def get_binding
+    return binding
+  end
 end

data/lib/knj/gettext_threadded.rb

@@ -29,7 +29,7 @@ class Knj::Gettext_threadded
                 pofn = "#{dir}/#{file}/#{fname}/#{pofile}"
                 
                 cont = nil
-                File.open(pofn, {:encoding => @args[:encoding]}) do |fp|
+                File.open(pofn, "r", {:encoding => @args[:encoding]}) do |fp|
                   cont = fp.read.encode("utf-8")
                 end
                 

data/lib/knj/http2.rb

@@ -1,10 +1,11 @@
+require "#{$knjpath}web"
+
 class Knj::Http2
   attr_reader :cookies
   
   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 = {}
@@ -135,6 +136,7 @@ class Knj::Http2
   def get(addr, args = {})
     begin
       @mutex.synchronize do
+        args[:addr] = addr
         header_str = "GET /#{addr} HTTP/1.1#{@nl}"
         header_str << self.header_str(self.default_headers(args), args)
         header_str << "#{@nl}"
@@ -149,8 +151,7 @@ class Knj::Http2
         return resp
       end
     rescue Knj::Errors::Retry => e
-      print "Redirecting to: #{e.message}\n"
-      
+      print "Redirecting to: #{e.message}\n" if @debug
       return self.get(e.message, args)
     end
   end
@@ -191,14 +192,31 @@ class Knj::Http2
     return headers
   end
   
+  def self.post_convert_data(pdata)
+    praw = ""
+    
+    if pdata.is_a?(Hash)
+      pdata.each do |key, val|
+        praw << "&" if praw != ""
+        praw << "#{Knj::Web.urlenc(Knj::Http2.post_convert_data(key))}=#{Knj::Web.urlenc(Knj::Http2.post_convert_data(val))}"
+      end
+    elsif pdata.is_a?(Array)
+      count = 0
+      pdata.each do |val|
+        count += 1
+        praw << "#{count}=#{Knj::Web.urlenc(Knj::Http2.post_convert_data(val))}"
+      end
+    else
+      return pdata.to_s
+    end
+    
+    return praw
+  end
+  
   def post(addr, pdata = {}, args = {})
     begin
       @mutex.synchronize do
-        praw = ""
-        pdata.each do |key, val|
-          praw << "&" if praw != ""
-          praw << "#{Knj::Web.urlenc(key)}=#{Knj::Web.urlenc(val)}"
-        end
+        praw = Knj::Http2.post_convert_data(pdata)
         
         header_str = "POST /#{addr} HTTP/1.1#{@nl}"
         header_str << self.header_str(self.default_headers(args).merge("Content-Length" => praw.length), args)
@@ -360,7 +378,7 @@ class Knj::Http2
         return http.get(uri.path)
       end
     elsif resp.args[:code].to_s == "500"
-      raise "500 - Internal server error."
+      raise "500 - Internal server error: '#{args[:addr]}':\n\n#{resp.body}"
     elsif resp.args[:code].to_s == "403"
       raise Knj::Errors::NoAccess
     else

data/lib/knj/image.rb

@@ -152,4 +152,14 @@ class Knj::Image
     
     pic.matte = true
   end
+  
+  #Returns the width relative to the height.
+  def self.width_for_height(orig_width, orig_height, new_height)
+    return (orig_width.to_f / (orig_height.to_f / new_height.to_f)).to_i
+  end
+  
+  #Returns the height relative to the width.
+  def self.height_for_width(orig_width, orig_height, new_width)
+    return (orig_height.to_f / (orig_width.to_f / new_width.to_f)).to_i
+  end
 end

data/lib/knj/includes/require_info.rb

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

data/lib/knj/knj.rb

@@ -1,13 +1,20 @@
-if $knjpath
-  autoload_path = "#{$knjpath}autoload.rb"
-else
-  $knjpath = "knj/"
-  autoload_path = "#{File.dirname(__FILE__)}/autoload.rb"
-end
-
-require autoload_path if $knjautoload != false
+$knjpath = "knj/" if !$knjpath
 
 module Knj
+  CONFIG = {}
+  
+  def self.const_missing(name)
+    if name == "db"
+      filepath = "#{$knjpath}/knjdb/libknjdb"
+    else
+      filepath = "#{$knjpath}#{name.to_s.downcase}"
+    end
+    
+    require filepath
+    raise "Constant still not defined: '#{name}'." if !Knj.const_defined?(name)
+    return Knj.const_get(name)
+  end
+  
   def self.appserver_cli(filename)
     Knj::Os.chdir_file(filename)
     require "#{$knjpath}/includes/appserver_cli.rb"
@@ -15,7 +22,7 @@ module Knj
   
   def self.dirname(filepath)
     raise "Filepath does not exist: #{filepath}" if !File.exists?(filepath)
-    return Knj::Php.realpath(File.dirname(filepath))
+    return File.realpath(File.dirname(filepath))
   end
   
   #Returns the path of the knjrbfw-framework.

data/lib/knj/knj_controller.rb

@@ -8,9 +8,18 @@ class KnjController < Rho::RhoController
   def html_links
     System.open_url(@params["url"])
   end
-  
+	
   def callback
     block = $rhodes.callbacks(@params["callback_id"])
     block.call(:params => @params)
   end
+  
+  def youtube_embed
+		@iframe_height = System.get_property("screen_height").to_i - 40
+		render :file => "Knj/rhodes/youtube_embed.erb"
+  end
+  
+  def youtube_open
+		render :file => "Knj/rhodes/youtube_open.erb"
+  end
 end