knjrbfw 0.0.8 → 0.0.9

data/lib/knj/scripts/upgrade_knjrbfw_checker.rb

@@ -5,37 +5,37 @@ require "knj/autoload"
 mode = ARGV[0]
 
 if mode.to_s.length <= 0
-	print "No mode was given.\n"
-	exit
+  print "No mode was given.\n"
+  exit
 elsif mode != "dev" and mode != "original"
-	print "Invalid mode: #{mode}\n"
-	exit
+  print "Invalid mode: #{mode}\n"
+  exit
 end
 
 checks = [
-	"/usr/share/php/knjphpframework",
-	"/usr/lib/ruby/1.8/knjrbfw"
+  "/usr/share/php/knjphpframework",
+  "/usr/lib/ruby/1.8/knjrbfw"
 ]
 
 checks.each do |dir|
-	dev_name = dir + "_dev"
-	original_name = dir + "_original"
-	
-	if mode == "dev"
-		if File.exists?(dir) and File.symlink?(dir)
-			#do nothing.
-		elsif File.exists?(dir) and !File.exists?(original_name)
-			File.rename(dir, original_name)
-			File.rename(dev_name, dir)
-		end
-	elsif mode == "original"
-		if File.exists?(dir) and File.exists?(original_name) and File.symlink?(dir)
-			File.rename(dir, dev_name)
-			File.rename(original_name, dir)
-		else
-			#do nothing.
-		end
-	else
-		raise "No such mode: #{mode}"
-	end
+  dev_name = dir + "_dev"
+  original_name = dir + "_original"
+  
+  if mode == "dev"
+    if File.exists?(dir) and File.symlink?(dir)
+      #do nothing.
+    elsif File.exists?(dir) and !File.exists?(original_name)
+      File.rename(dir, original_name)
+      File.rename(dev_name, dir)
+    end
+  elsif mode == "original"
+    if File.exists?(dir) and File.exists?(original_name) and File.symlink?(dir)
+      File.rename(dir, dev_name)
+      File.rename(original_name, dir)
+    else
+      #do nothing.
+    end
+  else
+    raise "No such mode: #{mode}"
+  end
 end

data/lib/knj/sms.rb

@@ -1,54 +1,54 @@
 class Knj::Sms
