knjrbfw 0.0.72 → 0.0.74

data/Gemfile

@@ -6,6 +6,7 @@ gem "wref"
 gem "tsafe"
 gem "datet"
 gem "http2"
+gem "php4r"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -9,6 +9,9 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    php4r (0.0.0)
+      datet
+      http2
     rake (0.9.2.2)
     rmagick (2.13.1)
     rspec (2.3.0)
@@ -31,6 +34,7 @@ DEPENDENCIES
   datet
   http2
   jeweler (~> 1.6.3)
+  php4r
   rmagick
   rspec (~> 2.3.0)
   sqlite3

data/VERSION

@@ -1 +1 @@
-0.0.72
+0.0.74

data/knjrbfw.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.72"
+  s.version = "0.0.74"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
@@ -198,7 +198,6 @@ Gem::Specification.new do |s|
     "lib/knj/objects/objects_sqlhelper.rb",
     "lib/knj/opts.rb",
     "lib/knj/os.rb",
-    "lib/knj/php.rb",
     "lib/knj/php_parser/arguments.rb",
     "lib/knj/php_parser/functions.rb",
     "lib/knj/php_parser/php_parser.rb",
@@ -259,7 +258,6 @@ Gem::Specification.new do |s|
     "spec/db_spec_encoding_test_file.txt",
     "spec/knjrbfw_spec.rb",
     "spec/objects_spec.rb",
-    "spec/php_spec.rb",
     "spec/process_meta_spec.rb",
     "spec/process_spec.rb",
     "spec/spec_helper.rb",
@@ -281,6 +279,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<tsafe>, [">= 0"])
       s.add_runtime_dependency(%q<datet>, [">= 0"])
       s.add_runtime_dependency(%q<http2>, [">= 0"])
+      s.add_runtime_dependency(%q<php4r>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.3"])
@@ -291,6 +290,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<tsafe>, [">= 0"])
       s.add_dependency(%q<datet>, [">= 0"])
       s.add_dependency(%q<http2>, [">= 0"])
+      s.add_dependency(%q<php4r>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
@@ -302,6 +302,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<tsafe>, [">= 0"])
     s.add_dependency(%q<datet>, [">= 0"])
     s.add_dependency(%q<http2>, [">= 0"])
