lib/picky/loader.rb in picky-0.10.5 vs lib/picky/loader.rb in picky-0.11.0

@@ -82,11 +82,11 @@
   # Loads the framework.
   #
   def self.load_framework
     # Load compiled C code.
     #
-    require_relative 'initializers/ext'
+    require_relative 'ext/maybe_compile'
     
     # Load extensions.
     #
     load_relative 'extensions/object'
     load_relative 'extensions/array'
@@ -164,14 +164,28 @@
     load_relative 'index/file/json'
     load_relative 'index/files'
     
     # Index types.
     #
+    load_relative 'bundle'
+    
+    load_relative 'indexing/bundle'
+    load_relative 'indexing/category'
+    load_relative 'indexing/categories'
+    load_relative 'indexing/type'
+    load_relative 'indexing/types'
+    
     load_relative 'index/bundle'
     load_relative 'index/category'
+    load_relative 'index/categories'
     load_relative 'index/type'
+    load_relative 'index/types'
     
+    load_relative 'types'
+    load_relative 'alias_instances'
+    load_relative 'type'
+    
     load_relative 'index/wrappers/exact_first'
     
     # Tokens.
     #
     load_relative 'query/token'
@@ -191,11 +205,10 @@
     load_relative 'query/allocation'
     load_relative 'query/allocations'
     
     load_relative 'query/qualifiers'
     load_relative 'query/weigher'
-    load_relative 'query/combinator'
     
     load_relative 'query/weights'
     
     # Query.
     #
@@ -217,17 +230,14 @@
     load_relative 'sources/db'
     load_relative 'sources/csv'
     load_relative 'sources/delicious'
     load_relative 'sources/couch'
     
-    # Indexes.
-    #
-    load_relative 'indexes'
+    load_relative 'sources/wrappers/base'
+    load_relative 'sources/wrappers/location'
     
     # Configuration.
     #
-    load_relative 'configuration/field'
-    load_relative 'configuration/type'
     load_relative 'configuration/indexes'
     
     # ... in Application.
     #
     load_relative 'configuration/queries'