lib/ronin/cached_file.rb in ronin-1.0.0.rc3 vs lib/ronin/cached_file.rb in ronin-1.0.0

@@ -18,11 +18,11 @@
 #
 
 require 'ronin/support/inflector'
 require 'ronin/model'
 
-require 'contextify'
+require 'object_loader'
 
 module Ronin
   autoload :Repository, 'ronin/repository'
 
   #
@@ -117,18 +117,16 @@
     #   objects or the cache file contained a syntax error.
     #   
     def fresh_object
       begin
         # load the first found context
-        blocks = Contextify.load_blocks(self.path)
+        blocks = ObjectLoader.load_blocks(self.path)
       rescue Exception => e
         @cache_exception = e
         return nil
       end
 
-      blocks.each do |name,block|
-        model = Contextify.contexts[name]
-
+      blocks.each do |model,block|
         if model < Cacheable
           # create the fresh object
           object = model.new()
 
           begin