ende 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a43d1f2847080ff697b021741b23c5e8f70a2d2d
-  data.tar.gz: e95635f01eef3bbd4a12c3e8ebc567d4166a390c
+  metadata.gz: 0f81a5afa3210fac75452451a82198e1ddfdf83b
+  data.tar.gz: 7aeb495dce92136c0e1e3ff165e9410dfb201836
 SHA512:
-  metadata.gz: 9d61938ca51a95be7a1f48ccae19e85644bbdbcbc9f85b5689966864f0962c5aba93471d886a46c2b785803538566d59d77cab913d96ee8c8879321ba1f66023
-  data.tar.gz: f9f8a934fe14328409c26e0065f3bd76e8d5cc5fa4f99e494471e56e2ac2edb2525543c60237201eb3ded8ee88f4f10ef3e07a5463f17be996b4164d4e4fd793
+  metadata.gz: 48563ccd10da8cf8481d1314ed381d53bed38cae72d8c0797dc0eea4f5acacd66f75b6d85f5b39e1a5e7a4b131c83225d18ddb561f6baf27583272b792b95ad4
+  data.tar.gz: 330bc4c64bf3fef112fb874ff07ca5baf4f3d126e8a3081d384f5b8e1e1c053b2a96db6e048690a9ffe22873dbacf2510fb1cbfd6c8d898bfe45548f998c5f77

data/lib/assets/javascripts/aura/extensions/widget/presentable.js.coffee

@@ -0,0 +1,24 @@
+'use strict'
+
+# TODO finish this extension
+# TODO initialize dependent extensions
+define 'aura/extensions/widget/presentable', ['advisable']  ->
+
+  presentable =
+    constructor: (options) ->
+      presentable.super.constructor.call @, options
+
+      @after 'initialized', =>
+        @presenter?.sandbox = @sandbox
+
+  (application) ->
+
+    version: '0.2.0'
+
+    initialize: (application) ->
+      {core} = application
+
+      # Add support for element removal after stoping widget
+      # TODO replace Base.extend inheritance to stampit composition
+      core.Widgets.Base = core.Widgets.Base.extend presentable
+      recyclable.super  = core.Widgets.Base.__super__

data/lib/assets/javascripts/aura/presentable.js.coffee

@@ -0,0 +1,3 @@
+'use strict'
+
+define 'aura/presenterable', ['stampit/stampit'], (stampit) -> stampit()

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

@@ -3,6 +3,8 @@
 define ->
 
   dialog_extensions =
+    close_template: '<a class="close">&times;</a>'
+
     positionate: ->
       @el.css marginLeft: -(this.el.width() / 2) + 'px'
 
@@ -31,13 +33,17 @@ define ->
       {sandbox, $el: el} = widget
       @el = el
 
-      el.addClass 'hide' unless options.autoshow
+      el.addClass 'hide'         unless options.autoshow
 
       sandbox.inject options.content
 
       sandbox.once "#{child.name}.#{child.identifier || 'default'}.started", (widget) =>
         @positionate()
 
+        # TODO better close html creation and handling
+        el.prepend @close_template if     options.closable
+
+        # TODO use urls on hrefs istead of binding events
         el.find('.close').click (event) =>
           @emit 'close'
           @hide()
@@ -47,6 +53,8 @@ define ->
 
   dialog: null
 
+  version: '0.1.0'
+
   options:
 
     autoshow: false
@@ -66,7 +74,8 @@ define ->
     widget_options = @extract_options()
     @dialog = new dialog
       widget: @, # TODO forward only element of the widget
-      autoshow: @options.autoshow
+      autoshow: options.autoshow
+      closable: options.closable
       content: widget_options
 
       # TODO forward only element of the widget

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

@@ -58,7 +58,12 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview'], (tem
   # TODO Current remote page that is beign displayed
   options:
     resource: 'default'
+
+    # TODO rename records to resource
     records: null
+
+    # Use to fetch records from an attribute instead of all
+    attribute: null
   #   page:
   #     current: 1
   #     per    : 5
@@ -78,7 +83,7 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview'], (tem
     @sandbox.emit "viewer.#{@identifier}.selected", item.model
 
   scope_to: (scope, child_scope) ->
-    throw new TypeError "Invalid scope sent to viewer@#{@identifier} sent: #{scope.resource}, expected: #{@scope.resource}" if scope.resource != @scope.resource
+    throw new TypeError "Invalid scope sent to viewer@#{@identifier} sent: #{scope.resource}, expected: #{@scope.resource}" if scope.resource.toString() != @scope.resource.toString()
     @scope = scope
 
     # TODO better hierachical event distribution
@@ -101,7 +106,9 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview'], (tem
 
     # ✔ Generalize this filtering option
     # TODO make scope.all method use scope too, and replace @scope.fetch by it
-    presented = @scope.fetch null, (records) ->
+    options  = @options # TODO better options accessing
+    presented = @scope.fetch null, (result) ->
+      records = if options.attribute? then result[options.attribute] else result
       records = _.map records, @, @
 
       # TODO implement Array.concat ou Array.merge in observer, and
@@ -122,20 +129,36 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview'], (tem
         @load.stop()
         @load = null
 
-
   populate: (handlers) ->
     sandbox = @sandbox
 
     @load   = @sandbox.ui.loader @results
 
-    if @options.records?
+
+    # TODO replace with strategy pattern, please!
+    if @options.records?.length
+
       deferred = jQuery.Deferred()
       deferred.resolveWith @scope, [@options.records]
+
+    else if @options.attribute
+
+      deferred = @scope.reload?()
+
+      # TODO better threating this case!
+      unless deferred
+        deferred = jQuery.Deferred()
+        empty    = {}
+        empty[@options.attribute] = []
+        deferred.resolveWith @scope, [empty]
+
     else
       deferred = @scope.all()
 
     # Initialize dependencies
-    deferred.done (records) =>
+    # TODO replace with strategy pattern, please!
+    deferred.done (result) =>
+      records = if @options.attribute? then result[@options.attribute] else result
 
       @load.stop()
 
@@ -154,16 +177,16 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview'], (tem
 
       @handles 'click', 'back', '.back'
 
+    deferred.fail =>
+      # TODO better error message and viewer status
+      @html 'Failed to fetch data from server.'
+
   initialize: (options) ->
     # TODO import core extensions in another place
     @scope = model = @sandbox.resource options.resource
     cssify         = @sandbox.util.inflector.cssify
     @sandbox.on "viewer.#{@identifier}.scope", @scope_to, @
 
-    # Extend presentation
-    # TODO execute only one time
-    presenter.drawing = @sandbox.modacad.drawing
-
     # TODO Initialize pagination settings
     # @page  = options.page
 

data/lib/assets/javascripts/widgets/viewer/presenters/default.js.coffee

@@ -1,52 +1,19 @@
 'use strict'
 
-# TODO implement default viewer presenteer
-define () ->
+# TODO implement default presenter
+# define ['aura/presenterable'], (presenterable) ->
+#  presenterable()
+# TODO move observable to requirejs
+observable = require('observable').mixin
 
-  observable = require('observable').mixin
-  extend     = require 'segmentio-extend'
-  self       = null
-  view       = null
+define ['stampit/stampit'], (stampit) ->
 
-  normalizer =
-    normalize: (model) ->
-      observable extend
-        name : model.code
-        image : null
-        selected : false
-        model : model
-        normalized : true
-        , self.handlers.item
+  itemable = stampit().enclose -> observable @
 
-    drawings: ->
-      selection = view.select (binding) ->
-        binding.keypath == 'items'
+  viewer   = (items) ->
+    observable items: _.map items, itemable
 
-      items_binding = selection[0]
+  (items) ->
 
-      for item_view in items_binding.iterated
-        selection = item_view.select (binding) ->
-          binding.keypath == 'image'
-
-        image_binding  = selection[0]
-        drawing        = self.drawing $(image_binding.el), image_binding.model.model
-        drawing.width  = (parseInt(drawing.width ) / 4) + 'px'
-        drawing.height = (parseInt(drawing.height) / 4) + 'px'
-
-  self = (items) ->
-
-    # TODO create view_model
     presentation =
-      presented: (v) -> view = v
-      viewer: observable
-        items: self._.map items, normalizer.normalize
-
-    presentation.viewer.subscribe 'items', (items) ->
-      for item in items
-        unless item.normalized
-          index = @items.indexOf item
-          @observed.items[index] = normalizer.normalize item
-
-      normalizer.drawings()
-
-    presentation
+      viewer: viewer items

data/lib/assets/javascripts/widgets/viewer/states/default.html

@@ -1,6 +1,6 @@
 <div class="items">
   <div class="item" data-each-item="viewer.items" data-class-selected="item.selected" data-on-click="item.clicked">
     <div data-html="item.name" ></div>
-    <div class="image" data-html="item.image"></div>
+    <img class="image" data-src="item.source">
   </div>
 </div>

data/lib/ende/version.rb

@@ -1,3 +1,3 @@
 module Ende
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ende
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Heitor Salazar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,6 +79,8 @@ files:
 - lib/assets/javascripts/aura/extensions/states.js.coffee
 - lib/assets/javascripts/aura/extensions/widget/eventable.js.coffee
 - lib/assets/javascripts/aura/extensions/widget/lifecycleable.js.coffee
+- lib/assets/javascripts/aura/extensions/widget/presentable.js.coffee
+- lib/assets/javascripts/aura/presentable.js.coffee
 - lib/assets/javascripts/config/initializers/jquery.js.coffee
 - lib/assets/javascripts/config/initializers/load_components.js.coffee
 - lib/assets/javascripts/config/initializers/requirejs.js.coffee