joosy 1.1.2 → 1.2.0.alpha.4

data/lib/joosy.rb

@@ -1,17 +1,16 @@
 require 'haml_coffee_assets'
-require 'joosy/version'
-
-if defined?(Rails)
-  require 'joosy/rails/engine'
-  require 'rails/resources_with_joosy'
-end
+require 'json'
 
 module Joosy
+  PACKAGE = File.expand_path("../../package.json", __FILE__)
+
+  # Converting semver to the notation compatible with rubygems
+  VERSION = JSON.parse(File.read(PACKAGE))['version'].gsub '-', '.'
+
   def self.assets_paths
     [
-        File.expand_path('../../app/assets/javascripts', __FILE__),
-        File.expand_path('../../vendor/assets/javascripts', __FILE__),
-        File.dirname(HamlCoffeeAssets.helpers_path)
+      File.expand_path('../../src', __FILE__),
+      File.dirname(HamlCoffeeAssets.helpers_path)
     ]
   end
 end

data/package.json

@@ -0,0 +1,37 @@
+{
+  "name": "joosy",
+  "description": "Joosy Framework",
+  "keywords": [
+    "joosy"
+  ],
+  "version": "1.2.0-alpha.4",
+  "author": "Boris Staal <boris@staal.io>",
+  "bin": {
+    "joosy": "bin/joosy"
+  },
+  "engines": {
+    "node": ">=0.4.0"
+  },
+  "dependencies": {
+    "sugar": "~1.3.8",
+    "coffee-script": "~1.6.3",
+    "command-router": "0.0.5",
+    "resolve": "~0.4.0",
+    "ejs": "~0.8.4",
+    "prompt": "~0.2.9",
+    "commander": "~1.2.0",
+    "colors": "~0.6.0-1",
+    "grunt": "~0.4.1"
+  },
+  "devDependencies": {
+    "bower": "~0.9.2",
+    "mincer": "~0.4.6",
+    "grunt-mincer": "~0.3.1",
+    "grunt-contrib-jasmine": "git://github.com/inossidabile/grunt-contrib-jasmine.git#deep-outfile",
+    "grunt-contrib-watch": "~0.4.4",
+    "grunt-contrib-coffee": "~0.7.0",
+    "grunt-contrib-connect": "~0.3.0",
+    "grunt-coffeelint": "0.0.6",
+    "grunt-release": "~0.3.5"
+  }
+}

data/spec/{javascripts/joosy/core/form_spec.js.coffee → joosy/core/form_spec.coffee}

@@ -54,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 5
+      expect(formWithProperties.$fields.length).toEqual 5
 
       expect(@spy.callCount).toEqual 1
 
@@ -63,7 +63,7 @@ describe "Joosy.Form", ->
       expect(formWithCallback.container).toEqual @putForm
       expect(formWithCallback.invalidationClass).toEqual 'field_with_errors'
       expect(formWithCallback.success).toBe callback
-      expect(formWithCallback.fields.length).toEqual 1
+      expect(formWithCallback.$fields.length).toEqual 1
 
       expect(@spy.callCount).toEqual 1
 
@@ -97,40 +97,40 @@ describe "Joosy.Form", ->
 
     it "should fill form, set proper action and method and store resource", ->
       @nudeForm.fill @resource
-      expect(@nudeForm.fields[0].value).toEqual 'foo'
-      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.$fields[0].value).toEqual 'foo'
+      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
 
     it "should fill form with camelized properties", ->
       @putForm.fill @resource
-      expect(@putForm.fields[0].value).toEqual 'baz'
+      expect(@putForm.$fields[0].value).toEqual 'baz'
       expect(@putForm.container.attr('method').toLowerCase()).toEqual 'post'
       expect(@putForm.container.attr 'action').toEqual '/tests/1'
 
     it "should fill form with any properties", ->
       @exactForm.fill @resource
-      expect(@exactForm.fields[0].value).toEqual 'works'
+      expect(@exactForm.$fields[0].value).toEqual 'works'
 
     it "should fill form with decorator", ->
       @moreForm.fill @resource,
         decorator: (e) ->
           e.ololo = e.camelBaz
           e
-      expect(@moreForm.fields[0].value).toEqual 'baz'
+      expect(@moreForm.$fields[0].value).toEqual 'baz'
 
     it "should fill form with extended action", ->
       @nudeForm.fill @resource,
         action: @resource.memberPath(from: 'calculate')
