phenomenal_rails 1.1.0 → 1.2.2

data/lib/phenomenal_rails/context.rb

@@ -11,7 +11,7 @@ class Phenomenal::Context
   def to_path
     if name
       name.to_s.underscore
-    elsif self==manager.default_context
+    elsif self==manager.default_feature
       nil
     elsif manager.combined_contexts[self]
        manager.combined_contexts[self].flatten.join("/").underscore

data/lib/phenomenal_rails/engine.rb

@@ -1,13 +1,20 @@
-module PhenomenalRails
-  class Engine < Rails::Engine
-    isolate_namespace PhenomenalRails
-    config.app_middleware.use(PhenomenalRails::Middleware)
-    config.after_initialize do
-      ActionController::Base.prepend_view_path(Phenomenal::Resolver.instance)
-      PhenomenalRails.load_dir("#{Rails.root}/phenomenal")
-    end
-  end
-end
-
-
-
+class PhenomenalRails::Engine < Rails::Engine
+  isolate_namespace PhenomenalRails
+  config.app_middleware.use(PhenomenalRails::Middleware)
+  
+  config.before_configuration do
+    Rails.configuration.autoload_paths += PhenomenalRails::Loader.autoload_paths(File.expand_path(PhenomenalRails::PATH,Rails.root))
+  end
+  
+  config.to_prepare do
+    PhenomenalRails::Loader.prepare(true)
+  end
+  
+  config.after_initialize do
+    ActionController::Base.prepend_view_path(PhenomenalRails::Resolver.instance)
+  end
+  
+  ActionDispatch::Callbacks.before do |*args|
+    PhenomenalRails::Loader.prepare
+  end
+end

data/lib/phenomenal_rails/loader.rb

@@ -0,0 +1,60 @@
+class PhenomenalRails::Loader
+  class << self
+    def autoload_paths(path,paths=[])
+      scan_dir(path) do |filepath, entry|
+        if File.directory?(filepath)
+          if (filepath.match(/.*\/controllers/) ||
+            filepath.match(/.*\/models/) ||
+            filepath.match(/.*\/helpers/))      
+            paths.push(filepath)
+          end
+          autoload_paths(filepath,paths)        
+        end
+      end
+      paths
+    end
+    
+    def prepare(loading=false)
+      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
+          if !Rails.configuration.cache_classes
+            phen_forget_context(context)
+          end
+        end
+      end
+
+      if !Rails.configuration.cache_classes || loading
+        load_files(File.expand_path(PhenomenalRails::PATH,Rails.root))
+      end
+    end
+    
+    private 
+    def scan_dir(path, &block)
+      if Dir.exist? path
+        Dir.entries(path).each do |entry|
+          if entry!="." && entry !=".."
+            filepath=File.join(path,entry)
+            yield(filepath, entry)
+          end
+        end
+      end
+    end
+   
+    def load_files(path)
+      scan_dir(path) do |filepath, entry|
+        if File.file?(filepath) && entry.match(/.*\.rb/)
+          load filepath
+        elsif File.directory?(filepath)
+          if !(filepath.match(/.*\/controllers/) ||
+            filepath.match(/.*\/models/) ||
+            filepath.match(/.*\/helpers/))
+            load_files(filepath)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/phenomenal_rails/middleware.rb

@@ -1,26 +1,24 @@
-module PhenomenalRails
-  class Middleware
-    def initialize(app)
-      @app=app
-      @activation_conditions=Array.new
-      Phenomenal::Feature.middleware=self
-    end
-    
-    def add_condition(feature,&block)
-      @activation_conditions.push([feature,block])
-    end
+class PhenomenalRails::Middleware
+  def initialize(app)
+    @app=app
+    @activation_conditions=Array.new
+    Phenomenal::Feature.middleware=self
+  end
+  
+  def add_condition(feature,&block)
+    @activation_conditions.push([feature,block])
+  end
 
-    def call(env)
-      before_call(env)
-      @app.call(env)
-    end
-    
-    def before_call(env)
-      @activation_conditions.each do |feature_block|
-        feature,block = feature_block
-        if feature.active?
-          block.call(env)
-        end
+  def call(env)
+    before_call(env)
+    @app.call(env)
+  end
+  
+  def before_call(env)
+    @activation_conditions.each do |feature_block|
+      feature,block = feature_block
+      if feature.active?
+        block.call(env)
       end
     end
   end

data/lib/phenomenal_rails/path_set.rb

