joosy 1.2.0.alpha.14 → 1.2.0.alpha.15

data/lib/joosy.rb

@@ -1,10 +1,5 @@
 require 'json'
 
-begin
-  require 'haml_coffee_assets'
-rescue Gem::LoadError # This is required for the first bundle run
-end
-
 module Joosy
   PACKAGE = File.expand_path("../../package.json", __FILE__)
 

data/package.json

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

data/spec/helpers/helper.coffee

@@ -1,5 +1,5 @@
 beforeEach ->
-  Joosy.Resource.Generic.resetIdentity()
+  Joosy.Resources.Base?.resetIdentity()
 
   window.JST = {}
   $('body').append('<div id="ground">')

data/spec/joosy/core/joosy_spec.coffee

@@ -3,7 +3,7 @@ describe "Joosy", ->
   it "should properly initialize", ->
     expect(Joosy.Application.config.debug).toBeFalsy()
     expect(Joosy.Modules).toBeDefined()
-    expect(Joosy.Resource).toBeDefined()
+    expect(Joosy.Resources).toBeDefined()
 
   it "should declare namespaces", ->
     Joosy.namespace 'Namespaces.Test1'
@@ -70,30 +70,3 @@ describe "Joosy", ->
     runs -> Joosy.preloadImages images, callback
     waits(150)
     runs -> expect(callback.callCount).toEqual(2)
-
-  it "should define resource", ->
-    container = {}
-    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'
-    window.DefinedsCollection = 'that'
-    Joosy.defineResources
-      '':
-        test: '/test'
-        defined: 'no'
-      'Scope.Test':
-        another: ''
-    expect(Object.isFunction Test).toBeTruthy()
-    expect(Object.isFunction TestsCollection).toBeTruthy()
-    expect(Object.isFunction Scope.Test.Another).toBeTruthy()
-    expect(Object.isFunction Scope.Test.AnothersCollection).toBeTruthy()
-    expect(Defined).toEqual 'this'
-    expect(DefinedsCollection).toEqual 'that'

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

@@ -52,101 +52,6 @@ describe "Joosy.Modules.Renderer", ->
     runs ->
       expect(elem.text()).toBe "new"
 
-  it "renders resources and keep html up2date", ->
-    data = Joosy.Resource.Generic.build zombie: 'rock'
-
-    @TestContainer.view (locals) ->
-      template = -> @zombie
-
-      @renderDynamic(template, locals)
-
-    elem = $("<div></div>")
-    @ground.append elem
-
-    elem.html @dummyContainer.__renderer(data)
-
-    waits 0
-
-    runs ->
-      expect(elem.text()).toBe "rock"
-
-    runs ->
-      data 'zombie', 'suck'
-
-    waits 0
-
-    runs ->
-      expect(elem.text()).toBe "suck"
-
-  it "renders collections and keep html up2date", ->
-    class Foo extends Joosy.Resource.Generic
-      @entity 'foo'
-
-    data = new Joosy.Resource.Collection(Foo)
-
-    data.load [
-        { zombie: 'rock' },
-        { zombie: 'never sleep' }
-      ]
-
-    @TestContainer.view (locals) ->
-      template = -> @data[1] 'zombie'
-
-      @renderDynamic(template, locals)
-
-    elem = $("<div></div>")
-    @ground.append elem
-
-    elem.html @dummyContainer.__renderer(data)
-
-    waits 0
-
-    runs ->
-      expect(elem.text()).toBe "never sleep"
-
-    runs ->
-      data.data[1] 'zombie', 'suck'
-
-    waits 0
-
-    runs ->
-      expect(elem.text()).toBe "suck"
-
-  xit "renders collections and track its new items", ->
-    class Foo extends Joosy.Resource.Generic
-      @entity 'foo'
-
-    data = new Joosy.Resource.Collection(Foo)
-    data.load [
-      {key: 1},
-      {key: 2}
-    ]
-
-    @TestContainer.view (locals) ->
-      template = -> @data.map((item) -> item('key')).join('')
-      @renderDynamic(template, locals)
-
-    elem = $("<div></div>")
-    @ground.append elem
-    elem.html @dummyContainer.__renderer(data)
-
-    waits 0
-
-    runs ->
-      expect(elem.text()).toBe "12"
-      data.add Foo.build(key: 3)
-
-    waits 0
-
-    runs ->
-      expect(elem.text()).toBe "123"
-      data.at(2)('key', 6)
-
-    waits 0
-
-    runs ->
-      expect(elem.text()).toBe "126"
-
   it "debounces morpher updates", ->
     @TestContainer.view (locals) ->
       template = -> @object.value

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

