nali 0.1.7 → 0.1.9

data/lib/assets/javascripts/nali/application.js.coffee

@@ -2,8 +2,8 @@ Nali.extend Application:
   
   domEngine:      jBone.noConflict()
   wsServer:       'ws://' + window.location.host
-  defaultUrl:     ''
-  notFoundUrl:    ''
+  defaultUrl:     'home'
+  notFoundUrl:    'home'
   htmlContainer:  'body'
   title:          'Application'
   keepAliveDelay: 20

data/lib/assets/javascripts/nali/controller.js.coffee

@@ -5,36 +5,68 @@ Nali.extend Controller:
       @prepareActions() 
       @modelSysname = @sysname.replace /s$/, '' 
     @
-
+  
+  actions: {}
+  
   prepareActions: ->
-    @routedActions = {}
-    if @actions?
-      for action of @actions when action isnt 'default'
-        [ name, filters... ] = action.split '/'
-        params = []
-        for filter in filters[ 0.. ] when /^:/.test filter
-          filters.splice filters.indexOf( filter ), 1
-          params.push filter[ 1.. ]
-        @routedActions[ name ] = name: action, filters: filters, params: params
+    @routedActions   = {}
+    @preparedActions = {}
+    for name, action of @actions when not ( name in [ 'default', 'before', 'after' ] )
+      [ name, filters... ] = name.split '/'
+      params = []
+      for filter in filters[ 0.. ] when /^:/.test filter
+        filters.splice filters.indexOf( filter ), 1
+        params.push filter[ 1.. ]
+      @routedActions[ name ]   = filters: filters, params: params
+      @preparedActions[ name ] = [ action ]
+    @prepareBefores()
+    @prepareAfters()
+    @ 
+    
+  prepareBefores: ->
+    if @actions.before?
+      beforeActions = {}
+      for names, action of @actions.before
+        for name in names.split /\s*,\s*/
+          ( beforeActions[ name ] ?= [] ).push action
+      for name, actions of beforeActions
+        @preparedActions[ name ] = actions.concat @preparedActions[ name ]
     @
-  
-  runAction: ( name, filters, params ) ->
-    collection = @Model.extensions[ @modelSysname ].where filters 
-    result = @actions[ @routedActions[ name ].name ].call @, collection, params
-    if result instanceof Object and result.render is false
-      collection.destroy()
+    
+  prepareAfters: ->
+    if @actions.after?
+      afterActions = {}
+      for names, action of @actions.after
+        for name in names.split /\s*,\s*/
+          ( afterActions[ name ] ?= [] ).push action
+      for name, actions of afterActions
+        @preparedActions[ name ] = @preparedActions[ name ].concat actions
+    @
+    
+  run: ( action, filters, params ) ->
+    controller = @clone 
+      collection: @Model.extensions[ @modelSysname ].where filters 
+      params:     params
+    controller.runAction action
+    if controller.defaultPrevented
+      controller.collection.destroy()
     else
-      collection.show name
-      @changeUrl name, filters
+      controller.collection.show action
+      @changeUrl action, filters
+    @
+    
+  runAction: ( name ) ->
+    action.call @ for action in @preparedActions[ name ] when not @defaultPrevented
     @
+    
+  preventDefault: ->
+    @defaultPrevented = true
+    @ 
       
   redirect: ( args... ) ->
-    @::redirect args...
-    render: false
-    
-  query: ( args... ) ->
-    @::query args...
-    render: false
+    @Router.go args...
+    @preventDefault()
+    @
       
   changeUrl: ( action, filters ) ->
     params   = ( value for own key, value of filters )

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

@@ -81,7 +81,7 @@ window.Nali =
     @
   
   removeObservationItem: ( from, obj, event ) ->
-    for item in @[ from ][ 0.. ] when item[0] is obj and ( item[1] is event or not event )
+    for item in @[ from ][..] when item[0] is obj and ( item[1] is event or not event )
       @[ from ].splice @[ from ].indexOf( item ), 1
     @
     
@@ -115,13 +115,13 @@ window.Nali =
     @
   
   unsubscribeAll: ( event ) ->
-    @unsubscribe item[0], event for item in @observers[ 0.. ]
+    @unsubscribe item[0], event for item in @observers[..]
     @
   
   unsubscribeFromAll: ( event ) ->
