joosy 1.0.0.RC3 → 1.0.0.RC4

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

@@ -101,12 +101,17 @@ class Joosy.Layout extends Joosy.Module
   #     $.get '/rumbas', (@data) => complete()
   #
   @fetch: (callback) ->
-    @::__fetch = callback
+    @::__fetch = (complete) -> 
+      @data = {}
+      callback.call this, =>
+        @dataFetched = true
+        complete()
 
   #
-  # Defaults to `false` to ease beforePaint state check.
+  # Prefetched page data.
   #
   data: false
+  dataFetched: false
   
   #
   # @param [Hash] params              List of route params

data/app/assets/javascripts/joosy/core/modules/renderer.js.coffee

@@ -85,14 +85,20 @@ Joosy.Modules.Renderer =
     stack.template = template
     stack.locals   = locals
 
-    isResource   = Joosy.Module.hasAncestor locals.constructor, Joosy.Resource.Generic
-    isCollection = Joosy.Module.hasAncestor locals.constructor, Joosy.Resource.Collection
+    # If template was given as a lambda, parameters should
+    # be passed as a context, not as a argument
+    assignContext = false
+
+    isResource    = Joosy.Module.hasAncestor locals.constructor, Joosy.Resource.Generic
+    isCollection  = Joosy.Module.hasAncestor locals.constructor, Joosy.Resource.Collection
 
     if Object.isString template
       if @__renderSection?
         template = Joosy.Application.templater.resolveTemplate @__renderSection(), template, this
 
       template = Joosy.Application.templater.buildView template
+    else if Object.isFunction template
+      assignContext = true
     else if !Object.isFunction template
       throw new Error "#{Joosy.Module.__className @}> template (maybe @view) does not look like a string or lambda"
 
@@ -104,6 +110,8 @@ Joosy.Modules.Renderer =
         @render template, locals, stack
       renderDynamic: (template, locals={}) =>
         @renderDynamic template, locals, stack
+      renderInline: (locals={}, template) =>
+        @renderDynamic template, locals, stack
 
     context = =>
       data = {}
@@ -117,7 +125,11 @@ Joosy.Modules.Renderer =
       Joosy.Module.merge data, renderers
       data
 
-    result = -> template(context())
+    result = ->
+      if assignContext
+        template.call(context())
+      else
+        template(context())
 
     if dynamic
       morph  = Metamorph result()

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

@@ -52,6 +52,7 @@ class Joosy.Page extends Joosy.Module
   # Prefetched page data.
   #
   data: false
+  dataFetched: false
 
   #
   # Sets layout for current page
@@ -133,7 +134,9 @@ class Joosy.Page extends Joosy.Module
   @fetch: (callback) ->
     @::__fetch = (complete) -> 
       @data = {}
-      callback.call(this, complete)
+      callback.call this, =>
+        @dataFetched = true
+        complete()
 
   #
   # Sets the several separate methods that will fetch data in parallel.

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

@@ -114,6 +114,9 @@ class Joosy.Resource.Collection extends Joosy.Module
   #
   find: (description) ->
     @data.find description
+
+  sortBy: (params...) ->
+    @data.sortBy params...
   
   #
   # Gets resource by id

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

@@ -72,7 +72,8 @@ class Joosy.Resource.Generic extends Joosy.Module
     class clone extends this
 
     if entity instanceof Joosy.Resource.Generic
-      clone.__source = entity.memberPath()
+      clone.__source  = entity.memberPath() 
+      clone.__source += '/' + @::__entityName.pluralize() if @::__entityName
     else
       clone.__source = entity
 

data/lib/joosy/rails/version.rb

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

data/lib/rails/generators/joosy/layout_generator.rb

@@ -8,10 +8,8 @@ module Joosy
       def create_files
         super
 
-        empty_directory "#{app_path}/layouts"
         template "app/layouts/template.js.coffee", "#{app_path}/layouts/#{file_name}.js.coffee"
 
-        empty_directory "#{app_path}/templates/layouts"
         create_file("#{app_path}/templates/layouts/#{file_name}.jst.#{options[:template_kind]}")
       end
 

data/lib/rails/generators/joosy/page_generator.rb

@@ -8,10 +8,8 @@ module Joosy
       def create_files
         super
 
-        empty_directory "#{app_path}/pages/#{namespace_path}"
         template "app/pages/template.js.coffee", "#{app_path}/pages/#{namespace_path}/#{file_name}.js.coffee"
 