@@ -19,7 +19,7 @@ describe "Joosy.Form", ->
     @exactForm = $('#exact')
     @arrayForm = $('#array')
 
-    class Test extends Joosy.Resource.REST
+    class Test extends Joosy.Resources.REST
       @entity 'test'
     @Test = Test
 
@@ -36,7 +36,7 @@ describe "Joosy.Form", ->
           test: 'test'
       EXact:
         MATCH: 'works'
-      items: (new Joosy.Resource.RESTCollection(Test)).load([{attr: 'one'}, {attr: 'two'}])
+      items: (new Joosy.Resources.RESTCollection(Test)).load([{attr: 'one'}, {attr: 'two'}])
       single: Test.build(attr: 'sin')
 
   afterEach ->

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

@@ -1,5 +1,5 @@
 describe "Joosy.Helpers.Form", ->
-  class Test extends Joosy.Resource.Generic
+  class Test extends Joosy.Resources.Base
     @entity 'test'
 
   h = Joosy.Helpers.Application

data/spec/joosy/{core/resource/generic_spec.coffee → extensions/resources/base_spec.coffee}

@@ -1,19 +1,19 @@
-describe "Joosy.Resource.Generic", ->
+describe "Joosy.Resources.Base", ->
 
-  class TestInline extends Joosy.Resource.Generic
+  class TestInline extends Joosy.Resources.Base
     @entity 'test_inline'
 
-  class Test extends Joosy.Resource.REST
+  class Test extends Joosy.Resources.REST
     @entity 'test'
     @map 'test_inlines', TestInline
 
-  class TestNode extends Joosy.Resource.Generic
+  class TestNode extends Joosy.Resources.Base
     @entity 'test_node'
     @map 'children', TestNode
     @map 'parent', TestNode
 
   beforeEach ->
-    @resource = Joosy.Resource.Generic.build @data =
+    @resource = Joosy.Resources.Base.build @data =
       foo: 'bar'
       bar: 'baz'
       very:
@@ -24,7 +24,7 @@ describe "Joosy.Resource.Generic", ->
     expect(Test::__primaryKey).toEqual 'id'
 
   it "remembers where it belongs", ->
-    resource = new Joosy.Resource.Generic foo: 'bar'
+    resource = new Joosy.Resources.Base foo: 'bar'
     expect(resource.data).toEqual foo: 'bar'
 
   it "produces magic function", ->
@@ -49,7 +49,7 @@ describe "Joosy.Resource.Generic", ->
     expect(@resource 'another.deep').toEqual value: 'banana strikes back'
 
   it "handles @at", ->
-    class Fluffy extends Joosy.Resource.Generic
+    class Fluffy extends Joosy.Resources.Base
       @entity 'fluffy'
 
     clone = Fluffy.at('rumbas!')
@@ -73,7 +73,7 @@ describe "Joosy.Resource.Generic", ->
     expect(callback.callCount).toEqual(2)
 
   it "handles the before filter", ->
-    class R extends Joosy.Resource.Generic
+    class R extends Joosy.Resources.Base
       @beforeLoad (data) ->
         data ||= {}
         data.tested = true
@@ -84,13 +84,13 @@ describe "Joosy.Resource.Generic", ->
       expect(resource 'tested').toBeTruthy()
 
   it "should map inlines", ->
-    class RumbaMumba extends Joosy.Resource.Generic
+    class RumbaMumba extends Joosy.Resources.Base
       @entity 'rumba_mumba'
 
-    class R extends Joosy.Resource.Generic
+    class R extends Joosy.Resources.Base
       @map 'rumbaMumbas', RumbaMumba
 
-    class S extends Joosy.Resource.Generic
+    class S extends Joosy.Resources.Base
       @map 'rumbaMumba', RumbaMumba
 
     resource = R.build
@@ -98,20 +98,20 @@ describe "Joosy.Resource.Generic", ->
         {foo: 'bar'},
         {bar: 'baz'}
       ]
