joosy 1.2.0.alpha.73 → 1.2.0.beta.1

data/spec/joosy/core/router_spec.coffee

@@ -89,9 +89,9 @@ describe "Joosy.Router", ->
       Joosy.Router.compileRoute '/such/a/long/long/url/:with/:plenty/:of/:params', '123'
 
       expect(Joosy.Router.routes['^/?such/a/long/long/url/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$']).toEqual
-          capture: ['with', 'plenty', 'of', 'params']
-          to: '123'
-          as: undefined
+        capture: ['with', 'plenty', 'of', 'params']
+        to: '123'
+        as: undefined
 
     it 'compiles aliased route', ->
       Joosy.Router.compileRoute '/such/a/long/long/url/:with/:plenty/:of/:params', '456', '123'

data/spec/joosy/core/widget_spec.coffee

@@ -12,7 +12,7 @@ describe "Joosy.Widget", ->
 
       for instance in entries
         for filter in ['paint', 'beforePaint', 'erase', 'fetch']
-          spies[instance+'/'+filter] = sinon.spy()
+          spies[instance + '/' + filter] = sinon.spy()
 
       class @A extends Joosy.Widget
         @view """
@@ -55,8 +55,8 @@ describe "Joosy.Widget", ->
         sinon.spy @[instance], '__load'
         sinon.spy @[instance], '__unload'
 
-      @nestingMap = 
-        '#content': 
+      @nestingMap =
+        '#content':
           instance: @b
           nested:
             '#subcontent': {instance: @d}
@@ -79,7 +79,7 @@ describe "Joosy.Widget", ->
 
       @c.__bootstrap null, {}, $('#content', @$ground)
 
-      ['paint', 'beforePaint'].each (filter) =>
+      for filter in ['paint', 'beforePaint']
         expect(@spies["a/#{filter}"].callCount).toEqual 1
         expect(@spies["b/#{filter}"].callCount).toEqual 0
         expect(@spies["c/#{filter}"].callCount).toEqual 1
@@ -219,7 +219,7 @@ describe "Joosy.Widget", ->
       class @F extends Joosy.Widget
         @view "F"
 
-      ['a', 'b', 'c', 'd', 'e', 'f'].each (instance) =>
+      for instance in ['a', 'b', 'c', 'd', 'e', 'f']
         @[instance] = new @[instance.toUpperCase()] 'params'
 
       @nestingMap =
@@ -333,7 +333,7 @@ describe "Joosy.Widget", ->
           @A.fetch (complete) -> setTimeout complete, 100
 
           @C.fetch (complete) -> setTimeout complete, 0
-          @C.independent()          
+          @C.independent()
 
           runs ->
             @a.__bootstrap null, @nestingMap, @$ground

data/spec/joosy/environments/amd_spec.coffee

@@ -16,13 +16,14 @@ describe "Joosy", ->
     runs ->
       requirejs ['joosy/module'], (module) ->
         result = true
-        expect(Object.isFunction module.hasAncestor).toBeTruthy()
+        expect(typeof(module.hasAncestor) == 'function').toBeTruthy()
 
     waitsFor (-> result), 'Unable to download Joosy', 1000
 
   it "registers internal components as modules", ->
-    expect(Object.keys(require.s.contexts._.registry).sortBy()).toEqual [
+    expect(Object.keys(require.s.contexts._.registry).sort()).toEqual [
       'joosy/application',
+      'joosy/form',
       'joosy/layout',
       'joosy/modules/dom',
       'joosy/modules/events',
@@ -34,6 +35,7 @@ describe "Joosy", ->
       'joosy/page',
       'joosy/resources/array',
       'joosy/resources/hash',
+      'joosy/resources/rest',
       'joosy/resources/scalar',
       'joosy/router',
       'joosy/templaters/jst',

data/spec/joosy/environments/global_spec.coffee

@@ -18,4 +18,4 @@ describe "Joosy", ->
     waitsFor (-> result), 'Unable to download Joosy', 1000
 
     runs ->
-      expect(Object.keys ghetto).toEqual ['Joosy', 'Metamorph']
+      expect(Object.keys ghetto).toEqual ['inflection', 'Joosy', 'Metamorph']

data/spec/joosy/{extensions/form → form}/form_spec.coffee

@@ -1,8 +1,6 @@
 describe "Joosy.Form", ->
 
   beforeEach ->
-    Joosy.Resources.Base?.resetIdentity()
-
     @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'/><input name='test[set]' type='radio' value='qwe' /><input name='test[set]' type='radio' value='zxc' /></form>"
@@ -78,8 +76,7 @@ describe "Joosy.Form", ->
 
     it "should not stack _method inputs", ->
       form   = new Joosy.Form @putForm
-      3.times =>
-        form.fill @resource
+      form.fill @resource for i in [1..3]
       marker = @putForm.find "input[name=_method]"
       expect(marker.length).toEqual 1
       expect(marker.attr 'value').toEqual 'PUT'
@@ -135,7 +132,7 @@ describe "Joosy.Form", ->
       expect(@nudeForm.$fields()[1].value).toEqual 'bar'
       expect(@nudeForm.$container.attr 'action').toEqual '/tests/1/calculate'
 
-      resource = @Test.build 'someId'
+      resource = @Test.build id: 'someId'
 
       @nudeForm.fill resource,
         action: resource.memberPath(action: 'calculate')
@@ -188,15 +185,13 @@ describe "Joosy.Form", ->
 
       it 'should allow multiple submit', ->
         @nudeForm = new Joosy.Form @nudeForm
-        3.times =>
-          @nudeForm.$container.submit()
+        @nudeForm.$container.submit() for i in [1..3]
         expect(@requests.length).toEqual 3
 
       it 'should optionally prevent multiple submit', ->
         @nudeForm = new Joosy.Form @nudeForm, debounce: true
-        [200, 404, 500].each (code) =>
-          3.times =>
-            @nudeForm.$container.submit()
+        for code in [200, 404, 500]
+          @nudeForm.$container.submit() for i in [1..3]
           expect(@requests.length).toEqual 1
           @requests[0].respond(code, {}, '{}')
           expect(@requests.length).toEqual 1
@@ -212,14 +207,12 @@ describe "Joosy.Form", ->
 
       it 'should optionally allow multiple submit', ->
         @nudeForm = new Joosy.Form @nudeForm, debounce: false
-        3.times =>
-          @nudeForm.$container.submit()
+        @nudeForm.$container.submit() for i in [1..3]
         expect(@requests.length).toEqual 3
 
       it 'should prevent multiple submit', ->
         @nudeForm = new Joosy.Form @nudeForm
-        3.times =>
-          @nudeForm.$container.submit()
+        @nudeForm.$container.submit() for i in [1..3]
         expect(@requests.length).toEqual 1
 
   describe "Callbacks", ->
@@ -228,11 +221,11 @@ describe "Joosy.Form", ->
       @nudeForm = new Joosy.Form @nudeForm, @spy=sinon.spy()
       @nudeForm.fill @resource
       @nudeForm.$container.submit()
-      @target = @server.requests.last()
+      @target = @server.requests[@server.requests.length-1]
 
     it "should trigger 'success'", ->
       expect(@target.method).toEqual 'POST'
-      expect(@target.url.endsWith '/tests/1').toEqual true
+      expect(@target.url.match /\/tests\/1$/).toBeTruthy()
       @target.respond 200, 'Content-Type': 'application/json', '{"form": "works"}'
       expect(@spy.callCount).toEqual 1
       expect(@spy.args[0][0]).toEqual {form: 'works'}

data/spec/joosy/{extensions/form → form}/helpers/forms_spec.coffee

@@ -1,12 +1,12 @@
 describe "Joosy.Helpers.Form", ->
-  class Test extends Joosy.Resources.Base
+  class Test extends Joosy.Resources.REST
     @entity 'test'
 
   h = Joosy.Helpers.Application
-  resource = Test.build 1
+  resource = Test.build id: 1
 
   describe "simple", ->
-    ['text', 'file', 'hidden', 'password'].each (type) =>
+    for type in ['text', 'file', 'hidden', 'password']
       it "renders #{type}Field", ->
         expect(h["#{type}Field"] 'a', 'b', {a: 'b'}).toBeTag 'input', '', id: 'a_b', name: 'a[b]', a: 'b', type: type
 
@@ -56,7 +56,7 @@ describe "Joosy.Helpers.Form", ->
     h.formFor(resource, callback)
     form = callback.args[0][0]
 
-    ['text', 'file', 'hidden', 'password'].each (type) =>
+    for type in ['text', 'file', 'hidden', 'password']
       it "renders #{type}Field", ->
         expect(form["#{type}Field"] 'b', {a: 'b'}).toBeTag 'input', '', id: 'test_b', name: 'test[b]', a: 'b', type: type
 
@@ -84,7 +84,7 @@ describe "Joosy.Helpers.Form", ->
     h.formFor(resource, extendIds: true, callback)
     form = callback.args[0][0]
 
-    ['text', 'file', 'hidden', 'password'].each (type) =>
+    for type in ['text', 'file', 'hidden', 'password']
       it "renders #{type}Field", ->
         expect(form["#{type}Field"] 'b', {a: 'b'}).toBeTag 'input', '', id: 'test_1_b', name: 'test[b]', a: 'b', type: type
 

data/spec/joosy/{core/resources → resources}/array_spec.coffee

@@ -1,4 +1,4 @@
-describe "Joosy.Resources.Array", ->
+describe 'Joosy.Resources.Array', ->
 
   describe 'in general', ->
     beforeEach ->
@@ -18,7 +18,7 @@ describe "Joosy.Resources.Array", ->
       expect(@array.length).toEqual 3
       expect(@array[0]).toEqual 1
       expect(@array[1]).toEqual 2
-      expect(@array[2]).toEqual 3      
+      expect(@array[2]).toEqual 3
 
     it 'triggers', ->
       spy = sinon.spy()

data/spec/joosy/{core/resources → resources}/hash_spec.coffee

@@ -10,14 +10,6 @@ describe "Joosy.Resources.Hash", ->
       expect(@hash 'bar').toEqual {baz: 'yummy!'}
       expect(@hash 'bar.baz').toEqual 'yummy!'
 
-    it 'clones', ->
-      clone = @hash.clone()
-      clone.data.foo = 'new'
-      clone('bar', 'new as well')
-      expect(@hash 'foo').toEqual 'bar'
-      expect(@hash 'bar').toEqual {baz: 'yummy!'}
-      expect(@hash 'bar.baz').toEqual 'yummy!'
-
     it 'sets', ->
       @hash('bar.baz', 'the ignition')
       expect(@hash.data.bar.baz).toEqual 'the ignition'

data/spec/joosy/resources/modules/identity_map_spec.coffee

@@ -0,0 +1,47 @@
+describe "Joosy.Modules.Resources.IdentityMap", ->
+
+  class Model extends Joosy.Resources.Hash
+    @include Joosy.Modules.Resources.Model
+    @extend  Joosy.Modules.Resources.IdentityMap
+
+  class TestInline extends Model
+    @entity 'test_inline'
+
+  class Test extends Model
+    @entity 'test'
+    @map 'test_inlines', TestInline
+
+  class TestNode extends Model
+    @entity 'test_node'
+    @map 'children', TestNode
+    @map 'parent', TestNode
+
+  beforeEach ->
+    Model.identityReset()
+
+  it "sets proper identity holder", ->
+    expect(Test.build().__identityHolder).toEqual Model
+
+  it "handles builds", ->
+    foo = Test.build id: 1
+    bar = Test.build id: 1
+
+    expect(foo).toEqual bar
+
+  it "handles maps", ->
+    inline = TestInline.build(id: 1)
+    root   = Test.build
+      id: 1
+      test_inlines: [{id: 1}, {id: 2}]
+
+    inline('foo', 'bar')
+
+    expect(root('test_inlines')[0]('foo')).toEqual 'bar'
+
+  it "handles nested bi-directional reference", ->
+    biDirectionTestNode = TestNode.build
+      id: 1
+      yolo: true
+      children: [{id: 2, parent: {id: 1, yolo: true}}]
+
+    expect(biDirectionTestNode).toEqual(biDirectionTestNode('children')[0]('parent'))

data/spec/joosy/{extensions/resources/base_spec.coffee → resources/modules/model_spec.coffee}

@@ -1,22 +1,10 @@
-describe "Joosy.Resources.Base", ->
+describe "Joosy.Modules.Resources.Model", ->
 
-  beforeEach ->
-    Joosy.Resources.Base?.resetIdentity()
-
-  class TestInline extends Joosy.Resources.Base
-    @entity 'test_inline'
-
-  class Test extends Joosy.Resources.REST
-    @entity 'test'
-    @map 'test_inlines', TestInline
-
-  class TestNode extends Joosy.Resources.Base
-    @entity 'test_node'
-    @map 'children', TestNode
-    @map 'parent', TestNode
+  class Model extends Joosy.Resources.Hash
+    @include Joosy.Modules.Resources.Model
 
   beforeEach ->
-    @resource = Joosy.Resources.Base.build @data =
+    @resource = new Model @data =
       foo: 'bar'
       bar: 'baz'
       very:
@@ -24,14 +12,14 @@ describe "Joosy.Resources.Base", ->
           value: 'boo!'
 
   it "has primary key", ->
-    expect(Test::__primaryKey).toEqual 'id'
+    expect(Model::__primaryKey).toEqual 'id'
 
   it "remembers where it belongs", ->
-    resource = new Joosy.Resources.Base foo: 'bar'
+    resource = new Model foo: 'bar'
     expect(resource.data).toEqual foo: 'bar'
 
   it "produces magic function", ->
-    expect(Object.isFunction @resource).toBeTruthy()
+    expect(typeof(@resource) == 'function').toBeTruthy()
     expect(@resource.data).toEqual @data
 
   it "gets values", ->
@@ -60,27 +48,27 @@ describe "Joosy.Resources.Base", ->
     expect(callback.callCount).toEqual(2)
 
   it "handles the before filter", ->
-    class R extends Joosy.Resources.Base
+    class R extends Model
       @beforeLoad (data) ->
         data ||= {}
         data.tested = true
         data
 
-      resource = R.build()
+      resource = new R()
 
       expect(resource 'tested').toBeTruthy()
 
   it "should map inlines", ->
-    class RumbaMumba extends Joosy.Resources.Base
+    class RumbaMumba extends Model
       @entity 'rumba_mumba'
 
-    class R extends Joosy.Resources.Base
+    class R extends Model
       @map 'rumbaMumbas', RumbaMumba
 
-    class S extends Joosy.Resources.Base
+    class S extends Model
       @map 'rumbaMumba', RumbaMumba
 
-    resource = R.build
+    resource = new R
       rumbaMumbas: [
         {foo: 'bar'},
         {bar: 'baz'}
@@ -88,32 +76,24 @@ describe "Joosy.Resources.Base", ->
     expect(resource('rumbaMumbas') instanceof Joosy.Resources.Array).toBeTruthy()
     expect(resource('rumbaMumbas')[0]('foo')).toEqual 'bar'
 
-    resource = S.build
+    resource = new S
       rumbaMumba: {foo: 'bar'}
-    expect(resource('rumbaMumba') instanceof Joosy.Resources.Base).toBeTruthy()
+    expect(resource('rumbaMumba') instanceof Model).toBeTruthy()
     expect(resource('rumbaMumba.foo')).toEqual 'bar'
 
-  describe "identity map", ->
-    it "handles builds", ->
-      foo = Test.build 1
-      bar = Test.build 1
-
-      expect(foo).toEqual bar
-
-    it "handles maps", ->
-      inline = TestInline.build(1)
-      root   = Test.build
-        id: 1
-        test_inlines: [{id: 1}, {id: 2}]
-
-      inline('foo', 'bar')
+  it "allows to override a collection", ->
+    class Array extends Joosy.Resources.Array
 
-      expect(root('test_inlines').at(0)('foo')).toEqual 'bar'
+    class RumbaMumba extends Model
+      @entity 'rumba_mumba'
+      @collection Array
 
-    it "handles nested bi-directional reference", ->
-      biDirectionTestNode = TestNode.build
-        id: 1
-        yolo: true
-        children: [{id: 2, parent: {id: 1, yolo: true}}]
+    class R extends Model
+      @map 'rumbaMumbas', RumbaMumba
 
-      expect(biDirectionTestNode).toEqual(biDirectionTestNode('children').at(0)('parent'))
+    resource = new R
+      rumbaMumbas: [
+        {foo: 'bar'},
+        {bar: 'baz'}
+      ]
+    expect(resource('rumbaMumbas') instanceof Array).toBeTruthy()

data/spec/joosy/{extensions/resources → resources}/rest_spec.coffee

@@ -1,8 +1,5 @@
 describe "Joosy.Resources.REST", ->
 
-  beforeEach ->
-    Joosy.Resources.Base?.resetIdentity()
-
   class FluffyInline extends Joosy.Resources.REST
     @entity 'fluffy_inline'
 
@@ -50,18 +47,18 @@ describe "Joosy.Resources.REST", ->
 
     it 'makes a class whose instances get new source too', ->
       clone = @Test.at 'rumbas'
-      expect(clone.build(1).memberPath()).toEqual '/rumbas/tests/1'
+      expect(clone.build(id: 1).memberPath()).toEqual '/rumbas/tests/1'
 
     it 'accepts another resource instance', ->
-      clone = @Test.at Fluffy.build(1)
+      clone = @Test.at Fluffy.build(id: 1)
       expect(clone.collectionPath()).toEqual '/fluffies/1/tests'
 
     it 'accepts array', ->
-      clone = @Test.at ['rumbas', Fluffy.build(1), 'salsas']
+      clone = @Test.at ['rumbas', Fluffy.build(id: 1), 'salsas']
       expect(clone.collectionPath()).toEqual '/rumbas/fluffies/1/salsas/tests'
 
     it 'accepts sequential attributes', ->
-      clone = @Test.at 'rumbas', 'salsas', Fluffy.build(1)
+      clone = @Test.at 'rumbas', 'salsas', Fluffy.build(id: 1)
       expect(clone.collectionPath()).toEqual '/rumbas/salsas/fluffies/1/tests'
 
   describe '::at', ->
@@ -70,25 +67,25 @@ describe "Joosy.Resources.REST", ->
         @entity 'test'
 
     it 'returns base class instance', ->
-      original = @Test.build id: 1, name: 'foobar'
+      original = @Test.build id: 1, name: 'foobar', 'thing': 'baseclass'
       clone    = original.at 'rumbas'
       expect(clone instanceof @Test).toBeTruthy()
       expect(clone.data).toEqual original.data
 
     it 'accepts string', ->
-      clone = @Test.build(1).at('rumbas')
+      clone = @Test.build(id: 1).at('rumbas')
       expect(clone.memberPath()).toEqual '/rumbas/tests/1'
 
     it 'accepts another resource instance', ->
-      clone = @Test.build(1).at(Fluffy.build(1))
+      clone = @Test.build(id: 1).at(Fluffy.build(id: 1))
       expect(clone.memberPath()).toEqual '/fluffies/1/tests/1'
 
     it 'accepts array', ->
-      clone = @Test.build(1).at ['rumbas', Fluffy.build(1), 'salsas']
+      clone = @Test.build(id: 1).at ['rumbas', Fluffy.build(id: 1), 'salsas']
       expect(clone.memberPath()).toEqual '/rumbas/fluffies/1/salsas/tests/1'
 
     it 'accepts sequential attributes', ->
-      clone = @Test.build(1).at 'rumbas', 'salsas', Fluffy.build(1)
+      clone = @Test.build(id: 1).at 'rumbas', 'salsas', Fluffy.build(id: 1)
       expect(clone.memberPath()).toEqual '/rumbas/salsas/fluffies/1/tests/1'
 
   describe '@memberPath', ->
@@ -207,7 +204,7 @@ describe "Joosy.Resources.REST", ->
       expect(data).toEqual {foo: 'bar'}
 
     describe "member", ->
-      resource = Fluffy.build 1
+      resource = Fluffy.build id: 1
 
       it "with get", ->
         resource.get {action: 'foo', params: {foo: 'bar'}}, callback
@@ -244,15 +241,25 @@ describe "Joosy.Resources.REST", ->
         resource.delete callback
         checkAndRespond @server.requests[0], 'DELETE', /^\/fluffies/, rawData
 
-  describe "identity map", ->
-    it "handles finds", ->
-      inline = FluffyInline.build(1)
-      root   = Fluffy.find 1
+    describe "save", ->
+      beforeEach ->
+        class @Resource extends Joosy.Resources.REST
+          @entity 'resource'
+
+          @beforeSave (data) ->
+            data.tested = true
+            data
+
+      it "creates", ->
+        resource = new @Resource(foo: 'bar')
+        resource.save()
 
-      inline.bind 'changed', callback = sinon.spy()
+        checkAndRespond @server.requests[0], 'POST', /^\/resources/, rawData
+        expect(@server.requests[0].requestBody).toEqual 'foo=bar&tested=true'
 
-      checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/1\?_=\d+/,
-        '{"id": 1, "fluffy_inlines": [{"id": 1, "name": 1}, {"id": 2, "name": 2}]}'
+      it "updates", ->
+        resource = new @Resource(id: 1, foo: 'bar')
+        resource.save()
 
-      expect(inline 'name').toEqual 1
-      expect(callback.callCount).toEqual 1
+        checkAndRespond @server.requests[0], 'PUT', /^\/resources\/1/, rawData
+        expect(@server.requests[0].requestBody).toEqual 'id=1&foo=bar&tested=true'

data/spec/joosy/{core/resources → resources}/scalar_spec.coffee

@@ -10,18 +10,18 @@ describe "Joosy.Resources.Scalar", ->
 
     it 'clones', ->
       clone = @scalar.clone()
-      clone.set(1)
+      clone(1)
       expect(@scalar()).toEqual(5)
 
     it 'triggers', ->
       spy = sinon.spy()
       @scalar.bind 'changed', spy
 
-      @scalar.set(7)
-      expect(@scalar.get()).toEqual 7
+      @scalar(7)
+      expect(@scalar()).toEqual 7
 
       @scalar.load(8)
-      expect(@scalar.get()).toEqual 8
+      expect(@scalar()).toEqual 8
 
       expect(spy.callCount).toEqual 2
 
@@ -32,10 +32,10 @@ describe "Joosy.Resources.Scalar", ->
           data + 1
 
       scalar = new Scalar(5)
-      expect(scalar.get()).toEqual 6
+      expect(scalar()).toEqual 6
 
-      scalar.set(5)
-      expect(scalar.get()).toEqual 5
+      scalar(5)
+      expect(scalar()).toEqual 5
 
       scalar.load(7)
-      expect(scalar.get()).toEqual 8
+      expect(scalar()).toEqual 8

data/templates/application/application.coffee.tt

@@ -1,7 +1,5 @@
 <%= dependencies %>
 #
-#= require joosy
-#
 #= require_tree ./
 
 $ ->

data/templates/environment/app/haml/index.haml

@@ -2,6 +2,6 @@
 %html
   %head
     %title
-    %link{:href => "assets/application.css", :media => "screen", :rel => "stylesheet", :type => "text/css"}/
-    %script{:src => "assets/application.js", :type => "text/javascript"}
+    %link{:href => "application.css", :media => "screen", :rel => "stylesheet", :type => "text/css"}
+    %script{:src => "application.js", :type => "text/javascript"}
   %body

data/templates/environment/package.json

@@ -10,7 +10,7 @@
     "grunt-cli": "~0.1.9",
     "grunt-contrib-uglify": "~0.2.2",
     "grunt-contrib-cssmin": "~0.6.1",
-    "grunt-contrib-testem": "~0.3.0",
+    "grunt-contrib-testem": "~0.5.3",
     "phantom": "~0.5.2"
   },
   "scripts": {