joosy 1.2.0.alpha.11 → 1.2.0.alpha.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2562609e94bd0b3bdf7a9edde2cc5d41f9290848
-  data.tar.gz: 4986201f074531fdbd1d50e6c733b3c78ba0ec05
+  metadata.gz: 8acd5941c7bfd2510ece8281052154171bb70fc0
+  data.tar.gz: 286702ccec5063cb93bd649110d152a74234e127
 SHA512:
-  metadata.gz: 02b7f851c6a7a66871a3a9f8d4c06b98f16e371925e15e8b42695357c5fffdf8469d409f22d54b89cd29f73a8c79ef16115f074f1cfc7b640036ee0ba2e402d9
-  data.tar.gz: 0cf587ba0d8b4af332008ccfd88332ed51ef9f9926ae25b519ab0d1946a4d23475fca95ced5dc6d5d0acc0028b6dd66beb27a8a26930ca16781c08f9a05fe008
+  metadata.gz: 34c782e41c5fafbc531011fbb5c6bbd7ed538d8e4064d6e049462e1a9c2d1d60d7eb15321fedbf13b9881d976101d0960b1b3a1b732e988c135a4e6709b696bd
+  data.tar.gz: 2c15767017d4beeec7cd9c13ebcb830e45d13f295d19aac86ed269eb594dd99d85c9857599b05b3fc349c3344251b4f0b4c09b3c0d0d4025c0b75ad1b11fe15f

data/.travis.yml

@@ -0,0 +1,7 @@
+language: node_js
+node_js:
+  - 0.8
+before_script:
+  - npm install -g grunt-cli
+  - ./node_modules/.bin/bower install
+script: "grunt test"

data/README.md

@@ -1,5 +1,9 @@
 # Joosy 1.2: Feather
 
