nali 0.4.2 → 0.4.3

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

@@ -12,21 +12,21 @@ Nali.extend Application:
   run: ( options ) ->
     @::starting()
     @[ key ] = value for key, value of options
-    @onReadyDOM ->
+    @_onReadyDOM ->
       @::_           = @domEngine
       @htmlContainer = @_ @htmlContainer
       @setTitle @title
       @Router.start()
-      @runConnection()
+      @_runConnection()
 
-  onReadyDOM: ( callback ) ->
+  _onReadyDOM: ( callback ) ->
     document.addEventListener 'DOMContentLoaded', =>
       document.removeEventListener 'DOMContentLoaded', arguments.callee, false
       callback.call @
     , false
     @
 
-  runConnection: ->
+  _runConnection: ->
     if @useWebSockets
       @Connection.subscribe @, 'open',  @onConnectionOpen
       @Connection.subscribe @, 'close', @onConnectionClose

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

@@ -1,19 +1,19 @@
 Nali.extend Collection:
 
-  toShowViews:  []
-  visibleViews: []
-  length:       0
-
   cloning: ->
-    @subscribeTo @Model, "create.#{ @model._name.lower() }", @onModelCreated
-    @subscribeTo @Model, "update.#{ @model._name.lower() }", @onModelUpdated
-    @subscribeTo @Model, "destroy.#{ @model._name.lower() }", @onModelDestroyed
+    @subscribeTo @Model, "create.#{ @model._name.lower() }",  @_onModelCreated
+    @subscribeTo @Model, "update.#{ @model._name.lower() }",  @_onModelUpdated
+    @subscribeTo @Model, "destroy.#{ @model._name.lower() }", @_onModelDestroyed
     @adaptations = apply: [], cancel: []
-    @ordering    = {}
-    @adaptCollection()
+    @_ordering   = {}
+    @_adaptCollection()
     @refilter()
     @
 
+  _toShowViews:  []
+  _visibleViews: []
+  length:        0
+
   refilter: ->
     @model.each ( model ) =>
       if isCorrect = model.isCorrect( @filters ) and not ( model in @ ) then @add model
@@ -23,34 +23,34 @@ Nali.extend Collection:
   new: ( model, filters ) ->
     @clone model: model, filters: filters
 
-  onModelCreated: ( model ) ->
+  _onModelCreated: ( model ) ->
     @add model if not @freezed and model.isCorrect @filters
     @
 
-  onModelUpdated: ( model ) ->
+  _onModelUpdated: ( model ) ->
     if model.written()
       if model in @
         if @freezed or model.isCorrect @filters
-          @reorder()
+          @_reorder()
           @trigger 'update.model', model
         else @remove model
       else if not @freezed and model.isCorrect @filters
         @add model
     @
 
-  onModelDestroyed: ( model ) ->
+  _onModelDestroyed: ( model ) ->
     @remove model if model in @ and not @freezed
     @
 
-  adaptCollection: ->
-    for name, method of @model when /^_\w+$/.test( name ) and typeof method is 'function'
+  _adaptCollection: ->
+    for name, method of @model when /^__\w+$/.test( name ) and typeof method is 'function'
       do ( name, method ) =>
-        @[ name = name[ 1.. ] ] = ( args... ) =>
+        @[ name = name[ 2.. ] ] = ( args... ) =>
           @each ( model ) -> model[ name ] args...
           @
     @
 
-  adaptModel: ( model, type = 'apply' ) ->
+  _adaptModel: ( model, type = 'apply' ) ->
     adaptation.call @, model for adaptation in @adaptations[ type ]
     @
 
@@ -63,17 +63,17 @@ Nali.extend Collection:
   add: ( models... ) ->
     for model in [].concat models...
       Array::push.call @, model
-      @adaptModel  model
-      @reorder()
+      @_adaptModel  model
+      @_reorder()
       @trigger 'update.length.add', model
       @trigger 'update.length', 'add', model
     @
 
   remove: ( model ) ->
-    @adaptModel model, 'cancel'
+    @_adaptModel model, 'cancel'
     Array::splice.call @, @indexOf( model ), 1
     @unsubscribeFrom model
-    @reorder()
+    @_reorder()
     @trigger 'update.length.remove', model
     @trigger 'update.length', 'remove', model
     @
@@ -113,37 +113,37 @@ Nali.extend Collection:
     filters[ name ] = value for name, value of @filters
     @model.where filters
 