-	def initialize(opts)
-		@opts = Knj::ArrayExt.hash_sym(opts)
-		
-		@opts.each do |key, value|
-			if key == :type
-				if value == "bibob" or value == "cbb" or value == "smsd_db"
-					@type = value
-					
-					if @type == "smsd_db"
-						@db = Knj::Db.new(@opts[:knjdb_args])
-						Knj::Thread.new(@db) do |db|
-							db.query("SELECT * FROM outbox WHERE id = 0") #ping!
-							sleep 15
-						end
-					end
-				else
-					raise "Not supported: " + value.to_s
-				end
-			end
-		end
-	end
-	
-	def send_sms(number, msg)
-		if @type == "bibob"
-			if !@soap
-				require "webrick/https"
-				@soap = SOAP::WSDLDriverFactory.new("https://www.bibob.dk/SmsSender.asmx?WSDL").create_rpc_driver
-			end
-			
-			result = @soap.SendMessage({
-				"cellphone" => @opts[:user],
-				"password" => Knj::Php.md5(@opts[:pass]),
-				"smsTo" => {"string" => number},
-				"smscontents" => msg,
-				"sendDate" => Knj::Php.date("Y-m-d"),
-				"deliveryReport" => "0",
-				"fromNumber" => @opts[:user]
-			})
-			
-			if result.sendMessageResult.errorString.to_s != "Ingen fejl."
-				raise "Could not send SMS: (" + result.sendMessageResult.errorCode.to_s + "): " + result.sendMessageResult.errorString.to_s
-			end
-		elsif @type == "smsd_db"
-			@db.insert("outbox", {
-				"number" => number,
-				"text" => msg,
-				"insertdate" => Knj::Php.date("Y-m-d H:i:s")
-			})
-		else
-			raise "Not supported: " + @type
-		end
-	end
+  def initialize(opts)
+    @opts = Knj::ArrayExt.hash_sym(opts)
+    
+    @opts.each do |key, value|
+      if key == :type
+        if value == "bibob" or value == "cbb" or value == "smsd_db"
+          @type = value
+          
+          if @type == "smsd_db"
+            @db = Knj::Db.new(@opts[:knjdb_args])
+            Knj::Thread.new(@db) do |db|
+              db.query("SELECT * FROM outbox WHERE id = 0") #ping!
+              sleep 15
+            end
+          end
+        else
+          raise "Not supported: " + value.to_s
+        end
+      end
+    end
+  end
+  
+  def send_sms(number, msg)
+    if @type == "bibob"
+      if !@soap
+        require "webrick/https"
+        @soap = SOAP::WSDLDriverFactory.new("https://www.bibob.dk/SmsSender.asmx?WSDL").create_rpc_driver
+      end
+      
+      result = @soap.SendMessage({
+        "cellphone" => @opts[:user],
+        "password" => Knj::Php.md5(@opts[:pass]),
+        "smsTo" => {"string" => number},
+        "smscontents" => msg,
+        "sendDate" => Knj::Php.date("Y-m-d"),
+        "deliveryReport" => "0",
+        "fromNumber" => @opts[:user]
+      })
+      
+      if result.sendMessageResult.errorString.to_s != "Ingen fejl."
+        raise "Could not send SMS: (" + result.sendMessageResult.errorCode.to_s + "): " + result.sendMessageResult.errorString.to_s
+      end
+    elsif @type == "smsd_db"
+      @db.insert("outbox", {
+        "number" => number,
+        "text" => msg,
+        "insertdate" => Knj::Php.date("Y-m-d H:i:s")
+      })
+    else
+      raise "Not supported: " + @type
+    end
+  end
 end

data/lib/knj/sshrobot/sshrobot.rb

@@ -1,93 +1,95 @@
 class Knj::SSHRobot
-	def initialize(args)
-		@forwards = []
-		@args = Knj::ArrayExt.hash_sym(args)
-		@args[:port] = 22 if !@args.key?(:port)
-	end
-	
-	def session
-		@session = self.session_spawn if !@session
-		return @session
-	end
-	
-	def session_spawn
-		return Net::SSH.start(@args[:host], @args[:user], :password => @args[:passwd], :port => @args[:port].to_i)
-	end
-	
-	def shell
-		return self.session.shell.sync
-	end
-	
-	def sftp
-		@sftp = Net::SFTP.start(@args[:host], @args[:user], @args[:passwd], :port => @args[:port].to_i)
-	end
-	
-	def exec(command)
-		return self.session.exec!(command)
-	end
-	
-	def fileExists(filepath)
-		result = self.exec("ls " + Strings.UnixSafe(filepath)).strip
-		
-		if result == filepath
-			return true
-		else
-			return false
-		end
-	end
-	
-	def forward(args)
-		Knj::ArrayExt.hash_sym(args)
-		args[:type] = "local" if !args[:type]
-		args[:session] = self.session_spawn if !args[:session]
-		args[:host_local] = "0.0.0.0" if !args[:host_local]
-		
-		return SSHRobot::Forward.new(args)
-	end
-	
-	alias getShell shell
-	alias getSFTP sftp
-	alias shellCMD exec
+  def initialize(args)
+    require "net/ssh"
+    
+    @forwards = []
+    @args = Knj::ArrayExt.hash_sym(args)
+    @args[:port] = 22 if !@args.key?(:port)
+  end
+  
+  def session
+    @session = self.session_spawn if !@session
+    return @session
+  end
+  
+  def session_spawn
+    return Net::SSH.start(@args[:host], @args[:user], :password => @args[:passwd], :port => @args[:port].to_i)
+  end
+  
+  def shell
+    return self.session.shell.sync
+  end
+  
+  def sftp
+    @sftp = Net::SFTP.start(@args[:host], @args[:user], @args[:passwd], :port => @args[:port].to_i)
+  end
+  
+  def exec(command)
+    return self.session.exec!(command)
+  end
+  
+  def fileExists(filepath)
+    result = self.exec("ls #{Strings.UnixSafe(filepath)}").strip
+    return true if result == filepath
+    return false
+  end
+  
+  def forward(args)
+    Knj::ArrayExt.hash_sym(args)
+    args[:type] = "local" if !args[:type]
+    args[:session] = self.session_spawn if !args[:session]
+    args[:host_local] = "0.0.0.0" if !args[:host_local]
+    return SSHRobot::Forward.new(args)
+  end
+  
+  alias getShell shell
+  alias getSFTP sftp
+  alias shellCMD exec
+  
+  def close
+    @session.close if @session
+    @session = nil
+  end
 end
 
 class Knj::SSHRobot::Forward
