ende 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05341be16c6adf9fb604e0fdbb587139d9cd6835
-  data.tar.gz: 9a6ef4d5d143fa40eceb5325ea9d5fb5e43fd981
+  metadata.gz: caaa7f535f49335e7750267ca46931905ff7b23e
+  data.tar.gz: 25f153014541704bf57f2ba14164dac5e1f748cf
 SHA512:
-  metadata.gz: 3187b8b68a424f0a0bdfe940b7e8e07a622b42430d0163f889865b24c3a025e952f629a0b6a3757813408764147780551ddb3c2f2f3d0f01b3e1b885c02d4b07
-  data.tar.gz: 2ec1d55d52ae63a412296cedd20e32837bab8a1e862fc2f4162f48c713c771afcfa01ab5e197c0fbea50534058260351bc2e74686aaa147a262d8b4b8e00e44f
+  metadata.gz: b6cabe61279b7634405d4f46f6f3b9d60afb2495d150a1dc0647a8bc54f4484c8e304841cb8a054da20534aff1a0f4b8a35ae87a8fc7d51b384d057ebf5439e0
+  data.tar.gz: 15724ab7f7bb9a085dda78e3274a7c290752d440727168c2b7b2f985211e04b60567b72d854e12a4e667007f57960707c7b1973ff3e0cc23c93a71f83df8f77e

data/component.json

@@ -13,6 +13,7 @@
     "component/type": "*",
     "component/bind": "*",
     "component/jquery": "*",
+    "component/querystring": "*",
     "components/modernizr": "*",
     "indefinido/indemma": "*",
     "indefinido/observable": "*",

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

@@ -112,7 +112,7 @@ define 'aura/extensions/devise', () ->
 
   #      user_password POST   /users/password(.:format)                 devise/passwords#create
   #  new_user_password GET    /users/password/new(.:format)             devise/passwords#new
-  # edit_user_password GET    /userss/password/edit(.:format)            devise/passwords#edit
+  # edit_user_password GET    /users/password/edit(.:format)            devise/passwords#edit
   #                    PATCH  /users/password(.:format)                 devise/passwords#update
   #                    PUT    /users/password(.:format)                 devise/passwords#updaet
   password =
@@ -123,7 +123,7 @@ define 'aura/extensions/devise', () ->
         password: user.password
 
     create: (user) ->
-
+      event_name        = @event
       user_password     = password.build user
       password.instance = user_password
 
@@ -131,7 +131,18 @@ define 'aura/extensions/devise', () ->
 
       user_password
         .save ->
-          mediator.emit 'user.password_recovered', @
+          # TODO add models event emission to the models extension
+          # TODO detect model event emission need based on
+          # subscriptions to resource events
+          mediator.emit 'password.created', @
+
+          switch(event_name)
+            when 'user.create_password'
+              mediator.emit 'user.password_created'  , user
+            when 'user.recover_password'
+              mediator.emit 'user.password_recovered', user
+            else
+              console.warn "devise password created: no corresponding confirmation event found for #{event_name}"
         .fail ->
           # TODO improve event naming
           mediator.emit 'user.unauthorized', @
@@ -168,17 +179,6 @@ define 'aura/extensions/devise', () ->
     core     = application.core
     sandbox  = application.sandbox
     mediator = core.mediator
-
-    # Define callbacks
-    # TODO get json with features info from devise
-    # gem and only use apropriated listeners
-    mediator.on 'user.sign_in' , session.create
-    mediator.on 'user.sign_out', session.destroy
-    mediator.on 'user.recover_password', password.create
-
-
-    mediator.on 'action.unauthorized', domain.action_unauthorized
-
     # TODO add ajax control into an extension and stop using jquery directly
     jQuery(document).ajaxError (event, xhr) ->
       if xhr.status == 401
@@ -197,7 +197,11 @@ define 'aura/extensions/devise', () ->
     router.define '/users/sign_out'    , 'session.destroy'
 
     # TODO get devise configuration for password recovery
-    router.define '/users/password/new', 'password.new'
+    router.define '/users/password/new' , 'password.new'
+    router.define '/users/password/edit', 'password.edit'
+
+    # TODO get devise configuration for user registry
+    router.define '/users/new'         , 'registration.new'
 
   define_resources: (model) ->
 
@@ -217,15 +221,28 @@ define 'aura/extensions/devise', () ->
 
       email: String
 
