knjrbfw 0.0.59 → 0.0.62

data/Gemfile

@@ -4,6 +4,8 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 gem "wref"
 gem "tsafe"
+gem "datet"
+gem "http2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,12 +1,18 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    datet (0.0.0)
     diff-lcs (1.1.3)
     git (1.2.5)
+    http2 (0.0.0)
+      knjrbfw
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    knjrbfw (0.0.55)
+      tsafe
+      wref
     rake (0.9.2.2)
     rcov (0.9.11)
     rcov (0.9.11-java)
@@ -29,6 +35,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.0.0)
+  datet
+  http2
   jeweler (~> 1.6.3)
   rcov
   rmagick

data/VERSION

@@ -1 +1 @@
-0.0.59
+0.0.62

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.59"
+  s.version = "0.0.62"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-07-10}
+  s.date = %q{2012-07-14}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -62,7 +62,6 @@ Gem::Specification.new do |s|
     "lib/knj/datarow.rb",
     "lib/knj/datarow_custom.rb",
     "lib/knj/datestamp.rb",
-    "lib/knj/datet.rb",
     "lib/knj/db.rb",
     "lib/knj/degulesider.rb",
     "lib/knj/erb/apache_knjerb.conf",
@@ -96,8 +95,6 @@ Gem::Specification.new do |s|
     "lib/knj/gtk2_tv.rb",
     "lib/knj/gtk2_window.rb",
     "lib/knj/hash_methods.rb",
-    "lib/knj/http.rb",
-    "lib/knj/http2.rb",
     "lib/knj/image.rb",
     "lib/knj/includes/appserver_cli.rb",
     "lib/knj/includes/require_info.rb",
@@ -259,10 +256,8 @@ Gem::Specification.new do |s|
     "spec/amixer_spec.rb",
     "spec/arrayext_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",
     "spec/knjrbfw_spec.rb",
     "spec/objects_spec.rb",
     "spec/php_spec.rb",
@@ -286,6 +281,8 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<wref>, [">= 0"])
       s.add_runtime_dependency(%q<tsafe>, [">= 0"])
+      s.add_runtime_dependency(%q<datet>, [">= 0"])
+      s.add_runtime_dependency(%q<http2>, [">= 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"])
@@ -295,6 +292,8 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<wref>, [">= 0"])
       s.add_dependency(%q<tsafe>, [">= 0"])
+      s.add_dependency(%q<datet>, [">= 0"])
+      s.add_dependency(%q<http2>, [">= 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"])
@@ -305,6 +304,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<wref>, [">= 0"])
     s.add_dependency(%q<tsafe>, [">= 0"])
