joosy 1.2.0.beta.1 → 1.2.0.beta.2

data/source/joosy/resources/scalar.coffee

@@ -1,32 +1,31 @@
-class Joosy.Resources.Scalar extends Joosy.Function
+class Joosy.Resources.Scalar extends Joosy.Module
 
   @include Joosy.Modules.Events
   @include Joosy.Modules.Filters
 
   @registerPlainFilters 'beforeLoad'
 
+  @build: ->
+    new @ arguments...
+
+  __call: ->
+    if arguments.length > 0
+      @set arguments[0]
+    else
+      @get()
+
   constructor: (value) ->
-    return super ->
-      @load value
+    @load value
 
   load: (value) ->
     @value = @__applyBeforeLoads(value)
     @trigger 'changed'
     @value
 
-  clone: (callback) ->
-    new @constructor @value
-
-  __call: ->
-    if arguments.length > 0
-      @__set arguments[0]
-    else
-      @__get()
-
-  __get: ->
+  get: ->
     @value
 
-  __set: (@value) ->
+  set: (@value) ->
     @trigger 'changed'
 
   valueOf: ->

data/source/joosy/router.coffee

@@ -290,10 +290,12 @@ class Joosy.Router extends Joosy.Module
       @["#{as}Path"] = helper
 
       @["#{as}Url"] = (options) ->
+        origin  = "#{location.protocol}//#{location.host}"
+
         if Joosy.Router.config.html5
-          "#{location.origin}#{helper(options)}"
+          "#{origin}#{helper(options)}"
         else
-          "#{location.origin}#{location.pathname}#{helper(options)}"
+          "#{origin}#{location.pathname}#{helper(options)}"
 
   @__grabParams: (query, route=null, match=[]) ->
     params = {}

data/spec/helpers/matchers.coffee

@@ -30,7 +30,8 @@ beforeEach ->
       return true
 
     toEqualHTML: (string) ->