+  define_handlers: ->
+    # TODO get json with features info from devise
+    # gem and only use apropriated listeners
+    mediator.on 'user.sign_in' , session.create
+    mediator.on 'user.sign_out', session.destroy
+    mediator.on 'user.create_password' , password.create
+    mediator.on 'user.recover_password', password.create
+
+    mediator.on 'action.unauthorized', domain.action_unauthorized
+
+
   afterAppStart: (application) ->
     {router, models} = application.core
     @define_resources models
 
+    # We must define handlers only after resources have been
+    # acknowledged
+    @define_handlers()
+
     # TODO move to an external module
     @define_routes router if router?
 
-    @define_handlers
-
     # Restore session if not already
     # TODO Restore only when application is ready
     session.restore()

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

@@ -6,23 +6,44 @@ define 'aura/extensions/routes', (routes) ->
   # TODO Remove .call null
   loader.require.call null, 'modernizr'
   loader.require.call null, 'ened/vendor/assets/javascripts/lennon/lennon.js'
+  query  = loader.require.call null, 'querystring'
   router = null
 
   (application) ->
     core     = application.core
     mediator = core.mediator
-    _        = core.util._
+
+    # TODO unify router api
     router = new Lennon
       # TODO implement logger api for lennon or change lennon library
       # logger: application.logger
       publishEvent: (name, params) ->
-        # TODO better method parsing
-        params.method = "get"
+        # TODO method parsing (get, delete, put, post)
         mediator.emit name, params
 
+
+    router.location = (href) ->
+      if Modernizr.history
+        window.history.pushState null, null, href
+      else
+        # TODO parse href and extract path!
+        window.location.hash = href
+
+      router.process()
+
     application.core.router = router
 
-    version: '0.1.0'
+    location = Object.create null,
+      # TODO cache query parsing
+      query:
+        get: -> query.parse window.location.search.substring(1)
+
+      toString: -> window.location
+
+    version: '0.2.0'
+
+    initialize: (application) ->
+      application.sandbox.location = location
 
     afterAppStart: (application) ->
       router.process()

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

@@ -3,54 +3,67 @@ define 'aura/extensions/states', ['application/states'], (states) ->
   'use strict'
 
   (application) ->
-    core     = application.core
-    logger   = application.logger
-    mediator = core.mediator
-    _        = core.util._
+    {core, logger}  = application
+    {dom, mediator} = core
 
     state =
       current: 'initializing'
       list: []
       previous: null
       change: (transition) ->
-        if state.current != transition.to
-          from           = core.state
-          to             = if transition.to == 'previous' then state.previous else transition.to
-          state.previous = state.current
-          state.current  = to
-          mediator.emit 'state.changed', to: to, from: from
+
+        unless transition.to == transition.from
+          # The application transition consists in simply store the
+          # old state and updating the current one
+          state.previous  = state.current
+          state.current   = transition.to
+
+          mediator.emit 'state.changed', transition
         else
           mediator.emit 'state.errored', to: transition.to, message: 'Application already in this state!'
+
       changed: (transition) ->
-        core.dom.find('html').addClass(transition.to).removeClass(transition.from)
+        dom.find('html').addClass(transition.to).removeClass(transition.from)
 
     # Set default intial state
-    core.dom.find('html').addClass state.current
+    dom.find('html').addClass state.current
 
     # Application flow control
     flow =
 
       changed: (transition) ->
-        widget_configurations = states[transition.to]
-        if widget_configurations
+        unormalized_widget_options = states[transition.to]
+
+        # TODO cache rendered widgets!
+
+        if unormalized_widget_options
           widgets = []
 
-          for name, options of widget_configurations
+          for name, options of unormalized_widget_options
+            widget_name    = options.name || name
+
+            # To allow user controlling the application change the
+            # widget configuration at runtime, we check the transition
+            # for widget options
             widgets.push
-              name: options.name || name
-              options: options
+              name: widget_name
+              options: core.util.extend transition[widget_name], options
 
+            # TODO document why we delete this?
             delete options.name
 
           # TODO update aura and use native start method
           core.inject(widgets).fail flow.failed
 
+          # To prevent reinstation upon changing to this state for the
+          # second time, delete stored configuration for this state
           delete states[transition.to]
+
       failed: (exception) ->
-        logger.error "states.flow.failed: Failed autostarting widget #{@} \n Message: #{exception.message}", exception
+        logger.error "states.flow.failed: Failed autostarting widget! \n Message: #{exception.message}", exception
 
 
-    version: '0.2.0'
+    version: '0.2.1'
 
     initialize: (application) ->
       mediator.on 'state.change' , state.change
