lib/ronin/cache/overlay.rb in ronin-0.1.2 vs lib/ronin/cache/overlay.rb in ronin-0.1.3

@@ -1,11 +1,11 @@
 #
 #--
 # Ronin - A Ruby platform designed for information security and data
 # exploration tasks.
 #
-# Copyright (c) 2006-2008 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2009 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
@@ -260,29 +260,29 @@
       # Caches the objects contained within overlay.
       #
       def cache_objects
         require 'ronin/models'
 
-        return ObjectContext.cache_objects_in(objects_dir)
+        return Objectify.cache_objects_in(objects_dir)
       end
 
       #
       # Mirror the objects contained within the overlay.
       #
       def mirror_objects
         require 'ronin/models'
 
-        return ObjectContext.mirror_objects_in(objects_dir)
+        return Objectify.mirror_objects_in(objects_dir)
       end
 
       #
       # Delete all objects that existed within the overlay.
       #
       def expunge_objects
         require 'ronin/models'
 
-        return ObjectContext.expunge_objects_from(objects_dir)
+        return Objectify.expunge_objects_from(objects_dir)
       end
 
       #
       # Adds the overlay to the overlay cache. If a _block is given,
       # it will be passed the newly created Overlay after it has been
@@ -336,11 +336,11 @@
 
       #
       # Returns the paths of all extensions within the overlay.
       #
       def extension_paths
-        directories
+        directories.reject { |dir| File.basename(dir) == 'objects' }
       end
 
       #
       # Passes each extension path to the specified _block_.
       #
@@ -373,12 +373,13 @@
       #
       # Loads an extension with the specified _name_ from the overlay.
       # If a _block_ is given, it will be passed the newly created
       # extension.
       #
-      #   repo.extension('awesome') # => Extension
+      #   overlay.extension('awesome')
+      #   # => #<Ronin::Cache::Extension: ...>
       #
-      #   repo.extension('shellcode') do |ext|
+      #   overlay.extension('shellcode') do |ext|
       #     ...
       #   end
       #
       def extension(name,&block)
         name = name.to_s