djr 0.0.2beta → 0.0.2

data/app/controllers/djr_controller.rb

@@ -5,30 +5,36 @@ class DjrController < ApplicationController
     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

data/lib/djr/version.rb

@@ -1,3 +1,3 @@
 module Djr
-  VERSION = "0.0.2beta"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: djr
 version: !ruby/object:Gem::Version
-  version: 0.0.2beta
-  prerelease: 5
+  version: 0.0.2
+  prerelease: 
 platform: ruby
 authors:
 - Christiano Milfont
@@ -13,7 +13,7 @@ date: 2012-02-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2153103180 !ruby/object:Gem::Requirement
+  requirement: &2160355100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153103180
+  version_requirements: *2160355100
 description: DJR will generate the JavaScript code from Rails Controllers to allow
   browsers to securely call into Ruby code almost as if it was running locally
 email:
@@ -61,9 +61,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: djr
 rubygems_version: 1.8.10