joosy 1.0.0.RC4 → 1.0.0.RC5

data/lib/rails/generators/joosy/templates/app/pages/welcome/index.js.coffee

@@ -3,12 +3,12 @@ Joosy.namespace 'Welcome', ->
   class @IndexPage extends ApplicationPage
     @layout ApplicationLayout
     @view   'index'
-    
+
     @afterLoad ->
       @startHeartbeat()
-      @content.css 
+      @content.css
         'padding-top': "#{$(window).height() / 2 - 160}px"
-    
+
     elements:
       content: '#content'
       joosy:   '.joosy'
@@ -16,7 +16,7 @@ Joosy.namespace 'Welcome', ->
     events:
       'mouseover $joosy': -> clearInterval @heartbeat
       'mouseout $joosy': 'startHeartbeat'
-      
+
     startHeartbeat: ->
       @heartbeat = @setInterval 1500, =>
-        @joosy.animate({opacity: 0.8}, 300).animate({opacity: 1}, 300)
+        @joosy.animate({opacity: 0.8}, 300).animate({opacity: 1}, 300)

data/lib/rails/generators/joosy/templates/app/routes.js.coffee

@@ -3,6 +3,6 @@ Joosy.Router.map
   '/'             : Welcome.IndexPage
 # '/resources'    :
 #   '/'           : Resource.IndexPage
+#   '/new'        : Resource.NewPage
 #   '/:id'        : Resource.ShowPage
-#   '/:id/edit'   : Resource.EditPage
-#   '/new'        : Resource.EditPage
+#   '/:id/edit'   : Resource.EditPage

data/lib/rails/generators/joosy/templates/preload.html.slim

@@ -0,0 +1,19 @@
+doctype html
+html
+  head
+    title = file_path
+
+    :javascript
+      window.joosy = {
+        libraries: #{extract_sources_and_sizes_from_include_tag('<%= file_path %>')}
+      };
+
+    = stylesheet_link_tag 'application'
+    = csrf_meta_tags
+
+  body
+    = javascript_include_tag '<%= file_path %>_preloader'
+    #application
+      #preloader
+        Loading application...
+        span#percents 0%

data/lib/rails/resources_with_joosy.rb

@@ -3,8 +3,8 @@ require 'action_dispatch/routing/mapper'
 module ActionDispatch::Routing::Mapper::Resources
   def resources_with_joosy(*resources, &block)
     resources_without_joosy(*resources, &block).tap do
-      namespace = Joosy::Rails::Engine.resources[@scope[:module]] ||= {}
-      namespace[resources[0].to_s.singularize] = "#{@scope[:shallow_path]}/#{resources[0]}"
+      namespace = Joosy::Rails::Engine.resources[@scope[:module].to_s] ||= {}
+      namespace[resources[0].to_s.singularize] = "#{@scope[:path]}/#{resources[0]}"
     end
   end
   alias_method_chain :resources, :joosy

data/spec/javascripts/helpers/spec_helper.js.coffee

@@ -45,5 +45,24 @@ beforeEach ->
             return false
       return true
 
+    toBeTag: (tagName, content, attrs) ->
+      @message = =>
+        "Expected #{@actual} to be a tag #{tagName} with attributes #{JSON.stringify attrs} and content #{content}"
+
+      tag = $ @actual
+      flag = true
+
+      flag = flag && tag.length == 1
+      flag = flag && tag[0].nodeName == tagName.toUpperCase()
+      if content != false
+        flag = flag && tag.html() == content
+
+      for name, val of attrs
+        flag = flag && !!(if val.constructor == RegExp then tag.attr(name).match(val) else tag.attr(name) == val)
+
+      flag = flag && tag[0].attributes.length == Object.keys(attrs).length
+
+      flag
+
 afterEach ->
   @ground.remove() unless @polluteGround

data/spec/javascripts/joosy/core/form_spec.js.coffee

@@ -3,30 +3,34 @@ describe "Joosy.Form", ->
   beforeEach ->
     @server = sinon.fakeServer.create()
     @seedGround()