@@ -65,13 +78,33 @@ define 'aura/extensions/states', ['application/states'], (states) ->
       Object.defineProperty core, 'state',
         set: (to) ->
           console.warn 'Changing state through the core object is no longer supported. Use application.state = \"other_state\" instead.'
-          state.change to: to
+          application.state = to
         get: ->
           console.warn 'Getting state through the core object is no longer supported. Use application.state instead.'
-          state.current
+          application.state
 
       Object.defineProperty application, 'state',
-        set: (to) -> state.change to: to
+        set: (to) ->
+          # To use a unified internal api, transform the setter call
+          # into the transition api
+
+          # app.state = name: 'new_state', ...
+          unless $.type(to) == 'string'
+            transition = to: to.name
+            delete to.name
+
+          # app.state = 'new_state'
+          else
+            transition = to: to
+
+          # app.state = 'previous'
+          transition.to   = if transition.to == 'previous' then state.previous else transition.to
+
+          # To change the application state, must invoke the change
+          # function with the apropriated transition object
+          transition.from = state.current
+          state.change transition
+
         get: -> state.current
 
     afterAppStart: (application) -> application.state = "default"

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

@@ -12,22 +12,25 @@ define 'aura/extensions/widget/lifecycleable', ->
 
       # TODO check for existing widgets before convert options, and
       # not only if type is object
-      for subwidget_name, suboptions of options
-        # TODO if isWidget subwidget_name
-        if $.type(suboptions) == 'object' and not suboptions instanceof jQuery
+      unless options.nested
+        for subwidget_name, suboptions of options
+          # TODO if isWidget subwidget_name
+          if $.type(suboptions) == 'object' and not (suboptions instanceof jQuery)
 
-          for name, suboption of suboptions
+            for name, suboption of suboptions
 
-            if $.type(suboption) == 'object' and not suboption instanceof jQuery
+              if $.type(suboption) == 'object' and not (suboption instanceof jQuery)
 
-              for subname, subsuboption of suboption
-                options["#{subwidget_name}#{@capitalize name}#{@capitalize subname}"] = subsuboption
+                for subname, subsuboption of suboption
+                  options["#{subwidget_name}#{@capitalize name}#{@capitalize subname}"] = subsuboption
 
-            else
+              else
 
-              options["#{subwidget_name}#{@capitalize name}"] = suboption
+                options["#{subwidget_name}#{@capitalize name}"] = suboption
 
-          # TODO delete options[subwidget_name]
+            # TODO delete options[subwidget_name]
+
+      delete options.nested
 
       ref               = definition.name.split "@"
       widgetName        = @decamelize ref[0]
@@ -68,14 +71,15 @@ define 'aura/extensions/widget/lifecycleable', ->
 
   (application) ->
 
+    version: '0.1.0'
+
     initialize: (application) ->
-      core = application.core
+      {core} = application
 
       # TODO use indemma inflections module instead
       core.util.capitalize = (string) ->
         string.charAt(0).toUpperCase() + string.slice(1);
 
-
       # Cache usefull methods
       lifecycleable.sources    = application.config.widgets.sources
       lifecycleable.find       = core.dom.find

data/lib/assets/javascripts/widgets/form/default.html

@@ -0,0 +1,3 @@
+<h1 data-html="form.title"> </h1>
+<p  data-html="form.description"> </p>
+

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

@@ -0,0 +1,23 @@
+define ['./presenter', 'text!./template'], (presenter, template) ->
+
+  type: 'Base'
+
+  initialize: (options) ->
+    sandbox = @sandbox
+    sandbox.logger.log "initialized!"
+
+    model   = sandbox.model options.resource
+    record  = model options.record
+
+    # Create defaults
+    # TODO extract and vaidate options
+    form    = sandbox.util.extend options,
+      title: options.resource
+
+    # Will also initialize sandbox!
+    @html template
+
+    # Bind presenter to template
+    presentation = presenter form, record
+    @$el.addClass 'form widget'
+    @bind presentation

data/lib/assets/javascripts/widgets/form/presenter.js.coffee

@@ -0,0 +1,18 @@
+'use strict'
+observable = require('observable').mixin
+
+define ->
+
+  (form, record) ->
+
+
+    # TODO create view_model
+    form: observable Object.create null,
+      title:
+        set: (title) -> record.title = title
+        get: -> record.title
+        configurable: true
+      body:
+        set: (body) -> record.body = body
+        get: -> record.body
+        configurable: true

