js-routes 0.9.1 → 0.9.2

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 class JsRoutes
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/lib/routes.js

@@ -147,7 +147,7 @@
       return result;
     },
     build_path: function(required_parameters, optional_parts, route, args) {
-      var opts, parameters, result, url, url_params;
+      var anchor, opts, parameters, result, url, url_params;
 
       args = Array.prototype.slice.call(args);
       opts = this.extract_options(required_parameters.length, args);
@@ -156,11 +156,13 @@
       }
       parameters = this.prepare_parameters(required_parameters, args, opts);
       this.set_default_url_options(optional_parts, parameters);
+      anchor = this.extract_anchor(parameters);
       result = "" + (this.get_prefix()) + (this.visit(route, parameters));
-      url = Utils.clean_path("" + result + (this.extract_anchor(parameters)));
+      url = Utils.clean_path("" + result);
       if ((url_params = this.serialize(parameters)).length) {
         url += "?" + url_params;
       }
+      url += anchor;
       return url;
     },
     visit: function(route, parameters, optional) {

data/lib/routes.js.coffee

@@ -86,10 +86,14 @@ Utils =
       throw new Error("Too many parameters provided for path")
     parameters = @prepare_parameters(required_parameters, args, opts)
     @set_default_url_options optional_parts, parameters
+    anchor = @extract_anchor(parameters)
     result = "#{@get_prefix()}#{@visit(route, parameters)}"
-    url = Utils.clean_path("#{result}#{@extract_anchor(parameters)}")
-    url += "?#{url_params}" if (url_params = @serialize(parameters)).length
+    url = Utils.clean_path("#{result}")
+    if (url_params = @serialize(parameters)).length
+      url += "?#{url_params}"
+    url += anchor
     url
+
   #
   # This function is JavaScript impelementation of the
   # Journey::Visitors::Formatter that builds route by given parameters

data/spec/js_routes/rails_routes_compatibility_spec.rb

@@ -60,6 +60,10 @@ describe JsRoutes, "compatibility with Rails"  do
     evaljs("Routes.inbox_path(1, {anchor: 'hello'})").should == routes.inbox_path(1, :anchor => "hello")
   end
 
+  it "should support url anchor and get parameters" do
+    evaljs("Routes.inbox_path(1, {expanded: true, anchor: 'hello'})").should == routes.inbox_path(1, :expanded => true, :anchor => "hello")
+  end
+
   it "should support engine routes" do
     evaljs("Routes.blog_app_posts_path()").should == blog_routes.posts_path()
   end

data/spec/spec_helper.rb

@@ -67,10 +67,10 @@ def draw_routes
       resources :things
     end
 
-    match "/other_optional/(:optional_id)" => "foo#foo", :as => :foo
+    get "/other_optional/(:optional_id)" => "foo#foo", :as => :foo
 
-    match 'books/*section/:title' => 'books#show', :as => :book
-    match 'books/:title/*section' => 'books#show', :as => :book_title
+    get 'books/*section/:title' => 'books#show', :as => :book
+    get 'books/:title/*section' => 'books#show', :as => :book_title
 
     mount BlogEngine::Engine => "/blog", :as => :blog_app
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3670636352927995574
+      hash: 3484352808511578031
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: