joosy 1.0.0.RC2 → 1.0.0.RC3

data/Gemfile.lock

@@ -19,7 +19,7 @@ GIT
 PATH
   remote: .
   specs:
-    joosy (1.0.0.RC1)
+    joosy (1.0.0.RC3)
       coffee-rails
       haml_coffee_assets
       i18n-js
@@ -82,7 +82,7 @@ GEM
     guard-coffeescript (0.5.7)
       coffee-script (>= 2.2.0)
       guard (>= 0.8.3)
-    haml_coffee_assets (0.9.1)
+    haml_coffee_assets (0.9.3)
       execjs (>= 1.2.9)
       sprockets (>= 2.0.3)
       tilt (>= 1.3.3)

data/app/assets/javascripts/joosy/core/form.js.coffee

@@ -164,8 +164,10 @@ class Joosy.Form extends Joosy.Module
       data = resource.data
 
     filler = (data, scope) =>
-      Object.each data, (key, val) =>
-        key = @concatFieldName scope, key
+      return if data.__joosy_form_filler_lock
+      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)")
         if input.length > 0
           unless input.is ':checkbox'
@@ -177,10 +179,12 @@ class Joosy.Form extends Joosy.Module
               input.removeAttr 'checked'
         if Object.isObject val
           filler val, key
-# TODO: decide how to make these cases compatible with Rails
-#        else if val instanceof Joosy.Resource.REST
-#          #filler val.data, key
-#        else if val instanceof Joosy.Resource.RESTCollection
+        else if val instanceof Joosy.Resource.REST
+          filler val.data, @concatFieldName(scope, "[#{property}_attributes][0]")
+        else if val instanceof Joosy.Resource.RESTCollection
+          for entity, i in val.data
+            filler entity.data, @concatFieldName(scope, "[#{property}_attributes][#{i}]")
+      delete data.__joosy_form_filler_lock
 
     filler data, resource.__entityName
 

data/app/assets/javascripts/joosy/core/page.js.coffee

@@ -10,7 +10,7 @@
 
 #
 # Base class for all of your Joosy Pages.
-# @see http://guides.joosy.ws/guides/layouts-pages-and-routing.html
+# @see http://guides.joosy.ws/guides/blog/layouts-pages-and-routing.html
 #
 # @example Sample application page
 #   class @RumbaPage extends Joosy.Layout

data/app/assets/javascripts/joosy/core/resource/rest.js.coffee

@@ -69,8 +69,8 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
   #
   # @see Joosy.Resource.REST.collectionPath
   #
-  collectionPath: ->
-    @constructor.collectionPath()
+  collectionPath: (options={}) ->
+    @constructor.collectionPath options
 
   #
   # Sends the GET query using collectionPath.

data/app/assets/javascripts/joosy/core/router.js.coffee

@@ -85,10 +85,12 @@ Joosy.Router =
   # during system startup
   #
   __setupRoutes: ->
+    $(window).hashchange =>
+      unless @__ignoreRequest && location.hash.match(@__ignoreRequest)
+        @__respondRoute location.hash 
+
     @__prepareRoutes @rawRoutes
     @__respondRoute location.hash
-    $(window).hashchange =>
-      @__respondRoute location.hash unless @__ignoreRequest && location.hash.match(@__ignoreRequest)
 
   #
   # Compiles routes to map object

data/lib/joosy/rails/version.rb

@@ -1,5 +1,5 @@
 module Joosy
   module Rails
-    VERSION = "1.0.0.RC2"
+    VERSION = "1.0.0.RC3"
   end
 end

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

@@ -3,8 +3,8 @@
   %head
     %title> <%= file_path %>
 
-    javascript:
-      window.preload = {
+    :javascript
+      window.joosy = {
         libraries: #{extract_sources_and_sizes_from_include_tag('<%= file_path %>')}
       };
 

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

@@ -6,14 +6,16 @@ describe "Joosy.Form", ->
     @nudeForm = "<form id='nude'><input name='test[foo]'/><input name='test[bar]'/><input name='test[bool]' type='checkbox' value='1'/></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]'/></form>"
-    @exactForm = "<form id='nested'><input name='test[EXact][MATCH]'/></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>"
 
-    @ground.find('#sidebar').after(@nudeForm).after(@putForm).after(@moreForm)
+    @ground.find('#sidebar').after(@nudeForm).after(@putForm).after(@moreForm).after(@nestedForm).after(@exactForm)
 
     @nudeForm = $('#nude')
     @putForm  = $('#put')
     @moreForm = $('#more')
+    @nestedForm = $('#nested')
+    @exactForm = $('#exact')
 
     class Test extends Joosy.Resource.REST
       @entity 'test'
@@ -30,6 +32,8 @@ describe "Joosy.Form", ->
           test: 'test'
       EXact:
         MATCH: 'works'
+      items: (new Joosy.Resource.RESTCollection(Test)).load([{attr: 'one'}, {attr: 'two'}])
+      single: Test.build(attr: 'sin')
 
   afterEach ->
     @server.restore()
@@ -130,9 +134,17 @@ describe "Joosy.Form", ->
       expect(@nudeForm.concatFieldName '[resource][key]', '[key1][key2]').toEqual 'resource[key][key1][key2]'
       expect(@nudeForm.concatFieldName '[][]', '[][]').toEqual '[][][]' # oops
 
-    it "should fill nested attributes", ->
+    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'
+
+    it "should break cross-references", ->
+      @resource('single')('trololo', @resource)
+      @nestedForm.fill @resource
+      # expect(you).toBeAlive(), lol
 
   describe "Callbacks", ->
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.0.0.RC2
+  version: 1.0.0.RC3
   prerelease: 6
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70270595054760 !ruby/object:Gem::Requirement
+  requirement: &70260746932080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70270595054760
+  version_requirements: *70260746932080
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &70270595054340 !ruby/object:Gem::Requirement
+  requirement: &70260746931660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70270595054340
+  version_requirements: *70260746931660
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70270595053880 !ruby/object:Gem::Requirement
+  requirement: &70260746931200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70270595053880
+  version_requirements: *70260746931200
 - !ruby/object:Gem::Dependency
   name: haml_coffee_assets
-  requirement: &70270595053460 !ruby/object:Gem::Requirement
+  requirement: &70260746930780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70270595053460
+  version_requirements: *70260746930780
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &70270595053040 !ruby/object:Gem::Requirement
+  requirement: &70260746930360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70270595053040
+  version_requirements: *70260746930360
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70270595052620 !ruby/object:Gem::Requirement
+  requirement: &70260746929940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70270595052620
+  version_requirements: *70260746929940
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &70270595052200 !ruby/object:Gem::Requirement
+  requirement: &70260746929520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70270595052200
+  version_requirements: *70260746929520
 - !ruby/object:Gem::Dependency
   name: guard-sprockets
-  requirement: &70270595051780 !ruby/object:Gem::Requirement
+  requirement: &70260746929100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70270595051780
+  version_requirements: *70260746929100
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &70270595051360 !ruby/object:Gem::Requirement
+  requirement: &70260746928680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,7 +112,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70270595051360
+  version_requirements: *70260746928680
 description: A gem wrapper to include Joosy via the asset pipeline.
 email: boris@roundlake.ru
 executables: []