js-routes 0.9.2 → 0.9.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: be32b22dcc7600a2141329061740f8fe7e9ff6e5
+  data.tar.gz: 64d3981fdf7cb0889ae9005c15821a6ff13b3997
+SHA512:
+  metadata.gz: 50da4f85cb59aaadc6e76cecbee608617a899d22b996c4d99590c2cac89e16981087282cfc56c727939ae40018afb9b3e8eb24baad57c09f915d89ff4a2a07fe
+  data.tar.gz: a503183633ad8570afbaa81124d3337ebc51420313b1d16d6a9d064a592882c1d413b42aa5fc5d13c113ada16a983d554a579efa5e882f2ed23a9d25428fd99d

data/.gitignore

@@ -48,5 +48,6 @@ pkg
 # For rubinius:
 #*.rbc
 .rvmrc
+.ruby-version
 
 Gemfile.lock

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - jruby-19mode
   - ruby-head
+  - jruby-head
 notifications:
   email:
     - agresso@gmail.com
@@ -14,3 +14,4 @@ branches:
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: jruby-head

data/js-routes.gemspec

@@ -23,14 +23,15 @@ Gem::Specification.new do |s|
   s.summary = %q{Brings Rails named routes to javascript}
 
   s.add_runtime_dependency(%q<rails>, [">= 3.2"])
-  s.add_development_dependency(%q<therubyracer>, [">= 0"])
   s.add_development_dependency(%q<rspec>, ["~> 2.10.0"])
   s.add_development_dependency(%q<bundler>, [">= 1.1.0"])
   s.add_development_dependency(%q<guard>, [">= 0"])
-  s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
   s.add_development_dependency(%q<guard-coffeescript>, [">= 0"])
-  if RUBY_VERSION >= "1.9"
+  if defined?(JRUBY_VERSION)
+    s.add_development_dependency(%q<therubyrhino>, [">= 0"])
+  else
     s.add_development_dependency(%q<debugger>, [">= 0"])
+    s.add_development_dependency(%q<therubyracer>, [">= 0"])
   end
 end
 

data/lib/js_routes/version.rb

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

data/lib/routes.js