-  order: ( @ordering ) ->
-    @reorder()
+  order: ( @_ordering ) ->
+    @_reorder()
     @
 
-  reorder: ->
-    if @ordering.by?
-      clearTimeout @ordering.timer if @ordering.timer?
-      @ordering.timer = setTimeout =>
-        if typeof @ordering.by is 'function'
-          @sort @ordering.by
+  _reorder: ->
+    if @_ordering.by?
+      clearTimeout @_ordering.timer if @_ordering.timer?
+      @_ordering.timer = setTimeout =>
+        if typeof @_ordering.by is 'function'
+          @sort @_ordering.by
         else
           @sort ( one, two ) =>
-            one = one[ @ordering.by ]
-            two = two[ @ordering.by ]
-            if @ordering.as is 'number'
+            one = one[ @_ordering.by ]
+            two = two[ @_ordering.by ]
+            if @_ordering.as is 'number'
               one = + one
               two = + two
-            if @ordering.as is 'string'
+            if @_ordering.as is 'string'
               one = '' + one
               two = '' + two
-            ( if one > two then 1 else if one < two then -1 else 0 ) * ( if @ordering.desc then -1 else 1 )
-        @orderViews()
-        delete @ordering.timer
+            ( if one > two then 1 else if one < two then -1 else 0 ) * ( if @_ordering.desc then -1 else 1 )
+        @_orderViews()
+        delete @_ordering.timer
       , 5
     @
 
-  orderViews: ->
-    if @inside
-      children = Array::slice.call @inside.children
+  _orderViews: ->
+    if @_inside
+      children = Array::slice.call @_inside.children
       children.sort ( one, two ) => @indexOf( one.view.model ) - @indexOf( two.view.model )
-      @inside.appendChild child for child in children
+      @_inside.appendChild child for child in children
     @
 
   show: ( viewName, insertTo, isRelation = false ) ->
@@ -153,12 +153,12 @@ Nali.extend Collection:
           view.subscribeTo @, 'reset', view.hide
         else unless @visible
           @visible = true
-          @prepareViewToShow view
-          @hideVisibleViews()
+          @_prepareViewToShow view
+          @_hideVisibleViews()
         else
-          @::visibleViews.push view
+          @::_visibleViews.push view
         view.show insertTo
-        @inside ?= view.element[0].parentNode
+        @_inside ?= view.element[0].parentNode
       , ( model ) ->
         model.hide viewName
     @
@@ -167,16 +167,16 @@ Nali.extend Collection:
     model.hide viewName, delay for model in @
     @
 
-  prepareViewToShow: ( view ) ->
-    unless view in @::toShowViews
-      @::toShowViews.push view
-      @prepareViewToShow layout if ( layout = view.layout() )?.childOf? 'View'
+  _prepareViewToShow: ( view ) ->
+    unless view in @::_toShowViews
+      @::_toShowViews.push view
+      @_prepareViewToShow layout if ( layout = view.layout() )?.childOf? 'View'
     @
 
-  hideVisibleViews: ->
-    view.hide() for view in @::visibleViews when not( view in @::toShowViews )
-    @::visibleViews = @::toShowViews
-    @::toShowViews  = []
+  _hideVisibleViews: ->
+    view.hide() for view in @::_visibleViews when not( view in @::_toShowViews )
+    @::_visibleViews = @::_toShowViews
+    @::_toShowViews  = []
     @
 
   first: ->
@@ -186,7 +186,7 @@ Nali.extend Collection:
     @[ @length - 1 ]
 
   reset: ->
-    @inside             = null
+    @_inside             = null
     @adaptations.length = 0
     @trigger 'reset'
     @

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

@@ -5,86 +5,86 @@ Nali.extend Connection:
     @
 
   open: ->
-    @dispatcher = new WebSocket @Application.wsServer
-    @dispatcher.onopen    = ( event ) => @identification()
-    @dispatcher.onclose   = ( event ) => @onClose   event
-    @dispatcher.onerror   = ( event ) => @onError   event
-    @dispatcher.onmessage = ( event ) => @onMessage JSON.parse event.data
-    @keepAlive()
+    @_dispatcher           = new WebSocket @Application.wsServer
+    @_dispatcher.onopen    = ( event ) => @_identification()
+    @_dispatcher.onclose   = ( event ) => @_onClose   event
+    @_dispatcher.onerror   = ( event ) => @_onError   event
+    @_dispatcher.onmessage = ( event ) => @_onMessage JSON.parse event.data
+    @_keepAlive()
     @
 
-  keepAliveTimer: null
-  journal:        []
-  reconnectDelay: 0
+  _keepAliveTimer: null
+  _journal:        []
+  _reconnectDelay: 0
 
-  onOpen: ->
-    @reconnectDelay = 0
+  _onOpen: ->
+    @_reconnectDelay = 0
     @trigger 'open'
 
-  onError: ( event ) ->
+  _onError: ( event ) ->
     console.warn 'Connection error %O', event
 
-  onClose: ( event ) ->
+  _onClose: ( event ) ->
     @trigger 'close'
-    setTimeout ( => @open() ), @reconnectDelay * 100
-    @reconnectDelay += 1
+    setTimeout ( => @open() ), @_reconnectDelay * 100
+    @_reconnectDelay += 1
 
-  onMessage: ( message ) ->
+  _onMessage: ( message ) ->
     @[ message.action ] message
 
-  send: ( msg ) ->
-    @dispatcher.send JSON.stringify msg
+  _send: ( msg ) ->
+    @_dispatcher.send JSON.stringify msg
     @
 
-  keepAlive: ->
-    clearTimeout @keepAliveTimer if @keepAliveTimer
+  _keepAlive: ->
+    clearTimeout @_keepAliveTimer if @_keepAliveTimer
     if @Application.keepAliveDelay
-      @keepAliveTimer = setTimeout =>
-        @keepAliveTimer = null
-        @send ping: true
+      @_keepAliveTimer = setTimeout =>
+        @_keepAliveTimer = null
+        @_send ping: true
       , @Application.keepAliveDelay * 1000
     @
 
-  pong: ->
-    @keepAlive()
+  _pong: ->
+    @_keepAlive()
     @
 
-  identification: ->
-    @send nali_browser_id: @Cookie.get( 'nali_browser_id' ) or @Cookie.set 'nali_browser_id', @Model.guid()
+  _identification: ->
+    @_send nali_browser_id: @Cookie.get( 'nali_browser_id' ) or @Cookie.set 'nali_browser_id', @Model.guid()
     @
 
-  sync: ( message ) ->
+  _sync: ( message ) ->
     @Model.sync message.params
     @
 
-  appRun: ( { method, params } ) ->
+  _appRun: ( { method, params } ) ->
     @Application[ method ]? params
     @
 
-  callMethod: ( { model, method, params } ) ->
+  _callMethod: ( { model, method, params } ) ->
     if model is 'Notice' then @Notice[ method ] params
     else
       [ model, id ] = model.split '.'
       @Model.callStackAdd model: model, id: id, method: method, params: params
     @
 
-  success: ( message ) ->
-    @journal[ message.journal_id ].success? message.params
-    delete @journal[ message.journal_id ]
+  _success: ( message ) ->
+    @_journal[ message.journal_id ].success? message.params
+    delete @_journal[ message.journal_id ]
     @
 
-  failure: ( message ) ->
-    @journal[ message.journal_id ].failure? message.params
-    delete @journal[ message.journal_id ]
+  _failure: ( message ) ->
+    @_journal[ message.journal_id ].failure? message.params
+    delete @_journal[ message.journal_id ]
     @
 
   query: ( to, params, success, failure ) ->
     return success?() unless @Application.useWebSockets
     [ controller, action ] = to.split '.'
-    @journal.push callbacks = success: success, failure: failure
-    @send
+    @_journal.push callbacks = success: success, failure: failure
+    @_send
       controller: controller
       action:     action
       params:     params
-      journal_id: @journal.indexOf callbacks
+      journal_id: @_journal.indexOf callbacks
     @

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

@@ -2,14 +2,14 @@ Nali.extend Controller:
 
   extension: ->
     if @_name isnt 'Controller'
-      @prepareActions()
+      @_prepareActions()
       @modelName = @_name.replace /s$/, ''
     @
 
   new: ( collection, filters, params ) ->
     @clone collection: collection, filters: filters, params: params
 
-  prepareActions: ->
+  _prepareActions: ->
     @_actions = {}
     for name, action of @actions when not ( name in [ 'default', 'before', 'after' ] )
       [ name, filters... ] = name.split '/'