-    expect(resource('rumbaMumbas') instanceof Joosy.Resource.Collection).toBeTruthy()
+    expect(resource('rumbaMumbas') instanceof Joosy.Resources.Collection).toBeTruthy()
     expect(resource('rumbaMumbas').at(0)('foo')).toEqual 'bar'
 
     resource = S.build
       rumbaMumba: {foo: 'bar'}
-    expect(resource('rumbaMumba') instanceof Joosy.Resource.Generic).toBeTruthy()
+    expect(resource('rumbaMumba') instanceof Joosy.Resources.Base).toBeTruthy()
     expect(resource('rumbaMumba.foo')).toEqual 'bar'
 
   it "should use magic collections", ->
-    class window.RumbaMumbasCollection extends Joosy.Resource.Collection
+    class window.RumbaMumbasCollection extends Joosy.Resources.Collection
 
-    class RumbaMumba extends Joosy.Resource.Generic
+    class RumbaMumba extends Joosy.Resources.Base
       @entity 'rumba_mumba'
-    class R extends Joosy.Resource.Generic
+    class R extends Joosy.Resources.Base
       @map 'rumbaMumbas', RumbaMumba
 
     resource = R.build
@@ -125,12 +125,12 @@ describe "Joosy.Resource.Generic", ->
     window.RumbaMumbasCollection = undefined
 
   it "should use manually set collections", ->
-    class OloCollection extends Joosy.Resource.Collection
+    class OloCollection extends Joosy.Resources.Collection
 
-    class RumbaMumba extends Joosy.Resource.Generic
+    class RumbaMumba extends Joosy.Resources.Base
       @entity 'rumba_mumba'
       @collection OloCollection
-    class R extends Joosy.Resource.Generic
+    class R extends Joosy.Resources.Base
       @map 'rumbaMumbas', RumbaMumba
 
     resource = R.build
@@ -142,7 +142,6 @@ describe "Joosy.Resource.Generic", ->
     expect(resource('rumbaMumbas').at(0)('foo')).toEqual 'bar'
 
   describe "identity map", ->
-
     it "handles builds", ->
       foo = Test.build 1
       bar = Test.build 1

data/spec/joosy/{core/resource → extensions/resources}/collection_spec.coffee

@@ -1,6 +1,6 @@
-describe "Joosy.Resource.Collection", ->
+describe "Joosy.Resources.Collection", ->
 
-  class Test extends Joosy.Resource.Generic
+  class Test extends Joosy.Resources.Base
     @entity 'test'
 
   data = '[{"id": 1, "name": "test1"}, {"id": 2, "name": "test2"}]'
@@ -11,7 +11,7 @@ describe "Joosy.Resource.Collection", ->
     expect(collection.data[0].data.name).toEqual 'test1'
 
   beforeEach ->
-    @collection = new Joosy.Resource.Collection(Test)
+    @collection = new Joosy.Resources.Collection(Test)
 
   it "should initialize", ->
     expect(@collection.model).toEqual Test
@@ -37,7 +37,7 @@ describe "Joosy.Resource.Collection", ->
     expect(callback.callCount).toEqual 0
 
   it "should properly handle the before filter", ->
-    class RC extends Joosy.Resource.Collection
+    class RC extends Joosy.Resources.Collection
       @beforeLoad (data) ->
         data.each (entry, i) ->
           data[i].tested = true

data/spec/joosy/{core/resource → extensions/resources}/rest_collection_spec.coffee

@@ -1,11 +1,11 @@
-describe "Joosy.Resource.RESTCollection", ->
+describe "Joosy.Resources.RESTCollection", ->
 
-  class Test extends Joosy.Resource.REST
+  class Test extends Joosy.Resources.REST
     @entity 'test'
 
   beforeEach ->
     @server = sinon.fakeServer.create()
-    @collection = new Joosy.Resource.RESTCollection(Test)
+    @collection = new Joosy.Resources.RESTCollection(Test)
 
   afterEach ->
     @server.restore()
@@ -30,7 +30,7 @@ describe "Joosy.Resource.RESTCollection", ->
     expect(@collection.data[0].data.name).toEqual 'test3'
 
   it "should use own storage", ->
-    class TestsCollection extends Joosy.Resource.RESTCollection
+    class TestsCollection extends Joosy.Resources.RESTCollection
       @model Test
     collection = new TestsCollection()
     collection.add 'test'

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

@@ -1,17 +1,17 @@
-describe "Joosy.Resource.REST", ->
+describe "Joosy.Resources.REST", ->
 