@@ -18,7 +18,6 @@
   Utils = {
     serialize: function(object, prefix) {
       var element, i, key, prop, result, s, _i, _len;
-
       if (prefix == null) {
         prefix = null;
       }
@@ -65,7 +64,6 @@
     },
     clean_path: function(path) {
       var last_index;
-
       path = path.split("://");
       last_index = path.length - 1;
       path[last_index] = path[last_index].replace(/\/+/g, "/").replace(/.\/$/m, "");
@@ -73,7 +71,6 @@
     },
     set_default_url_options: function(optional_parts, options) {
       var i, part, _i, _len, _results;
-
       _results = [];
       for (i = _i = 0, _len = optional_parts.length; _i < _len; i = ++_i) {
         part = optional_parts[i];
@@ -87,7 +84,6 @@
     },
     extract_anchor: function(options) {
       var anchor;
-
       anchor = "";
       if (options.hasOwnProperty("anchor")) {
         anchor = "#" + options.anchor;
@@ -97,7 +93,6 @@
     },
     extract_options: function(number_of_params, args) {
       var ret_value;
-
       ret_value = {};
       if (args.length > number_of_params) {
         ret_value = args.pop();
@@ -106,7 +101,6 @@
     },
     path_identifier: function(object) {
       var property;
-
       if (object === 0) {
         return "0";
       }
@@ -124,7 +118,6 @@
     },
     clone: function(obj) {
       var attr, copy, key;
-
       if ((obj == null) || "object" !== this.get_object_type(obj)) {
         return obj;
       }
@@ -138,7 +131,6 @@
     },
     prepare_parameters: function(required_parameters, actual_parameters, options) {
       var i, result, val, _i, _len;
-
       result = this.clone(options) || {};
       for (i = _i = 0, _len = required_parameters.length; _i < _len; i = ++_i) {
         val = required_parameters[i];
@@ -148,7 +140,6 @@
     },
     build_path: function(required_parameters, optional_parts, route, args) {
       var anchor, opts, parameters, result, url, url_params;
-
       args = Array.prototype.slice.call(args);
       opts = this.extract_options(required_parameters.length, args);
       if (args.length > required_parameters.length) {
@@ -167,7 +158,6 @@
     },
     visit: function(route, parameters, optional) {
       var left, left_part, right, right_part, type, value;
-
       if (optional == null) {
         optional = false;
       }
@@ -206,8 +196,10 @@
     },
     visit_globbing: function(route, parameters, optional) {
       var left, right, type, value;
-
       type = route[0], left = route[1], right = route[2];
+      if (left.replace(/^\*/i, "") !== left) {
+        route[1] = left = left.replace(/^\*/i, "");
+      }
       value = parameters[left];
       if (value == null) {
         return this.visit(route, parameters, optional);
@@ -224,7 +216,6 @@
     },
     get_prefix: function() {
       var prefix;
-
       prefix = defaults.prefix;
       if (prefix !== "") {
         prefix = (prefix.match("/$") ? prefix : "" + prefix + "/");
@@ -234,7 +225,6 @@
     _classToTypeCache: null,
     _classToType: function() {
       var name, _i, _len, _ref;
-
       if (this._classToTypeCache != null) {
         return this._classToTypeCache;
       }
@@ -248,7 +238,6 @@
     },
     get_object_type: function(obj) {
       var strType;
-
       if (window.jQuery && (window.jQuery.type != null)) {
         return window.jQuery.type(obj);
       }
@@ -257,7 +246,6 @@
     },
     namespace: function(root, namespaceString) {
       var current, parts;
-
       parts = (namespaceString ? namespaceString.split(".") : []);
       if (!parts.length) {
         return;

data/lib/routes.js.coffee

@@ -141,6 +141,8 @@ Utils =
   #
   visit_globbing: (route, parameters, optional) ->
     [type, left, right] = route
+    # fix for rails 4 globbing
+    route[1] = left = left.replace(/^\*/i, "") if left.replace(/^\*/i, "") isnt left
     value = parameters[left]
     return @visit(route, parameters, optional) unless value?
     parameters[left] = switch @get_object_type(value)

data/spec/js_routes/generated_javascript_spec.rb

@@ -15,7 +15,7 @@ describe JsRoutes do
     it "should have correct function with arguments signature" do
       should include("inbox_message_path: function(_inbox_id, _id, options)")
     end
-    it "should have correct function signature with Ruby 1.8.7 and unordered hash" do
+    it "should have correct function signature with unordered hash" do
       should include("inbox_message_attachment_path: function(_inbox_id, _message_id, _id, options)")
     end
 

data/spec/js_routes/rails_routes_compatibility_spec.rb

@@ -40,7 +40,7 @@ describe JsRoutes, "compatibility with Rails"  do
   end
 
   it "should support nested get parameters" do
-    evaljs("Routes.inbox_path(1, {format: 'json', env: 'test', search: { category_ids: [2,5], q: 'hello'}})").should == 
+    evaljs("Routes.inbox_path(1, {format: 'json', env: 'test', search: { category_ids: [2,5], q: 'hello'}})").should ==
       routes.inbox_path(1, :env => 'test', :search => {:category_ids => [2,5], :q => "hello"}, :format => "json")
   end
 
@@ -181,18 +181,18 @@ describe JsRoutes, "compatibility with Rails"  do
     it "should throw Exception if not enough parameters" do
       lambda {
         evaljs("Routes.inbox_path()")
-      }.should raise_error(V8::JSError)
+      }.should raise_error(js_error_class)
     end
     it "should throw Exception if required parameter is not defined" do
       lambda {
         evaljs("Routes.inbox_path(null)")
-      }.should raise_error(V8::JSError)
+      }.should raise_error(js_error_class)
     end
 
     it "should throw Exceptions if when there is too many parameters" do
       lambda {
         evaljs("Routes.inbox_path(1,2)")
-      }.should raise_error(V8::JSError)
+      }.should raise_error(js_error_class)
     end
   end
 

data/spec/spec_helper.rb

@@ -5,13 +5,22 @@ $:.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'rails/all'
 require 'js-routes'
-require "v8"
-require "cgi"
 require "active_support/core_ext/hash/slice"
 require 'coffee-script'
+if defined?(JRUBY_VERSION)
+  require 'rhino'
+  JS_LIB_CLASS = Rhino
+else
+  require "v8"
+  JS_LIB_CLASS = V8
+end
 
 def jscontext
-  @context ||= V8::Context.new
+  @context ||= JS_LIB_CLASS::Context.new
+end
+
+def js_error_class
+  JS_LIB_CLASS::JSError
 end
 
 def evaljs(string)
@@ -38,6 +47,8 @@ end
 class App < Rails::Application
   # Enable the asset pipeline
   config.assets.enabled = true
+  # initialize_on_precompile
+  config.assets.initialize_on_precompile = true
 end
 
 def draw_routes
@@ -52,7 +63,7 @@ def draw_routes
       end
     end
 
-    root :to => "inboxes#index" 
+    root :to => "inboxes#index"
 
     namespace :admin do
       resources :users
@@ -94,9 +105,6 @@ RSpec.configure do |config|
 
   config.before(:each) do
     evaljs("var window = this;")
-    # No need to replace native V8 functions for now
-    #jscontext[:cgi] = CGI
-    #evaljs("function encodeURIComponent(string) {return cgi.escape(string);}")
     jscontext[:log] = lambda {|context, value| puts value.inspect}
   end
   config.before(:all) do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 0.9.2
-  prerelease: 
+  version: 0.9.3
 platform: ruby
 authors:
 - Bogdan Gusiev
@@ -14,39 +13,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,81 +41,71 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rb-fsevent
+  name: guard-coffeescript
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-coffeescript
+  name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: therubyracer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Generates javascript file that defines all Rails named routes as javascript
@@ -173,29 +142,25 @@ files:
 homepage: http://github.com/railsware/js-routes
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3484352808511578031
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Brings Rails named routes to javascript
 test_files: []