-	attr_reader :open
-	
-	def initialize(args)
-		@open = true
-		@args = args
-		@thread = Knj::Thread.new do
-			begin
-				#args[:session].logger.sev_threshold = Logger::Severity::DEBUG
-				if args[:type] == "local"
-					@args[:session].forward.local(@args[:host_local], @args[:port_local].to_i, @args[:host], @args[:port_remote].to_i)
-				elsif args[:type] == "remote"
-					@args[:session].forward.remote_to(@args[:port_local], @args[:host], @args[:port_remote], @args[:host_local])
-				else
-					raise "No valid type given."
-				end
-				
-				@args[:session].loop do
-					true
-				end
-			rescue Exception => e
-				puts e.inspect
-				puts e.backtrace
-				
-				@open = false
-			end
-		end
-	end
-	
-	def close
-		if !@args
-			return nil
-		end
-		
-		@args[:session].close
-		@open = false
-		@thread.exit
-		@args = nil
-		@thread = nil
-	end
+  attr_reader :open
+  
+  def initialize(args)
+    @open = true
+    @args = args
+    @thread = Knj::Thread.new do
+      begin
+        #args[:session].logger.sev_threshold = Logger::Severity::DEBUG
+        if args[:type] == "local"
+          @args[:session].forward.local(@args[:host_local], @args[:port_local].to_i, @args[:host], @args[:port_remote].to_i)
+        elsif args[:type] == "remote"
+          @args[:session].forward.remote_to(@args[:port_local], @args[:host], @args[:port_remote], @args[:host_local])
+        else
+          raise "No valid type given."
+        end
+        
+        @args[:session].loop do
+          true
+        end
+      rescue Exception => e
+        puts e.inspect
+        puts e.backtrace
+        
+        @open = false
+      end
+    end
+  end
+  
+  def close
+    if !@args
+      return nil
+    end
+    
+    @args[:session].close
+    @open = false
+    @thread.exit
+    @args = nil
+    @thread = nil
+  end
 end

data/lib/knj/sshrobot.rb

@@ -0,0 +1 @@
+require "#{$knjpath}sshrobot/sshrobot"

data/lib/knj/strings.rb

@@ -1,69 +1,136 @@
+#encoding: utf-8
+
 module Knj::Strings