-      html     = @actual.replace(/>\s+</g, '><')
+      html     = @actual.replace(/>\s+</g, '><').toLowerCase().replace(/\"/g, '')
+      string   = string.toLowerCase().replace(/\"/g, '')
       @message = -> "Expected '#{html}' to equal '#{string}'"
 
       html == string
@@ -44,23 +45,36 @@ beforeEach ->
     #   tag.toBeTag 'div', 'foo', class: 'foo', id: /\S+/
     #
     toBeTag: (tagName, content, attrs) ->
+      reason = ''
       @message = =>
         actual = $('<div>').append(@actual).html()
-        "Expected '#{actual}' to be a tag #{tagName} with attributes #{JSON.stringify attrs} and content '#{content}'"
+        "Expected '#{actual}' to be a tag #{tagName} with attributes #{JSON.stringify attrs} and content '#{content}': #{reason}"
 
       tag = $ @actual
 
       # Is it alone?
       flag = tag.length == 1
+      if !flag
+        reason = 'not alone'
+        return false
 
       # Tag name matches?
       flag &&= tag[0].nodeName == tagName.toUpperCase()
+      if !flag
+        reason = 'tag name mismatch'
+        return false
 
       # Content matches?
       flag &&= tag.html() == content if content != false
+      if !flag
+        reason = 'content mismatch'
+        return false
 
       # Same number of attributes?
       flag &&= tag[0].attributes.length == Object.keys(attrs).length
+      if !flag
+        reason = 'attributes count mismatch'
+        return false
 
       # Attributes match?
       for name, val of attrs

data/spec/joosy/core/helpers/view_spec.coffee

@@ -5,10 +5,10 @@ describe "Joosy.Helpers.View", ->
 
   it "renders tag with string content", ->
     tag = h.contentTag 'div', 'content', {id: 'id'}
-    expect(tag).toEqual '<div id="id">content</div>'
+    expect(tag).toBeTag 'div', 'content', id: 'id'
 
   it "renders tag with lambda content", ->
     tag = h.contentTag 'div', {id: 'id'}, ->
       h.contentTag 'div', 'content', {id: 'id2'}
 
-    expect(tag).toEqual '<div id="id"><div id="id2">content</div></div>'
+    expect(tag.toLowerCase()).toEqualHTML '<div id="id"><div id="id2">content</div></div>'

data/spec/joosy/core/router_spec.coffee

@@ -190,127 +190,128 @@ describe "Joosy.Router", ->
         expect(Joosy.Helpers.Routes.sectionPagePath(id: 1)).toEqual '#section/page/1'
         expect(Joosy.Helpers.Routes.sectionPageUrl(id: 1)).toEqual "http://#{location.host}#{pathname}#section/page/1"
 
-    describe 'html5 based', ->
-      beforeEach ->
-        Joosy.Router.setup {html5: true}, @spies.responder, false
-        Joosy.Router.map @map
-
-      afterEach ->
-        Joosy.Router.reset()
-        history.pushState {}, '', pathname
-        waits 0
+    if history.pushState?
+      describe 'html5 based', ->
+        beforeEach ->
+          Joosy.Router.setup {html5: true}, @spies.responder, false
+          Joosy.Router.map @map
 
-      it 'resets', ->
-        runs -> Joosy.Router.navigate '/page'
-        waits 0
-        runs ->
+        afterEach ->
           Joosy.Router.reset()
-          Joosy.Router.navigate '/'
-        waits 0
-        runs ->
-          expect(@spies.responder.callCount).toEqual 1
-
-      it 'boots pages', ->
-        runs -> Joosy.Router.navigate '/page'
-        waits 0
-        runs ->
-          expect(@spies.responder.callCount).toEqual 1
-          expect(@spies.responder.args[0][0]).toEqual @Page
-
-      it 'runs lamdas', ->
-        runs -> Joosy.Router.navigate '/base'
-        waits 0
-        runs ->
-          expect(@spies.responder.callCount).toEqual 1
-          expect(@spies.responder.args[0][0]).toEqual @spies.base
-
-      it 'responds namespaced routes', ->
-        runs -> Joosy.Router.navigate '/section/page/1'
-        waits 0
-        runs ->
-          expect(@spies.responder.callCount).toEqual 1
-          expect(@spies.responder.args[0][0]).toEqual @spies.section
-
-      it 'parses query parametrs', ->
-        runs -> Joosy.Router.navigate '/?test=test&foo=bar'
-        waits 0
-        runs ->
-          expect(@spies.responder.callCount).toEqual 1
-          expect(@spies.responder.args[0][0]).toEqual @spies.root
-          expect(@spies.responder.args[0][1]).toEqual {test: 'test', foo: 'bar'}
-
-      it 'parses route placeholders', ->
-        runs -> Joosy.Router.navigate '/section/page/1'
-        waits 0
-        runs ->
-          expect(@spies.responder.callCount).toEqual 1
-          expect(@spies.responder.args[0][0]).toEqual @spies.section
-          expect(@spies.responder.args[0][1]).toEqual {id: '1'}
-
-      it 'ignores restricted routes', ->
-        Joosy.Router.restrict /^base/
+          history.pushState {}, '', pathname
+          waits 0
 
-        runs -> Joosy.Router.navigate '/base'
-        waits 0
-        runs ->
-          expect(@spies.responder.callCount).toEqual 0
+        it 'resets', ->
+          runs -> Joosy.Router.navigate '/page'
+          waits 0
+          runs ->
+            Joosy.Router.reset()
+            Joosy.Router.navigate '/'
+          waits 0
+          runs ->
+            expect(@spies.responder.callCount).toEqual 1
 
-      it 'defaults to wildcard route', ->
-        runs -> Joosy.Router.navigate '/trololo'
-        waits 0
-        runs ->
-          expect(@spies.responder.callCount).toEqual 1
-          expect(@spies.responder.args[0][0]).toEqual @spies.wildcard
+        it 'boots pages', ->
+          runs -> Joosy.Router.navigate '/page'
+          waits 0
+          runs ->
+            expect(@spies.responder.callCount).toEqual 1
+            expect(@spies.responder.args[0][0]).toEqual @Page
 
-      it 'navigates', ->
-        runs -> Joosy.Router.navigate '/base'
-        waits 0
-        runs ->
-          location.pathname == '/base'
-          expect(@spies.responder.callCount).toEqual 1
+        it 'runs lamdas', ->
+          runs -> Joosy.Router.navigate '/base'
+          waits 0
+          runs ->
+            expect(@spies.responder.callCount).toEqual 1
+            expect(@spies.responder.args[0][0]).toEqual @spies.base
 
-      it 'defines plain helper', ->
-        expect(Joosy.Helpers.Routes.rootPath()).toEqual '/'
-        expect(Joosy.Helpers.Routes.rootUrl()).toEqual "http://#{location.host}/"
+        it 'responds namespaced routes', ->
+          runs -> Joosy.Router.navigate '/section/page/1'
+          waits 0
+          runs ->
+            expect(@spies.responder.callCount).toEqual 1
+            expect(@spies.responder.args[0][0]).toEqual @spies.section
 
-      it 'defines namespaced parameterized helpers', ->
-        expect(Joosy.Helpers.Routes.sectionPagePath(id: 1)).toEqual '/section/page/1'
-        expect(Joosy.Helpers.Routes.sectionPageUrl(id: 1)).toEqual "http://#{location.host}/section/page/1"
+        it 'parses query parametrs', ->
+          runs -> Joosy.Router.navigate '/?test=test&foo=bar'
+          waits 0
+          runs ->
+            expect(@spies.responder.callCount).toEqual 1
+            expect(@spies.responder.args[0][0]).toEqual @spies.root
+            expect(@spies.responder.args[0][1]).toEqual {test: 'test', foo: 'bar'}
 
-  for name, val of { html5: true, hash: false }
-    do(name, val) ->
-      describe "#{name} prefix", ->
-        afterEach ->
-          Joosy.Router.reset()
-          location.hash = ''
-          history.pushState {}, '', pathname
+        it 'parses route placeholders', ->
+          runs -> Joosy.Router.navigate '/section/page/1'
           waits 0
+          runs ->
+            expect(@spies.responder.callCount).toEqual 1
+            expect(@spies.responder.args[0][0]).toEqual @spies.section
+            expect(@spies.responder.args[0][1]).toEqual {id: '1'}
 
-        beforeEach ->
-          Joosy.Router.setup {html5: val, prefix: 'admin', hashSuffix: 'admin'}, @spies.responder, false
-          Joosy.Router.map @map
+        it 'ignores restricted routes', ->
+          Joosy.Router.restrict /^base/
 
-        it "is considered in path without prefix", ->
           runs -> Joosy.Router.navigate '/base'
           waits 0
           runs ->
-            expect(@spies.responder.callCount).toEqual 1
-            expect(@spies.responder.args[0][0]).toEqual @spies.base
+            expect(@spies.responder.callCount).toEqual 0
 
-        it "is considered in path with prefix", ->
-          runs -> Joosy.Router.navigate '/admin/base'
+        it 'defaults to wildcard route', ->
+          runs -> Joosy.Router.navigate '/trololo'
           waits 0
           runs ->
             expect(@spies.responder.callCount).toEqual 1
-            expect(@spies.responder.args[0][0]).toEqual @spies.base
+            expect(@spies.responder.args[0][0]).toEqual @spies.wildcard
 
-        it "is considered in root path", ->
-          runs -> Joosy.Router.navigate '/admin'
+        it 'navigates', ->
+          runs -> Joosy.Router.navigate '/base'
           waits 0
           runs ->
+            location.pathname == '/base'
             expect(@spies.responder.callCount).toEqual 1
-            expect(@spies.responder.args[0][0]).toEqual @spies.root
 
+        it 'defines plain helper', ->
+          expect(Joosy.Helpers.Routes.rootPath()).toEqual '/'
+          expect(Joosy.Helpers.Routes.rootUrl()).toEqual "http://#{location.host}/"
+
+        it 'defines namespaced parameterized helpers', ->
+          expect(Joosy.Helpers.Routes.sectionPagePath(id: 1)).toEqual '/section/page/1'
+          expect(Joosy.Helpers.Routes.sectionPageUrl(id: 1)).toEqual "http://#{location.host}/section/page/1"
+
+  for name, val of { html5: true, hash: false }
+    do (name, val) ->
+      if name != 'html5' || history.pushState
+        describe "#{name} prefix", ->
+          afterEach ->
+            Joosy.Router.reset()
+            location.hash = ''
+            history.pushState?({}, '', pathname)
+            waits 0
+
+          beforeEach ->
+            Joosy.Router.setup {html5: val, prefix: 'admin', hashSuffix: 'admin'}, @spies.responder, false
+            Joosy.Router.map @map
+
+          it "is considered in path without prefix", ->
+            runs -> Joosy.Router.navigate '/base'
+            waits 0
+            runs ->
+              expect(@spies.responder.callCount).toEqual 1
+              expect(@spies.responder.args[0][0]).toEqual @spies.base
+
+          it "is considered in path with prefix", ->
+            runs -> Joosy.Router.navigate '/admin/base'
+            waits 0
+            runs ->
+              expect(@spies.responder.callCount).toEqual 1
+              expect(@spies.responder.args[0][0]).toEqual @spies.base
+
+          it "is considered in root path", ->
+            runs -> Joosy.Router.navigate '/admin'
+            waits 0
+            runs ->
+              expect(@spies.responder.callCount).toEqual 1
+              expect(@spies.responder.args[0][0]).toEqual @spies.root
 
   describe 'linker', ->
     it 'defines helper', ->

data/spec/joosy/core/templaters/jst_spec.coffee

@@ -7,8 +7,8 @@ describe "Joosy.Templaters.JST", ->
       window.I18n = {locale: 'en'}
 
     afterEach ->
-      delete window.JST
-      delete window.I18n
+      window.JST = undefined
+      window.I18n = undefined
 
     describe "with empty application name", ->
 

data/spec/joosy/form/form_spec.coffee

@@ -165,7 +165,7 @@ describe "Joosy.Form", ->
       expect(@arrayForm.$fields()[0].value).toEqual 'here'
 
     it "should break cross-references", ->
-      @resource('single')('trololo', @resource)
+      @resource.get('single').get('trololo', @resource)
       @nestedForm.fill @resource
       # expect(you).toBeAlive(), lol
 

data/spec/joosy/resources/array_spec.coffee

@@ -11,14 +11,10 @@ describe 'Joosy.Resources.Array', ->
       expect(@array[1]).toEqual 2
       expect(@array[2]).toEqual 3
 
-    it 'clones', ->
-      clone = @array.clone()
-      clone.push 5
-      clone.unshift 6
-      expect(@array.length).toEqual 3
-      expect(@array[0]).toEqual 1
-      expect(@array[1]).toEqual 2
-      expect(@array[2]).toEqual 3
+    it 'modifies', ->
+      @array.push 4
+      @array.push 5
+      expect(@array.length).toEqual 5
 
     it 'triggers', ->
       spy = sinon.spy()

data/spec/joosy/resources/hash_spec.coffee

@@ -2,40 +2,40 @@ describe "Joosy.Resources.Hash", ->
 
   describe 'in general', ->
     beforeEach ->
-      @hash = new Joosy.Resources.Hash({foo: 'bar', bar: {baz: 'yummy!'}})
+      @hash = Joosy.Resources.Hash.build({foo: 'bar', bar: {baz: 'yummy!'}})
 
     it 'wraps', ->
-      expect(typeof(@hash)).toEqual 'function'
-      expect(@hash 'foo').toEqual 'bar'
-      expect(@hash 'bar').toEqual {baz: 'yummy!'}
-      expect(@hash 'bar.baz').toEqual 'yummy!'
+      expect(typeof(@hash)).toEqual 'object'
+      expect(@hash.get 'foo').toEqual 'bar'
+      expect(@hash.get 'bar').toEqual {baz: 'yummy!'}
+      expect(@hash.get 'bar.baz').toEqual 'yummy!'
 
     it 'sets', ->
-      @hash('bar.baz', 'the ignition')
+      @hash.set('bar.baz', 'the ignition')
       expect(@hash.data.bar.baz).toEqual 'the ignition'
-      expect(@hash 'bar.baz').toEqual 'the ignition'
+      expect(@hash.get 'bar.baz').toEqual 'the ignition'
 
     it 'gets', ->
-      expect(@hash 'foo.bar.baz').toBeUndefined()
+      expect(@hash.get 'foo.bar.baz').toBeUndefined()
       expect(@hash.data.foo.bar).toBeUndefined()
 
     it 'triggers', ->
       spy = sinon.spy()
       @hash.bind 'changed', spy
 
-      @hash 'bar.baz', 'rocking'
+      @hash.set 'bar.baz', 'rocking'
       expect(spy.callCount)
 
   describe 'nested hash', ->
     beforeEach ->
-      @nested = new Joosy.Resources.Hash(trolo: 'lo')
-      @hash   = new Joosy.Resources.Hash({foo: 'bar', bar: @nested})
+      @nested = Joosy.Resources.Hash.build(trolo: 'lo')
+      @hash   = Joosy.Resources.Hash.build({foo: 'bar', bar: @nested})
 
     it 'gets', ->
-      expect(@hash 'bar.trolo').toEqual 'lo'
+      expect(@hash.get 'bar.trolo').toEqual 'lo'
 
     it 'sets', ->
-      @hash 'bar.trolo', 'lolo'
+      @hash.set 'bar.trolo', 'lolo'
       expect(@nested.data.trolo).toEqual 'lolo'
 
   describe 'filters', ->
@@ -45,6 +45,6 @@ describe "Joosy.Resources.Hash", ->
           data.test = true
           data
 
-      hash = new Hash(foo: 'bar')
+      hash = Hash.build(foo: 'bar')
       expect(hash.data.test).toBeTruthy()
-      expect(hash 'test').toBeTruthy()
+      expect(hash.get 'test').toBeTruthy()