@@ -18,23 +18,23 @@ Nali.extend Controller:
         filters.splice filters.indexOf( filter ), 1
         params.push filter[ 1.. ]
       @_actions[ name ] = filters: filters, params: params, methods: [ action ]
-    @prepareBefores()
-    @prepareAfters()
+    @_prepareBefores()
+    @_prepareAfters()
     @
 
-  prepareBefores: ->
+  _prepareBefores: ->
     if @actions?.before?
-      list = @analizeFilters 'before'
+      list = @_analizeFilters 'before'
       @_actions[ name ].methods = actions.concat @_actions[ name ].methods for name, actions of list
     @
 
-  prepareAfters: ->
+  _prepareAfters: ->
     if @actions?.after?
-      list = @analizeFilters 'after'
+      list = @_analizeFilters 'after'
       @_actions[ name ].methods = @_actions[ name ].methods.concat actions for name, actions of list
     @
 
-  analizeFilters: ( type ) ->
+  _analizeFilters: ( type ) ->
     list = {}
     for names, action of @actions[ type ]
       [ invert, names ] = switch
@@ -51,15 +51,15 @@ Nali.extend Controller:
     @
 
   runAction: ( name ) ->
-    method.call @ for method in @_actions[ name ].methods when not @stopped
-    if @stopped then @collection.destroy()
+    method.call @ for method in @_actions[ name ].methods when not @_stopped
+    if @_stopped then @collection.destroy()
     else
       @collection.show name
       @Router.changeUrl()
     @
 
   stop: ->
-    @stopped = true
+    @_stopped = true
     @
 
   redirect: ( args... ) ->

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

@@ -2,60 +2,59 @@ Nali.extend Model:
 
   extension: ->
     if @_name isnt 'Model'
-      @table       = @tables[ @_name ] ?= []
-      @table.index = {}
-      @parseRelations()
-      @adapt()
+      @_table       = @_tables[ @_name ] ?= []
+      @_table.index = {}
+      @_parseRelations()
+      @_adapt()
     @
 
   cloning: ->
-    @views = {}
+    @_views = {}
 
-  tables:      {}
-  attributes:  {}
+  _tables:     {}
+  _callStack:  []
+  attributes: {}
   updated:     0
-  callStack:   []
   destroyed:   false
 
-  adapt: ->
-    for name, method of @ when /^_\w+/.test name
+  _adapt: ->
+    for name, method of @ when /^__\w+/.test name
       do ( name, method ) =>
-        if typeof method is 'function'
-          @[ name[ 1.. ] ] = ( args... ) -> @[ name ] args...
-    @adaptViews()
+        @[ name[ 2.. ] ] = @[ name ] if typeof method is 'function'
+    @_adaptViews()
     @
 
-  adaptViews: ->
-    @views = {}
+  _adaptViews: ->
+    @_views = {}
     for name, view of @View.extensions when name.indexOf( @_name ) >= 0
       do ( name, view ) =>
-        @views[ short = view._shortName ] = view
+        @_views[ short = view._shortName ] = view
         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
     @
 
-  callStackAdd: ( params ) ->
+  _callStackAdd: ( params ) ->
     # добавляет задачу в очередь на выполнение, запускает выполнение очереди
-    @callStack.push params
+    @_callStack.push params
     @runStack()
     @
 
   runStack: ->
     # запускает выполнение задач у существующих моделей
-    for item, index in @callStack[ 0.. ]
+    for item, index in @_callStack[ 0.. ]
       if model = @extensions[ item.model ].find item.id
         model[ item.method ] item.params
-        @callStack.splice @callStack.indexOf( item ), 1
+        @_callStack.splice @_callStack.indexOf( item ), 1
     @
 
   # работа с моделями
 
-  accessing: ->
+  _accessing: ->
     # устанавливает геттеры доступа к атрибутам и связям
     @access @attributes
-    @setRelations()
+    @_setRelations()
     @
 
   save: ( success, failure ) ->
@@ -70,16 +69,16 @@ Nali.extend Model:
     else failure? @
     @
 
-  sync: ( { _name, attributes, created, updated, destroyed } ) ->
+  sync: ( { name, attributes, created, updated, destroyed } ) ->
     # синхронизирует пришедшую с сервера модель с локальной, либо создает новую