-    @nudeForm = "<form id='nude'><input name='test[foo]'/><input name='test[bar]'/><input name='test[bool]' type='checkbox' value='1'/></form>"
+    @nudeForm = "<form id='nude'><input name='test[foo]'/><input name='test[bar]'/><input name='test[bool]' type='checkbox' value='1'/><input name='test[set]' type='radio' value='qwe' /><input name='test[set]' type='radio' value='zxc' /></form>"
     @putForm  = "<form id='put' method='put'><input name='test[camel_baz]'/></form>"
     @moreForm = "<form id='more' method='put'><input name='test[ololo]'/></form>"
     @nestedForm = "<form id='nested'><input name='test[zee][capped][test]'/><input name='test[items_attributes][0][attr]'/><input name='test[items_attributes][1][attr]'/><input name='test[single_attributes][0][attr]'/></form>"
     @exactForm = "<form id='exact'><input name='test[EXact][MATCH]'/></form>"
+    @arrayForm = "<form id='array'><input name='test[arr][1][0][1]'/></form>"
 
-    @ground.find('#sidebar').after(@nudeForm).after(@putForm).after(@moreForm).after(@nestedForm).after(@exactForm)
+    @ground.find('#sidebar').after(@nudeForm).after(@putForm).after(@moreForm).after(@nestedForm).after(@exactForm).after(@arrayForm)
 
     @nudeForm = $('#nude')
     @putForm  = $('#put')
     @moreForm = $('#more')
     @nestedForm = $('#nested')
     @exactForm = $('#exact')
+    @arrayForm = $('#array')
 
     class Test extends Joosy.Resource.REST
       @entity 'test'
     @Test = Test
 
     @resource = Test.build
+      arr: [null, [[null, 'here']]]
       id: 1,
       foo: 'foo',
       bar: 'bar'
       camelBaz: 'baz'
       bool: true
+      set: 'zxc'
       zee:
         capped:
           test: 'test'
@@ -50,7 +54,7 @@ describe "Joosy.Form", ->
       formWithProperties = new Joosy.Form @nudeForm, invalidationClass: 'fluffy'
       expect(formWithProperties.container).toEqual @nudeForm
       expect(formWithProperties.invalidationClass).toEqual 'fluffy'
-      expect(formWithProperties.fields.length).toEqual 3
+      expect(formWithProperties.fields.length).toEqual 5
 
       expect(@spy.callCount).toEqual 1
 
@@ -78,6 +82,7 @@ describe "Joosy.Form", ->
       @moreForm   = new Joosy.Form @moreForm
       @nestedForm = new Joosy.Form @nestedForm
       @exactForm  = new Joosy.Form @exactForm
+      @arrayForm  = new Joosy.Form @arrayForm
 
     it "should fill form, set proper action and method and store resource", ->
       @nudeForm.fill @resource
@@ -85,6 +90,10 @@ describe "Joosy.Form", ->
       expect(@nudeForm.fields[1].value).toEqual 'bar'
       expect(@nudeForm.fields[2].checked).toEqual true
       expect(@nudeForm.fields[2].value).toEqual '1'
+      expect(@nudeForm.fields[3].value).toEqual 'qwe'
+      expect(@nudeForm.fields[3].checked).toEqual false
+      expect(@nudeForm.fields[4].value).toEqual 'zxc'
+      expect(@nudeForm.fields[4].checked).toEqual true
       expect(@nudeForm.container.attr('method').toLowerCase()).toEqual 'post'
       expect(@nudeForm.container.attr 'action').toEqual '/tests/1'
       expect(@nudeForm.__resource).toEqual @resource
@@ -100,14 +109,14 @@ describe "Joosy.Form", ->
       expect(@exactForm.fields[0].value).toEqual 'works'
 
     it "should fill form with decorator", ->
-      @moreForm.fill @resource, 
+      @moreForm.fill @resource,
         decorator: (e) ->
           e.ololo = e.camelBaz
           e
       expect(@moreForm.fields[0].value).toEqual 'baz'
 
     it "should fill form with extended action", ->