-	def self.UnixSafe(tha_string)
-		return tha_string.to_s.gsub(" ", "\\ ").gsub("&", "\&").gsub("(", "\\(").gsub(")", "\\)").gsub('"', '\"').gsub("\n", "\"\n\"")
-	end
-	
-	def self.unixsafe(string)
-		return Knj::Strings.UnixSafe(string)
-	end
-	
-	def self.searchstring(string)
-		words = []
-		string = string.to_s
-		
-		matches = string.scan /(\"(.+?)\")/
-		matches.each do |matcharr|
-			word = matcharr[1]
-			
-			if word and word.length > 0
-				words << matcharr[1]
-				string = string.gsub(matcharr[0], "")
-			end
-		end
-		
-		string.split(/\s/).each do |word|
-			words << word if word and word.length > 0
-		end
-		
-		return words
-	end
-	
-	def self.is_email?(str)
-		return true if str.to_s.match(/^\S+@\S+\.\S+$/)
-		return false
-	end
-	
-	def self.is_phonenumber?(str)
-		return true if str.to_s.match(/^\+\d{2}\d+$/)
-		return false
-	end
-	
-	def self.js_safe(str)
-		return str.gsub("\r", "").gsub("\n", "\\n").gsub('"', '\"');
-	end
-	
-	def self.yn_str(value, str_yes, str_no)
-		value = value.to_i if Knj::Php.is_numeric(value)
-		
-		if value.is_a?(Integer)
-			if value == 0
-				return str_no
-			else
-				return str_yes
-			end
-		end
-		
-		return str_no if !value
-		return str_yes
-	end
-	
-	def self.shorten(str, maxlength)
-		str = str.to_s
-		str = str.slice(0..(maxlength - 1)).strip + "..." if str.length > maxlength
-		return str
-	end
-	
-	def self.html_links(str, args = {})
+  def self.UnixSafe(tha_string)
+    return tha_string.to_s.gsub(" ", "\\ ").gsub("&", "\&").gsub("(", "\\(").gsub(")", "\\)").gsub('"', '\"').gsub("\n", "\"\n\"")
+  end
+  
+  def self.unixsafe(string)
+    return Knj::Strings.UnixSafe(string)
+  end
+  
+  #Returns a Regexp-object from the string formatted as what you would give to Php's preg_match.
+  def self.regex(str)
+    first_char = str[0, 1]
+    raise "First char should be '/' but wasnt: '#{first_char}'." if first_char != "/"
+    first_pos = 1
+    
+    second_pos = str.rindex("/")
+    pattern = str[first_pos, second_pos - 1]
+    
+    flags = str[second_pos + 1, str.length].to_s
+    arg_two = 0
+    
+    if flags
+      flags.length.times do |i|
+        arg = flags[i, 1]
+        
+        case arg
+          when "i"
+            arg_two |= Regexp::IGNORECASE
+          when "m"
+            arg_two |= Regexp::MULTILINE
+          when "x"
+            arg_two |= Regexp::EXTENDED
+          when "U"
+            raise Knj::Errors::InvalidData, "Ruby does (as far as I know) not support the 'U'-modifier. You should rewrite your regex with non-greedy operators such as '(\d+?)' instead for: '#{str}'."
+          else
+            raise "Unknown argument: '#{arg}'."
+        end
+      end
+    end
+    
+    regex = Regexp.new(pattern, arg_two)
+    
+    return regex
+  end
+  
+  #Partens a string up in blocks for whatever words can be used to search for. Supports a block or returns an array.
+  def self.searchstring(string, &block)
+    words = [] if !block
+    string = string.to_s
+    
+    matches = string.scan /(\"(.+?)\")/
+    matches.each do |matcharr|
+      word = matcharr[1]
+      
+      if word and word.length > 0
+        if block
+          yield(matcharr[1])
+        else
+          words << matcharr[1]
+        end
+        
+        string = string.gsub(matcharr[0], "")
+      end
+    end
+    
+    string.split(/\s/).each do |word|
+      if word and word.length > 0
+        if block
+          yield(word)
+        else
+          words << word
+        end
+      end
+    end
+    
+    return nil if block
+    return words
+  end
+  
+  #Returns boolean if the strings is a correctly formatted email: k@spernj.org.
+  def self.is_email?(str)
+    return true if str.to_s.match(/^\S+@\S+\.\S+$/)
+    return false
+  end
+  
+  #Returns boolean if the string is a correctly formatted phonenumber as: +4512345678.
+  def self.is_phonenumber?(str)
+    return true if str.to_s.match(/^\+\d{2}\d+$/)
+    return false
+  end
+  
+  def self.js_safe(str, args = {})
+    str = "#{str}"
+    
+    if args[:quotes_to_single]
+      str.gsub!('"', "'")
+    end
+    
+    str = str.gsub("\r", "").gsub("\n", "\\n").gsub("'", "\\\\'")
+    
+    if !args.key?(:quotes) or args[:quotes]
+      str.gsub!('"', '\"')
+    end
+    
+    return str
+  end
+  
+  #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)
+    
+    if value.is_a?(Integer)
+      if value == 0
+        return str_no
+      else
+        return str_yes
+      end
+    end
+    
+    return str_no if !value or value == "no"
+    return str_yes
+  end
+  
+  #Shortens a string to maxlength and adds "..." if it was shortened.
+  def self.shorten(str, maxlength)
+    str = str.to_s
+    str = str.slice(0..(maxlength - 1)).strip + "..." if str.length > maxlength
+    return str
+  end
+  
+  def self.html_links(str, args = {})
     str.to_s.html.scan(/(http:\/\/([A-z]+)\S*\.([A-z]{2,4})(\S+))/) do |match|
       if block_given?
         str = yield(:str => str, :args => args, :match => match)
@@ -74,15 +141,15 @@ module Knj::Strings
           html = "<a"
         end
         
-        html += " href=\"#{match[0]}\">#{match[0]}</a>"
+        html << " href=\"#{match[0]}\">#{match[0]}</a>"
         str = str.gsub(match[0], html)
       end
     end
     
     return str
-	end
-	
-	def self.strip(origstr, args)
+  end
+  
+  def self.strip(origstr, args)
     newstr = "#{origstr}<br>"
     
     if !args.key?(:right) or args[:right]
@@ -122,16 +189,61 @@ module Knj::Strings
     end
     
     return newstr
-	end
-	
-	#Returns the module from the given string - even if formed as SomeClass::SomeNewClass.
-	def self.const_get_full(str)
+  end
+  
+  #Returns the module from the given string - even if formed as SomeClass::SomeNewClass.
+  def self.const_get_full(str)
+    raise "Invalid object: '#{str.class.name}'." if !str.is_a?(String) and !str.is_a?(Symbol)
     module_use = Kernel
     
-    str.scan(/(.+?)(::|$)/) do |match|
+    str.to_s.scan(/(.+?)(::|$)/) do |match|
       module_use = module_use.const_get(match[0])
     end
     
     return module_use
   end
+  
+  #Email content may only be 1000 characters long. This method shortens them gracefully.
+  def self.email_str_safe(str)
+    str = str.to_s
+    strcopy = "#{str}"
+    
+    str.each_line("\n") do |substr_orig|
+      substr = "#{substr_orig}"
+      next if substr.length <= 1000
+      
+      lines = []
+      
+      while substr.length > 1000 do
+        whitespace_index = substr.rindex(/\s/, 1000)
+        
+        if whitespace_index == nil
+          lines << substr.slice(0, 1000)
+          substr = substr.slice(1000, substr.length)
+        else
+          lines << substr.slice(0, whitespace_index + 1)
+          substr = substr.slice(whitespace_index + 1, substr.length)
+        end
+      end
+      
+      lines << substr
+      
+      strcopy.gsub!(/^#{Regexp.escape(substr_orig)}$/, lines.join("\n"))
+    end
+    
+    return strcopy
+  end
+  
+  #Returns a float as human locaically readable. 1.0 will be 1, 1.5 will be 1.5 and so on.
+  def self.float_as_human_logic(floatval)
+    raise "Not a float." if !floatval.is_a?(Float)
+    
+    float_s = floatval.to_s
+    parts = float_s.split(".")
+    if parts[1].to_i > 0
+      return float_s
+    else
+      return parts[0].to_s
+    end
+  end
 end