knjrbfw 0.0.23 → 0.0.24

data/lib/knj/rhodes/rhodes.rb

@@ -15,6 +15,7 @@ class Knj::Rhodes
     require "#{$knjpath}errors.rb"
     require "#{$knjpath}gettext_threadded.rb"
     require "#{$knjpath}locales.rb"
+    require "#{$knjpath}locale_strings.rb"
     require "#{$knjpath}web.rb"
     
     if !Kernel.const_defined?("Mutex")
@@ -22,11 +23,6 @@ class Knj::Rhodes
       require "#{$knjpath}rhodes/mutex.rb"
     end
     
-    if !Kernel.const_defined?("WeakRef")
-      print "WeakRef not defined - loading alternative.\n"
-      require "#{$knjpath}rhodes/weakref.rb"
-    end
-    
     require "#{$knjpath}opts.rb"
     
     require "#{$knjpath}knjdb/libknjdb.rb"
@@ -43,7 +39,7 @@ class Knj::Rhodes
     @db = Knj::Db.new(
       :type => "sqlite3",
       :subtype => "rhodes",
-      :path => "#{Rho::RhoApplication.get_base_app_path}app/rhodes_default.sqlite3",
+      :path => "#{Rho::RhoApplication.get_user_path}rhodes_default.sqlite3",
       :return_keys => "symbols",
       :require => false
     )
@@ -54,6 +50,7 @@ class Knj::Rhodes
       schema = {"tables" => {}}
     end
     
+    #Table used for options-module.
     schema["tables"]["Option"] = {
       "columns" => [
         {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
@@ -62,23 +59,26 @@ class Knj::Rhodes
       ]
     }
     
+    #Run database-revision.
     dbrev = Knj::Db::Revision.new
     dbrev.init_db("schema" => schema, "db" => @db)
     
+    #Initialize options-module.
+    Knj::Opts.init(
+      "table" => "Option",
+      "knjdb" => @db
+    )
+    
+    #Initialize objects-module.
     @ob = Knj::Objects.new(
       :db => @db,
       :class_path => "#{Rho::RhoApplication.get_base_app_path}app/models",
       :require => false,
       :module => @args[:module],
-      :datarow => true,
-      :cache => :none
-    )
-    
-    Knj::Opts.init(
-      "table" => "Option",
-      "knjdb" => @db
+      :datarow => true
     )
     
+    #Initialize locales.
     @gettext = Knj::Gettext_threadded.new
     @gettext.load_dir("#{Rho::RhoApplication.get_base_app_path}app/locales")
     
@@ -181,8 +181,8 @@ class Knj::Rhodes
 end
 
 #This method is used to emulate web-behavior and make Knj::Locales.number_out and friends work properly.
-def _session(key)
-  return $rhodes.session_key(key)
+def _session
+  return {:locale => $rhodes.locale}
 end
 
 #This method is used to make gettext work.

data/lib/knj/rhodes/youtube_embed.erb

@@ -0,0 +1,12 @@
+<div data-role="page">
+	<div data-role="header">
+		<h1><%=_"YouTube embedded"%></h1>
+		
+		<a href="javascript: history.back(-1)" class="ui-btn-left" data-icon="back" data-back="true"><%=_("Back")%></a>
+	</div>
+	<div data-role="content">
+		<center>
+			<iframe width="100%" height="<%=@iframe_height%>px" src="http://www.youtube.com/embed/<%=@params["youtube_id"]%>" frameborder="0" allowfullscreen></iframe>
+		</center>
+	</div>
+</div>

data/lib/knj/rhodes/youtube_open.erb

@@ -0,0 +1,45 @@
+<div data-role="page">
+	<div data-role="header">
+		<h1><%=_"Open YouTube link"%></h1>
+		
+		<a href="javascript: history.back(-1)" class="ui-btn-left" data-icon="back" data-back="true"><%=_("Back")%></a>
+	</div>
+	<div data-role="content">
+		<ul data-role="listview">
+			<%if System::get_property('platform') != "APPLE"%>
+				<li>
+					<a href="javascript: knj_rhodes_html_links({'url': 'vnd.youtube://<%=@params["youtube_id"]%>'})">
+						<h3><%=_"Open in built-in app. (VND)"%></h3>
+						<p><%=_"This will trigger the YouTube-app. in Android."%></p>
+					</a>
+				</li>
+			<%end%>
+			
+			<%if System::get_property("platform") == "APPLE"%>
+				<li>
+					<a href="javascript: knj_rhodes_html_links({'url': iphone_str})">
+						<h3><%=_"Open in built-in app. (iPhone)"%></h3>
+						<p><%=_"This will trigger the YouTube-app. on iPhone."%></p>
+					</a>
+				</li>
+			<%end%>
+			
+			<li>
+				<a href="javascript: knj_rhodes_html_links({'url': 'http://www.youtube.com/watch?v=<%=@params["youtube_id"]%>'})">
+					<h3><%=_"Open YouTube-URL"%></h3>
+					<p><%=_"This will open the YouTube-video in a browser."%></p>
+				</a>
+			</li>
+			<li>
+				<a href="<%=url_for(:action => :youtube_embed, :query => {:youtube_id => @params["youtube_id"]})%>">
+					<h3><%=_"Open YouTube embedded"%></h3>
+					<p><%=_"Watch the video in this app. using embedding from YouTube."%></p>
+				</a>
+			</li>
+		</ul>
+		
+		<script>
+			var iphone_str = "[[UIApplication sharedApplication] openURL:[NSURL URLWithString:@\"http://www.youtube.com/v/oHg5SJYRHA0&f=gdata_videos\"]]; "
+		</script>
+	</div>
+</div>

data/lib/knj/strings.rb

@@ -110,6 +110,7 @@ module Knj::Strings
   #Returns 'Yes' or 'No' based on a value. The value can be 0, 1, yes, no, true or false.
   def self.yn_str(value, str_yes = "Yes", str_no = "No")
     value = value.to_i if Knj::Php.is_numeric(value)
+    value_s = value.to_s
     
     if value.is_a?(Integer)
       if value == 0
@@ -119,7 +120,7 @@ module Knj::Strings
       end
     end
     
-    return str_no if !value or value == "no"
+    return str_no if !value or value_s == "no" or value_s == "false" or value_s == ""
     return str_yes
   end
   

data/lib/knj/translations.rb

@@ -113,11 +113,11 @@ class Knj::Translations
       "object_class" => obj.class.name
     })
     trans.each do |tran|