-      expect(@nudeForm.fields[0].value).toEqual 'foo'
-      expect(@nudeForm.fields[1].value).toEqual 'bar'
+      expect(@nudeForm.$fields[0].value).toEqual 'foo'
+      expect(@nudeForm.$fields[1].value).toEqual 'bar'
       expect(@nudeForm.container.attr 'action').toEqual '/tests/1/calculate'
 
       resource = @Test.build 'someId'
@@ -156,14 +156,14 @@ describe "Joosy.Form", ->
 
     it "should fill nested attributes and resources", ->
       @nestedForm.fill @resource
-      expect(@nestedForm.fields[0].value).toEqual 'test'
-      expect(@nestedForm.fields[1].value).toEqual 'one'
-      expect(@nestedForm.fields[2].value).toEqual 'two'
-      expect(@nestedForm.fields[3].value).toEqual 'sin'
+      expect(@nestedForm.$fields[0].value).toEqual 'test'
+      expect(@nestedForm.$fields[1].value).toEqual 'one'
+      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'
+      expect(@arrayForm.$fields[0].value).toEqual 'here'
 
     it "should break cross-references", ->
       @resource('single')('trololo', @resource)
@@ -230,20 +230,20 @@ describe "Joosy.Form", ->
 
     it "should trigger 'success'", ->
       expect(@target.method).toEqual 'POST'
-      expect(@target.url).toMatch /.*?\/tests\/1/
+      expect(@target.url.endsWith '/tests/1').toEqual true
       @target.respond 200, 'Content-Type': 'application/json', '{"form": "works"}'
       expect(@spy.callCount).toEqual 1
       expect(@spy.args[0][0]).toEqual {form: 'works'}
 
     it "should fill class for invalidated fields by default", ->
       @target.respond 422, 'Content-Type': 'application/json', '{"foo": "error!"}'
-      expect($(@nudeForm.fields[0]).attr 'class').toEqual 'field_with_errors'
+      expect($(@nudeForm.$fields[0]).attr 'class').toEqual 'field_with_errors'
 
     it "should trigger 'error' and complete default action if it returned true", ->
       @nudeForm.error = sinon.spy ->
         true
       @target.respond 422, 'Content-Type': 'application/json', '{"foo": "error!"}'
-      expect($(@nudeForm.fields[0]).attr 'class').toEqual 'field_with_errors'
+      expect($(@nudeForm.$fields[0]).attr 'class').toEqual 'field_with_errors'
       expect(@nudeForm.error.callCount).toEqual 1
       expect(@nudeForm.error.args[0][0]).toEqual
         "foo": "error!"
@@ -252,31 +252,31 @@ describe "Joosy.Form", ->
       @nudeForm.error = sinon.spy ->
         false
       @target.respond 422, 'Content-Type': 'application/json', '{"foo": "error!"}'
-      expect($(@nudeForm.fields[0]).attr 'class').toNotEqual 'field_with_errors'
+      expect($(@nudeForm.$fields[0]).attr 'class').toNotEqual 'field_with_errors'
       expect(@nudeForm.error.callCount).toEqual 1
 
     it "should clear fields before another submit", ->
       @target.respond 422, 'Content-Type': 'application/json', '{"foo": "error!"}'
-      expect($(@nudeForm.fields[0]).attr 'class').toEqual 'field_with_errors'
+      expect($(@nudeForm.$fields[0]).attr 'class').toEqual 'field_with_errors'
       @nudeForm.container.submit()
-      expect($(@nudeForm.fields[0]).attr 'class').toNotEqual 'field_with_errors'
+      expect($(@nudeForm.$fields[0]).attr 'class').toNotEqual 'field_with_errors'
 
     it "should trigger 'before' and do default action if it returns true", ->
       @target.respond 422, 'Content-Type': 'application/json', '{"foo": "error!"}'
-      expect($(@nudeForm.fields[0]).attr 'class').toEqual 'field_with_errors'
+      expect($(@nudeForm.$fields[0]).attr 'class').toEqual 'field_with_errors'
       @nudeForm.before = sinon.spy ->
         true
       @nudeForm.container.submit()
-      expect($(@nudeForm.fields[0]).attr 'class').toNotEqual 'field_with_errors'
+      expect($(@nudeForm.$fields[0]).attr 'class').toNotEqual 'field_with_errors'
       expect(@nudeForm.before.callCount).toEqual 1
 
     it "should trigger 'before' and skip default action if it returns false", ->
       @target.respond 422, 'Content-Type': 'application/json', '{"foo": "error!"}'