-      @nudeForm.fill @resource, 
+      @nudeForm.fill @resource,
         action: @resource.memberPath(from: 'calculate')
       expect(@nudeForm.fields[0].value).toEqual 'foo'
       expect(@nudeForm.fields[1].value).toEqual 'bar'
@@ -115,7 +124,7 @@ describe "Joosy.Form", ->
 
       resource = @Test.build 'someId'
 
-      @nudeForm.fill resource, 
+      @nudeForm.fill resource,
         action: resource.memberPath(from: 'calculate')
       expect(@nudeForm.container.attr 'action').toEqual '/tests/someId/calculate'
 
@@ -141,6 +150,10 @@ describe "Joosy.Form", ->
       expect(@nestedForm.fields[2].value).toEqual 'two'
       expect(@nestedForm.fields[3].value).toEqual 'sin'
 
+    it 'should fill array-like attributes', ->
+      @arrayForm.fill @resource
+      expect(@arrayForm.fields[0].value).toEqual 'here'
+
     it "should break cross-references", ->
       @resource('single')('trololo', @resource)
       @nestedForm.fill @resource
@@ -204,41 +217,48 @@ describe "Joosy.Form", ->
       @nudeForm.container.submit()
       expect($(@nudeForm.fields[0]).attr 'class').toEqual 'field_with_errors'
       expect(@nudeForm.before.callCount).toEqual 1
-      
+
   describe "Error response handling", ->
-    
+
     beforeEach ->
       @nudeForm = new Joosy.Form @nudeForm, @spy=sinon.spy()
-    
+
     it "should prepare simple response", ->
       errors = {zombie: ['suck'], puppies: ['rock']}
       result = @nudeForm.__stringifyErrors(errors)
-      
+
       expect(result).toEqual zombie: ['suck'], puppies: ['rock']
-      
+
     it "should prepare inline response", ->
       errors = {"zombie.in1.subin1": ['suck'], "zombie.in2": ['rock']}
       result = @nudeForm.__stringifyErrors(errors)
-      
+
       expect(result).toEqual {"zombie[in1][subin1]": ['suck'], "zombie[in2]": ['rock']}
-      
+
     it "should prepare inline response with resource attached", ->
       @nudeForm.fill @resource
       errors = {"zombie.in1.subin1": ['suck'], "zombie.in2": ['rock']}
       result = @nudeForm.__stringifyErrors(errors)
 
       expect(result).toEqual {"test[zombie][in1][subin1]": ['suck'], "test[zombie][in2]": ['rock']}
-      
+
     it "should prepare simple response with resource attached", ->
       @nudeForm.fill @resource
       errors = {zombie: ['suck'], puppies: ['rock']}
       result = @nudeForm.__stringifyErrors(errors)
 
       expect(result).toEqual { "test[zombie]": ['suck'], "test[puppies]": ['rock'] }
-      
+
     it "should prepare complexe response", ->
       @nudeForm.fill @resource
       errors = {fluffies: {zombie: {mumbas: ['ololo']}}}
       result = @nudeForm.__stringifyErrors(errors)
 
-      expect(result).toEqual { "fluffies[zombie][mumbas]": ['ololo'] }
+      expect(result).toEqual { "fluffies[zombie][mumbas]": ['ololo'] }
+
+    it "should prepare nested response", ->
+      @nestedForm = new Joosy.Form @nestedForm
+      @nestedForm.fill @resource
+      errors = {test: {items_attributes: [{attr: ['first']}, {attr: ['second']}]}}
+      result = @nestedForm.__stringifyErrors(errors)
+      expect(result).toEqual { "test[items_attributes][0][attr]": ['first'], "test[items_attributes][1][attr]": ['second'] }

data/spec/javascripts/joosy/core/helpers/forms_spec.js.coffee

@@ -1,23 +1,4 @@
 describe "Joosy.Helpers.Form", ->
