ende 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 651a1f0a7bf111187f08f0eeab0f48b2a566d908
-  data.tar.gz: 7ee2ab2f06f2adaf262962166e4a2117593dc06b
+  metadata.gz: 0da97c41b5dc3465944322b1ece15ec3be43654c
+  data.tar.gz: a98863c9f0045fd41a98637525489715140fa862
 SHA512:
-  metadata.gz: 2fc675100ab3df6bc3d1f53795caba3baa5221e18deea33410e8e480e38ecac4c8b369a04d920c09859b89e344db495afa5b4e6559f1e72a13b7b550e7dc36d3
-  data.tar.gz: 8cd7cdff7a658afe0a2fad0156362c982fd439973df268e22508e40049ec10934a6a6d4d0bec3a062f58c8fe22fcc9e1e0515ae2d0322748af50253b59c443fe
+  metadata.gz: 044da7f2be4b59eafdcd02a44e7812408664e4e5fc72fe07e774cfed10e80157cde7bcdbc065300b92a29ab8fdc08d0a4f61e8f1ef2e02b6539a7812f2920002
+  data.tar.gz: f077995aab9837b6ab9ca75a69e9e7361bb6412febe1858e04b83da7b0506a6345b6ff67ac1c3f535eb6aed244790163d02f0800c5d838089bca7a96320b9003

data/lib/assets/javascripts/widgets/viewer/main.js.coffee

@@ -177,16 +177,14 @@ define [
     sent_scope    = @inflector.singularize scope.resource.toString()
     current_scope = @inflector.singularize @scope.resource.toString()
 
+    deferred      = @sandbox.data.deferred()
+
     if sent_scope != current_scope
       throw new TypeError "Invalid scope sent to viewer@#{@identifier} sent: '#{sent_scope}', expected: '#{current_scope}'"
 
     # For sobsequent usages we must store the scope
     @scope = scope
 
-    # TODO better hierachical event distribution
-    for { _widget: widget } in @sandbox._children?
-      widget.scope_to? child_scope
-
     @sandbox.emit "viewer.#{@identifier}.scope_changed", @scope
 
     # TODO better scope data binding, and updating
@@ -196,6 +194,15 @@ define [
 
     @repopulate()
 
+  # TODO rename this method
+  # TODO also move this to an external tag
+  statused: (status) ->
+    if status
+      @status = status
+      @sandbox.emit "viewer.#{@identifier}.status_changed", status
+    else
+      @status
+
   repopulate: ->
     unless @fetching?
       if @load?
@@ -209,6 +216,7 @@ define [
       @load   = @sandbox.ui.loader @$el.find '.results .items'
 
       # TODO implement status for viewer widget
+      @statused 'loading'
       @$el.addClass 'idle'
       @$el.removeClass 'loading'
 
@@ -243,6 +251,7 @@ define [
 
     @fetching.always =>
       # TODO implement status for viewer widget
+      @statused 'loading'
       @$el.addClass 'idle'
       @$el.removeClass 'loading'
 
@@ -257,6 +266,7 @@ define [
     @load   = @sandbox.ui.loader @$results
 
     # TODO implement status for viewer widget
+    @statused 'loading'
     @$el.removeClass 'idle'
     @$el.addClass 'loading'
 
@@ -310,7 +320,7 @@ define [
 
 
   plugins: (options) ->
-    deferreds = []
+    deferreds = [@]
 
     deferreds.push paginable  widget: @ if options.page
     deferreds.push scrollable widget: @ if options.scroll
@@ -426,21 +436,27 @@ define [
 
     @sandbox.on "viewer.#{@identifier}.scope", @scope_to, @
 
-    # Iniitalize plugins
+    # Initalize plugins
+    # TODO think how to implement plugins api
     loading = @plugins options
 
+    @statused 'idle'
     @$el.addClass "viewer widget #{@inflector.cssify @identifier} idle clearfix"
 
-    loading.done => @require_custom options
+    loading.done (widget) ->
+      widget.require_custom options.resource
+
+  # TODO externalize this code to an extension
+  require_custom: (resource) ->
+    deferred = @sandbox.data.deferred()
 
-  require_custom: (options) ->
     # Fetch custom templates
     # TODO better custom templates structure and custom presenter
     # TODO better segregation of concerns on this code
     # TODO handle case where custom presenter does not exist!
     require [
-      "text!./widgets/viewer/templates/default/#{options.resource}.html"
-      "./widgets/viewer/presenters/#{options.resource}"
+      "text!./widgets/viewer/templates/default/#{resource}.html"
+      "./widgets/viewer/presenters/#{resource}"
       ], (custom_default_template, custom_presenter) =>
 
       # TODO Better way to preserve widgets handlers
@@ -460,12 +476,19 @@ define [
 
       presenter.handlers = handlers
 
-      custom_default_template and templates[options.resource] = custom_default_template
-      @presenter = @sandbox.util.extend custom_presenter, presenter if custom_presenter
+      custom_default_template and templates[resource] = custom_default_template
+      @presenter  = @sandbox.util.extend custom_presenter, presenter if custom_presenter
 
-      @$results = @$el.find '.results .items'
+      @$results ||= @$el.find '.results .items'
 
       # Fetch default data
       @populate handlers
 
-    true
+      deferred.resolveWith @, [resource]
+
+    , (error) =>
+      # TODO handle other status codes with xhr error
+      @sandbox.logger.error "Error when loading presenter and template for resource '#{resource}':\n\n", error.message + "\n\n", error
+      deferred.rejectWith @, arguments
+
+    deferred

data/lib/ende/version.rb

@@ -1,3 +1,3 @@
 module Ende
-  VERSION = "0.3.11"
+  VERSION = "0.3.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ende
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Heitor Salazar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler