nali 0.2.3 → 0.2.4

data/lib/client/javascripts/nali/collection.js.coffee

@@ -10,6 +10,7 @@ Nali.extend Collection:
     @adaptations = apply: [], cancel: []
     @ordering    = {}
     @adaptCollection()
+    @model.each ( model ) => @add model if model.isCorrect @filters
     @
 
   new: ( model, filters ) ->
@@ -102,9 +103,8 @@ Nali.extend Collection:
     @
 
   where: ( filters ) ->
-    result = []
-    result.push model for model in @ when model.isCorrect filters
-    result
+    filters[ name ] = value for name, value of @filters
+    @model.where filters
 
   order: ( @ordering ) ->
     @reorder()

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

@@ -63,6 +63,6 @@ Nali.extend Controller:
     @
 
   redirect: ( args... ) ->
-    @Router.go args...
+    @Router.redirect args...
     @stop()
     @

data/lib/client/javascripts/nali/model.js.coffee

@@ -32,10 +32,10 @@ Nali.extend Model:
     for name, view of @View.extensions when name.indexOf( @_name ) >= 0
       do ( name, view ) =>
         @views[ short = view._shortName ] = view
-        unless @[ short ]?
-          @[ short ] = ->
-            @show short
-            @
+        shortCap = short.capitalize()
+        unless @[ viewMethod = 'view' + shortCap ]? then @[ viewMethod ] = -> @view short
+        unless @[ showMethod = 'show' + shortCap ]? then @[ showMethod ] = ( insertTo ) -> @show short, insertTo
+        unless @[ hideMethod = 'hide' + shortCap ]? then @[ hideMethod ] = -> @hide short
     @
 
   notice: ( params ) ->
@@ -149,8 +149,8 @@ Nali.extend Model:
   updateAttribute: ( name, value ) ->
     # обновляет один атрибут модели, проверяя его валидность, генерирует событие update.attributeName
     value = @normalizeValue value
-    if @attributes[ name ] isnt value and @isValidAttributeValue( name, value )
-      @attributes[ name ] = value
+    if @[ name ] isnt value and @isValidAttributeValue( name, value )
+      @[ name ] = value
       @[ 'onUpdate' + name.capitalize() ]?()
       @trigger "update.#{ name }"
       true
@@ -170,7 +170,6 @@ Nali.extend Model:
   where: ( filters ) ->
     # возвращает коллекцию моделей соответствующих фильтру
     collection = @Collection.new @, filters
-    collection.add model for model in @table when model.isCorrect filters
     if @forced and not collection.length
       attributes = {}
       attributes[ key ] = value for key, value of filters when typeof value in [ 'number', 'string' ]
@@ -178,8 +177,14 @@ Nali.extend Model:
     collection
 
   all: ->
+    # возвращает коллекцию всех моделей
     @where id: /./
 
+  each: ( callback ) ->
+    # применяет колбек ко всем моделям
+    callback.call @, model for model in @table
+    @
+
   # работа с аттрибутами
 
   guid: ->
@@ -211,7 +216,11 @@ Nali.extend Model:
     # проверяет соответствие аттрибутов модели определенному набору фильтров, возвращает true либо false
     return filters.call @ if typeof filters is 'function'
     return false unless Object.keys( filters ).length
-    return false for name, filter of filters when not @isCorrectAttribute @attributes[ name ], filter
+    for name, filter of filters
+      result = if name is 'correct' and typeof filter is 'function'
+        filter.call @
+      else @isCorrectAttribute @[ name ], filter
+      return false unless result
     return true
 
   isCorrectAttribute: ( attribute, filter ) ->
@@ -223,6 +232,8 @@ Nali.extend Model:
       '' + attribute is filter
     else if typeof filter is 'number'
       + attribute is filter
+    else if typeof filter is 'boolean'
+      attribute is filter
     else if filter instanceof Array
       '' + attribute in filter or + attribute in filter
     else false
@@ -316,10 +327,9 @@ Nali.extend Model:
     # связанных с текущей через модель through
     @getter name, =>
       delete @[ name ]
