ende 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f81a5afa3210fac75452451a82198e1ddfdf83b
-  data.tar.gz: 7aeb495dce92136c0e1e3ff165e9410dfb201836
+  metadata.gz: 5e5baed74e4549285499cb1cb26ec883f3b195eb
+  data.tar.gz: a39621527f298f1a3a961d407bcf238c9dd13824
 SHA512:
-  metadata.gz: 48563ccd10da8cf8481d1314ed381d53bed38cae72d8c0797dc0eea4f5acacd66f75b6d85f5b39e1a5e7a4b131c83225d18ddb561f6baf27583272b792b95ad4
-  data.tar.gz: 330bc4c64bf3fef112fb874ff07ca5baf4f3d126e8a3081d384f5b8e1e1c053b2a96db6e048690a9ffe22873dbacf2510fb1cbfd6c8d898bfe45548f998c5f77
+  metadata.gz: 1d2ebd1d32231ba1e4f76cd2d08f2136a4fc45aa0ba25c8605f971903b61f355b3ae17ad0ffd28f2e19553e49ded0b895255268a6d3004ab21870dcb9dd9c1d0
+  data.tar.gz: ba358650d4d19bcad4fc0cd3267ebfb8f7e72d5f76e6e999c6a02c46ee6b306d08595acb40e913a8aa750f8dc8cd9faa67990e18c769c213a07954bb41072753

data/lib/assets/javascripts/aura/extensions/rivets.js.coffee

@@ -211,9 +211,7 @@ define 'aura/extensions/rivets', ->
         else if value?.toString() isnt el.value?.toString()
           el.value = if value? then value else ''
 
-
-
-  rivets.formatters.float = (value) ->
+  rivets.formatters.float ||= (value) ->
     throw new TypeError "Invalid value passed to float formatter: #{value}" unless value?
 
     # Blank value and impossible to convert to string
@@ -228,10 +226,11 @@ define 'aura/extensions/rivets', ->
     # Format value
     value.toFixed(2).toString().replace '.', ','
 
-  rivets.formatters.currency = (value) ->
+  rivets.formatters.currency ||= (value) ->
     'R$ ' + rivets.formatters.float value
 
 
+
   (application) ->
 
     initialize: (application) ->

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

@@ -1,53 +1,87 @@
 define ->
 
   defaults =
-    context: null
     beforeSend: (xhr) ->
       xhr.setRequestHeader 'X-XHR-Referer', document.location.href
 
   type: 'Base'
-  version: '0.0.1'
+  version: '0.1.0'
   options:
     autoload: true
 
   initialize: (options) ->
     @sandbox.logger.log "initialized!"
 
-    throw new TypeError "content.initialize: No uri provided to load content" unless options.uri?
-    throw new TypeError "content.initialize: Multiple before sends are not supported yet" if options.beforeSend
-
-    defaults.context = @
-
-    options.url = options.uri
-    delete options.uri
+    @sandbox.on "content.#{@identifier}.load", @load, @
 
     if options.autoload
       delete options.autoload
-      @load()
-    else
-      @sandbox.once "content.#{@identifier}.load", @, @load
+      @sandbox.emit "content.#{@identifier}.load"
 
-    @$el.addClass "content"
+    @$el.addClass "content idle"
     @$el.attr 'id', @identifier unless @$el.attr 'id'
-  load: ->
+
+  normalize_options: (extra) ->
+    throw new TypeError "content.initialize: Multiple before sends are not supported yet" if extra?.beforeSend
+
     options = @sandbox.util._.omit @options, 'el', 'ref', '_ref', 'name', 'require', 'baseUrl'
-    options = $.extend {}, defaults, options
+    normalized_options = @sandbox.util.extend context: @, defaults, options, extra
+
+    throw new TypeError "content.initialize: No uri provided to load content" unless normalized_options.uri?
+
+    normalized_options.url = normalized_options.uri
+    delete normalized_options.uri
+
+    normalized_options
+
+  # Total number of completed loads (loaded or failed)
+  loads: 0
+
+  load: (options) ->
+    # TODO move to anoter method
+    if @loads > 0
+      @html ''
+
+      @loading?.abort()
+      @spinner?.stop()
+
+    # Give user some feedback
+    # TODO move spinner outside this component? And use only css
+    # classes instead
+    @spinner = @sandbox.ui.loader @$el
+    @$el.addClass "loading"
+    @$el.removeClass "idle"
 
     # TODO remove jQuery dependency
-    $.ajax(options).done(@loaded).fail(@failed)
+    @loading = $.ajax(@normalize_options options).done(@loaded).fail(@failed).always(@ended)
 
-  loaded: (response) ->
+    @sandbox.emit "content.#{@identifier}.loading", @loading
 
+  # Executed upon successfully loaded
+  loaded: (response) ->
     # Will also initialize sandbox!
     @html response
 
   failed: (xhr) ->
+    # TODO better debugging code location
     if @sandbox.debug.enabled
       html  = "<h2>Content Widget: Failed to load Content</h2>"
       html += xhr.responseText
       html  = html.replace /\n/g, '<br/>'
-      @html html
 
     else
       # TODO prettier message
       html  = "Failed to load content."
+
+    @html html
+
+  ended: ->
+    @$el.removeClass "loading"
+    @$el.addClass "idle"
+    @loads++
+
+    # TODO move to anoter method
+    @spinner.stop()
+    @spinner = null
+    @loading = null
+

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

@@ -1,9 +1,72 @@
 'use strict';
 
-define ['./states/index', './presenters/default', '/assets/jquery/inview'], (templates, presenter) ->
+define [
+  './states/index',
+  './presenters/default',
+  '/assets/jquery/inview',
+  'stampit/stampit'], (templates, presenter, inview, stampit) ->
 
   observable = require('indefinido-observable').mixin
 
+  paginable = stampit
+    flip_to: (page) ->
+      @widget.scope.page (page - 1)
+      @flip()
+
+    flip: ->
+      {scope} = @widget
+      {page_number, total_pages} = scope
+
+      return unless total_pages?
+
+      scope.page ++page_number
+
+      if page_number <= total_pages
+        @widget.scope_to scope
+      else
+        @widget.sandbox.emit "#{@widget.name}.#{@widget.identifier}.last_page"
+  ,
+    {}
+  , ->
+
+    {sandbox, scope}   = @widget
+    {page_number}      = scope
+    scope.total_pages ?= Infinity
+
+    unless scope.page? page_number
+      throw new TypeError "Pagination could not be initialized required method scope#page not found!"
+
+    # TODO scope.subscribe 'page_number', total_pages
+
+    sandbox.on "#{@widget.name}.#{@widget.identifier}.flip"         , @flip    , @
+    sandbox.on "#{@widget.name}.#{@widget.identifier}.flip_to"      , @flip_to , @
+
+    stampit.mixIn @, @widget.options.pagination
+
+  scrollable = stampit
+    bottoned: ->
+      scrollBottom     = @scroll_container.scrollTop() + @scroll_container.height()
+      scrollableBottom = @widget.$el.height() + @widget.$el.offset().top
+
+      scrollBottom + @buffer  > scrollableBottom
+
+    scrolled: ->
+      @widget.sandbox.emit "#{@widget.name}.#{@widget.identifier}.flip" if @bottoned()
+  ,
+    buffer: 400
+  , ->
+    @scroll_container = $ window
+
+    @scroll_container.scroll _.throttle (params...) =>
+      @scrolled params...
+    , 500
+
+    # Trigger more items loading if page starts in bottom state
+    # TODO Account for autofetchable viewer
+    @widget.sandbox.on "viewer.#{@widget.identifier}.populated", @scrolled, @
+
+    stampit.mixIn @, @widget.options.scroll
+
   boo =
     cache: {}
     initialize: (container) ->
@@ -46,27 +109,30 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview'], (tem
         ghost.shamed = false
         # In order to remove staticaly set width and height we pass
         # empty strings to css jquery method
-        element.css(width: '', height: '', visibility: '')
+        element.css width: '', height: '', visibility: ''
 
 
     viewed: (event, in_view, horizontal, vertical) ->
       boo[if in_view then 'pride' else 'shame'] event.target
 
-  version: '0.1.3'
+  version: '0.2.0'
 
   # TODO better separation of concerns
   # TODO Current remote page that is beign displayed
   options:
     resource: 'default'
 
-    # TODO rename records to resource
+    # TODO rename records to resources
     records: null
 
-    # Use to fetch records from an attribute instead of all
-    attribute: null
-  #   page:
-  #     current: 1
-  #     per    : 5
+    # Automatically fetch records on initialization
+    autofetch: false
+
+    # If page attribute is set, viewer will assume that there is a
+    # page method on the scope
+    page: null
+
+    scroll: null
 
   type: 'Base'
 
@@ -83,39 +149,45 @@ 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.toString() != @scope.resource.toString()
+    throw new TypeError "Invalid scope sent to viewer@#{@identifier} sent: #{scope.resource.toString()}, expected: #{@scope.resource.toString()}" if scope.resource.toString() != @scope.resource.toString()
     @scope = scope
 
     # TODO better hierachical event distribution
     for { _widget: widget } in @sandbox._children?
       widget.scope_to? child_scope
 
-    @repopulate()
     @sandbox.emit "viewer.#{@identifier}.scope_changed", @scope
 
