0
@@ -18,14 +18,18 @@ module Waves
0
     #
0
     module Model
0
 
0
+      def model( name )
0
+        Waves.application.models[ name ]
0
+      end
0
+      
0
       # Just like model.all. Returns all the instances of that model.
0
       def all( model )
0
-        Waves.application.models[ model ].all( domain )
0
+        model( model ).all( domain )
0
       end
0
 
0
       # Finds a specific instance using the name field
0
       def find( model, name )
0
-        Waves.application.models[ model ][ :name => name ] rescue nil
0
+        model( model )[ :name => name ] rescue nil
0
       end
0
 
0
     end

0
@@ -16,7 +16,7 @@ module Waves
0
         METHODS.all? do | method |
0
           wanted = instance_variable_get( "@#{method}")
0
           got = request.send( method ) if wanted
0
-          wanted === got
0
+          wanted.is_a? Proc ? wanted.call( got ) : wanted === got
0
         end
0
       end
0
             

0
@@ -45,10 +45,4 @@ module Attributes
0
   
0
   alias_method :to_hash, :to_h
0
   
0
-  class Object
0
-    include Attributes
0
-  end
0
-  
0
 end
0
-	
0
-	
0
\ No newline at end of file

0
@@ -15,6 +15,9 @@ module Waves
0
       def exabytes ; self * 1024.petabytes ; end
0
       def zettabytes ; self * 1024.exabytes ; end
0
       def yottabytes ; self * 1024.zettabytes ; end
0
+      def to_delimited(delim=',')
0
+        self.to_s.gsub(/(\d)(?=(\d\d\d)+$)/, "\\1#{delim}")
0
+      end
0
     end
0
   end
0
 end