-  beforeEach ->
-    @addMatchers toBeTag: (tagName, content, attrs) ->
-      @message = =>
-        "Expected #{@actual} to be a tag #{tagName} with attributes #{JSON.stringify attrs} and content #{content}"
-
-      tag = $ @actual
-      flag = true
-
-      flag = flag && tag.length == 1
-      flag = flag && tag[0].nodeName == tagName.toUpperCase()
-      flag = flag && tag.html() == content
-
-      for name, val of attrs
-        flag = flag && tag.attr(name) == val
-
-      flag = flag && tag[0].attributes.length == Object.keys(attrs).length
-
-      flag
-
   class Test extends Joosy.Resource.Generic
     @entity 'test'
 
@@ -34,6 +15,7 @@ describe "Joosy.Helpers.Form", ->
       expect(h.textField 'a', '[b][c]', {a: 'b'}).toBeTag 'input', '', id: 'a_b_c', name: 'a[b][c]', a: 'b', type: 'text'
 
     it "renders label", ->
+      expect(h.label 'a', 'b', 'test').toBeTag 'label', 'test', for: 'a_b'
       expect(h.label 'a', 'b', {a: 'b'}, 'test').toBeTag 'label', 'test', for: 'a_b', a: 'b'
 
     it "renders checkBox", ->
@@ -43,11 +25,26 @@ describe "Joosy.Helpers.Form", ->
       expect(tags[1]).toBeTag 'input', '', value: '1', id: 'a_b', name: 'a[b]', type: 'checkbox', a: 'b'
 
     it "renders radioButton", ->
-      expect(h.radioButton 'a', 'b', 'test', {a: 'b'}).toBeTag 'input', '', value: 'test', id: 'a_b', name: 'a[b]', type: 'radio', a: 'b'
+      expect(h.radioButton 'a', 'b', 'test', {a: 'b'}).toBeTag 'input', '', value: 'test', id: 'a_b_test', name: 'a[b]', type: 'radio', a: 'b'
 
     it "renders textArea", ->
       expect(h.textArea 'a', 'b', {a: 'b', value: 'foo'}).toBeTag 'textarea', 'foo', id: 'a_b', name: 'a[b]', a: 'b'
 
+    it "renders select with options object", ->
+      expect(tag = h.select 'a', 'b', {a: 'b', c: 'd'}, {a: 'b', value: 'c', includeBlank: true}).toBeTag 'select', false, id: 'a_b', name: 'a[b]', a: 'b'
+      opts = $ $(tag).html()
+      expect(opts.length).toEqual 3
+      expect(opts[0]).toBeTag 'option', '', value: ''
+      expect(opts[1]).toBeTag 'option', 'b', value: 'a'
+      expect(opts[2]).toBeTag 'option', 'd', value: 'c', selected: 'selected'
+
+    it "renders select with options array", ->
+      expect(tag = h.select 'a', 'b', [['b', 'a'], ['d', 'c']], {a: 'b'}).toBeTag 'select', false, id: 'a_b', name: 'a[b]', a: 'b'
+      opts = $ $(tag).html()
+      expect(opts.length).toEqual 2
+      expect(opts[0]).toBeTag 'option', 'b', value: 'a'
+      expect(opts[1]).toBeTag 'option', 'd', value: 'c'
+
     it "renders formFor", ->
       callback = sinon.spy()
       expect(h.formFor resource, callback).toMatch /<form id=".*"><\/form>/
@@ -64,6 +61,7 @@ describe "Joosy.Helpers.Form", ->
         expect(form["#{type}Field"] 'b', {a: 'b'}).toBeTag 'input', '', id: 'test_b', name: 'test[b]', a: 'b', type: type
 
     it "renders label", ->
+      expect(form.label 'b', 'test').toBeTag 'label', 'test', for: 'test_b'
       expect(form.label 'b', {a: 'b'}, 'test').toBeTag 'label', 'test', for: 'test_b', a: 'b'
 
     it "renders checkBox", ->
@@ -73,11 +71,14 @@ describe "Joosy.Helpers.Form", ->
       expect(tags[1]).toBeTag 'input', '', value: '1', id: 'test_b', name: 'test[b]', type: 'checkbox', a: 'b'
 
     it "renders radioButton", ->
