ende 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48ea395bfca3bbe1ea124665465c52b6e5897cc5
-  data.tar.gz: c6c097475ccfa0b037ca7801f092932d7cae1601
+  metadata.gz: 256ffd95cf61eef34bd8c67bcb027d699634c0d3
+  data.tar.gz: 9bdfdb3355ccf703026f1ed816883575dd2638d8
 SHA512:
-  metadata.gz: f63a2d8340006c7124cf410f88a3c0b89358852f2f2bb4efb4799229e8be907bf3d0e358d4122bb3321ecef5000874a52358076fa14c6513012392d98ab32725
-  data.tar.gz: 93be43830a8fc8ddacd5a13a7e471ba346a330a63ad7570949281ca07eb1ab0364c4d8707016f86fa283bdd69f95ef86aeff27bb88b7045368088cd6b5384c41
+  metadata.gz: f9ef470cb19226f3c0b8e96f7aafda66d2a8f234d260896d6fcca2d7ff1c010b7f8e76a51b72907165359cdd69396daf00124cc5233b828a4896e5a134eba347
+  data.tar.gz: 95f2057c016fdef753a7223429809c9084514537953a33125cc561ba3fa6006d43bd9cdbc7d41af5a34cdc20aa1bc61f9b1108781e60200b5e43aae0b19b4293

data/component.json

@@ -17,7 +17,8 @@
     "components/modernizr": "*",
     "indefinido/indemma": "*",
     "indefinido/observable": "*",
-    "indefinido/advisable": "*"
+    "indefinido/advisable": "*",
+    "component/dialog": "*"
   },
   "scripts": [
     "vendor/assets/javascripts/lennon/lennon.js",

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

@@ -116,8 +116,9 @@ define 'aura/extensions/devise', () ->
           # devise is included to send it to us
           # TODO implement as a indemma extension
           token = xhr.getResponseHeader 'X-CSRF-Token'
-          console.warn "Server did not send the new csrf token.\n User may not be logged in!" unless token
-          $('meta[name="csrf-token"]').attr 'content', token
+          unless token
+            console.error "Server did not send the new csrf token.\n User may not be logged in!"
+            $('meta[name="csrf-token"]').attr 'content', token
 
         .fail (xhr) ->
           switch xhr.status

data/lib/assets/javascripts/aura/extensions/models.js.coffee.erb

@@ -20,7 +20,6 @@ end
 
 %>
 
-
 'use strict'
 
 root = exports ? this
@@ -54,7 +53,7 @@ define 'aura/extensions/models', <%= models_list.to_json  %>, (models...) ->
     core.resource = core.model  = sandbox.resource = sandbox.model = (name) ->
       # TODO use a Map internally in indemma
       model = indemma.model[name]
-      throw new Error "Model '#{name}' not found!" unless model?
+      throw new Error unless model?
       model
 
     # TODO rename core.models to core.domain, completely

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

@@ -58,20 +58,33 @@ define 'aura/extensions/widget/lifecycleable', ->
 
   recyclable =
     constructor: (options) ->
-      recyclable.super.constructor.call @, options
 
       # TODO only listen to this specific sandbox stop
       @sandbox.on 'aura.sandbox.stop', (sandbox) =>
         @stopped() if @sandbox.ref == sandbox.ref
 
-    inject: (name, options) -> core.inject name, options
+      @sandbox.on 'aura.sandbox.start', (sandbox) =>
+        @started() if @sandbox.ref == sandbox.ref
+
+      recyclable.super.constructor.call @, options
+
+      @initialized()
+
+    inject: (name, options) ->
+      core.inject name, options
+
+    initialized: ->
+      @sandbox.emit "#{@name}.#{@identifier}.initialized", @
+
+    started: ->
+      @sandbox.emit "#{@name}.#{@identifier}.started", @
 
     stopped: ->
       @$el.remove()
 
   (application) ->
 
-    version: '0.1.0'
+    version: '0.2.0'
 
     initialize: (application) ->
       {core} = application
@@ -87,19 +100,27 @@ define 'aura/extensions/widget/lifecycleable', ->
       lifecycleable.decamelize = core.util.decamelize
       lifecycleable.capitalize = core.util.capitalize
 
-      # Add injection functiono for widgets
-      core.inject = (name = options.name, options) ->
-        if jQuery.isArray name
-          widgets    = name
-          injections = core.util._.map widgets, lifecycleable.injection, lifecycleable
-          return core.start injections
-
-        if not name
-          throw new TypeError "app.core.inject: No widget name provided"
-
-        options.name = name
-
-        core.start [lifecycleable.injection name: name, options: options]
+      # Add injection function for widgets
+      core.inject = (name, options) ->
+
+        switch arguments.length
+          when 1
+            if jQuery.isArray name
+              widgets    = name
+              injections = core.util._.map widgets, lifecycleable.injection, lifecycleable
+              return core.start injections
+            else
+              options = name
+              core.start [lifecycleable.injection name: options.name, options: options]
+
+          when 2
+            options.name ||= name
+            core.start [lifecycleable.injection name: options.name, options: options]
+
+      # TODO instead of using inject function, overwrite start function
+      application.sandbox.inject = (params...) ->
+        console.warn 'sandbox.inject will be deprecated, then you will use sandbox.start with object parameters'
+        core.inject params...
 
       # Add support for element removal after stoping widget
       # TODO replace Base.extend inheritance to stampit composition

data/lib/assets/javascripts/ende.js.coffee

@@ -1,3 +1,3 @@
-#= require ende/build
+#= require ende_build
 #= require_tree ./config/initializers
 # TODO think if require jquery and jquery inview in this place is actualy a good idead

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

@@ -0,0 +1,100 @@
+'use strict'
+
+define ->
+
+  dialog_extensions =
+    show: ->
+      @emit 'show'
+
+      {_overlay: overlay} = @
+
+      # overlay
+      if overlay
+        overlay.show()
+        @el.addClass 'model'
+
+      # escapable
+      @escapable() if !overlay || overlay.closable
+
+      # position
+      @el.removeClass 'hide'
+      @el.appendTo 'body'
+      @el.css marginLeft: -(this.el.width() / 2) + 'px'
+
+      @emit 'showed'
+
+    render: (options) ->
+      {widget}  = options
+      {sandbox, $el: el} = widget
+      @el = el
+
+      sandbox.inject options.content
+
+      el.find '.close', (event) =>
+        @emit 'close'
+        @hide()
+        event.preventDefault()
+
+      unless options.autoshow
+        setTimeout ->
+          el.addClass 'hide'
+        , 0
+
+  type: 'Base'
+
+  dialog: null
+
+  options:
+
+    autoshow: false
+    modal: false
+
+  initialize: (options) ->
+    @sandbox.logger.log "initialized!"
+
+    # TODO integrate component and requirejs
+    dialog  = require('dialog').Dialog
+    overlay = require 'component-overlay'
+    @sandbox.util.extend dialog.prototype, dialog_extensions
+
+    widget_options = @extract_options()
+    @dialog = new dialog
+      widget: @,
+      autoshow: @options.autoshow
+      content: widget_options
+
+    @identifier = widget_options.name if @identifier == 'default'
+    @$el.attr 'id', 'dialog'
+    @$el.addClass "modal"
+
+    # TODO update dialog and remove this code when issue
+    # https://github.com/component/dialog/issues/9 is fixed
+    if @options.modal
+      @dialog.on 'show', ->
+        @_overlay = overlay closable: false
+        @_overlay.show()
+
+
+    @sandbox.on "modal.#{@identifier}.show"   , @dialog.show   , @dialog
+    @sandbox.on "modal.#{@identifier}.hide"   , @dialog.hide   , @dialog
+    # @sandbox.on "modal.#{@identifier}.overlay", @dialog.overlay, @dialog
+
+    # TODO build a custom presenter for the widget?
+    # @presentation = presenter model
+    # @bind presentation
+    @sandbox.start()
+
+  extract_options: ->
+    options =  _.omit @options, 'el', 'ref', '_ref', 'name', 'require', 'baseUrl'
+
+    dynamic_options = _.omit options, Object.keys(@constructor.__super__.options)
+
+    keys = Object.keys dynamic_options
+    throw new TypeError "Too many keys on options object! #{keys.join(', ')}" unless keys.length == 1
+
+    widget_options        = dynamic_options[keys[0]]
+    widget_options.name ||= keys[0]
+    widget_options.el     = @$el
+
+    widget_options
+

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

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

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

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

data/lib/assets/javascripts/widgets/dialog/states/index.js.coffee

@@ -0,0 +1,2 @@
+define ['text!./default.html'], (default_state) ->
+  default: default_state

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

@@ -1,5 +1,6 @@
 # = require lunr/lunr
 
+# TODO reconstruir usando https://github.com/javve/list.js
 define ['./states/index', './presenter'], (templates, presenter) ->
 
   # TODO move lunar and lunr to an extension

data/lib/assets/stylesheets/ende.styl

@@ -0,0 +1 @@
+//= require ende_build

data/lib/ende/version.rb

@@ -1,3 +1,3 @@
 module Ende
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/ende.rb

@@ -11,9 +11,13 @@ module Ende
       assets      = Ende.assets
 
       assets.paths << current_dir.join('lib', 'assets', 'javascripts').to_s
-      # assets.paths << current_dir.join('lib', 'assets', 'stylesheets').to_s uncomment if you use
+      assets.paths << current_dir.join('lib', 'assets', 'stylesheets').to_s
+      assets.paths << current_dir.join('lib', 'assets', 'components' ).to_s
+
       assets.paths << current_dir.join('vendor', 'assets', 'javascripts').to_s
-      # assets.paths << current_dir.join('vendor', 'assets', 'stylesheets').to_s uncomment if you use
+      assets.paths << current_dir.join('vendor', 'assets', 'stylesheets').to_s
+      assets.paths << current_dir.join('vendor', 'assets', 'components' ).to_s
+
     end
 
     # Check if devise exists and extend devise controllers to send

data/vendor/assets/components/build.css

@@ -0,0 +1,111 @@
+.overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  opacity: 1;
+  width: 100%;
+  height: 100%;
+  background: rgba(0,0,0,.75);
+  -webkit-transition: opacity 300ms;
+  -moz-transition: opacity 300ms;
+  transition: opacity 300ms;
+  z-index: 500;
+}
+
+.overlay.hide {
+  pointer-events: none;
+  opacity: 0;
+}
+
+#dialog {
+  position: fixed;
+  left: 50%;
+  top: 150px;
+  max-width: 600px;
+  min-width: 250px;
+  border: 1px solid #eee;
+  background: white;
+  z-index: 1000;
+}
+
+#dialog .content {
+  padding: 15px 20px;
+}
+
+#dialog h1 {
+  margin: 0 0 5px 0;
+  font-size: 16px;
+  font-weight: normal;
+}
+
+#dialog p {
+  margin: 0;
+  padding: 0;
+  font-size: .9em;
+}
+
+/* close */
+
+#dialog .close {
+  position: absolute;
+  top: 3px;
+  right: 10px;
+  text-decoration: none;
+  color: #888;
+  font-size: 16px;
+  font-weight: bold;
+  display: none;
+}
+
+#dialog .close em {
+  display: none;
+}
+
+#dialog.closable .close {
+  display: block;
+}
+
+#dialog .close:hover {
+  color: black;
+}
+
+#dialog .close:active {
+  margin-top: 1px;
+}
+
+/* slide */
+
+#dialog.slide {
+  -webkit-transition: opacity 300ms, top 300ms;
+  -moz-transition: opacity 300ms, top 300ms;
+}
+
+#dialog.slide.hide {
+  opacity: 0;
+  top: -500px;
+}
+
+/* fade */
+
+#dialog.fade {
+  -webkit-transition: opacity 300ms;
+  -moz-transition: opacity 300ms;
+}
+
+#dialog.fade.hide {
+  opacity: 0;
+}
+
+/* scale */
+
+#dialog.scale {
+  -webkit-transition: -webkit-transform 300ms;
+  -moz-transition: -moz-transform 300ms;
+  -webkit-transform: scale(1);
+  -moz-transform: scale(1);
+}
+
+#dialog.scale.hide {
+  -webkit-transform: scale(0);
+  -moz-transform: scale(0);
+}