-    if model = @extensions[ _name ].find attributes.id
+    if model = @extensions[ name ].find attributes.id
       if destroyed then model.remove()
       else if updated > @updated
         model.updated = updated
         model.created = created
         model.update attributes
     else
-      model = @extensions[ _name ].new attributes
+      model = @extensions[ name ].new attributes
       model.updated = updated
       model.created = created
       model.write()
@@ -98,13 +97,13 @@ Nali.extend Model:
     @
 
   written: ->
-    @ in @table
+    @ in @_table
 
   write: ->
     # добавляет модель в локальную таблицу, генерирует событие create
-    @table.index[ @id ] = @ if @id and not @table.index[ @id ]
+    @_table.index[ @id ] = @ if @id and not @_table.index[ @id ]
     unless @written()
-      @table.push @
+      @_table.push @
       @onCreate?()
       @Model.trigger "create.#{ @_name.lower() }", @
       @Model.runStack()
@@ -114,8 +113,8 @@ Nali.extend Model:
     # удаляет модель из локальной таблицы, генерирует событие destroy
     if @written()
       @destroyed = true
-      delete @table.index[ @id ]
-      @table.splice @table.indexOf( @ ), 1
+      delete @_table.index[ @id ]
+      @_table.splice @_table.indexOf( @ ), 1
       @trigger 'destroy'
       @Model.trigger "destroy.#{ @_name.lower() }", @
       @onDestroy?()
@@ -124,8 +123,8 @@ Nali.extend Model:
 
   new: ( attributes ) ->
     # создает модель, не сохраняя её на сервере
-    model = @clone( attributes: @defaultAttributes() ).accessing()
-    model[ name ] = @normalizeAttributeValue name, value for name, value of attributes
+    model = @clone( attributes: @_defaultAttributes() )._accessing()
+    model[ name ] = @_normalizeAttributeValue name, value for name, value of attributes
     model
 
   create: ( attributes, success, failure ) ->
@@ -144,7 +143,7 @@ Nali.extend Model:
 
   updateProperty: ( name, value, checkValidation = true ) ->
     # обновляет один атрибут модели, проверяя его валидность, генерирует событие update.propertyName
-    value = @normalizeAttributeValue name, value
+    value = @_normalizeAttributeValue name, value
     if @[ name ] isnt value and ( not checkValidation or @isValidAttributeValue( name, value ) )
       @[ name ] = value
       @[ 'onUpdate' + name.capitalize() ]?()
@@ -166,7 +165,7 @@ Nali.extend Model:
 
   find: ( id ) ->
     # находит модель по её id используя индекс
-    @table.index[ id ]
+    @_table.index[ id ]
 
   where: ( filters ) ->
     # возвращает коллекцию моделей соответствующих фильтру
@@ -178,7 +177,7 @@ Nali.extend Model:
 
   each: ( callback ) ->
     # применяет колбек ко всем моделям
-    callback.call @, model for model in @table
+    callback.call @, model for model in @_table
     @
 
   # работа с аттрибутами
@@ -191,16 +190,16 @@ Nali.extend Model:
       date = Math.floor date / 16
       ( if sub is 'x' then rand else ( rand & 0x7 | 0x8 ) ).toString 16
 
-  defaultAttributes: ->
+  _defaultAttributes: ->
     # возвращает объект аттрибутов по умолчанию
     attributes = id: @guid()
     for name, value of @attributes
       if value instanceof Object
-        attributes[ name ] = if value.default? then @normalizeAttributeValue name, value.default else null
-      else attributes[ name ] = @normalizeAttributeValue name, value
+        attributes[ name ] = if value.default? then @_normalizeAttributeValue name, value.default else null
+      else attributes[ name ] = @_normalizeAttributeValue name, value
     attributes
 
-  normalizeAttributeValue: ( name, value ) ->
+  _normalizeAttributeValue: ( name, value ) ->
     # если формат свойства number пробует привести значение к числу
     if @::attributes[ name ]?.format is 'number' and value is ( ( correct = + value ) + '' ) then correct else value
 
@@ -232,17 +231,17 @@ Nali.extend Model:
 
   # работа со связями
 
-  parseRelations: ( type, options ) ->
+  _parseRelations: ( type, options ) ->
     # производит разбор связей
     @relations = {}
     for type in [ 'belongsTo', 'hasOne', 'hasMany' ]
       for options in [].concat( @[ type ] ) when @[ type ]?