-      expect($(@nudeForm.fields[0]).attr 'class').toEqual 'field_with_errors'
+      expect($(@nudeForm.$fields[0]).attr 'class').toEqual 'field_with_errors'
       @nudeForm.before = sinon.spy ->
         false
       @nudeForm.container.submit()
-      expect($(@nudeForm.fields[0]).attr 'class').toEqual 'field_with_errors'
+      expect($(@nudeForm.$fields[0]).attr 'class').toEqual 'field_with_errors'
       expect(@nudeForm.before.callCount).toEqual 1
 
   describe "Error response handling", ->

data/spec/{javascripts/joosy/core/modules/container_spec.js.coffee → joosy/core/modules/container_spec.coffee}

@@ -15,7 +15,7 @@ describe "Joosy.Modules.Container", ->
   it "should have property named per declared element in container", ->
     @ground.prepend('<div class="footer" />')  # out of container
     @box.refreshElements()
-    target = @box.footer.get 0
+    target = @box.$footer.get 0
     expect(target).toBeTruthy()
     expect(target).toBe $('.footer', @box.container).get 0
     expect(target).toBe @box.$('.footer').get 0

data/spec/{javascripts/joosy/core/modules/renderer_spec.js.coffee → joosy/core/modules/renderer_spec.coffee}

@@ -112,6 +112,41 @@ describe "Joosy.Modules.Renderer", ->
     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/{javascripts/joosy/core/resource/rest_spec.js.coffee → joosy/core/resource/rest_spec.coffee}

@@ -14,10 +14,6 @@ describe "Joosy.Resource.REST", ->
     class @Cat extends Joosy.Resource.REST
       @entity 'cat'
 
-    class @Dog extends Joosy.Resource.REST
-      @entity 'dog'
-      @source '/cuties'
-
   beforeEach ->
     @server = sinon.fakeServer.create()
 
@@ -37,10 +33,6 @@ describe "Joosy.Resource.REST", ->
     expect(Animal.Cat.basePath parent: parent).toEqual '/fluffy_parents/1/animal/cats'
     expect(Animal.Cat.basePath parent: [grandParent, parent]).toEqual '/fluffy_parents/666/fluffy_parents/1/animal/cats'
 
-    expect(Animal.Dog.basePath()).toEqual '/cuties'
-    expect(Animal.Dog.basePath parent: parent).toEqual '/fluffy_parents/1/cuties'
-    expect(Animal.Dog.basePath parent: [grandParent, parent]).toEqual '/fluffy_parents/666/fluffy_parents/1/cuties'
-
   it "builds member path", ->
     parent = FluffyParent.build 1
     grandParent = FluffyParent.build 666

data/spec/{javascripts/joosy/core/router_spec.js.coffee → joosy/core/router_spec.coffee}

@@ -141,7 +141,7 @@ describe "Joosy.Router", ->
 
     Joosy.Application.setCurrentPage.restore()
     Joosy.Router.restrict false
-
+    
   it "should DRAW simple routes, only using match and root", ->
     Joosy.Router.map
       '/': spies.root
@@ -150,14 +150,14 @@ describe "Joosy.Router", ->
     raw_routes_for_map = Joosy.Router.rawRoutes
 
     Joosy.Router.reset()
-
+    
     Joosy.Router.draw ->
       @root to: spies.root
       @match '/page', to: TestPage
       @notFound to: spies.wildcard
-
+      
     expect(Joosy.Router.rawRoutes).toEqual(raw_routes_for_map)
-
+    
   it "should DRAW namespaced routes", ->
     Joosy.Router.map
       '/': spies.root
@@ -169,7 +169,7 @@ describe "Joosy.Router", ->
     rawRoutesForMap = Joosy.Router.rawRoutes
 
     Joosy.Router.reset()
-
+    
     Joosy.Router.draw ->
       @root to: spies.root
       @match '/page', to: TestPage
@@ -177,25 +177,25 @@ describe "Joosy.Router", ->
         @match '/page/:id', to: spies.section
         @match '/page2/:more', to: TestPage
       @notFound to: spies.wildcard
-
+      
     expect(Joosy.Router.rawRoutes).toEqual(rawRoutesForMap)
-
+    
   it "should DRAW simple route reverses, only using match and root", ->
     Joosy.Router.draw ->
       @root to: spies.root
       @match '/page', to: TestPage, as: "page"
       @match '/page/:id', to: TestPage, as: "pageFor"
       @notFound to: spies.wildcard
-
+      
     validate = ->
       expect(@rootUrl).not.toEqual undefined
       expect(@rootPath).not.toEqual undefined
-
+    
       expect(@rootPath()).toEqual "#!/"
       expect(@pagePath()).toEqual "#!/page"
       expect(@pageForPath(id: 3)).toEqual "#!/page/3"
     validate.call(Joosy.Helpers.Application)
-
+    
   it "should DRAW more complex reverses using namespaces", ->
     Joosy.Router.draw ->
       @namespace '/projects', as: "projects", ->
@@ -203,13 +203,11 @@ describe "Joosy.Router", ->
         @namespace "/:id", ->
           @match "/", to: TestPage, as: "show"
           @match "/edit", to: TestPage, as: "edit"
-
-        @namespace '/subnamespace', as: 'subnamespace', ->
-          @match '/', to: TestPage, as: 'index'
-
+          @match "/delete", to: TestPage, as: "delete"
+          
       @namespace '/tickets', ->
         @match "/", to: TestPage, as: "tasksIndex"
-
+        
       @namespace '/activities', ->
         @root to: TestPage, as: "activities"
 
@@ -217,21 +215,20 @@ describe "Joosy.Router", ->
       expect(@projectsIndexPath).not.toEqual undefined
       expect(@projectsIndexPath()).not.toEqual "#!/projects"
       expect(@projectsIndexPath()).toEqual "#!/projects/"
-
+    
       expect(@projectsShowPath(id: 3)).toEqual "#!/projects/3/"
       expect(@projectsEditPath(id: 3)).toEqual "#!/projects/3/edit"
-
+      expect(@projectsDeletePath(id: 3)).toEqual "#!/projects/3/delete"
+    
       expect(@tasksIndexPath()).toEqual "#!/tickets/"
       expect(@activitiesPath()).toEqual "#!/activities/"
-
-      expect(@projectsSubnamespaceIndexPath()).toEqual '#!/projects/subnamespace/'
     validate.call(Joosy.Helpers.Application)
-
+    
   it "should return reverse url with hostname and pathname", ->
     Joosy.Router.draw ->
       @match "/projects/", to: TestPage, as: "projectsIndex"
-
+        
     validate = ->
       expect(@projectsIndexPath()).toEqual "#!/projects/"
-      expect(@projectsIndexUrl()).toEqual "http://localhost:8888/#!/projects/"
+      expect(@projectsIndexUrl()).toEqual "#{location.protocol}//#{location.host}#{location.pathname}#!/projects/"
     validate.call(Joosy.Helpers.Application)

data/spec/{javascripts/joosy/preloaders/caching_spec.js.coffee → joosy/preloaders/caching_spec.coffee}

@@ -8,7 +8,7 @@ describe "CachingPreloader", ->
     server   = sinon.fakeServer.create()
 
     load = ->
-      CachingPreloader.load [['/spec/javascripts/support/assets/test.js']],
+      CachingPreloader.load [['/test.js']],
         complete: callback
 
     load()
@@ -16,7 +16,7 @@ describe "CachingPreloader", ->
     expect(server.requests.length).toEqual 1
     target = server.requests[0]
     expect(target.method).toEqual 'GET'
-    expect(target.url).toMatch /^\/spec\/javascripts\/support\/assets\/test.js$/
+    expect(target.url).toMatch /^\/test.js$/
     target.respond 200, 'Content-Type': 'application/javascript',
       "window.variable_assigned_on_load = 'yapyap';"
 

data/spec/{javascripts/joosy/preloaders/inline_spec.js.coffee → joosy/preloaders/inline_spec.coffee}

@@ -5,7 +5,7 @@ describe "InlinePreloader", ->
     callback = sinon.spy()
 
     runs ->
-      InlinePreloader.load [['/spec/javascripts/support/assets/test.js']],
+      InlinePreloader.load [['/spec/support/test.js']],
         complete: callback
 
     waits 100

data/spec/support/test.js

@@ -0,0 +1 @@
+window.variable_assigned_on_load = 'yapyap';

data/{app/assets/javascripts/joosy/core/form.js.coffee → src/joosy/core/form.coffee}

@@ -157,7 +157,7 @@ class Joosy.Form extends Joosy.Module
   # Resets form submit behavior to default
   #
   unbind: ->
-    @container.unbind('submit').find('input:submit,input:image,button:submit').unbind('click');
+    @container.unbind('submit').find('input:submit,input:image,button:submit').unbind('click')
 
   #
   # Links current form with given resource and sets values of form inputs from with it.