-      expect(form.radioButton 'b', 'test', {a: 'b'}).toBeTag 'input', '', value: 'test', id: 'test_b', name: 'test[b]', type: 'radio', a: 'b'
+      expect(form.radioButton 'b', 'test', {a: 'b'}).toBeTag 'input', '', value: 'test', id: 'test_b_test', name: 'test[b]', type: 'radio', a: 'b'
 
     it "renders textArea", ->
       expect(form.textArea 'b', {a: 'b', value: 'foo'}).toBeTag 'textarea', 'foo', id: 'test_b', name: 'test[b]', a: 'b'
 
+    it "renders select", ->
+      expect(form.select 'b', {a: 'b', c: 'd'}, {a: 'b'}).toBeTag 'select', false, id: 'test_b', name: 'test[b]', a: 'b'
+
   describe "resource with extendIds", ->
     callback = sinon.spy()
     h.formFor(resource, extendIds: true, callback)
@@ -88,6 +89,7 @@ describe "Joosy.Helpers.Form", ->
         expect(form["#{type}Field"] 'b', {a: 'b'}).toBeTag 'input', '', id: 'test_1_b', name: 'test[b]', a: 'b', type: type
 
     it "renders label", ->
+      expect(form.label 'b', 'test').toBeTag 'label', 'test', for: 'test_1_b'
       expect(form.label 'b', {a: 'b'}, 'test').toBeTag 'label', 'test', for: 'test_1_b', a: 'b'
 
     it "renders checkBox", ->
@@ -97,7 +99,10 @@ describe "Joosy.Helpers.Form", ->
       expect(tags[1]).toBeTag 'input', '', value: '1', id: 'test_1_b', name: 'test[b]', type: 'checkbox', a: 'b'
 
     it "renders radioButton", ->
-      expect(form.radioButton 'b', 'test', {a: 'b'}).toBeTag 'input', '', value: 'test', id: 'test_1_b', name: 'test[b]', type: 'radio', a: 'b'
+      expect(form.radioButton 'b', 'test', {a: 'b'}).toBeTag 'input', '', value: 'test', id: 'test_1_b_test', name: 'test[b]', type: 'radio', a: 'b'
 
     it "renders textArea", ->
-      expect(form.textArea 'b', {a: 'b', value: 'foo'}).toBeTag 'textarea', 'foo', id: 'test_1_b', name: 'test[b]', a: 'b'
+      expect(form.textArea 'b', {a: 'b', value: 'foo'}).toBeTag 'textarea', 'foo', id: 'test_1_b', name: 'test[b]', a: 'b'
+
+    it "renders select", ->
+      expect(form.select 'b', {a: 'b', c: 'd'}, {a: 'b'}).toBeTag 'select', false, id: 'test_1_b', name: 'test[b]', a: 'b'

data/spec/javascripts/joosy/core/helpers/widgets_spec.js.coffee

@@ -0,0 +1,17 @@
+describe "Joosy.Helpers.Widgets", ->
+
+  h = Joosy.Helpers.Application
+
+  beforeEach ->
+    h.onRefresh = sinon.spy()
+
+  afterEach ->
+    delete h.onRefresh
+
+  it "renders widget tag", ->
+    expect(h.widget 'div', (->)).toBeTag 'div', '', id: /\S{36}/
+    expect(h.onRefresh.callCount).toEqual 1
+
+  it "renders widget tag with given classes", ->
+    expect(h.widget 'div.class1.class2', (->)).toBeTag 'div', '', id: /\S{36}/, class: 'class1 class2'
+    expect(h.onRefresh.callCount).toEqual 1

data/spec/javascripts/joosy/core/joosy_spec.js.coffee

@@ -76,9 +76,11 @@ describe "Joosy", ->
     Joosy.defineResource 'foo', '', container
     expect(Object.isFunction container.Foo).toBeTruthy()
     expect(Object.isFunction container.FoosCollection).toBeTruthy()
+    expect(container.Foo::__collection()).toEqual container.FoosCollection
     Joosy.defineResource 'boo'
     expect(Object.isFunction Boo).toBeTruthy()
     expect(Object.isFunction BoosCollection).toBeTruthy()