-      #Delete the translation object.
-      @ob.delete(tran)
-      
       #Delete the cache if defined on the object.
       cache.delete(tran[:key].to_sym) if cache and cache.key?(tran[:key].to_sym)
+      
+      #Delete the translation object.
+      @ob.delete(tran)
     end
   end
 end

data/lib/knj/unix_proc.rb

@@ -12,7 +12,7 @@ class Knj::Unix_proc
     begin
       proc_ele = PROCS[pid]
       proc_ele.update_data(data)
-    rescue WeakRef::RefError
+    rescue Knj::Wref::Recycled
       proc_ele = Knj::Unix_proc.new(data)
       PROCS[pid] = proc_ele
     end
@@ -30,7 +30,7 @@ class Knj::Unix_proc
     end
     
     MUTEX.synchronize do
-      ret = []
+      ret = [] unless block_given?
       res = Knj::Os.shellcmd(cmdstr)
       
       res.scan(/^(\S+)\s+([0-9]+)\s+([0-9.]+)\s+([0-9.]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+ (.+)($|\n)/) do |match|
@@ -60,11 +60,22 @@ class Knj::Unix_proc
           next if !found
         end
         
-        ret << Knj::Unix_proc.spawn(data)
+        proc_obj = Knj::Unix_proc.spawn(data)
+        
+        if block_given?
+          yield(proc_obj)
+        else
+          ret << proc_obj
+        end
       end
       
       PROCS.clean
-      return ret
+      
+      if block_given?
+        return nil
+      else
+        return ret
+      end
     end
   end
   

data/lib/knj/web.rb

@@ -1,213 +1,16 @@
 class Knj::Web
-  attr_reader :session, :cgi, :data
-  
-  def initialize(args = {})
-    @args = Knj::ArrayExt.hash_sym(args)
-    @db = @args[:db] if @args[:db] 
-    @args[:tmp] = "/tmp" if !@args[:tmp]
-    
-    raise "No ID was given." if !@args[:id]
-    raise "No DB was given." if !@args[:db]
-    
-    if @args[:cgi]
-      @cgi = @args[:cgi]
-    elsif $_CGI
-      @cgi = $_CGI
-    else
-      if ENV["HTTP_HOST"] or $knj_eruby or Knj::Php.class_exists("Apache")
-        @cgi = CGI.new
-      end
-    end
-    
-    $_CGI = @cgi if !$_CGI
-    self.read_cgi
-    
-    if $_FCGI
-      KnjEruby.connect("exit") do
-        @session.close
-        
-        @post = nil
-        @get = nil
-        @server = nil
-        @cookie = nil
-        
-        $_POST = nil
-        $_GET = nil
-        $_SERVER = nil
-        $_COOKIE = nil
-      end
-    else
-      Kernel.at_exit do
-        @session.close
-        
-        @post = nil
-        @get = nil
-        @server = nil
-        @cookie = nil
-        
-        $_POST = nil
-        $_GET = nil
-        $_SERVER = nil
-        $_COOKIE = nil
-      end
-    end
-  end
-  
-  def read_cgi(args = {})
-    args.each do |key, value|
-      if key == :cgi
-        @cgi = value
-      else
-        raise "No such key: #{key.to_s}"
-      end
-    end
-    
-    if $_FCGI_COUNT and $_FCGI and $_CGI
-      @server = {}
-      $_CGI.env_table.each do |key, value|
-        @server[key] = value
-      end
-    elsif $_CGI and ENV["HTTP_HOST"] and ENV["REMOTE_ADDR"]
-      @server = {}
-      ENV.each do |key, value|
-        @server[key] = value
-      end
-    elsif Knj::Php.class_exists("Apache")
-      @server = {
-        "HTTP_HOST" => Apache.request.hostname,
-        "HTTP_USER_AGENT" => Apache.request.headers_in["User-Agent"],
-        "REMOTE_ADDR" => Apache.request.remote_host(1),
-        "REQUEST_URI" => Apache.request.unparsed_uri
-      }
-    else
-      @server = {}
-    end
-    
-    @files = {}
-    @post = {}
-    if @cgi and @cgi.request_method == "POST"
-      @cgi.params.each do |pair|
-        do_files = false
-        isstring = true
-        varname = pair[0]
-        stringparse = nil
-        
-        if pair[1][0].class.name == "Tempfile"
-          if varname[0..3] == "file"
-            isstring = false
-            do_files = true
-            
-            if pair[1][0].size > 0
-              stringparse = {
-                "name" => pair[1][0].original_filename,
-                "tmp_name" => pair[1][0].path,
-                "size" => pair[1][0].size,
-                "error" => 0
-              }
-              
-              stringparse["name"] = pair[1][0].original_filename if pair[1][0].respond_to?("original_filename")
-            end
-          else
-            stringparse = File.read(pair[1][0].path)
-          end
-        elsif pair[1][0].is_a?(StringIO)
-          if varname[0..3] == "file"
-            tmpname = @args[:tmp] + "/knj_web_upload_#{Time.now.to_f.to_s}_#{rand(1000).to_s.untaint}"
-            isstring = false
-            do_files = true
-            cont = pair[1][0].string
-            Knj::Php.file_put_contents(tmpname, cont.to_s)
-            
-            if cont.length > 0
-              stringparse = {
-                "tmp_name" => tmpname,
-                "size" => cont.length,
-                "error" => 0
-              }
-              
-              stringparse["name"] = pair[1][0].original_filename if pair[1][0].respond_to?("original_filename")
-            end
-          else
-            stringparse = pair[1][0].string
-          end
-        else
-          stringparse = pair[1][0]
-        end
-        
-        if stringparse
-          if !do_files
-            if isstring
-              Knj::Web.parse_name(@post, varname, stringparse)
-            else
-              @post[varname] = stringparse
-            end
-          else
-            if isstring
-              Knj::Web.parse_name(@files, varname, stringparse)
-            else
-              @files[varname] = stringparse
-            end
-          end
-        end
-      end
-    end
-    
-    
-    if @cgi and @cgi.query_string
-      @get = Knj::Web.parse_urlquery(@cgi.query_string)
-    else
-      @get = {}
-    end
+  #Parses URI and returns hash with data.
+  def self.parse_uri(str)
+    uri_match = str.to_s.match(/^\/(.+?\..+?|)(\?(.+)|)$/)
+    raise "Could not parse the URI: '#{str}'." if !uri_match
     
-    @cookie = {}
-    if @cgi
-      @cgi.cookies.each do |key, value|
-        @cookie[key] = value[0]
-      end
-    end
-    
-    self.global_params if @args[:globals]
-    
-    if @cookie[@args[:id]] and (sdata = @args[:db].single(:sessions, :id => @cookie[@args[:id]]))
-      @data = Knj::ArrayExt.hash_sym(sdata)
-      
-      if @data
-        if @data[:user_agent] != @server["HTTP_USER_AGENT"] or @data[:ip] != @server["REMOTE_ADDR"]
-          @data = nil
-        else
-          @db.update(:sessions, {"last_url" => @server["REQUEST_URI"].to_s, "date_active" => Time.new}, {"id" => @data[:id]})
-          session_id = @args[:id] + "_" + @data[:id]
-        end
-      end
-    end
-    
-    if !@data or !session_id
-      @db.insert(:sessions,
-        :date_start => Time.new,
-        :date_active => Time.new,
-        :user_agent => @server["HTTP_USER_AGENT"],
-        :ip => @server["REMOTE_ADDR"],
-        :last_url => @server["REQUEST_URI"].to_s
-      )
-      
-      @data = Knj::ArrayExt.hash_sym(@db.single(:sessions, :id => @db.last_id))
-      session_id = @args[:id] + "_" + @data[:id]
-      Knj::Php.setcookie(@args[:id], @data[:id])
-    end
-    
-    require "cgi/session"
-    require "cgi/session/pstore"
-    @session = CGI::Session.new(@session, "database_manager" => CGI::Session::PStore, "session_id" => session_id, "session_path" => @args[:tmp])
-  end
-  
-  def [](key)
-    return @session[key.to_sym]
-  end
-  
-  def []=(key, value)
-    return @session[key.to_sym] = value
+    return {
+      :path => "/#{uri_match[1]}",
+      :query => uri_match[3]
+    }
   end
   
+  #Parses cookies-string and returns hash with parsed cookies.
   def self.parse_cookies(str)
     ret = {}
     
@@ -356,22 +159,6 @@ class Knj::Web
     end
   end
   
-  def global_params
-    $_POST = @post
-    $_GET = @get
-    $_COOKIE = @cookie
-    $_FILES = @files
-    $_SERVER = @server
-  end
-  
-  def destroy
-    @cgi = nil
-    @post = nil
-    @get = nil
-    @session = nil
-    @args = nil
-  end
-  
   def self.require_eruby(filepath)
     cont = File.read(filepath).untaint
     parse = Erubis.Eruby.new(cont)
@@ -722,13 +509,8 @@ class Knj::Web
     return html
   end
   
-  def self.rendering_engine
-    begin
-      servervar = _server
-    rescue Exception
-      servervar = $_SERVER
-    end
-    
+  def self.rendering_engine(servervar = nil)
+    servervar = _server if !servervar
     if !servervar
       raise "Could not figure out meta data."
     end
@@ -749,13 +531,8 @@ class Knj::Web
     end
   end
   
-  def self.os
-    begin
-      servervar = _server
-    rescue Exception
-      servervar = $_SERVER
-    end
-    
+  def self.os(servervar = nil)
+    servervar = _server if !servervar
     if !servervar
       raise "Could not figure out meta data."
     end
@@ -778,14 +555,7 @@ class Knj::Web
   end
   
   def self.browser(servervar = nil)
-    if !servervar
-      begin
-        servervar = _server
-      rescue Exception => e
-        servervar = $_SERVER
-      end
-    end
-    
+    servervar = _server if !servervar
     raise "Could not figure out meta data." if !servervar
     agent = servervar["HTTP_USER_AGENT"].to_s.downcase
     
@@ -923,10 +693,10 @@ class Knj::Web
   end
   
   def self.locale(args = {})
-    begin
+    if args[:servervar]
+      servervar = args[:servervar]
+    else
       servervar = _server
-    rescue Exception
-      servervar = $_SERVER
     end
     
     if !servervar

data/lib/knj/webscripts/image.rhtml

@@ -26,6 +26,12 @@
     end
   end
   
+  #Base64-encoding of path.
+  if _get["path64"]
+    require "base64"
+    _get["path"] = Base64.decode64(_get["path64"])
+  end
+  
   
 	idstr = Digest::MD5.hexdigest("#{_get["path"]}_#{_get["smartsize"].to_i}_#{_get["width"].to_i}_#{_get["height"].to_i}_#{_get["maxwidth"].to_i}_#{_get["maxheight"].to_i}_#{_get["rounded_corners"].to_i}_#{_get["border"].to_i}_#{_get["border_color"]}")
 	
@@ -38,9 +44,9 @@
 	
 	tmp_use = false
 	tmp_write = false
-	if $knj_webscripts_image_config
+	if Knj::CONFIG["webscripts_image"]
 		tmp_use = true
-		tmp_path = "#{$knj_webscripts_image_config["tmp_path"]}/#{idstr}"
+		tmp_path = "#{Knj::CONFIG["webscripts_image"]["tmp_path"]}/#{idstr}"
 		tmp_exists = File.exists?(tmp_path)
 		tmp_write = true if !tmp_exists
 		
@@ -167,7 +173,7 @@
 	if tmp_use and !force
     _kas.header("Last-Modified", "#{time_orig.httpdate} GMT") if time_orig
 		_kas.header("Content-Type", "image/png")
-		_httpsession.force_content(File.new(tmp_path))
+		_httpsession.force_content(File.read(tmp_path))
 	else
     _kas.header("Last-Modified", "#{time_orig.httpdate} GMT") if time_orig
 		_kas.header("Content-Type", "image/png")