@@ -185,7 +185,7 @@ class Joosy.Form extends Joosy.Module
       data.__joosy_form_filler_lock = true
       Object.each data, (property, val) =>
         key = @concatFieldName scope, property
-        input = @fields.filter("[name='#{key}']:not(:file),[name='#{key.underscore()}']:not(:file),[name='#{key.camelize(false)}']:not(:file)")
+        input = @$fields.filter("[name='#{key}']:not(:file),[name='#{key.underscore()}']:not(:file),[name='#{key.camelize(false)}']:not(:file)")
         if input.length > 0
           if input.is ':checkbox'
             if val
@@ -203,7 +203,7 @@ class Joosy.Form extends Joosy.Module
           filler val.data, @concatFieldName(scope, "[#{property}_attributes][0]")
         else if Object.isObject(val) || Object.isArray(val)
           filler val, key
-        else 
+        else
       delete data.__joosy_form_filler_lock
 
     filler data, resource.__entityName || options.resourceName
@@ -252,7 +252,7 @@ class Joosy.Form extends Joosy.Module
   #
   __before: (xhr, settings) ->
     if !@before? || @before(arguments...) is true
-      @fields.removeClass @invalidationClass
+      @$fields.removeClass @invalidationClass
 
   #
   # Inner error callback.
@@ -298,7 +298,7 @@ class Joosy.Form extends Joosy.Module
   # @param [String] field         Name of field to find
   #
   findField: (field) ->
-    @fields.filter("[name='#{field}']")
+    @$fields.filter("[name='#{field}']")
 
   #
   # Simulates REST methods by adding hidden _method input with real method

data/{app/assets/javascripts/joosy/core/joosy.js.coffee → src/joosy/core/joosy.coffee}

@@ -35,7 +35,7 @@
     name  = name.split '.'
     space = window
     for part in name
-      space = space[part] ?= {}
+      space = space[part] ?= {} if part.length > 0
 
     if generator
       generator = generator.apply space

data/{app/assets/javascripts/joosy/core/modules/container.js.coffee → src/joosy/core/modules/container.coffee}

@@ -29,7 +29,7 @@ Joosy.Modules.Container =
   refreshElements: ->
     @__collectElements().each (key, value) =>
       # TODO: Check for possible collisions?
-      @[key] = @$(value)
+      @['$'+key] = @$(value)
 
     if @hasOwnProperty "__onRefreshes"
       @__onRefreshes.each (callback) => callback.apply @

data/{app/assets/javascripts/joosy/core/modules/events.js.coffee → src/joosy/core/modules/events.coffee}

@@ -1,5 +1,3 @@
-#= require joosy/core/joosy
-
 #
 # Basic events implementation
 #
@@ -15,13 +13,13 @@ Joosy.Modules.Events =
   # @param [Hash] options               Options
   #
   wait: (name, events, callback) ->
-    @__oneShotEvents ||= {}
+    @__oneShotEvents ||= Object.extended()
 
     # unnamed binding
     if Object.isFunction(events)
       callback = events
       events   = name
-      name     = Object.keys(@__oneShotEvents).length.toString()
+      name     = @__oneShotEvents.keys().length.toString()
 
     events = @__splitEvents events
     @__validateEvents events
@@ -37,13 +35,13 @@ Joosy.Modules.Events =
   # @param [Hash] options               Options
   #
   bind: (name, events, callback) ->
-    @__boundEvents ||= {}
+    @__boundEvents ||= Object.extended()
 
     # unnamed binding
     if Object.isFunction(events)
       callback = events
       events   = name
-      name     = Object.keys(@__boundEvents).length.toString()
+      name     = @__boundEvents.keys().length.toString()
 
     events = @__splitEvents events
     @__validateEvents events

data/{app/assets/javascripts/joosy/core/modules/renderer.js.coffee → src/joosy/core/modules/renderer.coffee}

@@ -1,5 +1,5 @@
 #= require_tree ../templaters
-#= require metamorph
+#= require vendor/metamorph
 
 #
 # Core DOM rendering mechanics

data/{app/assets/javascripts/joosy/core/page.js.coffee → src/joosy/core/page.coffee}

@@ -155,7 +155,6 @@ class Joosy.Page extends Joosy.Module
   #
   @fetchSynchronized: (callback) ->
     @::__fetch = (complete) ->
-      @data = {}
       @synchronize (context) ->
         context.after -> complete()
         callback.call(this, context)