@@ -1,4 +1,4 @@
-#ActionView::LookupContext.register_detail(:feature)  {[false]} -> add the details to the options hash
+ActionView::LookupContext.register_detail(:feature)  {[]} #-> add the details to the options hash
 module ActionView
   class PathSet
     def find(*args)
@@ -18,7 +18,7 @@ module ActionView
     def find_all_inactive(path, prefixes = [], *args)
       prefixes = [prefixes] if String === prefixes
       prefixes.each do |prefix|
-        templates = paths.find{|p| p.is_a?Phenomenal::Resolver}.find_all_inactive(path, prefix, *args)
+        templates = paths.find{|p| p.is_a?PhenomenalRails::Resolver}.find_all_inactive(path, prefix, *args)
         return templates unless templates.empty?
       end
       []

data/lib/phenomenal_rails/resolver.rb

@@ -1,20 +1,26 @@
-class Phenomenal::Resolver < ActionView::OptimizedFileSystemResolver
+class PhenomenalRails::Resolver < ActionView::OptimizedFileSystemResolver
   include Singleton
   
   def find_all(name, prefix=nil, partial=false, details={}, key=nil, locals=[])
-    contexts = phen_defined_contexts.find_all{|c| c.active?}
+    contexts = phen_defined_contexts.find_all do |c| 
+      c.active? && 
+      (details[:feature].empty? ? true : c==feature(*details[:feature]))
+    end
     contexts.sort!{|a,b| Phenomenal::Manager.instance.conflict_policy(a,b)}
     find_all_contexts(name,contexts, prefix, partial, details, key, locals)
   end
   
   def find_all_inactive(name, prefix=nil, partial=false, details={}, key=nil, locals=[])
-    contexts = phen_defined_contexts.find_all{|c| !c.active?}
+    contexts = phen_defined_contexts.find_all do |c| 
+      !c.active? && 
+      (details[:feature].empty? ? true : c==feature(*details[:feature]))
+    end
     find_all_contexts(name,contexts, prefix, partial, details, key, locals)
   end
   
   private
   def initialize()
-    super("phenomenal")
+    super(PhenomenalRails::PATH)
     @cached={}
   end
   

data/lib/phenomenal_rails/version.rb

@@ -1,3 +1,3 @@
 module PhenomenalRails
-  VERSION = "1.1.0"
+  VERSION = "1.2.2"
 end

data/lib/phenomenal_rails.rb

@@ -1,4 +1,6 @@
+
 require "phenomenal"
+require "phenomenal_rails/loader"
 require "phenomenal_rails/context"
 require "phenomenal_rails/feature"
 require "phenomenal_rails/middleware"
@@ -7,48 +9,11 @@ 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

data/spec/dummy/app/views/pages/home.html.haml

@@ -19,12 +19,13 @@
         %td=context.active?
 
 %br
-=render "shared/partial1"
+=render :partial=>"shared/partial1"
 %br
 =render "shared/partial2"
 %br
+=render :partial=>"shared/partial3",:feature=>[:PersistentFeature]
 %br
-
+=render :partial=>"shared/partial4"
 = ActionController::Base.view_paths.paths
 %br
 %br

data/spec/dummy/app/views/shared/_partial4.html.haml

@@ -0,0 +1 @@
+PARIAL 4 base

data/spec/dummy/{phenomenal → app_phenomenal}/persistent_feature/persistent_feature.rb

@@ -3,8 +3,10 @@ feature :PersistentFeature do
   activation_condition do |env|
     if Rack::Request.new(env).params["activated"]
       activate_context :TestContext
+      activate_context :TestFeature
     else
       deactivate_context :TestContext
+      deactivate_context :TestFeature
     end
   end
 end

data/spec/dummy/app_phenomenal/persistent_feature/views/shared/_partial3.html.haml

@@ -0,0 +1 @@
+Persistent feature only partial

data/spec/dummy/app_phenomenal/test_feature/test_feature.rb

@@ -0,0 +1 @@
+feature :TestFeature

data/spec/dummy/app_phenomenal/test_feature/views/shared/_partial4.html.haml

@@ -0,0 +1 @@
+PARTIAL 4 TEST FEATURE

data/spec/dummy/config/application.rb

@@ -14,8 +14,6 @@ module Dummy
 
     # Custom directories with classes and modules you want to be autoloadable.
     # config.autoload_paths += %W(#{config.root}/extras)
-    config.autoload_paths += %W(#{config.root}/app/contexts )
-
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.