+    s.add_dependency(%q<php4r>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.3"])

data/lib/knj/arrayext.rb

@@ -1,3 +1,5 @@
+require "php4r"
+
 module Knj::ArrayExt
   def self.join(args = {}, key = nil, sep = nil)
     if args.is_a?(Array) and sep
@@ -13,7 +15,7 @@ module Knj::ArrayExt
     str = ""
     first = true
     
-    Knj::Php.foreach(args[:arr]) do |key, value|
+    Php4r.foreach(args[:arr]) do |key, value|
       if first
         first = false
       else
@@ -30,7 +32,7 @@ module Knj::ArrayExt
         if args[:callback].is_a?(Proc) or args[:callback].is_a?(Method)
           value = args[:callback].call(value)
         else
-          value = Knj::Php.call_user_func(args[:callback], value) if args[:callback]
+          value = Php4r.call_user_func(args[:callback], value) if args[:callback]
         end
       end
       
@@ -58,7 +60,7 @@ module Knj::ArrayExt
   def self.hash_numeric_keys?(hash)
     all_num = true
     hash.each do |key, val|
-      if !Knj::Php.is_numeric(key)
+      if !Php4r.is_numeric(key)
         all_num = false
         break
       end
@@ -212,10 +214,10 @@ module Knj::ArrayExt
     return hash if !hash
     
     hash = hash.clone
-    Knj::Php.foreach(hash) do |key, val|
+    Php4r.foreach(hash) do |key, val|
       if val.is_a?(String)
         begin
-          hash[key] = Knj::Php.utf8_encode(val)
+          hash[key] = Php4r.utf8_encode(val)
         rescue Encoding::UndefinedConversionError => e
           if args["ignore_encoding_errors"]
             next

data/lib/knj/datarow.rb

@@ -732,6 +732,12 @@ class Knj::Datarow
     return @data.each(*args, &block)
   end
   
+  #Hash-compatible.
+  def to_hash
+    self.reload if @should_reload
+    return @data.clone
+  end
+  
   #Returns a default-URL to show the object.
   def url
     cname = self.class.classname.to_s.downcase

data/lib/knj/datarow_custom.rb

@@ -146,4 +146,8 @@ class Knj::Datarow_custom
   def each(&args)
     return @data.each(&args)
   end
+  
+  def to_hash
+    return @data.clone
+  end
 end

data/lib/knj/datestamp.rb

@@ -1,6 +1,6 @@
 class Knj::Datestamp
   def self.in(time = Time.new)
-    if Knj::Php.is_numeric(time)
+    if Php4r.is_numeric(time)
       time = Time.at(time.to_i)
     elsif time.is_a?(String)
       time = Time.local(*ParseDate.parsedate(time))
@@ -14,7 +14,7 @@ class Knj::Datestamp
       time = Time.new
     end
     
-    if Knj::Php.is_numeric(time)
+    if Php4r.is_numeric(time)
       time = Time.at(time.to_i)
     elsif time.is_a?(String)
       begin
@@ -42,10 +42,10 @@ class Knj::Datestamp
     
     time = Time.new if !time
     
-    if Knj::Php.is_numeric(time)
+    if Php4r.is_numeric(time)
       time = Time.at(time.to_i)
     elsif time.is_a?(String)
-      time = Time.at(Knj::Php.strtotime(time))
+      time = Time.at(Php4r.strtotime(time))
     end
     
     str = ""

data/lib/knj/degulesider.rb

@@ -7,7 +7,7 @@ class Knj::Degulesider
   end
   
   def search(sargs)
-    url = "/search/#{Knj::Php.urlencode(sargs[:where])}/-/1/"
+    url = "/search/#{Php4r.urlencode(sargs[:where])}/-/1/"
     
     html = @http.get(url)
     ret = []

data/lib/knj/erb/include.rb

@@ -30,7 +30,7 @@ class ERuby
     Dir.chdir(File.dirname(filename))
     
     fpath = "#{KnjEruby.filepath}/cache/#{filename.gsub("/", "_").gsub(".", "_")}"
-    pi = Knj::Php.pathinfo(filename)
+    pi = Php4r.pathinfo(filename)
     cachename = fpath + ".cache"
     
     filetime = File.mtime(filename)

data/lib/knj/fs/fs.rb

@@ -1,11 +1,11 @@
 class Knj::Fs
   @drivers = []
-  drivers_path = Knj::Php.realpath("#{File.dirname(__FILE__)}/drivers")
+  drivers_path = Php4r.realpath("#{File.dirname(__FILE__)}/drivers")
   Dir.new(drivers_path).each do |file|
     fn = "#{drivers_path}/#{file}"
     next if file == "." or file == ".." or File.directory?(fn)
     
-    class_name = Knj::Php.ucwords(file.slice(0..-4)).to_sym
+    class_name = Php4r.ucwords(file.slice(0..-4)).to_sym
     print "Classname: #{class_name}\n"
     autoload class_name, fn
     
@@ -24,7 +24,7 @@ class Knj::Fs
   end
   
   def spawn_driver
-    class_name = Knj::Php.ucwords(@args[:driver])
+    class_name = Php4r.ucwords(@args[:driver])
     @driver = self.class.const_get(class_name).new(:fs => self, :args => @args)
   end
 end

data/lib/knj/gtk2_menu.rb

@@ -26,7 +26,7 @@ class Knj::Gtk2::Menu
       
       if menuitem["connect"]
         newitem.signal_connect("activate") do
-          Knj::Php.call_user_func(menuitem["connect"])
+          Php4r.call_user_func(menuitem["connect"])
         end
       else
         newitem.signal_connect("activate") do

data/lib/knj/hash_methods.rb

@@ -28,6 +28,15 @@ class Knj::Hash_methods < Hash
     return self[:data]
   end
   
+  def to_hash
+    h = {}
+    self.each do |key, val|
+      h[k] = val
+    end
+    
+    return h
+  end
+  
   #Proxies methods into the hash as keys.
   def method_missing(method, *args)
     method = method.to_sym

data/lib/knj/iotop.rb

@@ -26,7 +26,7 @@ class Knj::Iotop
             
             if match[12].index("bestseller") != nil
               print line_str + "\n"
-              Knj::Php.print_r(match)
+              Php4r.print_r(match)
             end
             
             @data[pid] = {

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

@@ -14,7 +14,7 @@ class GladeXML
       @cont = filename
       @data = XmlSimple.xml_in(@cont)
       window_name = self.find_window(data)
-      Knj::Php.file_put_contents("temp.glade", @cont)
+      Php4r.file_put_contents("temp.glade", @cont)
       @glade = Glade::XML.new("temp.glade", window_name, nil)
       FileUtils.rm("temp.glade")
     end

data/lib/knj/jruby-gtk2/gladexml.rb

@@ -14,7 +14,7 @@ class GladeXML
       cont = filename
       @data = XmlSimple.xml_in(cont)
       window_name = self.find_window(data)
-      Knj::Php.file_put_contents("temp.glade", cont)
+      Php4r.file_put_contents("temp.glade", cont)
       @glade = org.gnome.glade.Glade::parse("temp.glade", window_name)
       FileUtils.rm("temp.glade")
     end

data/lib/knj/jruby-gtk2/tests/test_glade_window.rb

@@ -28,7 +28,7 @@ class WinAppEdit
     print "Save clicked.\n"
     
     val = @glade["tvTest"].sel
-    Knj::Php.print_r(val)
+    Php4r.print_r(val)
   end
   
   def on_btnCancel_clicked

data/lib/knj/knj.rb

@@ -30,9 +30,9 @@ module Knj
     return File.realpath(File.dirname(__FILE__))
   end
   
-  #Shortcut to Knj::Php.print_r.
+  #Shortcut to Php4r.print_r.
   def self.p(*args, &block)
-    return Knj::Php.print_r(*args, &block)
+    return Php4r.print_r(*args, &block)
   end
   
   def self.handle_return(args)

data/lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3.rb

@@ -163,7 +163,7 @@ class KnjDB_sqlite3_result
     
     ret = {}
     result_hash.each do |key, val|
-      if Knj::Php::is_numeric(key)
+      if Php4r.is_numeric(key)
         #do nothing.
       elsif @symbols and !key.is_a?(Symbol)
         ret[key.to_sym] = val

data/lib/knj/knjdb/libknjdb.rb

@@ -401,8 +401,8 @@ class Knj::Db
       end
       
       if args["limit_from"] and args["limit_to"]
-        raise "'limit_from' was not numeric: '#{args["limit_from"]}'." if !Knj::Php.is_numeric(args["limit_from"])
-        raise "'limit_to' was not numeric: '#{args["limit_to"]}'." if !Knj::Php.is_numeric(args["limit_to"])
+        raise "'limit_from' was not numeric: '#{args["limit_from"]}'." if !Php4r.is_numeric(args["limit_from"])
+        raise "'limit_to' was not numeric: '#{args["limit_to"]}'." if !Php4r.is_numeric(args["limit_to"])
         sql << " LIMIT #{args["limit_from"]}, #{args["limit_to"]}"
       end
     end

data/lib/knj/knjdb/libknjdb_row.rb

@@ -130,6 +130,10 @@ class Knj::Db_row
     return @data.each(&args)
   end
   
+  def to_hash
+    return @data.clone
+  end
+  
   def esc(str)
     return self.db.escape(str)
   end

data/lib/knj/locales.rb

@@ -51,7 +51,7 @@ module Knj::Locales
   # Knj::Locales.number_out(123456.68) #=> "123,456.68"
   def self.number_out(num_str, dec = 2)
     lc = Knj::Locales.localeconv
-    return Knj::Php.number_format(num_str, dec, lc["decimal_point"], lc["thousands_sep"])
+    return Php4r.number_format(num_str, dec, lc["decimal_point"], lc["thousands_sep"])
   end
   
   #Returns the current locale for the current environment (_session[:locale] or Thread.current[:locale]).

data/lib/knj/notify.rb

@@ -26,7 +26,7 @@ class Knj::Notify
       cmd = "notify-send"
       
       if args["time"]
-        raise "Time is not numeric." if !Knj::Php.is_numeric(args["time"])
+        raise "Time is not numeric." if !Php4r.is_numeric(args["time"])
         cmd << " -t #{args["time"]}"
       end
       

data/lib/knj/objects.rb

@@ -41,7 +41,7 @@ class Knj::Objects
         file_parsed = file
         file_parsed.gsub!(@args[:class_pre], "") if @args.key?(:class_pre)
         file_parsed.gsub!(/\.rb$/, "")
-        file_parsed = Knj::Php.ucwords(file_parsed)
+        file_parsed = Php4r.ucwords(file_parsed)
         
         loads << file_parsed
         self.requireclass(file_parsed, {:load => false})
@@ -186,7 +186,7 @@ class Knj::Objects
           
           callback["block"].call(*callargs)
         elsif callback["callback"]
-          Knj::Php.call_user_func(callback["callback"], args)
+          Php4r.call_user_func(callback["callback"], args)
         else
           raise "No valid callback given."
         end
@@ -403,7 +403,7 @@ class Knj::Objects
   def get_try(obj, col_name, obj_name = nil)
     if !obj_name
       if match = col_name.to_s.match(/^(.+)_id$/)
-        obj_name = Knj::Php.ucwords(match[1]).to_sym
+        obj_name = Php4r.ucwords(match[1]).to_sym
       else
         raise "Could not figure out objectname for: #{col_name}."
       end
@@ -557,7 +557,7 @@ class Knj::Objects
       list_args = {}
     end
     
-    if RUBY_VERSION[0..2] == 1.8 and Knj::Php.class_exists("Dictionary")
+    if RUBY_VERSION[0..2] == 1.8 and Php4r.class_exists("Dictionary")
       list = Dictionary.new
     else
       list = {}

data/lib/knj/objects/objects_sqlhelper.rb

@@ -109,7 +109,7 @@ class Knj::Objects
                   end
                 end
                 
-                raise "No such joined table on '#{args[:table]}': '#{col.first}' (#{col.first.class.name}) with the following joined table:\n#{Knj::Php.print_r(args[:joined_tables], true)}" if !found
+                raise "No such joined table on '#{args[:table]}': '#{col.first}' (#{col.first.class.name}) with the following joined table:\n#{Php4r.print_r(args[:joined_tables], true)}" if !found
               elsif col.is_a?(String) or col.is_a?(Symbol)
                 col_str = "#{table_def}`#{col}`"
                 found = true

data/lib/knj/php_parser/php_parser.rb

@@ -7,7 +7,7 @@ class Knj::Php_parser
     
     if !args.key?("require_requirements") or args["require_requirements"]
       @retcont = "require \"knj/autoload\"\n"
-      @retcont << "require \"knj/php\"\n"
+      @retcont << "require \"php4r\"\n"
       @retcont << "require \"knj/php_parser/php_parser\"\n"
       @retcont << "\n"
     else

data/lib/knj/php_parser/tests/test.rb

@@ -4,8 +4,8 @@ require "#{$knjpath}php_parser/php_parser"
 
 module Knj::Php_parser::Functions
   def self.my_function(phpvar_arg)
-    Knj::Php.print("Hejsa.\n")
-    Knj::Php.print(phpvar_arg + "\n")
+    Php4r.print("Hejsa.\n")
+    Php4r.print(phpvar_arg + "\n")
   end
 end
 Knj::Php_parser::Functions.my_function("Helloworld.")

data/lib/knj/power_manager.rb

@@ -11,7 +11,7 @@ class Knj::Power_manager
       fn = "/proc/acpi/ac_adapter/#{file}"
       
       if File.directory?(fn)
-        @ac_folder = Knj::Php.realpath(fn)
+        @ac_folder = Php4r.realpath(fn)
         break
       end
     end

data/lib/knj/process.rb

@@ -1,5 +1,6 @@
 require "#{$knjpath}errors"
 require "#{$knjpath}thread"
+require "tsafe"
 
 #This class is able to control communicate with another Ruby-process also running Knj::Process.
 class Knj::Process

data/lib/knj/scripts/ip2location.rb

@@ -6,7 +6,7 @@ ip2loc = Knj::Ip2location.new
 data = ip2loc.lookup(ARGV[0])
 
 if ARGV[1] == "json"
-  print Knj::Php.json_encode(data)
+  print Php4r.json_encode(data)
 else
-  Knj::Php.print_r(data)
+  Php4r.print_r(data)
 end