-      @[ name ] = @Collection.new model, ->
+      @[ name ] = model.where correct: ->
         return true for model in @[ through ] when model[ key ] is @
         false
-      @[ name ].add @[ through ].pluck key
       @[ name ].subscribeTo @[ through ], 'update.length.add',    ( collection, model ) -> @add    model[ key ]
       @[ name ].subscribeTo @[ through ], 'update.length.remove', ( collection, model ) -> @remove model[ key ]
       @[ name ]

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

@@ -1,7 +1,7 @@
 Nali.extend Router:
 
   initialize: ->
-    @::expand redirect: ( args... ) => @go args...
+    @::expand redirect: ( args... ) => @redirect args...
     @
 
   routes:      {}
@@ -12,7 +12,7 @@ Nali.extend Router:
       event.preventDefault()
       event.stopPropagation()
       @saveHistory false
-      @go event.target.location.pathname
+      @redirect event.target.location.pathname
     @
 
   scanRoutes: ->
@@ -25,13 +25,13 @@ Nali.extend Router:
       @routes[ route ] = controller
     @
 
-  go: ( url = window.location.pathname, options = {} ) ->
+  redirect: ( url = window.location.pathname, options = {} ) ->
     if found = @findRoute @prepare( url ) or @prepare( @Application.defaultUrl )
       { controller, action, filters, params } = found
       params[ name ] = value for name, value in options
       controller.run action, filters, params
     else if @Application.notFoundUrl
-      @go @Application.notFoundUrl
+      @redirect @Application.notFoundUrl
     else console.warn "Not exists route to the address %s", url
     @
 

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

@@ -34,9 +34,10 @@ Nali.extend View:
     @
 
   show: ( insertTo = @insertTo() ) ->
-    @prepareElement().draw().bindEvents()
+    @prepareElement()
     unless @visible
       @runModelCallback 'beforeShow'
+      @draw().bindEvents()
       @runAssistants 'show'
       @subscribeTo @model, 'update',  @onSourceUpdated
       @subscribeTo @model, 'destroy', @onSourceDestroyed
@@ -45,6 +46,8 @@ Nali.extend View:
       setTimeout ( => @onShow() ), 5 if @onShow?
       @visible = true
       @runModelCallback 'afterShow'
+    else
+      @draw()
     @
 
   hide: ( delay = 0 ) ->
@@ -105,7 +108,7 @@ Nali.extend View:
       obj = if match[1].length is 1 then @ else @model
       if obj[ method ]? and typeof obj[ method ] is 'function' then obj[ method ] params
       else console.warn "Method %s not exists", method
-    else @Router.go url, params
+    else @redirect url, params
     @
 
   formToHash: ( form ) ->

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

@@ -2,6 +2,6 @@ Nali::Application.configure :development do |config|
   
   config.client_debug       = true
   
-  ActiveRecord::Base.logger = false #Logger.new STDOUT 
+  ActiveRecord::Base.logger = false #Logger.new STDOUT
  
 end

data/lib/nali/clients.rb

@@ -19,12 +19,13 @@ module Nali
       if message[ :ping ]
         client.send_json action: :pong
       else
-        if controller = Object.const_get( message[ :controller ].capitalize + 'Controller' )
+        name = message[ :controller ].capitalize + 'Controller'
+        if Math.const_defined?( name ) and controller = Object.const_get( name )
           controller = controller.new( client, message )
           if controller.respond_to?( action = message[ :action ].to_sym )
             controller.runAction action
           else puts "Action #{ action } not exists in #{ controller }" end
-        else puts "Controller #{ controller } not exists" end
+        else puts "Controller #{ name } not exists" end
         on_message( client, message ) if respond_to?( :on_message )
       end
     end
@@ -36,4 +37,4 @@ module Nali
     
   end
   
-end
+end

data/lib/nali/version.rb

@@ -1,5 +1,5 @@
 module Nali
   
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
   
 end

metadata

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