data/lib/assets/javascripts/widgets/form/templates/password.html

@@ -0,0 +1,2 @@
+<h1 data-html="form.title"> </h1>
+<p  data-html="form.body" > </p>

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

@@ -10,17 +10,17 @@ define ['./states/index', './presenter'], (templates, presenter) ->
     sandbox:
       search:
        index: lunr
-    initialize: (models) ->
-      throw 'no models provided' unless models?
+    initialize: (records) ->
+      throw 'no records provided' unless records?
 
-      @sample = models[0]
+      @sample = records[0]
       @index  = @sandbox.search.index(@indexate)
 
-      for model in models
-        @index.add model
-        @store.set model._id, model
+      for record in records
+        @index.add record
+        @store.set record._id, record
 
-      @store.all = models
+      @store.all = records
 
     # TODO put bold face on matched texts
     search: (params...) ->
@@ -41,27 +41,16 @@ define ['./states/index', './presenter'], (templates, presenter) ->
       true
 
 
-  # If some extension provides you can use the type defineda in there
-  # to extend your widget. Defaults to Base constructor.
-  #
-  # type: 'Base'
+  # Widget Prototype
 
-  # Default values for the options passed to this widget
-  #
-  # Note: the options are passed thorught the html element data
-  # attributes for this widget: <div data-aura-amount="3"></div>
-  #
-  # options: {}
+  type: 'Base'
 
-
-  # Widget initialization method, will be called upon loading, options
-  # are already filled with defaults
   initialize: (options) ->
     widget  = @
     sandbox = @sandbox
     sandbox.logger.log "initialized!"
 
-    model = sandbox.models[options.model]
+    record = sandbox.models[options.model]
 
     # Will also initialize sandbox!
     @html templates.default

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

@@ -86,19 +86,12 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
 
   populate: (handlers) ->
     # Initialize dependencies
-    list   = ''
-    if @options.listModel
-      list = "<div data-aura-widget=\"list\" data-model=\"#{@options.listModel}\"></div>"
-      @sandbox.on 'list.stabilized'  , handlers.list.stabilized
-      @sandbox.on 'list.selection.incremented' , handlers.list.changed
-      @sandbox.on 'list.selection.decremented' , handlers.list.changed
-
     @scope.all (records) =>
       @load.stop()
 
       @presentation = @presenter records
 
-      @html list + templates[@options.resource]
+      @html templates[@options.resource]
       boo.initialize @$el.find '.results .items'
 
       sandbox = @sandbox
@@ -107,7 +100,7 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
       @bind @presentation,
          binders:
            unfolding: (element) ->
-             drawing = sandbox.modacad.drawing $(element), @model[@keypath]
+             drawing = sandbox.modacad.drawing $(element), @model.model
              setTimeout ->
                drawing.redisplay
                  doll:
@@ -128,10 +121,9 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
   initialize: (options) ->
     # TODO rename all options model to options.resource
     options.model     ||= options.resource
-    options.listModel ||= options.listResource
 
     # TODO import core extensions in another place
-    @scope = model = @sandbox.models[options.model]
+    @scope = model = @sandbox.models[options.resource]
     cssify         = @sandbox.util.inflector.cssify
     loader         = @sandbox.ui.loader
     @sandbox.on "viewer.#{@identifier}.scope", @scope_to, @

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

@@ -46,7 +46,6 @@ define () ->
       for item in items
         unless item.normalized
           index = @items.indexOf item
-          console.debug item, item.code, item.name, index
           @observed.items[index] = normalizer.normalize item
 
       normalizer.drawings()

data/lib/ende/version.rb

@@ -1,3 +1,3 @@
 module Ende
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ende
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Heitor Salazar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,6 +89,10 @@ files:
 - lib/assets/javascripts/widgets/authenticator/states/default.html
 - lib/assets/javascripts/widgets/authenticator/states/index.js.coffee
 - lib/assets/javascripts/widgets/authenticator/states/passwords.html
+- lib/assets/javascripts/widgets/form/default.html
+- lib/assets/javascripts/widgets/form/main.js.coffee
+- lib/assets/javascripts/widgets/form/presenter.js.coffee
+- lib/assets/javascripts/widgets/form/templates/password.html
 - lib/assets/javascripts/widgets/list/main.js.coffee
 - lib/assets/javascripts/widgets/list/presenter.js.coffee
 - lib/assets/javascripts/widgets/list/states/default.html