joosy 1.0.0.RC4 → 1.0.0.RC5

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

@@ -21,16 +21,16 @@ describe "Joosy.Resource.Generic", ->
   it "remembers where it belongs", ->
     resource = new Joosy.Resource.Generic foo: 'bar'
     expect(resource.data).toEqual foo: 'bar'
-    
+
   it "produces magic function", ->
     expect(Object.isFunction @resource).toBeTruthy()
     expect(@resource.data).toEqual @data
-    
+
   it "gets values", ->
     expect(@resource 'foo').toEqual 'bar'
     expect(@resource 'very.deep').toEqual value: 'boo!'
     expect(@resource 'very.deep.value').toEqual 'boo!'
-    
+
   it "sets values", ->
     expect(@resource 'foo').toEqual 'bar'
     @resource 'foo', 'baz'
@@ -39,49 +39,49 @@ describe "Joosy.Resource.Generic", ->
     expect(@resource 'very.deep').toEqual value: 'boo!'
     @resource 'very.deep', 'banana!'
     expect(@resource 'very.deep').toEqual 'banana!'
-    
+
     @resource 'another.deep.value', 'banana strikes back'
     expect(@resource 'another.deep').toEqual value: 'banana strikes back'
-    
+
   it "handles @at", ->
     class Fluffy extends Joosy.Resource.Generic
       @entity 'fluffy'
 
     clone = Fluffy.at('rumbas!')
-    
+
     expect(clone.__source).toEqual 'rumbas!'
     expect(Joosy.Module.hasAncestor clone, Fluffy).toBeTruthy()
 
     clone = Fluffy.at Test.build(1)
-    
+
     expect(clone.__source).toEqual '/tests/1/fluffies'
     expect(Joosy.Module.hasAncestor clone, Fluffy).toBeTruthy()
     # clone won't be instanceof Fluffy in IE
     #expect(clone.build({}) instanceof Fluffy).toBeTruthy()
-    
+
   it "triggers 'changed' right", ->
     callback = sinon.spy()
     @resource.bind 'changed', callback
     @resource 'foo', 'baz'
     @resource 'foo', 'baz2'
-    
+
     expect(callback.callCount).toEqual(2)
-    
+
   it "handles the before filter", ->
     class R extends Joosy.Resource.Generic
       @beforeLoad (data) ->
         data ||= {}
         data.tested = true
         data
-        
+
       resource = R.build()
-      
+
       expect(resource 'tested').toBeTruthy()
-      
+
   it "should map inlines", ->
-    class RumbaMumba extends Joosy.Resource.Generic   
+    class RumbaMumba extends Joosy.Resource.Generic
       @entity 'rumba_mumba'
- 
+
     class R extends Joosy.Resource.Generic
       @map 'rumbaMumbas', RumbaMumba
 
@@ -103,7 +103,7 @@ describe "Joosy.Resource.Generic", ->
 
   it "should use magic collections", ->
     class window.RumbaMumbasCollection extends Joosy.Resource.Collection
-      
+
     class RumbaMumba extends Joosy.Resource.Generic
       @entity 'rumba_mumba'
     class R extends Joosy.Resource.Generic
@@ -116,9 +116,9 @@ describe "Joosy.Resource.Generic", ->
       ]
     expect(resource('rumbaMumbas') instanceof RumbaMumbasCollection).toBeTruthy()
     expect(resource('rumbaMumbas').at(0)('foo')).toEqual 'bar'
-    
+
     window.RumbaMumbasCollection = undefined
-    
+
   it "should use manually set collections", ->
     class OloCollection extends Joosy.Resource.Collection
 
@@ -152,4 +152,4 @@ describe "Joosy.Resource.Generic", ->
 
       inline('foo', 'bar')
 
-      expect(root('test_inlines').at(0)('foo')).toEqual 'bar'
+      expect(root('test_inlines').at(0)('foo')).toEqual 'bar'

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

@@ -12,7 +12,6 @@ describe "Joosy.Resource.RESTCollection", ->
 
   it "loads", ->
     @collection.load [{"id": 1, "name": "test1"}, {"id": 2, "name": "test2"}]
-    console.log @collection.data[0].constructor
     expect(@collection.data.length).toEqual 2
     expect(@collection.data[0] instanceof Test).toBeTruthy()
     expect(@collection.data[0].data.name).toEqual 'test1'

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

@@ -23,17 +23,21 @@ describe "Joosy.Resource.REST", ->
 
   it "builds member path", ->
     parent = FluffyParent.build 1