+    expect(Boo::__collection()).toEqual BoosCollection
 
   it "should define resource", ->
     window.Defined = 'this'

data/spec/javascripts/joosy/core/modules/events_spec.js.coffee

@@ -11,7 +11,7 @@ describe "Joosy.Modules.Events", ->
   it "should run callback once when the all listed events have occurred", ->
     callback = sinon.spy()
 
-    @box.wait 'events   list', callback
+    @box.wait '  events   list ', callback
 
     @box.trigger 'events'
     expect(callback.callCount).toEqual 0
@@ -23,6 +23,15 @@ describe "Joosy.Modules.Events", ->
     @box.trigger 'list'
     expect(callback.callCount).toEqual 1
 
+    expect(=> @box.wait '', callback).toThrow()
+    expect(callback.callCount).toEqual 1
+
+    expect(=> @box.wait '    ', callback).toThrow()
+    expect(callback.callCount).toEqual 1
+
+    expect(=> @box.wait [], callback).toThrow()
+    expect(callback.callCount).toEqual 1
+
   it "should allow for binding and unbinding to events", ->
     callback = sinon.spy()
 
@@ -64,3 +73,28 @@ describe "Joosy.Modules.Events", ->
           expect(-> done()).not.toThrow()
         , 2
     waits 3
+
+  it "should call finalizer", ->
+    callback = sinon.spy()
+
+    Joosy.synchronize (context) ->
+      context.do (done) ->
+        callback()
+        done()
+      context.after ->
+        expect(callback.callCount).toEqual 1
+        callback()
+
+    waits 1
+    expect(callback.callCount).toEqual 2
+
+  it "should call finalizer even if context.do hasn't been called", ->
+    callback = sinon.spy()
+
+    Joosy.synchronize (context) ->
+      context.after ->
+        expect(callback.callCount).toEqual 0
+        callback()
+
+    waits 1
+    expect(callback.callCount).toEqual 1

data/spec/javascripts/joosy/core/modules/renderer_spec.js.coffee

@@ -37,21 +37,21 @@ describe "Joosy.Modules.Renderer", ->
     @dummyObject.update "new"
 
     waits 0
-      
+
     runs ->
       expect(elem.text()).toBe "new"
-    
+
     waits 0
-    
+
     runs ->
       @dummyContainer.__removeMetamorphs()
       @dummyObject.update "afterwards"
-    
+
     waits 0
-    
+
     runs ->
       expect(elem.text()).toBe "new"
-    
+
   it "renders resources and keep html up2date", ->
     data = Joosy.Resource.Generic.build zombie: 'rock'
 
@@ -62,18 +62,18 @@ describe "Joosy.Modules.Renderer", ->
 
     elem = $("<div></div>")
     @ground.append elem
-  
+
     elem.html @dummyContainer.__renderer(data)
-    
+
     waits 0
 
-    runs -> 
+    runs ->
       expect(elem.text()).toBe "rock"
-    
+
     runs ->
       data 'zombie', 'suck'
-    
-    waits 0 
+
+    waits 0
 
     runs ->
       expect(elem.text()).toBe "suck"
@@ -83,7 +83,7 @@ describe "Joosy.Modules.Renderer", ->
       @entity 'foo'
 
     data = new Joosy.Resource.Collection(Foo)
