lib/phenomenal_rails.rb in phenomenal_rails-1.1.0 vs lib/phenomenal_rails.rb in phenomenal_rails-1.2.2

@@ -1,54 +1,19 @@
+
 require "phenomenal"
+require "phenomenal_rails/loader"
 require "phenomenal_rails/context"
 require "phenomenal_rails/feature"
 require "phenomenal_rails/middleware"
 require "phenomenal_rails/engine"
 require "singleton"
 require "phenomenal_rails/resolver"
 require "phenomenal_rails/path_set"
 
-# Set default context as persistent
-phen_default_context.persistent=true
+# Set default feature as persistent
+phen_default_feature.persistent=true
 
-module PhenomenalRails
-  def self.load_dir(path)
-    if Dir.exist? path
-      Dir.entries(path).each do |entry|
-        if entry!="." && entry !=".."
-          filepath=File.join(path,entry)
-          if File.file?(filepath) && entry.match(/.*\.rb/)
-            if !Rails.configuration.cache_classes && 
-              (path.match(/.*\/controllers/) || 
-              path.match(/.*\/models/) || 
-              path.match(/.*\/helpers/))
-              begin
-                entry.gsub(/.rb/,"").camelize.constantize
-              rescue
-              end
-            end
-            load filepath 
-          elsif File.directory?(filepath)
-            load_dir(filepath)
-          end
-        end
-      end
-    end
-  end
-  
-  ActionDispatch::Callbacks.before do
-    phen_defined_contexts.reverse.each do |context|
-      if !context.forgotten && (!context.persistent || !Rails.configuration.cache_classes)
-        while phen_context_active?(context) do
-          phen_deactivate_context(context) 
-        end
-        # Fix problem without page caching
-        if !Rails.configuration.cache_classes
-          phen_forget_context(context)
-        end
-      end
-    end
-    if !Rails.configuration.cache_classes
-      PhenomenalRails.load_dir("#{Rails.root}/phenomenal")
-    end
-  end
+
+module PhenomenalRails 
+  # Phenomenal application folder
+  PATH = "app_phenomenal"
 end