joosy 1.2.0.alpha.13 → 1.2.0.alpha.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86784de6b810fdda417c04e5f2a32be2f50cdf20
-  data.tar.gz: 807001da677b51db11ad5cf032ee1be57b70bc13
+  metadata.gz: e7efe3701ce2f216a6e1733e322573234cd19737
+  data.tar.gz: c41874a7bd7ce743e6f4c8232d5bad56acd4d8df
 SHA512:
-  metadata.gz: ca1a9f7eb9081e2cf6cac92401a4dc5daf15fa29cec19091441b85b774302b86f97104801fc252cf11bcfcafd464b0b3ce2db26b12d219d530c9cd184ee24008
-  data.tar.gz: 4dfd4f85e19997aa299ea7eadc2b59980d9cc93728b718deaccc00e1c8da62adca862ee0fef36ba485d4657c23aa003c4ae98f9092fd298de3708e4275e19c7d
+  metadata.gz: 3ac1bc38b42830cda852e9b46ff543d499d9057c7e290bc58b9d01b0995e5eb31604b05e8187f8dd87bbe37cf6de4dd659d95f4ba2baa29cc013a29cf2fbf1d7
+  data.tar.gz: 44265f5626c425a31c5ddcec40be293538a0b75e7d8d7f63a4b8ac92c116d3ee19d50befa8634c9c86a166b4457043d6cc6d747917b9549864ec726f23134d77

data/bower.json

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

data/lib/joosy.js

