ende 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb3f9a331bae0aaa9512e91c8c9952b93749bf41
-  data.tar.gz: b93430fc455f3eb4a5bd21b538d333c93afb9560
+  metadata.gz: 9c55828e653402799f49ba9f2a6871858db65cac
+  data.tar.gz: 95e66a157139ba4b826546a436e36b1d53061ed0
 SHA512:
-  metadata.gz: d7cc092ba680f1b34e963d389e5f9d103221a3fcc19ba11bd8e694b1d9be23c327180b35c414ce22ff8960ae17f0dec7b97d56be92ca2251ee80fc2cf040ebee
-  data.tar.gz: 58f634421569ebf55ee95182755b4db381a8912bda2e338eb3e31d2e36ccaccec658e27e860b0fffaa9b329a6bc7e742c7e070de245f0ee33c258ed773bfdf60
+  metadata.gz: e1634ba748d012ec0ab7fa30d28049e42b34d7ece94dada646c72ce8c0239c97db5934f63aeff155d177a931deba14b047860a9bd5a8a5a47a6e4d31e1b329e4
+  data.tar.gz: 0fce80e25a4365288c5f7721187f116c34fb3ef12b3616d66f7f6c64ca70c3ad14c214ca533e35f01ea94f2cabaff6dd231a81a3f46032845bb7c16559b9c00c

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

@@ -1,6 +1,6 @@
 'use strict';
 
-define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (templates, presenter) ->
+define ['./states/index', './presenters/default', '/assets/jquery/inview'], (templates, presenter) ->
 
   observable = require('indefinido-observable').mixin
 
@@ -14,7 +14,7 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
     identify: (index, element) ->
       element  = $ element
       identity = _.uniqueId()
-      element.data('boo', identity)
+      element.data 'boo', identity
       boo.cache[identity] = element
 
     shame: (element) ->
@@ -30,7 +30,6 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
 
       boo.cache[identity] = ghost
 
-
       element.css
         width: element.width()
         height: element.height()
@@ -52,12 +51,13 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
     viewed: (event, in_view, horizontal, vertical) ->
       boo[if in_view then 'pride' else 'shame'] event.target
 
-  version: '0.1.2'
+  version: '0.1.3'
 
   # TODO better separation of concerns
   # TODO Current remote page that is beign displayed
   options:
     resource: 'default'
+    records: null
   #   page:
   #     current: 1
   #     per    : 5
@@ -73,7 +73,7 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
 
     # We extend presentation.selected just to assign all values of the item model
     # TODO call presenter to do this job
-    @sandbox.util.extend @presentation.selected, item.model
+    @sandbox.util.extend @presentation.selected   , item.model
     @sandbox.emit "viewer.#{@identifier}.selected", item.model
 
   scope_to: (scope, child_scope) ->
@@ -97,27 +97,26 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
 
     viewer        = @presentation.viewer
     viewer.items  = []
-    presented_ids = []
-
-    # TODO generalise this filtering option
-    presented = #for item in selected
-      # if @scope?.scope.data.by_type_id
-      #   querier = item.models.by_type_id.apply item.models, @scope.scope.data.by_type_id
-      # else
-      #   querier = item.models
 
-      # TODO make scope.all method use scope too!
-      @scope.fetch null, (records) ->
-        _.map records, @       # TODO make scope.all method use scope too!
+    # ✔ Generalize this filtering option
+    # TODO make scope.all method use scope too, and replace @scope.fetch by it
+    presented = @scope.fetch null, (records) ->
+      records = _.map records, @, @
 
-        for record in records
-          viewer.items.push record if presented_ids.indexOf(record._id) == -1
+      # TODO implement Array.concat ou Array.merge in observer, and
+      # use it here instead of pushing each record
+      viewer.items.push record for record in records
 
-        presented_ids = _.union presented_ids, _.pluck(records, '_id')
 
-    $.when(presented...).then =>
-      boo.initialize @$el.find '.results .items'
-      presented_ids = []
+    presented.then =>
+      if viewer.items.length
+        boo.initialize @$el.find '.results .items'
+        @$el.addClass 'filled'
+        @$el.removeClass 'empty'
+      else
+        # TODO implement state support for viewer widget
+        @$el.addClass 'empty'
+        @$el.removeClass 'filled'
 
       if @load?
         @load.stop()
@@ -125,16 +124,28 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
 
 
   populate: (handlers) ->
+    sandbox = @sandbox
+
+    @load   = @sandbox.ui.loader @results
+
     # Initialize dependencies
     @scope.all (records) =>
+
       @load.stop()
 
+      # TODO do not fetch for records instead of just rendering an
+      # empty viewer
+      records       = @options.records if @options.records?
+
       @presentation = @presenter records
 
       @html templates[@options.resource]
-      boo.initialize @$el.find '.results .items'
 
-      sandbox = @sandbox
+      if records.length
+        boo.initialize @$el.find '.results .items'
+        @$el.addClass 'filled'
+      else
+        @$el.addClass 'empty'
 
       # TODO move binders to application
       @bind @presentation,
@@ -191,9 +202,6 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
       @$results = @$el.find '.results .items'
 
       # Fetch default data
-      @load = @sandbox.ui.loader @results
-      # TODO better scoping support by viewer
-
       @populate handlers
 
     @sandbox.logger.log "initialized!"

data/lib/assets/javascripts/widgets/viewer/{presenter.js.coffee → presenters/default.js.coffee}

@@ -1,4 +1,6 @@
 'use strict'
+
+# TODO implement default viewer presenteer
 define () ->
 
   observable = require('observable').mixin
@@ -6,7 +8,6 @@ define () ->
   self       = null
   view       = null
 
-
   normalizer =
     normalize: (model) ->
       observable extend
@@ -32,8 +33,6 @@ define () ->
         drawing.width  = (parseInt(drawing.width ) / 4) + 'px'
         drawing.height = (parseInt(drawing.height) / 4) + 'px'
 
-
-
   self = (items) ->
 
     # TODO create view_model

data/lib/ende/version.rb

@@ -1,3 +1,3 @@
 module Ende
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ende
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Heitor Salazar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,7 @@ files:
 - lib/assets/javascripts/widgets/support/main.js.coffee
 - lib/assets/javascripts/widgets/tray/main.js.coffee
 - lib/assets/javascripts/widgets/viewer/main.js.coffee
-- lib/assets/javascripts/widgets/viewer/presenter.js.coffee
+- lib/assets/javascripts/widgets/viewer/presenters/default.js.coffee
 - lib/assets/javascripts/widgets/viewer/states/default.html
 - lib/assets/javascripts/widgets/viewer/states/index.js.coffee
 - lib/assets/stylesheets/application/modules/authenticator.css.styl