js-routes 0.7.3 → 0.7.4

data/Gemfile.lock

@@ -42,7 +42,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    libv8 (3.3.10.2)
+    libv8 (3.3.10.4)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -89,7 +89,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.9.2)
+    therubyracer (0.9.9)
       libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)

data/Readme.md

@@ -57,6 +57,7 @@ Routes.user_path(1) // => "/users/1"
 Routes.user_path(1, {format: 'json'}) // => "/users/1.json"
 Routes.new_user_project_path(1, {format: 'json'}) // => "/users/1/projects/new.json"
 Routes.user_project_path(1,2, {q: 'hello', custom: true}) // => "/users/1/projects/2?q=hello&custom=true"
+Routes.user_project_path(1,2, {hello: ['world', 'mars']}) // => "/users/1/projects/2?hello%5B%5D=world&hello%5B%5D=mars"
 ```
 
 Using serialized object as route function arguments:

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.4

data/js-routes.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "js-routes"
-  s.version = "0.7.3"
+  s.name = %q{js-routes}
+  s.version = "0.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2011-12-22"
-  s.description = "Generates javascript file that defines all Rails named routes as javascript helpers"
-  s.email = "agresso@gmail.com"
+  s.date = %q{2012-01-22}
+  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 = [
     "LICENSE.txt"
   ]
@@ -36,13 +36,14 @@ Gem::Specification.new do |s|
     "spec/post_rails_init_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/railsware/js-routes"
+  s.homepage = %q{http://github.com/railsware/js-routes}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "Brings Rails named routes to javascript"
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Brings Rails named routes to javascript}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/js_routes.rb

@@ -109,7 +109,7 @@ class JsRoutes
   def build_js(route)
     params = build_params route
     _ = <<-JS.strip!
-  // #{route.name} => #{route.path}
+  // #{route.name} => #{route_spec(route)}
   #{route.name}_path: function(#{(params + ["options"]).join(", ")}) {
   return Utils.build_path(#{params.size}, #{path_parts(route).inspect}, #{optional_params(route).inspect}, arguments)
   }
@@ -119,16 +119,19 @@ class JsRoutes
   # TODO: might be possible to simplify this to use route.path
   # instead of all this path_info.source madness
   def optional_params(route)
+    if Rails.version >= "3.2.0"
+      return route.optional_parts.map(&:to_s)
+    end
+    path_info = route.conditions[:path_info]
+    path_info_source = path_info.source
     if RUBY_VERSION >= '1.9.2'
       optional_named_captures_regexp = /\?\:.+?\(\?\<(.+?)\>/
-      path_info = route.conditions[:path_info]
-      path_info.source.scan(optional_named_captures_regexp).flatten
+      path_info_source.scan(optional_named_captures_regexp).flatten
     else
       re = Regexp.escape("([^/.?]+)")
       optional_named_captures_regexp = /#{re}|\(\?\:.+?\)\?/
-      path_info = route.conditions[:path_info]
-      captures = path_info.source.scan(optional_named_captures_regexp).flatten
-      named_captures = path_info.named_captures.to_a.sort {|a,b|a.last.first<=>b.last.first} 
+      captures = path_info_source.scan(optional_named_captures_regexp).flatten
+      named_captures = path_info.named_captures.to_a.sort_by {|cap|cap.last.first} 
       captures.zip(named_captures).map do |type, (name, pos)|
         name unless type == '([^/.?]+)'
       end.compact
@@ -136,22 +139,36 @@ class JsRoutes
   end
 
   def build_params route
-    optional_named_captures = optional_params(route)
-    route.conditions[:path_info].named_captures.to_a.sort do |cap1, cap2|
-      # Hash is not ordered in Ruby 1.8.7
-      cap1.last.first <=> cap2.last.first
-    end.map do |cap|
-      name = cap.first
-        if !(optional_named_captures.include?(name.to_s))
-        # prepending each parameter name with underscore
-        # to prevent conflict with JS reserved words
-        "_" + name.to_s.gsub(/^:/, '')
-      end
-    end.compact
+    required_params(route).map do |name|
+      # prepending each parameter name with underscore
+      # to prevent conflict with JS reserved words
+      "_" + name.to_s
+    end
   end
 
 
   def path_parts route
-    route.path.gsub(/\(\.:format\)$/, "").split(/:[a-z\-_]+/)
+    route_spec(route).gsub(/\(\.:format\)$/, "").split(/:[a-z\-_]+/)
+  end
+
+  def route_spec route
+    if Rails.version >= "3.2.0"
+      route.path.spec
+    else
+      route.path
+    end.to_s
+  end
+
+  def required_params(route)
+    if Rails.version >= "3.2.0"
+      return route.required_parts.map(&:to_s)
+    end # if
+    optional_named_captures = optional_params(route)
+    route.conditions[:path_info].named_captures.to_a.sort_by do |cap1|
+      # Hash is not ordered in Ruby 1.8.7
+      cap1.last.first
+    end.map(&:first).reject do |name|
+      optional_named_captures.include?(name.to_s)
+    end
   end
 end

data/lib/routes.js

@@ -12,7 +12,14 @@
       var s = [];
       for (prop in obj){
         if (obj[prop]) {
-          s.push(prop + "=" + encodeURIComponent(obj[prop].toString()));
+          if (obj[prop] instanceof Array) {
+            for (var i=0; i < obj[prop].length; i++) {
+              key = prop + encodeURIComponent("[]");
+              s.push(key + "=" + encodeURIComponent(obj[prop][i].toString()));
+            }
+          } else {
+            s.push(prop + "=" + encodeURIComponent(obj[prop].toString()));
+          }
         }
       }
       if (s.length === 0) {

data/spec/js_routes_spec.rb

@@ -36,10 +36,14 @@ describe JsRoutes do
       evaljs("Routes.inbox_path(1, {format: 'json'})").should == routes.inbox_path(1, :format => "json")
     end
 
-    it "should support get parameters" do
+    it "should support simple get parameters" do
       evaljs("Routes.inbox_path(1, {format: 'json', lang: 'ua', q: 'hello'})").should == routes.inbox_path(1, :lang => "ua", :q => "hello", :format => "json")
     end
 
+    it "should support array get parameters" do
+      evaljs("Routes.inbox_path(1, {hello: ['world', 'mars']})").should == routes.inbox_path(1, :hello => [:world, :mars])
+    end
+
     it "should support null and undefined parameters" do
       evaljs("Routes.inboxes_path({uri: null, key: undefined})").should == routes.inboxes_path(:uri => nil, :key => nil)
     end

metadata

@@ -1,90 +1,123 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: js-routes
-version: !ruby/object:Gem::Version
-  version: 0.7.3
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 11
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 4
+  version: 0.7.4
 platform: ruby
-authors:
+authors: 
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &6782180 !ruby/object:Gem::Requirement
+
+date: 2012-01-22 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  requirement: *id001
   type: :runtime
+  name: rails
   prerelease: false
-  version_requirements: *6782180
-- !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: &6779260 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
   type: :development
+  name: therubyracer
   prerelease: false
-  version_requirements: *6779260
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &6777960 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 7
+        - 0
         version: 2.7.0
+  requirement: *id003
   type: :development
+  name: rspec
   prerelease: false
-  version_requirements: *6777960
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &6793480 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
+  requirement: *id004
   type: :development
+  name: bundler
   prerelease: false
-  version_requirements: *6793480
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &6792320 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
         version: 1.6.2
+  requirement: *id005
   type: :development
+  name: jeweler
   prerelease: false
-  version_requirements: *6792320
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &6791120 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
   type: :development
+  name: rcov
   prerelease: false
-  version_requirements: *6791120
-description: Generates javascript file that defines all Rails named routes as javascript
-  helpers
+description: Generates javascript file that defines all Rails named routes as javascript helpers
 email: agresso@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
-files:
+files: 
 - .document
 - .rspec
 - .travis.yml
@@ -104,32 +137,39 @@ files:
 - spec/js_routes_spec.rb
 - spec/post_rails_init_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/railsware/js-routes
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -783067730295265933
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Brings Rails named routes to javascript
 test_files: []
+