@@ -171,19 +171,24 @@ Joosy.Application = {
   Controls: {},
   loading: true,
   identity: true,
-  debug: false,
   debounceForms: false,
+  config: {
+    debug: false,
+    router: {
+      html5: false,
+      base: '/'
+    }
+  },
   initialize: function(name, selector, options) {
-    var key, value;
     this.name = name;
     this.selector = selector;
     if (options == null) {
       options = {};
     }
-    for (key in options) {
-      value = options[key];
-      this[key] = value;
+    if (window.JoosyEnvironment != null) {
+      this.mergeConfig(window.JoosyEnvironment);
     }
+    this.mergeConfig(options);
     this.templater = new Joosy.Templaters.RailsJST(this.name);
     Joosy.Router.__setupRoutes();
     this.sandboxSelector = Joosy.uuid();
@@ -202,6 +207,19 @@ Joosy.Application = {
     if (!attempt.halted) {
       return this.page = attempt;
     }
+  },
+  mergeConfig: function(options) {
+    var key, value, _results;
+    _results = [];
+    for (key in options) {
+      value = options[key];
+      if (Object.isObject(this.config[key])) {
+        _results.push(Object.merge(this.config[key], value));
+      } else {
+        _results.push(this.config[key] = value);
+      }
+    }
+    return _results;
   }
 };
 
@@ -324,7 +342,7 @@ Joosy.Modules.Log = {
   debug: function() {
     var args;
     args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-    if (!Joosy.Application.debug) {
+    if (!Joosy.Application.config.debug) {
       return;
     }
     return this.log.apply(this, args);
@@ -332,7 +350,7 @@ Joosy.Modules.Log = {
   debugAs: function() {
     var args, context, string;
     context = arguments[0], string = arguments[1], args = 3 <= arguments.length ? __slice.call(arguments, 2) : [];
-    if (!Joosy.Application.debug) {
+    if (!Joosy.Application.config.debug) {
       return;
     }
     context = Joosy.Module.__className(context) || 'unknown context';
@@ -3303,9 +3321,9 @@ Joosy.Router = {
       if (!history.pushState) {
         this.__ignoreRequest = to;
         location.hash = path;
-        return setTimeout(function() {
+        return setTimeout((function() {
           return _this.__ignoreRequest = false;
-        }, 2);
+        }), 0);
       } else {
         return history[options.replaceState ? 'replaceState' : 'pushState']({}, '', '#' + path);
       }

data/package.json

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

data/spec/joosy/core/application_spec.coffee

@@ -8,13 +8,14 @@ describe "Joosy.Application", ->
     Joosy.Router.__setupRoutes.restore()
 
   it "should initialize", ->
-    Joosy.Application.initialize 'app', '#application'
+    Joosy.Application.initialize 'app', '#application', router: {foo: 'bar'}
     expect(Joosy.Application.page).toBeUndefined()
     expect(Joosy.Application.selector).toEqual '#application'
     expect(Joosy.Application.sandboxSelector).toMatch /#[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[0-9A-F]{4}-[0-9A-F]{12}/
     expect($(Joosy.Application.sandboxSelector).length).toEqual 1
     expect(Joosy.Router.__setupRoutes.callCount).toEqual 1
     expect(Joosy.Application.name).toEqual 'app'
+    expect(Joosy.Application.config.router.foo).toEqual 'bar'
 
   it "should set container", ->
     expect(Joosy.Application.content()).toEqual $('#application')

data/spec/joosy/core/joosy_spec.coffee

@@ -1,7 +1,7 @@
 describe "Joosy", ->
 
   it "should properly initialize", ->
-    expect(Joosy.Application.debug).toBeFalsy()
+    expect(Joosy.Application.config.debug).toBeFalsy()
     expect(Joosy.Modules).toBeDefined()
     expect(Joosy.Resource).toBeDefined()
 

data/spec/joosy/core/modules/log_spec.coffee

@@ -9,7 +9,7 @@ describe "Joosy.Modules.Log", ->
     @box.log 'message', 'appendix'
 
   it "should log debug messages into console", ->
-    Joosy.Application.debug = true
+    Joosy.Application.config.debug = true
     @box.debug 'debug message'
-    Joosy.Application.debug = false
+    Joosy.Application.config.debug = false
     @box.debug 'unseen debug message'

data/spec/joosy/core/router_spec.coffee

@@ -7,20 +7,21 @@ describe "Joosy.Router", ->
     section: sinon.spy()
     wildcard: sinon.spy()
 
-  map = Object.extended
-    '/': spies.root
-    '/page': TestPage
-    '/section':
-      '/page/:id': spies.section
-      '/page2/:more': TestPage
-    404: spies.wildcard
+  map =
+    Object.extended
+      '/': spies.root
+      '/page': TestPage
+      '/section':
+        '/page/:id': spies.section
+        '/page2/:more': TestPage
+      404: spies.wildcard
 
   beforeEach ->
     Joosy.Router.reset()
     Joosy.Router.prefix = '!'
 
   afterEach ->
-    $(window).unbind 'hashchange'
+    $(window).off 'hashchange'
 
   it "should map", ->
     Joosy.Router.map map
@@ -124,7 +125,6 @@ describe "Joosy.Router", ->
     expect(location.hash).toEqual "#!test"
     Joosy.Router.navigate ''
     expect(location.hash).toEqual '#!'
-    location.hash = ''
 
   it "should restrict urls", ->
     sinon.stub Joosy.Router, '__respondRoute'

data/src/joosy/core/application.coffee

@@ -12,9 +12,14 @@ Joosy.Application =
 
   loading: true
   identity: true
-  debug: false
   debounceForms: false
 
+  config:
+    debug: false
+    router:
+      html5: false
+      base:  '/'
+
   #
   # Starts Joosy application by binding to element and bootstraping routes
   #
@@ -23,7 +28,9 @@ Joosy.Application =
   # @param [Object] options
   #
   initialize: (@name, @selector, options={}) ->
-    @[key] = value for key, value of options
+    @mergeConfig(window.JoosyEnvironment) if window.JoosyEnvironment?
+    @mergeConfig(options)
+
     @templater = new Joosy.Templaters.RailsJST @name
 
     Joosy.Router.__setupRoutes()
@@ -52,4 +59,11 @@ Joosy.Application =
   #
   setCurrentPage: (page, params) ->
     attempt = new page(params, @page)
-    @page = attempt unless attempt.halted
+    @page = attempt unless attempt.halted
+
+  mergeConfig: (options) ->
+    for key, value of options
+      if Object.isObject @config[key]
+        Object.merge @config[key], value
+      else
+        @config[key] = value

data/src/joosy/core/modules/log.coffee

@@ -21,7 +21,7 @@ Joosy.Modules.Log =
   # Runs `log` if debug is active
   #
   debug: (args...) ->
-    return unless Joosy.Application.debug
+    return unless Joosy.Application.config.debug
     @log args...
 
   #
@@ -31,6 +31,6 @@ Joosy.Modules.Log =
   # @param [String] string            Message to log
   #
   debugAs: (context, string, args...) ->
-    return unless Joosy.Application.debug
+    return unless Joosy.Application.config.debug
     context = Joosy.Module.__className(context) || 'unknown context'
     @debug "#{context}> #{string}", args...

data/src/joosy/core/router.coffee

@@ -98,9 +98,7 @@ Joosy.Router =
       if !history.pushState
         @__ignoreRequest = to
         location.hash = path
-        setTimeout =>
-          @__ignoreRequest = false
-        , 2 # jQuery.hashchange checks hash changing every 1ms
+        setTimeout (=> @__ignoreRequest = false), 0
       else
         history[if options.replaceState then 'replaceState' else 'pushState'] {}, '', '#'+path
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.13
+  version: 1.2.0.alpha.14
 platform: ruby
 authors:
 - Boris Staal