+    @repopulate()
+
   repopulate: ->
     if @load?
       @load.stop()
       @load = null
 
     # TODO store spinner instance, instead of creating a new one every time
-    @load = @sandbox.ui.loader @$el.find '.results .items' unless @load?
+    unless @load?
+      @load   = @sandbox.ui.loader @$el.find '.results .items'
+
+      # TODO implement status for viewer widget
+      @$el.addClass 'idle'
+      @$el.removeClass 'loading'
 
     viewer        = @presentation.viewer
-    viewer.items  = []
 
     # ✔ Generalize this filtering option
     # TODO make scope.all method use scope too, and replace @scope.fetch by it
     options  = @options # TODO better options accessing
-    presented = @scope.fetch null, (result) ->
-      records = if options.attribute? then result[options.attribute] else result
-      records = _.map records, @, @
+    presented = @scope.fetch null, (records) =>
+
+      # TODO instantiate records before calling this callback
+      records = _.map records, @resource, @resource unless records[0]?.resource
 
       # 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
+      viewer.items = records
 
-    presented.then =>
+    presented.then (records) =>
       if viewer.items.length
         # boo.initialize @$el.find '.results .items'
         @$el.addClass 'filled'
@@ -125,15 +197,26 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview'], (tem
         @$el.addClass 'empty'
         @$el.removeClass 'filled'
 
+      @sandbox.emit "viewer.#{@identifier}.populated", records
+
+    presented.always =>
+      # TODO implement status for viewer widget
+      @$el.addClass 'idle'
+      @$el.removeClass 'loading'
+
       if @load?
         @load.stop()
         @load = null
 
+
   populate: (handlers) ->
     sandbox = @sandbox
 
-    @load   = @sandbox.ui.loader @results
+    @load   = @sandbox.ui.loader @$results
 
+    # TODO implement status for viewer widget
+    @$el.removeClass 'idle'
+    @$el.addClass 'loading'
 
     # TODO replace with strategy pattern, please!
     if @options.records?.length
@@ -141,24 +224,18 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview'], (tem
       deferred = jQuery.Deferred()
       deferred.resolveWith @scope, [@options.records]
 
-    else if @options.attribute
-
-      deferred = @scope.reload?()
+    else if @options.autofetch
 
-      # TODO better threating this case!
-      unless deferred
-        deferred = jQuery.Deferred()
-        empty    = {}
-        empty[@options.attribute] = []
-        deferred.resolveWith @scope, [empty]
+      deferred = @scope.all()
 
     else
-      deferred = @scope.all()
+
+      deferred = jQuery.Deferred()
+      deferred.resolveWith @scope, [[]]
 
     # Initialize dependencies
     # TODO replace with strategy pattern, please!
-    deferred.done (result) =>
-      records = if @options.attribute? then result[@options.attribute] else result
+    deferred.done (records) =>
 
       @load.stop()
 
@@ -166,6 +243,7 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview'], (tem
 
       @html templates[@options.resource]
 
+
       if records.length
         # boo.initialize @$el.find '.results .items'
         @$el.addClass 'filled'
@@ -173,22 +251,35 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview'], (tem
         @$el.addClass 'empty'
 
       # TODO move binders to application
-      @bind @presentation, presenter.presentation
+      @bind @presentation, @presenter.presentation
 
       @handles 'click', 'back', '.back'
 
+      @sandbox.emit "viewer.#{@identifier}.populated", records
+
+
     deferred.fail =>
       # TODO better error message and viewer status
       @html 'Failed to fetch data from server.'
 
+
+  plugins: (options) ->
+
+    paginable  widget: @ if options.page
+    scrollable widget: @ if options.scroll
+
+
   initialize: (options) ->
     # TODO import core extensions in another place
-    @scope = model = @sandbox.resource options.resource
+    @resource      = @sandbox.resource options.resource
+    @scope         = model = @resource
     cssify         = @sandbox.util.inflector.cssify
     @sandbox.on "viewer.#{@identifier}.scope", @scope_to, @
 
-    # TODO Initialize pagination settings
-    # @page  = options.page
+    # Iniitalize plugins
+    @plugins options
+
+    @$el.addClass "viewer widget #{cssify(options.resource)} idle clearfix"
 
     # Fetch custom templates
     # TODO better custom templates structure and custom presenter
@@ -209,8 +300,6 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview'], (tem
       custom_default_template and templates[options.resource] = custom_default_template
       @presenter = @sandbox.util.extend custom_presenter, presenter if custom_presenter
 
-      # Will also initialize sandbox!
-      @$el.addClass "viewer widget #{cssify(options.resource)}"
       @$results = @$el.find '.results .items'
 
       # Fetch default data

data/lib/ende/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ende
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Heitor Salazar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler