knjrbfw 0.0.74 → 0.0.75

data/VERSION

@@ -1 +1 @@
-0.0.74
+0.0.75

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.74"
+  s.version = "0.0.75"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-07-28}
+  s.date = %q{2012-07-29}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [

data/lib/knj/arrayext.rb

@@ -60,7 +60,7 @@ module Knj::ArrayExt
   def self.hash_numeric_keys?(hash)
     all_num = true
     hash.each do |key, val|
-      if !Php4r.is_numeric(key)
+      if !(Float(key) rescue false)
         all_num = false
         break
       end

data/lib/knj/datestamp.rb

@@ -1,6 +1,6 @@
 class Knj::Datestamp
   def self.in(time = Time.new)
-    if Php4r.is_numeric(time)
+    if (Float(time) rescue false)
       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 Php4r.is_numeric(time)
+    if (Float(time) rescue false)
       time = Time.at(time.to_i)
     elsif time.is_a?(String)
       begin
@@ -42,7 +42,7 @@ class Knj::Datestamp
     
     time = Time.new if !time
     
-    if Php4r.is_numeric(time)
+    if (Float(time) rescue false)
       time = Time.at(time.to_i)
     elsif time.is_a?(String)
       time = Time.at(Php4r.strtotime(time))

data/lib/knj/knjdb/drivers/mysql/knjdb_mysql_columns.rb

@@ -137,8 +137,8 @@ class KnjDB_mysql::Columns::Column
   
   #Changes the column properties by the given hash.
   def change(data)
-    col_escaped = "#{@args[:db].enc_col}#{@args[:db].esc_col(self.name)}#{@args[:db].enc_col}"
-    table_escape = "#{@args[:db].enc_table}#{@args[:db].esc_table(self.table.name)}#{@args[:db].enc_table}"
+    col_escaped = "`#{@args[:db].esc_col(self.name)}`"
+    table_escape = "`#{@args[:db].esc_table(self.table.name)}`"
     newdata = data.clone
     
     newdata["name"] = self.name if !newdata.key?("name")

data/lib/knj/knjdb/drivers/mysql/knjdb_mysql_tables.rb

@@ -289,10 +289,10 @@ class KnjDB_mysql::Tables::Table
       end
       
       sql << " UNIQUE" if index_data["unique"]
-      sql << " INDEX #{db.escape_col}#{db.esc_col(index_data["name"])}#{db.escape_col}"
+      sql << " INDEX `#{db.esc_col(index_data["name"])}`"
       
       if args[:on_table] or !args.key?(:on_table)
-        sql << " ON #{db.escape_table}#{db.esc_table(args[:table_name])}#{db.escape_table}"
+        sql << " ON `#{db.esc_table(args[:table_name])}`"
       end
       
       sql << " ("
@@ -302,7 +302,7 @@ class KnjDB_mysql::Tables::Table
         sql << ", " if !first
         first = false if first
         
-        sql << "#{db.escape_col}#{db.esc_col(col_name)}#{db.escape_col}"
+        sql << "`#{db.esc_col(col_name)}`"
       end
       
       sql << ")"

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 Php4r.is_numeric(key)
+      if (Float(key) rescue false)
         #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 !Php4r.is_numeric(args["limit_from"])
-        raise "'limit_to' was not numeric: '#{args["limit_to"]}'." if !Php4r.is_numeric(args["limit_to"])
+        raise "'limit_from' was not numeric: '#{args["limit_from"]}'." if !(Float(args["limit_from"]) rescue false)
+        raise "'limit_to' was not numeric: '#{args["limit_to"]}'." if !(Float(args["limit_to"]) rescue false)
         sql << " LIMIT #{args["limit_from"]}, #{args["limit_to"]}"
       end
     end

data/lib/knj/notify.rb

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

data/lib/knj/objects.rb

@@ -33,7 +33,6 @@ class Knj::Objects
     raise "No class path given." if !@args[:class_path] and (@args[:require] or !@args.key?(:require))
     
     if args[:require_all]
-      require "#{$knjpath}php"
       loads = []
       
       Dir.foreach(@args[:class_path]) do |file|

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

@@ -1,5 +1,5 @@
 require "knj/autoload"
-require "#{$knjpath}php"
+require "php4r"
 require "#{$knjpath}php_parser/php_parser"
 
 module Knj::Php_parser::Functions

data/lib/knj/rhodes/rhodes.rb

@@ -7,7 +7,7 @@ class Knj::Rhodes
   def initialize(args = {})
     require "#{$knjpath}arrayext.rb"
     require "#{$knjpath}datet.rb"
-    require "#{$knjpath}php.rb"
+    require "php4r"
     require "#{$knjpath}objects.rb"
     require "#{$knjpath}datarow.rb"
     require "#{$knjpath}event_handler.rb"

data/lib/knj/strings.rb

@@ -123,7 +123,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 Php4r.is_numeric(value)
+    value = value.to_i if (Float(value) rescue false)
     value_s = value.to_s
     
     if value.is_a?(Integer)

data/lib/knj/web.rb

@@ -130,7 +130,7 @@ class Knj::Web
       secname = try.to_s
     end
     
-    secname = secname.to_sym if args[:syms] and secname.is_a?(String) and !Php4r.is_numeric(secname)
+    secname = secname.to_sym if args[:syms] and secname.is_a?(String) and !(Float(secname) rescue false)
     return [secname, secname_empty]
   end
   
@@ -380,7 +380,7 @@ class Knj::Web
       
       if args[:type] == :textarea
         if args.key?(:height)
-          if Php4r.is_numeric(args[:height])
+          if (Float(args[:height]) rescue false)
             css["height"] = "#{args[:height]}px"
           else
             css["height"] = args[:height]

data/spec/cmd_parser_spec.rb

@@ -18,7 +18,7 @@ describe "Cmd_parser" do
       res = Knj::Cmd_parser.lsl(str)
       
       res.each do |file|
-        raise "Byte was not numeric in: '#{str}'." if !Php4r.is_numeric(file[:size])
+        raise "Byte was not numeric in: '#{str}'." if !(Float(file[:size]) rescue false)
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.74
+  version: 0.0.75
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-28 00:00:00 +02:00
+date: 2012-07-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -394,7 +394,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1092444068000497155
+      hash: 1511757075564892829
       segments: 
       - 0
       version: "0"