+    grandParent = FluffyParent.build 666
 
     expect(Fluffy.memberPath 1).toEqual '/fluffies/1'
     expect(Fluffy.memberPath 1, parent: parent).toEqual '/fluffy_parents/1/fluffies/1'
+    expect(Fluffy.memberPath 1, parent: [grandParent, parent]).toEqual '/fluffy_parents/666/fluffy_parents/1/fluffies/1'
     expect(Fluffy.memberPath 1, parent: parent, from: 'test').toEqual '/fluffy_parents/1/fluffies/1/test'
     expect(Fluffy.memberPath 1, parent: parent, from: 'test', params: {foo: 'bar'}).toEqual '/fluffy_parents/1/fluffies/1/test'
 
   it "builds collection path", ->
     parent = FluffyParent.build 1
+    grandParent = FluffyParent.build 666
 
     expect(Fluffy.collectionPath()).toEqual '/fluffies'
     expect(Fluffy.collectionPath parent: parent).toEqual '/fluffy_parents/1/fluffies'
+    expect(Fluffy.collectionPath parent: [grandParent, parent]).toEqual '/fluffy_parents/666/fluffy_parents/1/fluffies'
     expect(Fluffy.collectionPath parent: parent, from: 'test').toEqual '/fluffy_parents/1/fluffies/test'
     expect(Fluffy.collectionPath parent: parent, from: 'test', params: {foo: 'bar'}).toEqual '/fluffy_parents/1/fluffies/test'
 
@@ -41,10 +45,11 @@ describe "Joosy.Resource.REST", ->
   describe "finds resource", ->
     rawData = '{"fluffy": {"id": 1, "name": "test1"}}'
 
-    callback = sinon.spy (target) ->
+    callback = sinon.spy (target, data) ->
       expect(target instanceof Fluffy).toEqual true
       expect(target.id()).toEqual 1
       expect(target 'name').toEqual 'test1'
+      expect(data).toEqual $.parseJSON(rawData)
 
     it "without params", ->
       resource = Fluffy.find 1, callback
@@ -75,12 +80,13 @@ describe "Joosy.Resource.REST", ->
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/1\?_=\d+/, rawData
 
   describe "finds collection", ->
-    rawData = '{"fluffies": [{"id": 1, "name": "test1"}, {"id": 2, "name": "test2"}]}'
+    rawData = '{"page": 42, "fluffies": [{"id": 1, "name": "test1"}, {"id": 2, "name": "test2"}]}'
 
-    callback = sinon.spy (target) ->
+    callback = sinon.spy (target, data) ->
       expect(target instanceof Joosy.Resource.RESTCollection).toEqual true
       expect(target.size()).toEqual 2
       expect(target.at(0) instanceof Fluffy).toEqual true
+      expect(data).toEqual $.parseJSON(rawData)
 
     it "without params", ->
       resource = Fluffy.find 'all', callback

data/spec/javascripts/joosy/preloaders/caching_spec.js.coffee

@@ -3,16 +3,16 @@ describe "CachingPreloader", ->
   it "should load JS", ->
     window.variable_assigned_on_load = undefined
     localStorage.clear()
-    
+
     callback = sinon.spy()
     server   = sinon.fakeServer.create()
-    
+
     load = ->
-      CachingPreloader.load [['/spec/javascripts/support/assets/test.js']], 
+      CachingPreloader.load [['/spec/javascripts/support/assets/test.js']],
         complete: callback
 
     load()
-    
+
     expect(server.requests.length).toEqual 1
     target = server.requests[0]
     expect(target.method).toEqual 'GET'
@@ -23,9 +23,9 @@ describe "CachingPreloader", ->
     expect(callback.callCount).toEqual 1
     expect(window.variable_assigned_on_load).toEqual 'yapyap'
     window.variable_assigned_on_load = undefined
-    
+
     load()
-    
+
     expect(server.requests.length).toEqual 1
     expect(callback.callCount).toEqual 2
     expect(window.variable_assigned_on_load).toEqual 'yapyap'
@@ -33,4 +33,4 @@ describe "CachingPreloader", ->
     server.restore()
 
     window.variable_assigned_on_load = undefined
-    localStorage.clear()
+    localStorage.clear()

data/spec/javascripts/joosy/preloaders/inline_spec.js.coffee

@@ -3,14 +3,14 @@ describe "InlinePreloader", ->
   it "should load JS", ->
     window.variable_assigned_on_load = undefined
     callback = sinon.spy()
-    
+
     runs ->
-      InlinePreloader.load [['/spec/javascripts/support/assets/test.js']], 
+      InlinePreloader.load [['/spec/javascripts/support/assets/test.js']],
         complete: callback
-    
+
     waits 100
-    
+
     runs ->
       expect(callback.callCount).toEqual 1
       expect(window.variable_assigned_on_load).toEqual 'yapyap'
-      window.variable_assigned_on_load = undefined
+      window.variable_assigned_on_load = undefined

data/spec/javascripts/support/sinon-1.3.1.js

@@ -4,13 +4,13 @@
  * @author Christian Johansen (christian@cjohansen.no)
  *
  * (The BSD License)
- * 
+ *
  * Copyright (c) 2010-2011, Christian Johansen, christian@cjohansen.no
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright notice,
  *       this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
  *     * Neither the name of Christian Johansen nor the names of his contributors
  *       may be used to endorse or promote products derived from this software
  *       without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -1197,7 +1197,7 @@ var sinon = (function (buster) {
             } else {
                 this.exception = error;
             }
-            
+
             return this;
         }
 
@@ -1238,7 +1238,7 @@ var sinon = (function (buster) {
                 if (typeof pos != "number") {
                     throw new TypeError("argument index is not number");
                 }
-                
+
                 this.returnArgAt = pos;
 
                 return this;

data/spec/javascripts/support/sinon-ie-1.3.1.js

@@ -4,13 +4,13 @@
  * @author Christian Johansen (christian@cjohansen.no)
  *
  * (The BSD License)
- * 
+ *
  * Copyright (c) 2010-2011, Christian Johansen, christian@cjohansen.no
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright notice,
  *       this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
  *     * Neither the name of Christian Johansen nor the names of his contributors
  *       may be used to endorse or promote products derived from this software
  *       without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -79,4 +79,4 @@ function XMLHttpRequest() {}
 
 // Reassign the original function. Now its writable attribute
 // should be true. Hackish, I know, but it works.
-XMLHttpRequest = sinon.xhr.XMLHttpRequest || undefined;
+XMLHttpRequest = sinon.xhr.XMLHttpRequest || undefined;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.0.0.RC4
+  version: 1.0.0.RC5
   prerelease: 6
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70267714575100 !ruby/object:Gem::Requirement
+  requirement: &70277116410620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70267714575100
+  version_requirements: *70277116410620
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &70267714574680 !ruby/object:Gem::Requirement
+  requirement: &70277116408700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70267714574680
+  version_requirements: *70277116408700
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70267714574220 !ruby/object:Gem::Requirement
+  requirement: &70277116407280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70267714574220
+  version_requirements: *70277116407280
 - !ruby/object:Gem::Dependency
   name: haml_coffee_assets
-  requirement: &70267714609360 !ruby/object:Gem::Requirement
+  requirement: &70277116405680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70267714609360
+  version_requirements: *70277116405680
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &70267714608940 !ruby/object:Gem::Requirement
+  requirement: &70277116402480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70267714608940
+  version_requirements: *70277116402480
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70267714608520 !ruby/object:Gem::Requirement
+  requirement: &70277116399260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267714608520
+  version_requirements: *70277116399260
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &70267714608100 !ruby/object:Gem::Requirement
+  requirement: &70277116397960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267714608100
+  version_requirements: *70277116397960
 - !ruby/object:Gem::Dependency
   name: guard-sprockets
-  requirement: &70267714607680 !ruby/object:Gem::Requirement
+  requirement: &70277116396780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267714607680
+  version_requirements: *70277116396780
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &70267714607260 !ruby/object:Gem::Requirement
+  requirement: &70277116396020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,7 +112,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267714607260
+  version_requirements: *70277116396020
 description: A gem wrapper to include Joosy via the asset pipeline.
 email: boris@roundlake.ru
 executables: []
@@ -184,6 +184,7 @@ files:
 - lib/rails/generators/joosy/templates/app_railties.js.coffee.erb
 - lib/rails/generators/joosy/templates/preload.html.erb
 - lib/rails/generators/joosy/templates/preload.html.haml
+- lib/rails/generators/joosy/templates/preload.html.slim
 - lib/rails/generators/joosy/widget_generator.rb
 - lib/rails/resources_with_joosy.rb
 - spec/javascripts/helpers/spec_helper.js.coffee
@@ -191,6 +192,7 @@ files:
 - spec/javascripts/joosy/core/form_spec.js.coffee
 - spec/javascripts/joosy/core/helpers/forms_spec.js.coffee
 - spec/javascripts/joosy/core/helpers/view_spec.js.coffee
+- spec/javascripts/joosy/core/helpers/widgets_spec.js.coffee
 - spec/javascripts/joosy/core/joosy_spec.js.coffee
 - spec/javascripts/joosy/core/layout_spec.js.coffee
 - spec/javascripts/joosy/core/modules/container_spec.js.coffee