-    @unsubscribeTo item[0], event for item in @observables[ 0.. ]
+    @unsubscribeTo item[0], event for item in @observables[..]
     @
     
   trigger: ( event, args... ) ->
-    item[2].call item[0], args... for item in @observers[ 0.. ] when item[1] is event
+    item[2].call item[0], args... for item in @observers[..] when item[1] is event
     @

data/lib/assets/javascripts/nali/router.js.coffee

@@ -32,7 +32,7 @@ Nali.extend Router:
     if found = @findRoute url
       { controller, action, filters, params } = found
       params[ name ] = value for name, value in options
-      controller.runAction action, filters, params
+      controller.run action, filters, params
     else if @Application.notFoundUrl
       @go @Application.notFoundUrl
     else console.warn "Not exists route to the address %s", url

data/lib/assets/javascripts/nali/view.js.coffee

@@ -190,8 +190,8 @@ Nali.extend View:
         for attribute, index in node.attributes 
           if attribute.name is 'bind'
             @assistantsMap.push nodepath: path, type: 'Form'
-          else if /{\s*.+?\s*}/.test attribute.textContent
-            @assistantsMap.push nodepath: path.concat( 'attributes', index ), type: 'Text'
+          else if /{\s*.+?\s*}/.test attribute.value
+            @assistantsMap.push nodepath: path.concat( 'attributes', index ), type: 'Attr'
       @scanAssistants child, path.concat 'childNodes', index for child, index in node.childNodes
     @
   
@@ -205,6 +205,11 @@ Nali.extend View:
     @assistants.push -> node.textContent = @analize initialValue
     @
     
+  addAttrAssistant: ( node ) ->
+    initialValue = node.value
+    @assistants.push -> node.value = @analize initialValue
+    @
+    
   addHtmlAssistant: ( node ) ->
     parent       = node.parentNode
     initialValue = node.innerHTML
@@ -254,7 +259,7 @@ Nali.extend View:
               
         source.subscribe @, "update.#{ property }", =>
           option.selected = true for option in node when source[ property ] + '' is option.value
-        
+    @
         
         
   analize: ( value ) ->

data/lib/generator/Gemfile

@@ -2,10 +2,12 @@ source 'https://rubygems.org'
 
 gem 'nali'
 
-gem 'sqlite3'
-
-gem 'yui-compressor'
-
-gem 'uglifier'
-
-gem 'debugger'
+group :development, :test do
+  gem 'debugger'
+  gem 'sqlite3'
+end
+
+group :production do
+  gem 'yui-compressor'
+  gem 'uglifier'
+end

data/lib/generator/app/assets/javascripts/application.js.coffee

@@ -1,6 +1,4 @@
 #= require nali
 #= require_tree .
 
-Nali.Application.run
-  defaultUrl:  'home'
-  notFoundUrl: 'home'
+Nali.Application.run()

data/lib/generator/config/environments/production.rb

@@ -1,11 +1,14 @@
+require 'uglifier'
+require 'yui/compressor'
+
 Nali::Application.configure :production do |config|
   
-  config.assets_digest = true
+  ActiveRecord::Base.logger    = false
   
-# config.assets_debug = true
+  config.assets_digest         = true
   
   config.assets.js_compressor  = Uglifier.new( mangle: true )
-  
+
   config.assets.css_compressor = YUI::CssCompressor.new
   
 end

data/lib/nali/application.rb

@@ -63,9 +63,8 @@ module Nali
     end
     
     def self.initialize!
-      Dir[ File.join( root, 'lib/*/**/*.rb'    ) ].each { |file| require( file ) }
-      Dir[ File.join( root, 'app/**/*.rb'    ) ].each { |file| require( file ) }
-      #Dir[ File.join( root, 'vendor/*/**/*.rb' ) ].each { |file| require( file ) }
+      Dir[ File.join( root, 'lib/*/**/*.rb' ) ].each { |file| require( file ) }
+      Dir[ File.join( root, 'app/**/*.rb'   ) ].each { |file| require( file ) }
       require File.join( root, 'config/application' )
       self
     end

data/lib/nali/version.rb

@@ -1,5 +1,5 @@
 module Nali
   
-  VERSION = '0.1.7'
+  VERSION = '0.1.9'
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nali
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin