component_helpers.rb in lolita-3.1.0

- old
+ new

@@ -6,11 +6,11 @@
     # controller instance when component is rendered.
     # All components ar placed in "app/helpers/components/[your component path]".
     # Component should have fallowing module structure Components::[NameSpace]::[Component name]Component
     #     Components::Lolita::ListComponent
     # ====Example
-    #     render_component :"lolita/list", :dispaly
+    #     render_component :"lolita/configuration/list", :dispaly
     #     # try to find /helpers/components/lolita/list_component.rb in every directory in $: that
     #     # ends with /helpers
     #     # require this file if found and extend self with Components::Lolita::ListComponent.
     # Component helpers is loaded in same order as views or controller.
     module ComponentHelpers
@@ -24,22 +24,24 @@
       #  also available through <code>@opts</code> variable.
       # =====Example
       #      render_component "lolita/list", :display
       #      render_component "lolita/list/display"
       def render_component *args
+        
         @opts=args.extract_options!
         name=args[0]
         state=args[1]
         format=@opts.delete(:format)
         raise "Can't render component without name!" unless name
         will_use_component name 
+        partial_name=File.join("/components",name.to_s,state ? state.to_s : nil)
         if format
           with_format(format) do
-            render(:partial=>"/components/#{name}#{state ? "/#{state}" : nil}",:locals=>@opts)
+            render(:partial=>partial_name,:locals=>@opts)
           end
         else
-          render(:partial=>"/components/#{name}#{state ? "/#{state}" : nil}",:locals=>@opts)
+          render(:partial=>partial_name,:locals=>@opts)
         end
       end
       
       def with_format(format, &block)
         old_formats = formats
@@ -49,30 +51,40 @@
         result
       end
 
       # Require component helper file and extend current instance with component helper module.
       # ====Example
-      #     will_use_component :"lolita/list"
+      #     will_use_component :"lolita/configuration/list"
       def will_use_component component_name
-        @used_component_helpers||=[]
-        unless @used_component_helpers.include?(component_name)
-          if path=component_helper_path(component_name)
-            self.class.class_eval do
-              require path
+        helpers_for_component(component_name) do |possible_component_name|
+          @used_component_helpers||=[]
+          unless @used_component_helpers.include?(possible_component_name)
+            if path=component_helper_path(possible_component_name)
+              self.class.class_eval do
+                require path
+              end
+              class_name=possible_component_name.to_s.camelize
+              self.extend("Components::#{class_name}Component".constantize) rescue nil #FIXME too slow
             end
-            class_name=component_name.to_s.camelize
-            self.extend("Components::#{class_name}Component".constantize)
+            @used_component_helpers<<possible_component_name
           end
-          @used_component_helpers<<component_name
         end
       end
       
+      def helpers_for_component component_name
+        names=component_name.to_s.split("/")
+        start_index=1 # first is lolita
+        start_index.upto(names.size) do |index|
+          yield names.slice(0..index).join("/")
+        end
+      end
+
       # Find path for given component.
       # 
       #    component_helper_path :"lolita/list" #=> [path_to_lolita]/app/helpers/components/lolita/list_component.rb
       def component_helper_path component_name
-         helper_paths=$:.reject{|p| !p.match(/\/helpers$/)}
+         @helper_paths||=$:.reject{|p| !p.match(/\/helpers$/)}
          get_path=lambda{|paths|
           extra_path=component_name.to_s.split("/")
           component=extra_path.pop
           paths.each do |path|
             new_path=File.join(path,"components",*extra_path,"#{component}_component.rb")
@@ -80,10 +92,10 @@
                  return new_path
                end
             end  
           nil
         }
-        path=get_path.call(helper_paths)
+        path=get_path.call(@helper_paths)
         path
       end
       
     end
   end
\ No newline at end of file