-        empty_directory "#{app_path}/templates/pages/#{namespace_path}"
         create_file "#{app_path}/templates/pages/#{namespace_path}/#{file_name}.jst.#{options[:template_kind]}"
       end
 

data/lib/rails/generators/joosy/preloader_generator.rb

@@ -18,10 +18,8 @@ HELP
 
         template "app_preloader.js.coffee.erb", "app/assets/javascripts/#{file_name}_preloader.js.coffee.erb"
 
-        empty_directory "app/controllers"
         template "app_controller.rb", "app/controllers/#{file_name}_controller.rb"
 
-        empty_directory "app/views/layouts"
         template "preload.html.#{options[:template_engine]}",
                  "app/views/layouts/#{file_name}.html.#{options[:template_engine]}"
 

data/lib/rails/generators/joosy/resource_generator.rb

@@ -8,7 +8,6 @@ module Joosy
       def create_files
         super
 
-        empty_directory "#{app_path}/resources"
         template "app/resources/template.js.coffee", "#{app_path}/resources/#{file_name}.js.coffee"
       end
 

data/lib/rails/generators/joosy/templates/app/templates/layouts/application.jst.hamlc

@@ -1,2 +1,2 @@
-#page{:style => 'font-family: "Lucida Grande", "Verdana"; text-align: center'}
+#page{:style => 'text-align: center'}
   .content{:id => @yield()}

data/lib/rails/generators/joosy/widget_generator.rb

@@ -8,10 +8,8 @@ module Joosy
       def create_files
         super
 
-        empty_directory "#{app_path}/widgets"
         template "app/widgets/template.js.coffee", "#{app_path}/widgets/#{file_name}.js.coffee"
 
-        empty_directory "#{app_path}/templates/widgets"
         create_file "#{app_path}/templates/widgets/#{file_name}.jst.#{options[:template_kind]}"
       end
 

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

@@ -24,8 +24,7 @@ describe "Joosy.Modules.Renderer", ->
 
   it "updates contents, but only while it is bound to DOM", ->
     @TestContainer.view (locals) ->
-      template = (locals) ->
-        "#{locals.object.value}"
+      template = -> @object.value
 
       @renderDynamic(template, locals)
 
@@ -57,8 +56,7 @@ describe "Joosy.Modules.Renderer", ->
     data = Joosy.Resource.Generic.build zombie: 'rock'
 
     @TestContainer.view (locals) ->
-      template = (locals) -> 
-        "#{locals.zombie}"
+      template = -> @zombie
 
       @renderDynamic(template, locals)
 
@@ -92,8 +90,7 @@ describe "Joosy.Modules.Renderer", ->
       ]
 
     @TestContainer.view (locals) ->
-      template = (locals) ->
-        "#{locals.data[1] 'zombie'}"
+      template = -> @data[1] 'zombie'
 
       @renderDynamic(template, locals)
 
@@ -118,8 +115,7 @@ describe "Joosy.Modules.Renderer", ->
 
   it "debounces morpher updates", ->
     @TestContainer.view (locals) ->
-      template = (locals) ->
-        "#{locals.object.value}"
+      template = -> @object.value
   
       @renderDynamic(template, locals)
   
@@ -155,8 +151,7 @@ describe "Joosy.Modules.Renderer", ->
     @TestContainer.helpers "Hoge"
 
     @TestContainer.view (locals) ->
-      template = (locals) ->
-        "#{locals.multiplier(10)}"
+      template = (locals) -> @multiplier(10)
 
       @render(template, locals)
 
@@ -172,8 +167,7 @@ describe "Joosy.Modules.Renderer", ->
       value * 6
 
     @TestContainer.view (locals) ->
-      template = (locals) ->
-        "#{locals.globalMultiplier(10)}"
+      template = (locals) -> @globalMultiplier(10)
 
       @render(template, locals)
 
@@ -192,7 +186,7 @@ describe "Joosy.Modules.Renderer", ->
     callback = sinon.spy()
 
     Box.view (locals) ->
-      template = (locals) -> locals.onRefresh -> callback()
+      template = -> @onRefresh -> callback()
       @render(template, locals)
 
     box = new Box

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

@@ -45,11 +45,17 @@ describe "Joosy.Resource.Generic", ->
     
   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()
     

metadata

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