js-routes 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/js-routes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{js-routes}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2011-08-04}
+  s.date = %q{2011-08-07}
   s.description = %q{Generates javascript file that defines all Rails named routes as javascript helpers}
   s.email = %q{agresso@gmail.com}
   s.extra_rdoc_files = [

data/lib/js_routes.rb

@@ -6,6 +6,7 @@ module JsRoutes
       js = File.read(File.dirname(__FILE__) + "/routes.js")
       options[:namespace] ||= "Routes"
       js.gsub!("NAMESPACE", options[:namespace])
+      js.gsub!("DEFAULT_FORMAT", options[:default_format].to_s)
       js.gsub!("ROUTES", js_routes(options))
     end
 
@@ -27,37 +28,32 @@ module JsRoutes
       exclude = Array(options[:exclude])
 
       Rails.application.reload_routes!
-      Rails.application.routes.named_routes.routes.map do |name, route|
-        if exclude.find {|e| name.to_s =~ e}
-          ""
+      Rails.application.routes.named_routes.routes.map do |_, route|
+        if exclude.find {|e| route.name =~ e}
+          nil
         else
-          build_js(name, route, options)
+          build_js(route, options)
         end
-      end.join("\n")
+      end.compact.join(",\n")
     end
 
-    def build_js(name, route, options)
-      _ = <<-JS
+    def build_js(route, options)
+      _ = <<-JS.strip!
   // #{route.name} => #{route.path}
-  #{name.to_s}_path: function(#{build_params route}) {
+  #{route.name}_path: function(#{build_params route}) {
     var opts = options || {};
-    var format = opts.format || '#{options[:default_format]}';
-    delete opts.format;
+    var format = Utils.extract_format(opts);
   #{build_default_params route};
-    return Routes.check_path('#{build_path route}' + format) + Routes.serialize(opts);
-  },
+    return Utils.check_path('#{build_path route}' + format) + Utils.serialize(opts);
+  }
 JS
     end
 
 
     def build_params route
       route.conditions[:path_info].captures.map do |cap|
-        if cap.is_a?(Rack::Mount::GeneratableRegexp::DynamicSegment)
-          if cap.name.to_s == "format"
-            nil
-          else
-            cap.name.to_s.gsub(':', '')
-          end
+        if cap.is_a?(Rack::Mount::GeneratableRegexp::DynamicSegment) && !(cap.name.to_s == "format")
+          cap.name.to_s.gsub(':', '')
         end
       end.compact.<<("options").join(', ')
     end
@@ -66,7 +62,7 @@ JS
       route.conditions[:path_info].captures.map do |cap|
         if cap.is_a?(Rack::Mount::GeneratableRegexp::DynamicSegment)
           segg = cap.name.to_s.gsub(':', '')
-          "#{segg} = Routes.check_parameter(#{segg});"
+          "#{segg} = Utils.check_parameter(#{segg});"
         end
       end.join("\n")
     end

data/lib/routes.js

@@ -1,8 +1,8 @@
 (function(){
 
-  var Routes = {
+  var Utils = {
 
-    ROUTES
+    default_format: 'DEFAULT_FORMAT',
 
     serialize: function(obj){
       if (obj == null) {return '';}
@@ -26,9 +26,16 @@
 
     check_path: function(path) {
       return path.replace(/\.$/m, '');
-    }
+    },
 
+    extract_format: function(options) {
+      var format =  options.hasOwnProperty("format") ? options.format : Utils.default_format;
+      delete options.format;
+      return format || "";
+    }
   };
 
-  window.NAMESPACE = Routes;
+  window.NAMESPACE = {
+    ROUTES
+  };
 })();

data/spec/js_routes_spec.rb

@@ -2,34 +2,35 @@ require 'spec_helper'
 require "fileutils"
 
 
-
 describe JsRoutes do
   before(:each) do
     Rails.application.stub!(:reload_routes!).and_return(true)
-    evaljs("var window = {};")
+    evaljs("var window = this;")
+    evaljs(_presetup)
     evaljs(JsRoutes.generate(_options))
   end
 
+  let(:_presetup) { "this;" }
   let(:_options) { {} }
 
   it "should generate collection routing" do
-    evaljs("window.Routes.inboxes_path()").should == "/inboxes"
+    evaljs("Routes.inboxes_path()").should == "/inboxes"
   end
 
   it "should generate member routing" do
-    evaljs("window.Routes.inbox_path(1)").should == "/inboxes/1"
+    evaljs("Routes.inbox_path(1)").should == "/inboxes/1"
   end
 
   it "should generate nested routing" do
-    evaljs("window.Routes.inbox_message_path(1,2)").should == "/inboxes/1/messages/2"
+    evaljs("Routes.inbox_message_path(1,2)").should == "/inboxes/1/messages/2"
   end
 
   it "should generate routing with format" do
-    evaljs("window.Routes.inbox_path(1, {format: 'json'})").should == "/inboxes/1.json"
+    evaljs("Routes.inbox_path(1, {format: 'json'})").should == "/inboxes/1.json"
   end
 
   it "should support get parameters" do
-    evaljs("window.Routes.inbox_path(1, {format: 'json', q: 'hello', lang: 'ua'})").should == "/inboxes/1.json?q=hello&lang=ua"
+    evaljs("Routes.inbox_path(1, {format: 'json', q: 'hello', lang: 'ua'})").should == "/inboxes/1.json?q=hello&lang=ua"
   end
 
   context "when exclude is specified" do
@@ -37,7 +38,11 @@ describe JsRoutes do
     let(:_options) { {:exclude => /^admin_/} }
 
     it "should exclude specified routes from file" do
-      evaljs("window.Routes.admin_users_path").should be_nil
+      evaljs("Routes.admin_users_path").should be_nil
+    end
+
+    it "should not exclude routes not under specified pattern" do
+      evaljs("Routes.inboxes_path()").should_not be_nil
     end
   end
 
@@ -45,11 +50,15 @@ describe JsRoutes do
     let(:_options) { {:default_format => "json"} }
     
     it "should render routing with default_format" do
-      evaljs("window.Routes.inbox_path(1)").should == "/inboxes/1.json"
+      evaljs("Routes.inbox_path(1)").should == "/inboxes/1.json"
+    end
+
+    it "should override default_format wehn spefified implicitly" do
+      evaljs("Routes.inbox_path(1, {format: 'xml'})").should == "/inboxes/1.xml"
     end
 
-    it "should override default_format implicitly" do
-      evaljs("window.Routes.inbox_path(1, {format: 'xml'})").should == "/inboxes/1.xml"
+    it "should override nullify implicitly when specified implicitly" do
+      evaljs("Routes.inbox_path(1, {format: null})").should == "/inboxes/1"
     end
 
   end
@@ -58,7 +67,15 @@ describe JsRoutes do
     let(:_options) { {:namespace => "PHM"} }
     it "should use this name space for routing" do
       evaljs("window.Routes").should be_nil
-      evaljs("window.PHM.inbox_path").should_not be_nil
+      evaljs("PHM.inbox_path").should_not be_nil
+    end
+    
+  end
+  context "when nested namspace option is specified" do
+    let(:_presetup) { "window.PHM = {}" }
+    let(:_options) { {:namespace => "PHM.Routes"} }
+    it "should use this name space for routing" do
+      evaljs("PHM.Routes.inbox_path").should_not be_nil
     end
     
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: js-routes
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-04 00:00:00 +03:00
+date: 2011-08-07 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency