lib/knj/objects.rb in knjrbfw-0.0.59 vs lib/knj/objects.rb in knjrbfw-0.0.62

@@ -303,11 +303,11 @@
       if row
         return true
       else
         return false
       end
-    rescue Knj::Errors::NotFound
+    rescue Errno::ENOENT
       return false
     end
   end
   
   #Gets an object from the ID or the full data-hash in the database.
@@ -321,11 +321,11 @@
     elsif data.is_a?(Hash) and data.key?(@args[:col_id].to_sym)
       id = data[@args[:col_id].to_sym].to_i
     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)
       case @args[:cache]
         when :weak
@@ -369,11 +369,11 @@
   
   #Same as normal get but returns false if not found instead of raising error.
   def get!(*args, &block)
     begin
       return self.get(*args, &block)
-    rescue Knj::Errors::NotFound
+    rescue Errno::ENOENT
       return false
     end
   end
   
   def object_finalizer(id)
@@ -412,11 +412,11 @@
     id_data = obj[col_name].to_i
     return false if id_data.to_i <= 0
     
     begin
       return self.get(obj_name, id_data)
-    rescue Knj::Errors::NotFound
+    rescue Errno::ENOENT
       return false
     end
   end
   
   #Returns an array-list of objects. If given a block the block will be called for each element and memory will be spared if running weak-link-mode.
@@ -467,12 +467,12 @@
           self.list(args[:class], :cloned_ubuf => true) do |obj|
             puts "Checking #{obj.classname}(#{obj.id}) for required #{req_data[:class]}." if args[:debug]
             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
         end
       end
\ No newline at end of file