-    
+
     data.load [
         { zombie: 'rock' },
         { zombie: 'never sleep' }
@@ -101,14 +101,14 @@ describe "Joosy.Modules.Renderer", ->
 
     waits 0
 
-    runs -> 
+    runs ->
       expect(elem.text()).toBe "never sleep"
 
     runs ->
       data.data[1] 'zombie', 'suck'
-    
-    waits 0 
-    
+
+    waits 0
+
     runs ->
       expect(elem.text()).toBe "suck"
 
@@ -116,33 +116,33 @@ describe "Joosy.Modules.Renderer", ->
   it "debounces morpher updates", ->
     @TestContainer.view (locals) ->
       template = -> @object.value
-  
+
       @renderDynamic(template, locals)
-  
+
     elem = $("<div></div>")
     @ground.append elem
-    
+
     sinon.spy window, 'Metamorph'
-  
+
     elem.html @dummyContainer.__renderer({ object: @dummyObject })
     expect(elem.text()).toBe "initial"
-    
+
     updater = sinon.spy window.Metamorph.returnValues[0], 'html'
-  
+
     @dummyObject.update "new"
-    
+
     waits 0
-    
+
     runs ->
       expect(elem.text()).toBe "new"
       expect(updater.callCount).toEqual 1
-      
+
     runs ->
       @dummyObject.update "don't make"
       @dummyObject.update "me evil"
-    
+
     waits 0
-    
+
     runs ->
       expect(elem.text()).toBe "me evil"
       expect(updater.callCount).toEqual 2
@@ -194,4 +194,4 @@ describe "Joosy.Modules.Renderer", ->
     box.__renderer({ })
     box.refreshElements()
 
-    expect(callback.callCount).toEqual 1
+    expect(callback.callCount).toEqual 1

data/spec/javascripts/joosy/core/page_spec.js.coffee

@@ -163,7 +163,7 @@ describe "Joosy.Page", ->
 
       it "should render layout and page", ->
         spies = []
-        
+
         @box.params = {tested: true}
 
         spies.push @box.__layoutClass.prototype.__renderer
@@ -175,4 +175,4 @@ describe "Joosy.Page", ->
         @box.__bootstrapLayout()
         expect(spies).toBeSequenced()
         expect(swapContainer.callCount).toEqual 2
-        expect(@box.layout.params).toEqual {tested: true}
+        expect(@box.layout.params).toEqual {tested: true}

data/spec/javascripts/joosy/core/resource/collection_spec.js.coffee

@@ -25,7 +25,7 @@ describe "Joosy.Resource.Collection", ->
   it "should load", ->
     @collection.load $.parseJSON(data)
     checkData @collection
-  
+
   it "should trigger changes", ->
     @collection.bind 'changed', callback = sinon.spy()
     @collection.load $.parseJSON(data)
@@ -42,7 +42,7 @@ describe "Joosy.Resource.Collection", ->
         data.each (entry, i) ->
           data[i].tested = true
         data
-      
+
     collection = new RC(Test)
     collection.load $.parseJSON(data)
 
@@ -65,20 +65,25 @@ describe "Joosy.Resource.Collection", ->
     @collection.remove 0, false
     expect(@collection.data.length).toEqual 0
     expect(callback.callCount).toEqual 0
-    
-  it "should add item from collection", ->
+
+  it "should add item to collection", ->
     @collection.load $.parseJSON(data)
     @collection.bind 'changed', callback = sinon.spy()
     @collection.add new Test {'rocking': 'mocking'}
     expect(@collection.data.length).toEqual 3
     expect(@collection.at(2).data).toEqual {'rocking': 'mocking'}
-    @collection.add new Test({'rocking': 'mocking'}), 1
+    @collection.add new Test({'happy': 'stubbing'}), 0
     expect(@collection.data.length).toEqual 4
-    expect(@collection.at(1).data).toEqual {'rocking': 'mocking'}
+    expect(@collection.at(0).data).toEqual {'happy': 'stubbing'}
     expect(@collection.at(3).data).toEqual {'rocking': 'mocking'}
-    
+    @collection.add new Test({'nerdy': 'coding'}), 1
+    expect(@collection.data.length).toEqual 5
+    expect(@collection.at(0).data).toEqual {'happy': 'stubbing'}
+    expect(@collection.at(1).data).toEqual {'nerdy': 'coding'}
+    expect(@collection.at(4).data).toEqual {'rocking': 'mocking'}
+
   it "should find items by id", ->
     @collection.load $.parseJSON(data)
-    
+
     expect(@collection.findById 1).toEqual @collection.data[0]
-    expect(@collection.findById 2).toEqual @collection.data[1]
+    expect(@collection.findById 2).toEqual @collection.data[1]