-        params = @[ 'parse' + type.capitalize() ] @parseInitialRelationParams options
+        params = @[ '_parse' + type.capitalize() ] @_parseInitialRelationParams options
         section = type + if params.through? then 'Through' else ''
         ( @relations[ section ] ?= [] ).push params
     @
 
-  parseInitialRelationParams: ( options ) ->
+  _parseInitialRelationParams: ( options ) ->
     # дает начальные параметры настроек связи
     if typeof options is 'object'
       params         = name: Object.keys( options )[0]
@@ -253,41 +252,41 @@ Nali.extend Model:
       params = name: options
     params
 
-  parseBelongsTo: ( params ) ->
+  _parseBelongsTo: ( params ) ->
     # производит разбор связей belongsTo
     params.model ?= @Model.extensions[ params.name.capitalize() ]
     params.key   ?= params.name.lower() + '_id'
     params
 
-  parseHasOne: ( params ) ->
+  _parseHasOne: ( params ) ->
     # производит разбор связей hasOne
     params.model ?= @Model.extensions[ params.name.capitalize() ]
     params.key   ?= ( if params.through then params.name else @_name + '_id' ).lower()
     params
 
-  parseHasMany: ( params ) ->
+  _parseHasMany: ( params ) ->
     # производит разбор связей hasMany
     params.model ?= @Model.extensions[ params.name[ ...-1 ].capitalize() ]
     params.key   ?= ( if params.through then params.name[ ...-1 ] else @_name + '_id' ).lower()
     params
 
-  setRelations: ->
+  _setRelations: ->
     # запускает установку связей у модели
-    @setRelationsType type for type in [ 'belongsTo', 'hasOne', 'hasMany', 'hasOneThrough', 'hasManyThrough' ]
+    @_setRelationsType type for type in [ 'belongsTo', 'hasOne', 'hasMany', 'hasOneThrough', 'hasManyThrough' ]
     @
 
-  setRelationsType: ( type ) ->
+  _setRelationsType: ( type ) ->
     # запускает установку связей определенного типа
     if params = @relations[ type ]
-      @[ 'set' + type.capitalize() ] param for param in params
+      @[ '_set' + type.capitalize() ] param for param in params
     @
 
-  setBelongsTo: ( { key, model, name, through } ) ->
+  _setBelongsTo: ( { key, model, name, through } ) ->
     # устанавливает геттер типа belongsTo возвращающий связанную модель
     @getter name, => model.find @[ key ]
     @
 
-  setHasOne: ( { key, model, name, through } ) ->
+  _setHasOne: ( { key, model, name, through } ) ->
     # устанавливает геттер типа hasOne возвращающий связанную модель
     @getter name, =>
       delete @[ name ]
@@ -297,7 +296,7 @@ Nali.extend Model:
       @[ name ]
     @
 
-  setHasMany: ( { key, model, name, through } ) ->
+  _setHasMany: ( { key, model, name, through } ) ->
     # устанавливает геттер типа hasMany возвращающий коллекцию связанных моделей
     @getter name, =>
       delete @[ name ]
@@ -305,7 +304,7 @@ Nali.extend Model:
       @[ name ] = model.where filters
     @
 
-  setHasOneThrough: ( { key, model, name, through } ) ->
+  _setHasOneThrough: ( { key, model, name, through } ) ->
     # устанавливает геттер типа hasOne возвращающий модель,
     # связанную с текущей через модель through
     @getter name, =>
@@ -314,7 +313,7 @@ Nali.extend Model:
       @[ name ]
     @
 
-  setHasManyThrough: ( { key, model, name, through } ) ->
+  _setHasManyThrough: ( { key, model, name, through } ) ->
     # устанавливает геттер типа hasMany возвращающий коллекцию моделей,
     # связанных с текущей через модель through
     @getter name, =>
@@ -332,9 +331,9 @@ Nali.extend Model:
 
   view: ( name ) ->
     # возвращает объект вида, либо новый, либо ранее созданный
-    unless ( view = @views[ name ] )?
-      if ( view = @::views[ name ] )?
-        view = @views[ name ] = view.clone model: @
+    unless ( view = @_views[ name ] )?
+      if ( view = @::_views[ name ] )?
+        view = @_views[ name ] = view.clone model: @
       else console.error 'View "%s" of model "%s" does not exist', name, @_name
     view