+[![NPM version](https://badge.fury.io/js/joosy.png)](http://badge.fury.io/js/joosy)
+[![Build Status](https://travis-ci.org/joosy/joosy.png)](https://travis-ci.org/joosy/joosy)
+[![Dependency Status](https://gemnasium.com/joosy/joosy.png)](https://gemnasium.com/joosy/joosy)
+
 ## WARNING!!!
 
 Master branch is currently totally incompatible with the stable 1.1 and 1.0 branches. 1.2 features

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "joosy",
-  "version": "1.2.0-alpha.11",
+  "version": "1.2.0-alpha.12",
   "main": "lib/joosy.js",
   "ignore": [
     "bin",

data/lib/joosy.js

@@ -3266,6 +3266,7 @@ Joosy.Router = {
   restrictPattern: false,
   __namespace: "",
   __asNamespace: "",
+  prefix: '',
   restrict: function(restrictPattern) {
     this.restrictPattern = restrictPattern;
   },
@@ -3289,7 +3290,13 @@ Joosy.Router = {
     if (options == null) {
       options = {};
     }
-    path = to.replace(/^\#?\!?/, '!');
+    path = to;
+    if (path[0] === '#') {
+      path = path.substr(1);
+    }
+    if (!path.startsWith(this.prefix)) {
+      path = this.prefix + path;
+    }
     if (options.respond !== false) {
       return location.hash = path;
     } else {
@@ -3402,7 +3409,7 @@ Joosy.Router = {
   __respondRoute: function(hash) {
     var found, fullPath, params, path, queryArray, regex, route, urlParams, vals, _ref;
     Joosy.Modules.Log.debug("Router> Answering '" + hash + "'");
-    fullPath = hash.replace(/^#!?/, '');
+    fullPath = hash.replace(RegExp("^(" + this.prefix + ")?"), '');
     if (this.restrictPattern && fullPath.match(this.restrictPattern) === null) {
       this.trigger('restricted', fullPath);
       return;
@@ -3464,7 +3471,8 @@ Joosy.Router = {
     return params;
   },
   __injectReverseUrl: function(as, route) {
-    var fnc;
+    var fnc,
+      _this = this;
     if (as === void 0) {
       return;
     }
@@ -3474,7 +3482,7 @@ Joosy.Router = {
       (route.match(/\/:[^\/]+/g) || []).each(function(str) {
         return url = url.replace(str.substr(1), options[str.substr(2)]);
       });
-      return "#!" + url;
+      return "#" + _this.prefix + url;
     };
     Joosy.Helpers.Application["" + as + "Path"] = function(options) {
       return fnc(options);
@@ -3539,6 +3547,7 @@ Joosy.Widget = (function(_super) {
     if (render == null) {
       render = true;
     }
+    this.__runBeforeLoads();
     if (render && this.__renderer) {
       this.swapContainer(this.container, this.__renderer(this.data || {}));
     }

data/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "joosy"
   ],
-  "version": "1.2.0-alpha.11",
+  "version": "1.2.0-alpha.12",
   "author": "Boris Staal <boris@staal.io>",
   "bin": {
     "joosy": "bin/joosy"

data/spec/joosy/core/router_spec.coffee

@@ -17,6 +17,7 @@ describe "Joosy.Router", ->
 
   beforeEach ->
     Joosy.Router.reset()
+    Joosy.Router.prefix = '!'
 
   afterEach ->
     $(window).unbind 'hashchange'
@@ -117,7 +118,7 @@ describe "Joosy.Router", ->
 
   it "should navigate", ->
     Joosy.Router.navigate 'test'
-    expect(location.hash).toEqual '#!test'
+    expect(location.hash).toEqual "#!test"
     Joosy.Router.navigate ''
     expect(location.hash).toEqual '#!'
     location.hash = ''

data/src/joosy/core/router.coffee

@@ -38,6 +38,11 @@ Joosy.Router =
   #
   __namespace: ""
   __asNamespace: ""
+
+  #
+  # Global url prefix
+  #
+  prefix: ''
   
   #
   # Set the restriction pattern. If the requested url does not match this it
@@ -74,7 +79,7 @@ Joosy.Router =
     Joosy.Module.merge @rawRoutes, routes
 
   #
-  # Changes current hash with shebang (#!) and therefore triggers new route loading
+  # Changes current hash and therefore triggers new route loading
   # to be loaded
   #
   # @param [String] to                       Route to navigate to
@@ -83,7 +88,10 @@ Joosy.Router =
   # @option options [Boolean] replaceState   If true uses replaces history entry instead of adding. Works only in browsers supporting history.pushState
   #
   navigate: (to, options={}) ->
-    path = to.replace /^\#?\!?/, '!'
+    path = to
+    path = path.substr(1) if path[0] == '#'
+    path = @prefix + path unless path.startsWith(@prefix)
+
     if options.respond != false
       location.hash = path
     else
@@ -213,7 +221,7 @@ Joosy.Router =
   #
   __respondRoute: (hash) ->
     Joosy.Modules.Log.debug "Router> Answering '#{hash}'"
-    fullPath = hash.replace /^#!?/, ''
+    fullPath = hash.replace ///^(#{@prefix})?///, ''
 
     if (@restrictPattern && fullPath.match(@restrictPattern) == null)
       @trigger 'restricted', fullPath
@@ -291,11 +299,11 @@ Joosy.Router =
   __injectReverseUrl: (as, route) ->
     return if as == undefined
     
-    fnc = (options) ->
+    fnc = (options) =>
       url = route
       (route.match(/\/:[^\/]+/g) || []).each (str) ->
         url = url.replace(str.substr(1), options[str.substr(2)])
-      "#!#{url}"
+      "##{@prefix}#{url}"
 
     Joosy.Helpers.Application["#{as}Path"] = (options) ->
       fnc(options)

data/src/joosy/core/widget.coffee

@@ -66,6 +66,7 @@ class Joosy.Widget extends Joosy.Module
   # @param [jQuery] container             Container to attach to
   #
   __load: (@parent, @container, render=true) ->
+    @__runBeforeLoads()
     if render && @__renderer
       @swapContainer @container, @__renderer(@data || {})
     @refreshElements()

data/templates/application/standalone/package.json

@@ -9,7 +9,7 @@
     "nib": "~0.9.1",
     "haml-coffee": "~1.11.1",
     "grunt": "~0.4.1",
-    "grunt-mincer": "git://github.com/inossidabile/grunt-mincer.git",
+    "grunt-mincer": "~0.3.2",
     "grunt-contrib-connect": "~0.3.0",
     "grunt-contrib-uglify": "~0.2.2",
     "grunt-contrib-watch": "~0.4.4",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.11
+  version: 1.2.0.alpha.12
 platform: ruby
 authors:
 - Boris Staal
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -48,6 +48,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gruntfile.coffee
 - README.md