+    s.add_dependency(%q<datet>, [">= 0"])
+    s.add_dependency(%q<http2>, [">= 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

@@ -190,7 +190,7 @@ module Knj::ArrayExt
   def self.validate_hash(h, args)
     h.each do |key, val|
       if args.key?(:not_empty) and args[:not_empty].index(key) != nil and val.to_s.strip.length <= 0
-        raise Knj::Errors::InvalidData, sprintf(args[:not_empty_error], key)
+        raise ArgumentError, sprintf(args[:not_empty_error], key)
       end
     end
   end

data/lib/knj/autoload/wref.rb

@@ -1,5 +1,5 @@
 begin
-  require "wref"
+  require "wref" if !Kernel.const_defined?(:Wref)
 rescue LoadError
   require "rubygems"
   require "wref"

data/lib/knj/cmd_parser.rb

@@ -27,7 +27,7 @@ class Knj::Cmd_parser
         month = match[18].to_i
         date = match[19].to_i
       elsif match[20] and match[21] and match[22]
-        month = Knj::Datet.month_str_to_no(match[21])
+        month = Datet.month_str_to_no(match[21])
         date = match[22].to_i
       end
       

data/lib/knj/datarow.rb

@@ -547,7 +547,7 @@ class Knj::Datarow
       classname = self.class.classname.to_sym
       if @ob.ids_cache_should.key?(classname)
         #ID caching is enabled for this model - dont reload until first use.
-        raise Knj::Errors::NotFound, "ID was not found in cache: '#{id}'." if !@ob.ids_cache[classname].key?(@id)
+        raise Errno::ENOENT, "ID was not found in cache: '#{id}'." if !@ob.ids_cache[classname].key?(@id)
         @should_reload = true
       else
         #ID caching is not enabled - reload now to check if row exists. Else set 'should_reload'-variable if 'skip_reload' is set.
@@ -558,7 +558,7 @@ class Knj::Datarow
         end
       end
     else
-      raise Knj::Errors::InvalidData, "Could not figure out the data from '#{data.class.name}'."
+      raise ArgumentError, "Could not figure out the data from '#{data.class.name}'."
     end
     
     if @id.to_i <= 0
@@ -574,7 +574,7 @@ class Knj::Datarow
   # print "The username changed in the database!" if user[:username] != old_username
   def reload
     @data = @db.single(self.table, {:id => @id})
-    raise Knj::Errors::NotFound, "Could not find any data for the object with ID: '#{@id}' in the table '#{self.table}'." if !@data
+    raise Errno::ENOENT, "Could not find any data for the object with ID: '#{@id}' in the table '#{self.table}'." if !@data
     @should_reload = false
   end
   
@@ -736,19 +736,19 @@ class Knj::Datarow
     method_name = "#{args[:col_name]}_str".to_sym
     if args[:inst_methods].index(method_name) == nil
       define_method(method_name) do |*method_args|
-        if Knj::Datet.is_nullstamp?(self[args[:col_name].to_sym])
+        if Datet.is_nullstamp?(self[args[:col_name].to_sym])
           return @ob.events.call(:no_date, self.class.name)
         end
         
-        return Knj::Datet.in(self[args[:col_name].to_sym]).out(*method_args)
+        return Datet.in(self[args[:col_name].to_sym]).out(*method_args)
       end
     end
     
     method_name = "#{args[:col_name]}".to_sym
     if args[:inst_methods].index(method_name) == nil
       define_method(method_name) do |*method_args|
-        return false if Knj::Datet.is_nullstamp?(self[args[:col_name].to_sym])
-        return Knj::Datet.in(self[args[:col_name].to_sym])
+        return false if Datet.is_nullstamp?(self[args[:col_name].to_sym])
+        return Datet.in(self[args[:col_name].to_sym])
       end
     end
   end

data/lib/knj/errors.rb

@@ -3,21 +3,9 @@ module Knj::Errors
   #An error that is used when the error is just a notice.
   class Notice < StandardError; end
   
-  #Typically used when an object is not found by the given arguments.
-  class NotFound < StandardError; end
-  
-  #If invalid data was supplied to a list-method or something like it.
-  class InvalidData < StandardError; end
-  
   #An error that specifies that the caller should retry the operation.
   class Retry < StandardError; end
   
-  #The current env does not have access to calling the method.
-  class NoAccess < StandardError; end
-  
-  #The thing you are trying to add already exists or have already been done.
-  class Exists < StandardError; end
-  
   #Returns a string describing the given error. Possible arguments can be given if you want the returned string formatted as HTML.
   #
   #===Examples

data/lib/knj/facebook_connect.rb

@@ -16,7 +16,7 @@ class Knj::Facebook_connect
   end
   
   def get(http, url)
-    resp = http.get(url)
+    resp = http.get(:url => url)
     
     if resp.body.length > 0
       begin
@@ -24,7 +24,7 @@ class Knj::Facebook_connect
         
         error_type = RuntimeError
         if jdata["error"] and jdata["error"]["message"] == "Code was invalid or expired. The session is invalid because the user logged out."
-          error_type = Knj::Errors::InvalidData
+          error_type = ArgumentError
         end
         
         raise error_type, "#{jdata["error"]["type"]}: #{jdata["error"]["message"]}" if jdata["error"]
@@ -72,7 +72,7 @@ class Knj::Facebook_connect
   end
   
   def login(args = {})
-    http = Knj::Http2.new(
+    http = Http2.new(
       :host => "graph.facebook.com",
       :ssl => true
     )
@@ -93,7 +93,7 @@ class Knj::Facebook_connect
   end
   
   def wall_post(args)
-    http = Knj::Http2.new(
+    http = Http2.new(
       :host => "graph.facebook.com",
       :ssl => true
     )
@@ -108,7 +108,7 @@ class Knj::Facebook_connect
       end
     end
     
-    res = http.post("/me/feed?access_token=#{atoken}", post_data)
+    res = http.post(:url => "/me/feed?access_token=#{atoken}", :post => post_data)
     raise res.body.to_s.strip if res.code.to_s != "200"
   end
 end

data/lib/knj/gtk2_tv.rb

@@ -127,13 +127,13 @@ module Knj::Gtk2::Tv
     :datetime => {
       :value => proc{ |data|
         begin
-          Knj::Datet.in(data[:value]).dbstr
-        rescue Knj::Errors::InvalidData
+          Datet.in(data[:value]).dbstr
+        rescue ArgumentError
           raise "Invalid timestamp entered."
         end
       },
       :value_set => proc{ |data|
-        Knj::Datet.in(data[:value]).out
+        Datet.in(data[:value]).out
       }
     },
     :time_as_sec => {

data/lib/knj/gtk2_window.rb

@@ -1,6 +1,6 @@
 #Containing various helper methods for Gtk2-windows.
 class Knj::Gtk2::Window
-  require "wref"
+  require "wref" if !Kernel.const_defined?(:Wref)
   @@uniques = Wref_map.new
   
   #Used to make a window-instance unique. If it already exists when unique! is called, then it will pass focus to the existing window instead of yielding the block, which should contain code to create the window.

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

@@ -10,7 +10,9 @@ class KnjDB_mysql
     @escape_val = "'"
     @esc_table = "`"
     @esc_col = "`"
-    @mutex = Mutex.new
+    
+    require "monitor"
+    @mutex = Monitor.new
     
     if @opts[:encoding]
       @encoding = @opts[:encoding]

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

@@ -31,7 +31,7 @@ class KnjDB_mysql::Tables
       return table_obj if table_obj.name == table_name
     end
     
-    raise Knj::Errors::NotFound.new("Table was not found: #{table_name}.")
+    raise Errno::ENOENT.new("Table was not found: #{table_name}.")
   end
   
   #Yields the tables of the current database.
@@ -103,7 +103,7 @@ class KnjDB_mysql::Tables
 end
 
 class KnjDB_mysql::Tables::Table
-  attr_accessor :list
+  attr_reader :list
   
   def initialize(args)
     @args = args
@@ -160,7 +160,7 @@ class KnjDB_mysql::Tables::Table
       return col if col.name == name
     end
     
-    raise Knj::Errors::NotFound.new("Column not found: '#{name}'.")
+    raise Errno::ENOENT.new("Column not found: '#{name}'.")
   end
   
   def columns(args = nil)
@@ -242,7 +242,7 @@ class KnjDB_mysql::Tables::Table
       return index if index.name.to_s == name
     end
     
-    raise Knj::Errors::NotFound.new("Index not found: #{name}.")
+    raise Errno::ENOENT.new("Index not found: #{name}.")
   end
   
   def create_columns(col_arr)

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

@@ -23,7 +23,7 @@ class KnjDB_sqlite3::Tables
       return table_obj if table_obj.name.to_s == table_name.to_s
     end
     
-    raise Knj::Errors::NotFound, "Table was not found: #{table_name}."
+    raise Errno::ENOENT, "Table was not found: #{table_name}."
   end
   
   def list
@@ -146,7 +146,7 @@ class KnjDB_sqlite3::Tables::Table
   def column(name)
     list = self.columns
     return list[name] if list[name]
-    raise Knj::Errors::NotFound.new("Column not found: #{name}.")
+    raise Errno::ENOENT.new("Column not found: #{name}.")
   end
   
   def columns
@@ -324,7 +324,7 @@ class KnjDB_sqlite3::Tables::Table
       return index if index.name.to_s == name
     end
     
-    raise Knj::Errors::NotFound.new("Index not found: #{name}.")
+    raise Errno::ENOENT.new("Index not found: #{name}.")
   end
   
   def indexes

data/lib/knj/knjdb/libknjdb.rb

@@ -1,8 +1,13 @@
+require "rubygems"
+
 if !Kernel.const_defined?(:Wref)
-  require "rubygems"
   require "wref"
 end
 
+if !Kernel.const_defined?(:Datet)
+  require "datet"
+end
+
 #A wrapper of several possible database-types.
 #
 #===Examples
@@ -333,7 +338,7 @@ class Knj::Db
         end
         
         #Convert dates to valid dbstr.
-        value = self.date_out(value) if value.is_a?(Knj::Datet) or value.is_a?(Time)
+        value = self.date_out(value) if value.is_a?(Datet) or value.is_a?(Time)
         
         sql << "#{driver.escape_col}#{key.to_s}#{driver.escape_col} = "
         sql << "#{driver.escape_val}#{driver.escape(value.to_s)}#{driver.escape_val}"
@@ -678,17 +683,17 @@ class Knj::Db
   #Returns a string which can be used in SQL with the current driver.
   #===Examples
   # str = db.date_out(Time.now) #=> "2012-05-20 22:06:09"
-  def date_out(date_obj = Knj::Datet.new, args = {})
+  def date_out(date_obj = Datet.new, args = {})
     conn_exec do |driver|
       if driver.respond_to?(:date_out)
         return driver.date_out(date_obj, args)
       end
     end
     
-    return Knj::Datet.in(date_obj).dbstr(args)
+    return Datet.in(date_obj).dbstr(args)
   end
   
-  #Takes a valid date-db-string and converts it into a Knj::Datet.
+  #Takes a valid date-db-string and converts it into a Datet.
   #===Examples
   # db.date_in('2012-05-20 22:06:09') #=> 2012-05-20 22:06:09 +0200
   def date_in(date_obj)
@@ -698,7 +703,7 @@ class Knj::Db
       end
     end
     
-    return Knj::Datet.in(date_obj)
+    return Datet.in(date_obj)
   end
   
   #Returns the table-module and spawns it if it isnt already spawned.

data/lib/knj/knjdb/libknjdb_row.rb

@@ -27,7 +27,7 @@ class Knj::Db_row
       @data[@args[:col_id].to_sym] = @args[:id]
       self.reload
     else
-      raise Knj::Errors::InvalidData.new("Invalid data: #{@args[:data].to_s} (#{@args[:data].class.to_s})")
+      raise ArgumentError.new("Invalid data: #{@args[:data].to_s} (#{@args[:data].class.to_s})")
     end
   end
   
@@ -54,7 +54,7 @@ class Knj::Db_row
     last_id = self.id
     data = self.db.single(@args[:table], {@args[:col_id] => self.id})
     if !data
-      raise Knj::Errors::NotFound.new("Could not find any data for the object with ID: '#{last_id}' in the table '#{@args[:table].to_s}'.")
+      raise Errno::ENOENT.new("Could not find any data for the object with ID: '#{last_id}' in the table '#{@args[:table].to_s}'.")
     end
     
     @data = {}

data/lib/knj/knjdb/revision.rb

@@ -151,7 +151,7 @@ class Knj::Db::Revision
                 end
                 
                 first_col = false
-              rescue Knj::Errors::NotFound => e
+              rescue Errno::ENOENT => e
                 print "Column not found: #{table_obj.name}.#{col_data["name"]}.\n" if args["debug"]
                 
                 if col_data.has_key?("renames")
@@ -161,7 +161,7 @@ class Knj::Db::Revision
                   col_data["renames"].each do |col_name|
                     begin
                       col_rename = table_obj.column(col_name)
-                    rescue Knj::Errors::NotFound => e
+                    rescue Errno::ENOENT => e
                       next
                     end
                     
@@ -202,7 +202,7 @@ class Knj::Db::Revision
             table_data["columns_remove"].each do |column_name, column_data|
               begin
                 col_obj = table_obj.column(column_name)
-              rescue Knj::Errors::NotFound => e
+              rescue Errno::ENOENT => e
                 next
               end
               
@@ -227,7 +227,7 @@ class Knj::Db::Revision
                   index_obj.drop
                   table_obj.create_indexes([index_data])
                 end
-              rescue Knj::Errors::NotFound => e
+              rescue Errno::ENOENT => e
                 table_obj.create_indexes([index_data])
               end
             end
@@ -237,7 +237,7 @@ class Knj::Db::Revision
             table_data["indexes_remove"].each do |index_name, index_data|
               begin
                 index_obj = table_obj.index(index_name)
-              rescue Knj::Errors::NotFound => e
+              rescue Errno::ENOENT => e
                 next
               end
               
@@ -250,14 +250,14 @@ class Knj::Db::Revision
           end
           
           rows_init("db" => db, "table" => table_obj, "rows" => table_data["rows"]) if table_data and table_data["rows"]
-        rescue Knj::Errors::NotFound => e
+        rescue Errno::ENOENT => e
           if table_data.key?("renames")
             table_data["renames"].each do |table_name_rename|
               begin
                 table_rename = db.tables[table_name_rename.to_sym]
                 table_rename.rename(table_name)
                 raise Knj::Errors::Retry
-              rescue Knj::Errors::NotFound
+              rescue Errno::ENOENT
                 next
               end
             end
@@ -292,7 +292,7 @@ class Knj::Db::Revision
           table_obj = db.tables[table_name.to_sym]
           table_data["callback"].call("db" => db, "table" => table_obj) if table_data.is_a?(Hash) and table_data["callback"]
           table_obj.drop
-        rescue Knj::Errors::NotFound => e
+        rescue Errno::ENOENT => e
           next
         end
       end

data/lib/knj/objects/objects_sqlhelper.rb

@@ -208,7 +208,7 @@ class Knj::Objects
       
       if args[:cols].key?(key)
         if val.is_a?(Array)
-          if val.empty?
+          if val.empty? and db.opts[:type].to_s == "mysql"
             sql_where << " AND false"
           else
             escape_sql = Knj::ArrayExt.join(
@@ -312,7 +312,7 @@ class Knj::Objects
         found = true
       elsif args.key?(:cols_date) and match = key.match(/^(.+)_(day|week|month|year|from|to|below|above)(|_(not))$/) and args[:cols_date].index(match[1]) != nil
         not_v = match[4]
-        val = Knj::Datet.in(val) if val.is_a?(Time)
+        val = Datet.in(val) if val.is_a?(Time)
         
         if match[2] == "day"
           if val.is_a?(Array)

data/lib/knj/objects.rb

@@ -305,7 +305,7 @@ class Knj::Objects
       else
         return false
       end
-    rescue Knj::Errors::NotFound
+    rescue Errno::ENOENT
       return false
     end
   end
@@ -323,7 +323,7 @@ class Knj::Objects
     elsif data.is_a?(Hash) and data.key?(@args[:col_id].to_s)
       id = data[@args[:col_id].to_s].to_i
     elsif
-      raise Knj::Errors::InvalidData, "Unknown data: '#{data.class.to_s}'."
+      raise ArgumentError, "Unknown data: '#{data.class.to_s}'."
     end
     
     if @objects.key?(classname)
@@ -371,7 +371,7 @@ class Knj::Objects
   def get!(*args, &block)
     begin
       return self.get(*args, &block)
-    rescue Knj::Errors::NotFound
+    rescue Errno::ENOENT
       return false
     end
   end
@@ -414,7 +414,7 @@ class Knj::Objects
     
     begin
       return self.get(obj_name, id_data)
-    rescue Knj::Errors::NotFound
+    rescue Errno::ENOENT
       return false
     end
   end
@@ -469,9 +469,9 @@ class Knj::Objects
             id = obj[req_data[:col]]
             
             begin
-              raise Knj::Errors::NotFound if !id
+              raise Errno::ENOENT if !id
               obj_req = self.get(req_data[:class], id)
-            rescue Knj::Errors::NotFound
+            rescue Errno::ENOENT
               yielder << {:obj => obj, :type => :required, :id => id, :data => req_data}
             end
           end

data/lib/knj/php.rb

@@ -168,8 +168,8 @@ module Knj::Php
       end
       
       retstr << "}\n"
-    elsif cstr == "Time" or cstr == "Knj::Datet"
-      argument = argument.time if cstr == "Knj::Datet"
+    elsif cstr == "Time" or cstr == "Datet"
+      argument = argument.time if cstr == "Datet"
       retstr << "#{cstr}::#{"%04d" % argument.year}-#{"%02d" % argument.month}-#{"%02d" % argument.day} #{"%02d" % argument.hour}:#{"%02d" % argument.min}:#{"%02d" % argument.sec}\n"
     else
       #print argument.to_s, "\n"
@@ -707,7 +707,7 @@ module Knj::Php
     month = cur_time.month if month == nil
     year = cur_time.year if year == nil
     
-    new_time = Knj::Datet.in("#{year.to_s}-#{month.to_s}-#{date.to_s} #{hour.to_s}:#{min.to_s}:#{sec.to_s}")
+    new_time = Datet.in("#{year.to_s}-#{month.to_s}-#{date.to_s} #{hour.to_s}:#{min.to_s}:#{sec.to_s}")
     return new_time.to_i
   end
   
@@ -716,7 +716,7 @@ module Knj::Php
       date_object = Time.now
     elsif Knj::Php.is_numeric(date_input)
       date_object = Time.at(date_input.to_i)
-    elsif date_input.is_a?(Knj::Datet)
+    elsif date_input.is_a?(Datet)
       date_object = date_input.time
     elsif date_input.is_a?(Time)
       date_object = date_input

data/lib/knj/scripts/php_to_rb_helper.rb

@@ -100,7 +100,7 @@ end
 #Match catch exception handeling.
 cont.scan(/((\s+?)}\s*catch\s*\(\s*(#{regexes["class"]})\s+\$(#{regexes["var"]})\s*\)\s*{(\s+))/) do |match|
   classname = "#{match[2][0..0].upcase}#{match[2][1..999]}"
-  classname = "Knj::Errors::NotFound" if classname == "Knjdb_rownotfound_exception"
+  classname = "Errno::ENOENT" if classname == "Knjdb_rownotfound_exception"
   
   rb_str = "#{match[1]}rescue #{classname} => #{match[3]}#{match[4]}"
   cont = cont.gsub(match[0], rb_str)

data/lib/knj/scripts/process_meta_exec.rb

@@ -87,7 +87,7 @@ objects = {}
         res = nil
         
         begin
-          raise Knj::Errors::NotFound, "No object by that name: '#{obj["var_name"]}' in '#{objects}'." if !objects.key?(obj["var_name"])
+          raise Errno::ENOENT, "No object by that name: '#{obj["var_name"]}' in '#{objects}'." if !objects.key?(obj["var_name"])
           obj_to_call = objects[obj["var_name"]]
           raise "No object by that name: '#{obj["var_name"]}'." if !obj
           
@@ -101,14 +101,14 @@ objects = {}
         end
       elsif obj["type"] == "unset"
         raise "Invalid var-name: '#{obj["var_name"]}'." if obj["var_name"].to_s.strip.length <= 0
-        raise Knj::Errors::NotFound, "Var-name didnt exist when trying to unset: '#{obj["var_name"]}'." if !objects.key?(obj["var_name"])
+        raise Errno::ENOENT, "Var-name didnt exist when trying to unset: '#{obj["var_name"]}'." if !objects.key?(obj["var_name"])
         objects.delete(obj["var_name"])
         d.answer("type" => "unset_success")
       elsif obj["type"] == "unset_multiple"
         err = nil
         obj["var_names"].each do |var_name|
-          err = [Knj::Errors::InvalidData, "Invalid var-name: '#{var_name}'."] if var_name.to_s.strip.length <= 0
-          err = [Knj::Errors::NotFound, "Var-name didnt exist when trying to unset: '#{var_name}'."] if !objects.key?(var_name)
+          err = [ArgumentError, "Invalid var-name: '#{var_name}'."] if var_name.to_s.strip.length <= 0
+          err = [Errno::ENOENT, "Var-name didnt exist when trying to unset: '#{var_name}'."] if !objects.key?(var_name)
           objects.delete(var_name)
         end
         

data/lib/knj/strings.rb

@@ -45,7 +45,7 @@ module Knj::Strings
           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}'."
+            raise ArgumentError, "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