-  class FluffyInline extends Joosy.Resource.REST
+  class FluffyInline extends Joosy.Resources.REST
     @entity 'fluffy_inline'
 
-  class FluffyParent extends Joosy.Resource.REST
+  class FluffyParent extends Joosy.Resources.REST
     @entity 'fluffy_parent'
 
-  class Fluffy extends Joosy.Resource.REST
+  class Fluffy extends Joosy.Resources.REST
     @entity 'fluffy'
     @map 'fluffy_inlines', FluffyInline
 
   Joosy.namespace 'Animal', ->
-    class @Cat extends Joosy.Resource.REST
+    class @Cat extends Joosy.Resources.REST
       @entity 'cat'
 
   beforeEach ->
@@ -94,7 +94,7 @@ describe "Joosy.Resource.REST", ->
     rawData = '{"page": 42, "fluffies": [{"id": 1, "name": "test1"}, {"id": 2, "name": "test2"}]}'
 
     callback = sinon.spy (target, data) ->
-      expect(target instanceof Joosy.Resource.RESTCollection).toEqual true
+      expect(target instanceof Joosy.Resources.RESTCollection).toEqual true
       expect(target.size()).toEqual 2
       expect(target.at(0) instanceof Fluffy).toEqual true
       expect(data).toEqual $.parseJSON(rawData)
@@ -174,7 +174,6 @@ describe "Joosy.Resource.REST", ->
         checkAndRespond @server.requests[0], 'DELETE', /^\/fluffies/, rawData
 
   describe "identity map", ->
-
     it "handles finds", ->
       inline = FluffyInline.build(1)
       root   = Fluffy.find 1

data/src/joosy.coffee

@@ -1,2 +1 @@
-#= require_tree ./joosy/core
-#= require_tree ./joosy/preloaders
+#= require_tree ./joosy/core

data/src/joosy/core/helpers/view.coffee

@@ -23,14 +23,6 @@ Joosy.helpers 'Application', ->
     temp.appendChild element
     temp.innerHTML
 
-  #
-  # Converts \n into <br/> in your text
-  #
-  # @param [String] text      Text to convert
-  #
-  @nl2br = (text) ->
-    text.toString().replace /\n/g, '<br/>'
-
   #
   # Wraps the inline block into given template
   # Request template will receive the inline block as @yield parameter

data/src/joosy/core/joosy.coffee

@@ -1,3 +1,6 @@
+#= require_self ./
+#= require joosy/core/modules/module
+
 #
 # All the tiny core stuff
 #
@@ -12,7 +15,7 @@
   #
   # Resources container
   #
-  Resource: {}
+  Resources: {}
 
   #
   # Templaters container
@@ -136,46 +139,4 @@
     if !paramsString.isBlank() && url.last() != '?'
       paramsString = '&' + paramsString
 
-    url + paramsString + hash
-
-  #
-  # Creates classes and collection classes for the given resources that might have been extracted from the routes
-  #
-  # @param [Hash] resources      Resources declaration
-  #
-  # @example Basic usage
-  #   Joosy.defineResources {'': {foo: '/foos'}, 'namespace': {bar: '/namespace/bars'}}
-  #
-  defineResources: (resources) ->
-    Object.extended(resources).each (namespace, resources) ->
-      if namespace.isBlank()
-        Object.extended(resources).each (resource, path) ->
-          Joosy.defineResource resource, path
-      else
-        Joosy.namespace namespace, ->
-          Object.extended(resources).each (resource, path) =>
-            Joosy.defineResource resource, path, @
-
-  #
-  #
-  # @param [String] resource      Entity name in singular form
-  # @param [String] path          Entity REST end-point
-  # @param [Object] space         Namespace for new classes
-  #
-  # @example Basic usage
-  #   Joosy.defineResource 'foo', '/foos'
-  #
-  defineResource: (resource, path, space=window) ->
-    className = resource.camelize()
-    collectionName = "#{resource.pluralize().camelize()}Collection"
-    unless space[className]
-      Joosy.Modules.Log.debugAs space, "Define #{className}"
-      space[className] = class extends Joosy.Resource.REST
-        @entity resource
-        @source path
-        __collection: ->
-          space[collectionName]
-    unless space[collectionName]
-      Joosy.Modules.Log.debugAs space, "Define #{collectionName}"
-      space[collectionName] = class extends Joosy.Resource.RESTCollection
-        @model space[className]
+    url + paramsString + hash