app/controllers/djr_controller.rb in djr-0.0.2beta vs app/controllers/djr_controller.rb in djr-0.0.2

@@ -3,32 +3,38 @@
   def djr
     
     routeSet = Rails.application.routes
     routes = routeSet.routes
     
-    js = ""
-
-    js << routes.map { |route| route.defaults[:controller]}.uniq.compact.map { |route|
-      route_str = ""
-      controller_name = "#{route.camelize.gsub(/\:\:/, '.')}Controller"
-      if m = controller_name.match(/\./)
-        route_str << "if(!#{m.pre_match}) { var #{m.pre_match} = {}; }; "
-      end
-      route_str << "#{controller_name} = function(){DJR.call(this);}; #{controller_name}.prototype.routes = {};" 
-    }.compact.join
-    
+    js = ";"
     js << routes.map { |route| 
-      method = route.conditions[:request_method].present? ? route.conditions[:request_method].source[1..-2] : "GET"
-      route.defaults[:controller].present? ? mount_js(route) : nil
+      route.defaults[:controller]
+    }.uniq.compact.map { |route|
+      mapped_controllers route
     }.compact.join
+    js << routes.map { |route| mapped_actions route }.compact.join
     
     render :text => js.to_s
     
   end
   
   private
-  def mount_js route
-    controller_name = "#{route.defaults[:controller].camelize.gsub(/\:\:/, '.')}Controller"
-    " #{controller_name}.prototype.routes['#{route.defaults[:action]}'] = {url: \"#{route.path}\", method: \"#{method}\" };"
+  def mapped_controllers route
+    route_str = ""
+    controller_name = "#{route.camelize.gsub(/\:\:/, '.')}Controller"
+    if m = controller_name.match(/\./)
+      route_str << "if(!#{m.pre_match}) { var #{m.pre_match} = {}; }; "
+    end
+    route_str << "#{controller_name} = function(){DJR.call(this);}; #{controller_name}.prototype.routes = {};"
+  end
+  
+  def mapped_actions route
+    if route.defaults[:controller].present?
+      method = route.conditions[:request_method].present? ? route.conditions[:request_method].source[1..-2] : "GET"
+      controller_name = "#{route.defaults[:controller].camelize.gsub(/\:\:/, '.')}Controller"
+      " #{controller_name}.prototype.routes['#{route.defaults[:action]}'] = {url: \"#{route.path}\", method: \"#{method}\" };"
+    else
+      nil
+    end
   end
   
 end
\ No newline at end of file