nali 0.1.2 → 0.1.3

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in nali.gemspec
-gemspec
+gemspec

data/LICENSE.txt

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/bin/nali

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+require 'nali/extensions'
+require 'nali/version'
+require 'nali/generator'
+require 'nali/path'
+
+if ['--version', '-v'].include?(ARGV.first)
+  puts "Nali #{Nali::VERSION}"
+  exit(0)
+end
+
+Nali::Generator.new ARGV

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

@@ -22,6 +22,6 @@ Nali.extend Application:
     unless @titleBox
       @_( '<title>' ).appendTo 'head' unless @_( 'head title' ).lenght
       @titleBox = @_ 'head title'
-    @titleBox.text @title
+    @titleBox[0].innerText = @title
     @trigger 'update.title'
     @

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

@@ -38,12 +38,12 @@ Nali.extend Connection:
     @          
   
   success: ( message ) ->
-    @journal[ message.journal_id ].success message.params
+    @journal[ message.journal_id ].success? message.params
     delete @journal[ message.journal_id ] 
     @
     
   failure: ( message ) ->
-    @journal[ message.journal_id ].failure message.params
+    @journal[ message.journal_id ].failure? message.params
     delete @journal[ message.journal_id ] 
     @
     

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

@@ -33,12 +33,9 @@ Nali.extend Model:
         @noticesWait.splice @noticesWait.indexOf( item ), 1
     @
   
-  force: ( attributes = {} ) ->
-    ( attributes = @copy attributes ).id ?= null
-    for name, value of @attributes when not ( name of attributes )
-      if value instanceof Object
-        attributes[ name ] = if value.default? then value.default else null
-      else attributes[ name ] = value or null
+  force: ( params = {} ) ->
+    attributes = @default_attributes()
+    attributes[ name ] = value for name, value of params
     attributes[ name ] = @normalizeValue value for name, value of attributes
     @clone( attributes: attributes ).accessing()
   
@@ -48,8 +45,8 @@ Nali.extend Model:
     @
   
   save: ( success, failure ) ->
-    if @isValid()?
-      @query "#{ @sysname.lowercase() }s.save", @attributes, #=> success? @
+    if @isValid()
+      @query "#{ @sysname.lowercase() }s.save", @attributes, 
         ( { attributes, created, updated } ) =>
           @update( attributes, updated, created ).write()
           success? @
@@ -110,7 +107,7 @@ Nali.extend Model:
     
   update_attribute: ( name, value ) ->
     value = @normalizeValue value
-    if @attributes[ name ] isnt value and @isValidAttributeValue( name, value )?
+    if @attributes[ name ] isnt value and @isValidAttributeValue( name, value )
       @attributes[ name ] = value
       @[ 'onUpdate' + name.capitalize() ]?()
       @trigger "update.#{ name }", @
@@ -129,19 +126,34 @@ Nali.extend Model:
       collection.add @build attributes
     @select filters
     collection  
+  
+  # работа с аттрибутами
+  
+  default_attributes: ->
+    # возвращает объект аттрибутов по умолчанию
+    attributes = id: null
+    for name, value of @attributes
+      if value instanceof Object 
+        attributes[ name ] = if value.default? then value.default else null
+      else attributes[ name ] = value
+    attributes
     
   normalizeValue: ( value ) ->
+    # приводит значения к нормальному виду, если в строке только числа - преобразуется к числу
+    # т.е. строка '123' становится числом 123, '123.5' становится 123.5, а '123abc' остается строкой
     if typeof value is 'string'
       value = "#{ value }".trim()
-      if value is ( ( correct = parseInt( value ) ) + '' ) then correct else value
+      if value is ( ( correct = parseFloat( value ) ) + '' ) then correct else value
     else value
 
   isCorrect: ( filters = {} ) ->
+    # проверяет соответствие аттрибутов модели определенному набору фильтров, возвращает true либо false
     return false unless Object.keys( filters ).length
     return false for name, filter of filters when not @isCorrectAttribute @attributes[ name ], filter
     return true
     
-  isCorrectAttribute: ( attribute, filter ) ->                  
+  isCorrectAttribute: ( attribute, filter ) ->          
+    # проверяет соответствие аттрибута модели определенному фильтру, возвращает true либо false
     return false unless attribute
     if filter instanceof RegExp
       filter.test attribute
@@ -153,19 +165,24 @@ Nali.extend Model:
       attribute.toString() in filter or parseInt( attribute ) in filter
     else false 
     
+  # работа со связями 
+    
   setRelations: ->
+    # устанавливает геттеры к объектам связанным с моделью
     @belongsToRelation  attribute for attribute of @attributes when /_id$/.test attribute
     @hasOneRelation     attribute for attribute in [].concat @hasOne
     @hasManyRelation    attribute for attribute in [].concat @hasMany
     @  
     
   belongsToRelation: ( attribute ) ->
+    # устанавливает геттер типа belongs_to возвращающий связанную модель
     name  = attribute.replace '_id', ''
     model = @Model.extensions[ name.capitalize() ]
     @getter name, => model.find @[ attribute ]
     @ 
   
   hasOneRelation: ( name ) ->
+    # устанавливает геттер типа has_one возвращающий связанную модель
     @getter name, => 
       delete @[ name ]
       ( filters = {} )[ "#{ @sysname.lowercase() }_id" ] = @id
@@ -175,13 +192,17 @@ Nali.extend Model:
     @
   
   hasManyRelation: ( name ) ->
+    # устанавливает геттер типа has_many возвращающий коллекцию связанных моделей
     @getter name, => 
       delete @[ name ]
       ( filters = {} )[ "#{ @sysname.lowercase() }_id" ] = @id
       @[ name ] = @Model.extensions[ name[ ...-1 ].capitalize() ].where filters
     @     
   
+  # работа с видами
+  
   view: ( name ) ->
+    # приводит сокращенное имя к полному и возвращает объект вида, либо новый, либо ранее созданный
     name = @sysname + name.camelcase().capitalize() unless @View.extensions[ name ]?
     unless ( view = ( @views ?= {} )[ name ] )?
       if ( view = @View.extensions[ name ] )? 
@@ -190,9 +211,14 @@ Nali.extend Model:
     view
           
   show: ( name, insertTo ) ->
+    # вставляет html-код вида в указанное место ( это может быть селектор, html-элемент или ничего - тогда 
+    # вставка произойдет в элемент указанный в самом виде либо в элемент приложения )
+    # функция возвращает объект вида при успехе либо null при неудаче
     if ( view = @view( name ) )? then view.show insertTo else null 
       
   hide: ( name ) ->
+    # удаляет html-код вида со страницы
+    # функция возвращает объект вида при успехе либо null при неудаче
     if ( view = @view( name ) )? then view.hide() else null    
       
   # валидации
@@ -220,18 +246,18 @@ Nali.extend Model:
   
   isValid: ->
     # проверяет валидна ли модель, вызывается перед сохранением модели на сервер если модель валидна, 
-    # то вызов model.isValid()? вернет true, иначе false
-    return null for name, value of @attributes when not @isValidAttributeValue( name, value )? 
+    # то вызов model.isValid() вернет true, иначе false
+    return false for name, value of @attributes when not @isValidAttributeValue( name, value ) 
     true
     
   isValidAttributeValue: ( name, value ) ->
     # проверяет валидно ли значение для определенного атрибута модели, вызывается при проверке 
-    # валидности модели, а также в методе update() перед изменением значения атрибута, если значение
+    # валидности модели, а также в методе update_attribute() перед изменением значения атрибута, если значение
     # валидно то вызов model.isValidAttributeValue( name, value )? вернет true, иначе false
     for validation, tester of @validations when ( filter = @::attributes[ name ]?[ validation ] )?
       unless tester.call @, value, filter
         console.warn 'Attribute %s of model %O has not validate %s', name, @, validation
         for type in [ 'info', 'warning', 'error' ] when ( message = @::attributes[ name ][ type ] )?
           @Notice[ type ] message: message
-        return null 
+        return false
     true

data/lib/generator/Gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem 'nali'
+
+gem 'sqlite3'
+
+gem 'yui-compressor'
+
+gem 'uglifier'
+
+gem 'debugger'

data/lib/generator/Rakefile

@@ -0,0 +1,3 @@
+require './config/application'
+
+Nali::Application.tasks

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

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

data/lib/generator/app/assets/javascripts/controllers/homes.js.coffee

@@ -0,0 +1,6 @@
+Nali.Controller.extend Homes:
+  
+  actions: 
+    default: 'index'
+    
+    index: ( collection ) ->

data/lib/generator/app/assets/javascripts/models/home.js.coffee

@@ -0,0 +1,3 @@
+Nali.Model.extend Home:
+  
+  forced: true

data/lib/generator/app/assets/javascripts/views/home/index.js.coffee

@@ -0,0 +1 @@
+Nali.View.extend HomeIndex: {}

data/lib/generator/app/assets/stylesheets/application.css.sass

@@ -0,0 +1,4 @@
+/*
+ *= require_self
+ *= require_tree .
+ */

data/lib/generator/app/assets/stylesheets/home/index.css.sass

@@ -0,0 +1 @@
+.HomeIndex

data/lib/generator/app/assets/stylesheets/notices/error.css.sass

@@ -0,0 +1,11 @@
+.NoticeError
+  position:      absolute
+  z-index:       99
+  bottom:        1rem
+  right:         2rem
+  width:         55%
+  background:    rgba(35, 35, 35, 0.95)
+  border-radius: 0.3rem
+  box-shadow:    0px 2px 5px rgba(0, 0, 0, 0.7)
+  color:         #F75E4E
+  padding:       1.3rem

data/lib/generator/app/assets/stylesheets/notices/info.css.sass

@@ -0,0 +1,11 @@
+.NoticeInfo
+  position:      absolute
+  z-index:       99
+  bottom:        1rem
+  right:         2rem
+  width:         55%
+  background:    rgba(35, 35, 35, 0.95)
+  border-radius: 0.3rem
+  box-shadow:    0px 2px 5px rgba(0, 0, 0, 0.7)
+  color:         #58EB96
+  padding:       1.3rem

data/lib/generator/app/assets/stylesheets/notices/warning.css.sass

@@ -0,0 +1,11 @@
+.NoticeWarning
+  position:      absolute
+  z-index:       99
+  bottom:        1rem
+  right:         2rem
+  width:         55%
+  background:    rgba(35, 35, 35, 0.95)
+  border-radius: 0.3rem
+  box-shadow:    0px 2px 5px rgba(0, 0, 0, 0.7)
+  color:         #FED93A
+  padding:       1.3rem

data/lib/generator/app/clients.rb

@@ -0,0 +1,19 @@
+module Nali
+  
+  module Clients
+
+    def self.client_connected( client )
+      
+    end
+    
+    def self.on_message( client, message )
+      
+    end
+    
+    def self.client_disconnected( client )
+      
+    end
+    
+  end
+  
+end

data/lib/generator/app/templates/application.html.erb

@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <%= stylesheet_tag 'application' %>
+    <%= templates_tags %>
+    <%= javascript_tag 'application' %>
+  </head>
+  <body>
+  </body>
+</html>

data/lib/generator/app/templates/notice/error.html

@@ -0,0 +1 @@
+{ @message }

data/lib/generator/app/templates/notice/info.html

@@ -0,0 +1 @@
+{ @message }

data/lib/generator/app/templates/notice/warning.html

@@ -0,0 +1 @@
+{ @message }

data/lib/generator/config/application.rb

@@ -0,0 +1,11 @@
+require 'rubygems'
+require 'bundler/setup'
+Bundler.require
+
+module Nali
+  
+  class Application
+
+  end
+  
+end

data/lib/generator/config/database.yml

@@ -0,0 +1,17 @@
+development:
+  adapter:  sqlite3
+  database: db/development.sqlite3
+  pool:     5
+  timeout:  5000
+
+test:
+  adapter:  sqlite3
+  database: db/test.sqlite3
+  pool:     5
+  timeout:  5000
+
+production:
+  adapter:  sqlite3
+  database: db/production.sqlite3
+  pool:     5
+  timeout:  5000  

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

@@ -0,0 +1,13 @@
+Nali::Application.configure :development do |config|
+  
+# config.assets_digest = true
+  
+  config.assets_debug = true
+  
+# config.assets.js_compressor  = Uglifier.new( mangle: true )
+  
+# config.assets.css_compressor = YUI::CssCompressor.new
+  
+  ActiveRecord::Base.logger = false #Logger.new STDOUT 
+ 
+end

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

@@ -0,0 +1,32 @@
+Evo::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+  
+  config.middleware.delete Rack::Lock
+  
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations
+  config.active_record.migration_error = :page_load
+
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
+  config.log_level    = :error
+end

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

@@ -0,0 +1,11 @@
+Nali::Application.configure :production do |config|
+  
+  config.assets_digest = true
+  
+# config.assets_debug = true
+  
+  config.assets.js_compressor  = Uglifier.new( mangle: true )
+  
+  config.assets.css_compressor = YUI::CssCompressor.new
+  
+end

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

@@ -0,0 +1,80 @@
+Evo::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both thread web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable Rails's static asset server (Apache or nginx will already do this).
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
+
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
+
+  # Generate digests for assets URLs.
+  config.assets.digest = true
+
+  # Version of your assets, change this if you want to expire all your assets.
+  config.assets.version = '1.0'
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # Set to :debug to see everything in the log.
+  config.log_level = :info
+
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Precompile additional assets.
+  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+  # config.assets.precompile += %w( search.js )
+
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found).
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners.
+  config.active_support.deprecation = :notify
+
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+end

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

@@ -0,0 +1,11 @@
+Nali::Application.configure :test do |config|
+  
+# config.assets_digest = true
+  
+# config.assets_debug = true
+  
+# config.assets.js_compressor  = Uglifier.new( mangle: true )
+  
+# config.assets.css_compressor = YUI::CssCompressor.new
+  
+end

data/lib/generator/config.ru

@@ -0,0 +1,3 @@
+require './config/application'
+
+run Nali::Application.initialize!

data/lib/nali/application.rb

@@ -19,9 +19,10 @@ module Nali
     require File.join( root, 'config/environments', environment.to_s )
     
     configure do
+      
       assets.cache = Sprockets::Cache::FileStore.new File.join( root, 'tmp/cache' )
       
-      assets.append_path File.join( Nali.gem_path, 'lib/assets/javascripts' ) 
+      assets.append_path File.join( Nali.path, 'assets/javascripts' ) 
       
       %w( app/templates app/assets/stylesheets app/assets/javascripts lib/assets/stylesheets 
           lib/assets/javascripts vendor/assets/stylesheets vendor/assets/javascripts
@@ -46,53 +47,24 @@ module Nali
         settings.assets[ 'application.html' ]
       else
         request.websocket do |client|
-          client.onopen    { onopen client }
-          client.onmessage { |message| onmessage( client, JSON.parse( message ).keys_to_sym! ) }
-          client.onclose   { onclose client }
+          client.onopen    { Nali::Clients.on_client_connected client }
+          client.onmessage { |message| Nali::Clients.on_received_message( client, JSON.parse( message ).keys_to_sym! ) }
+          client.onclose   { Nali::Clients.on_client_disconnected client }
         end
       end
     end
     
-    def onopen( client )
-      clients << client
-      client_connected client 
-    end
-    
-    def onmessage( client, message )
-      if controller = Object.const_get( message[ :controller ].capitalize + 'Controller' )
-        controller = controller.new( client, message )
-        if controller.methods.include?( action = message[ :action ].to_sym )
-          controller.send action
-        else puts "Action #{ action } not exists in #{ controller }" end
-      else puts "Controller #{ controller } not exists" end
-      on_message client, message
-    end
-    
-    def onclose( client )
-      clients.delete client
-      client_disconnected client
-    end
-    
-    def client_connected( client )
-    end
-    
-    def on_message( client, message )
-    end
-    
-    def client_disconnected( client )
-    end
-    
-    def clients
-      self.class.clients
-    end
-    
-    def self.clients
-      @@clients ||= []
+    def self.access_options
+      if settings.environment == :development
+        YAML.load_file( File.join( root, 'app/models/access.yml' ) ).keys_to_sym!
+      else
+        @access_options ||= YAML.load_file( File.join( root, 'app/models/access.yml' ) ).keys_to_sym!
+      end
     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, 'app/**/*.rb'    ) ].each { |file| require( file ) }
       Dir[ File.join( root, 'vendor/*/**/*.rb' ) ].each { |file| require( file ) }
       require File.join( root, 'config/application' )
       self

data/lib/nali/clients.rb

@@ -0,0 +1,40 @@
+module Nali
+  
+  module Clients
+    
+    def self.clients
+      @@clients ||= []
+    end
+    
+    def self.on_client_connected( client )
+      clients << client
+      client_connected client 
+    end
+    
+    def self.on_received_message( client, message )
+      if controller = Object.const_get( message[ :controller ].capitalize + 'Controller' )
+        controller = controller.new( client, message )
+        if controller.methods.include?( action = message[ :action ].to_sym )
+          controller.send action
+        else puts "Action #{ action } not exists in #{ controller }" end
+      else puts "Controller #{ controller } not exists" end
+      on_message client, message
+    end
+    
+    def self.on_client_disconnected( client )
+      clients.delete client
+      client_disconnected client
+    end
+    
+    def self.client_connected( client )
+    end
+    
+    def self.on_message( client, message )
+    end
+    
+    def self.client_disconnected( client )
+    end
+    
+  end
+  
+end

data/lib/nali/connection.rb

@@ -1,7 +1,6 @@
 module EventMachine
   module WebSocket
     class Connection
-      
          
       def filters( model_name )
         @filters ||= {} 
@@ -60,10 +59,11 @@ module EventMachine
       end
         
       def sync( model )
-        if model.sync_access( self ) and ( watch_time( model ) < model.updated_at.to_f or model.destroyed? )
+        params, relations = model.get_sync_params( self )
+        if not params.empty? and ( watch_time( model ) < model.updated_at.to_f or model.destroyed? )
           watch_time_up model
-          model.get_sync_models( self ).each { |relation| sync relation } unless model.destroyed?
-          send_json( { action: 'sync', params: model.get_sync_params( self ) } )
+          relations.each { |relation| sync relation }
+          send_json action: 'sync', params: params 
         end
       end
         

data/lib/nali/controller.rb

@@ -11,25 +11,34 @@ module Nali
     end
     
     def clients
-      Nali::Application.clients
+      Nali::Clients.clients
     end
     
     def save
-      if params[ :id ]
-        if model = model_class.find_by_id( params[ :id ] )
-          save_success( model ) if model.update_attributes( params )
-        end
-      else
-        if ( model = model_class.new( params ) ).valid?
-          save_success( model ) if model.save
-        end
+      params[ :id ] ? update : create
+    end
+    
+    def create
+      model = model_class.new params 
+      model.access_action( :create, client ) do |options|
+        permit_params options
+        if ( model = model_class.new( params ) ).save
+          trigger_success model.get_sync_params( client )[0]
+          model.sync client
+        else trigger_failure end
       end
     end
     
-    def save_success( model )
-      on_save( model ) if self.methods.include?( :on_save )
-      trigger_success model.get_sync_params( client )
-      model.sync client
+    def update
+      if model = model_class.find_by_id( params[ :id ] )
+        model.access_action( :update, client ) do |options|
+          permit_params options
+          if model.update( params )
+            trigger_success model.get_sync_params( client )[0] 
+            model.sync client
+          else trigger_failure end
+        end
+      end
     end
     
     def select
@@ -39,10 +48,12 @@ module Nali
 
     def destroy
       if model = model_class.find_by_id( params[ :id ] )
-        on_destroy( model ) if self.methods.include?( :on_destroy )
-        model.destroy() 
-        model.sync
-      end
+        model.access_action( :destroy, client ) do |options|
+          model.destroy()
+          trigger_success model.id 
+          model.sync
+        end
+      else trigger_failure end
     end
     
     def trigger_success( params = nil )
@@ -55,6 +66,11 @@ module Nali
     
     private 
     
+    def permit_params( filter )
+      params.keys.each { |key| params.delete( key ) unless filter.include?( key ) }
+      params
+    end
+    
     def model_class
       Object.const_get model_name 
     end

data/lib/nali/extensions.rb

@@ -2,10 +2,27 @@ class Object
   
   def keys_to_sym!
     self.keys.each do |key|
-      self[ key ].keys_to_sym! if self[ key ].is_a?( Hash ) || self[ key ].is_a?( Array ) 
+      self[ key ].keys_to_sym! if self[ key ].is_a?( Hash )
       self[ ( key.to_sym rescue key ) ] = self.delete( key )
     end
     self
   end
     
+end
+
+class String
+   
+  def underscore!
+    gsub!(/(.)([A-Z])/,'\1_\2')
+    downcase!
+  end
+
+  def underscore
+    dup.tap { |s| s.underscore! }
+  end
+  
+  def capitalize_first
+    dup.tap { |s| s[0] = s[0].capitalize }
+  end
+  
 end

data/lib/nali/generator.rb

@@ -0,0 +1,114 @@
+module Nali
+  
+  class Generator
+    
+    def initialize( args )
+      if [ 'app', 'application' ].include?( args.first )
+        if args[1] then create_application args[1]
+        else puts 'Enter a name for the application' end
+      end
+        
+      if [ 'm', 'model' ].include?( args.first )
+        if args[1] then create_model args[1]
+        else puts 'Enter a name for the model' end
+      end 
+        
+      if [ 'v', 'view' ].include?( args.first )
+        if args[1] then create_view args[1]
+        else puts 'Enter a name for the view' end
+      end  
+        
+    end
+    
+    def create_application( name )
+      source_path = File.join( Nali.path, 'generator/.' ) 
+      target_path = File.join( Dir.pwd, name )
+      FileUtils.cp_r source_path, target_path
+      dirs = []
+      dirs << File.join( target_path, "app/controllers" )
+      dirs << File.join( target_path, "db" )
+      dirs << File.join( target_path, "db/migrate" )
+      dirs << File.join( target_path, "lib" )
+      dirs << File.join( target_path, "public" )
+      dirs << File.join( target_path, "tmp" )
+      dirs << File.join( target_path, "vendor" )
+      dirs.each { |path| Dir.mkdir( path ) unless Dir.exists?( path ) }
+      puts "Application #{ name } created"
+    end
+        
+    def create_model( name )
+      if Dir.exists?( File.join( Dir.pwd, 'app' ) )
+        filename  = name.underscore
+        classname = name.capitalize_first
+        File.open( File.join( Dir.pwd, "app/assets/javascripts/models/#{ filename }.js.coffee" ), 'w' ) do |f|     
+          f.write( "Nali.Model.extend #{ classname }: {}" )   
+        end
+        File.open( File.join( Dir.pwd, "app/assets/javascripts/controllers/#{ filename }s.js.coffee" ), 'w' ) do |f|     
+          f.write( "Nali.Controller.extend #{ classname }s: {}" )   
+        end
+        File.open( File.join( Dir.pwd, "app/models/#{ filename }.rb" ), 'w' ) do |f|     
+          f.write( 
+"class #{ classname } < ActiveRecord::Base
+
+  include Nali::Model
+
+end" 
+            )
+        end
+        File.open( File.join( Dir.pwd, "app/controllers/#{ filename }s_controller.rb" ), 'w' ) do |f|     
+          f.write( 
+"class #{ classname }sController
+  
+  include Nali::Controller
+  
+end" 
+            )
+        end
+        File.open( File.join( Dir.pwd, "app/models/access.yml" ), 'a' ) do |f|     
+          f.write( 
+"#{ classname }:
+  create:
+  read:
+  update:
+  destroy:
+
+
+" 
+            )
+        end
+        FileUtils.rm_rf( File.join( Dir.pwd, "tmp/cache" ) )
+        puts "Created: app/assets/javascripts/models/#{ filename }.js.coffee"
+        puts "Created: app/assets/javascripts/controllers/#{ filename }s.js.coffee"
+        puts "Created: app/models/#{ filename }.rb"
+        puts "Created: app/controllers/#{ filename }s_controller.rb"
+        puts "Updated: app/models/access.yml"
+      else puts 'Please go to the application folder' end
+    end
+        
+    def create_view( name )
+      if Dir.exists?( File.join( Dir.pwd, 'app' ) )
+        dirname, *filename = name.underscore.split( '_' )
+        filename  = filename.join( '_' )
+        classname = name.capitalize_first
+        dirs = []
+        dirs << File.join( Dir.pwd, "app/assets/javascripts/views/#{ dirname }" )
+        dirs << File.join( Dir.pwd, "app/assets/stylesheets/#{ dirname }" ) 
+        dirs << File.join( Dir.pwd, "app/templates/#{ dirname }" ) 
+        dirs.each { |path| Dir.mkdir( path ) unless Dir.exists?( path ) }
+        File.open( File.join( Dir.pwd, "app/assets/javascripts/views/#{ dirname }/#{ filename }.js.coffee" ), 'w' ) do |f|     
+          f.write( "Nali.View.extend #{ classname }: {}" )   
+        end 
+        File.open( File.join( Dir.pwd, "app/assets/stylesheets/#{ dirname }/#{ filename }.css.sass" ), 'w' ) do |f|     
+          f.write( ".#{ classname }" )
+        end 
+        File.open( File.join( Dir.pwd, "app/templates/#{ dirname }/#{ filename }.html" ), 'w' ) {}
+        FileUtils.rm_rf( File.join( Dir.pwd, "tmp/cache" ) )
+        puts "Created: app/assets/javascripts/views/#{ dirname }/#{ filename }.js.coffee"
+        puts "Created: app/assets/stylesheets/#{ dirname }/#{ filename }.css.sass"
+        puts "Created: app/templates/#{ dirname }/#{ filename }.html"
+      else puts 'Please go to the application folder' end
+    end    
+        
+  end
+  
+end

data/lib/nali/model.rb

@@ -1,37 +1,49 @@
 module Nali
 
   module Model
-    
-    def sync_access( client )
-      true
-    end
-    
-    def sync_models( client )
-      []
-    end
-    
-    def sync_params( client )
-      {}
+
+    def access_level( client )
+      :default
     end
     
-    def get_sync_models( client )
-      ( [] << sync_models( client ) ).flatten.compact
+    def access_action( action, client )
+      level = self.access_level client
+      if access_levels = access_options[ action ] and access_levels.keys.include?( level )
+        options = []
+        ( [] << access_levels[ level ] ).flatten.compact.each { |option| options << option.to_sym }
+        yield options
+      end
     end
     
     def get_sync_params( client )
-      attributes        = sync_params( client )
-      attributes[ :id ] = self.id
-      {
-        attributes: attributes,
-        created:    self.created_at.to_f,
-        updated:    self.updated_at.to_f,
-        sysname:    self.class.name,
-        destroyed:  self.destroyed?
-      }
+      params    = {}
+      relations = []
+      access_action( :read, client ) do |options|
+        attributes = { id: self.id }
+        options.each do |option| 
+          if self.respond_to?( option )
+            value = self.send( option )
+            if value.is_a?( ActiveRecord::Associations::CollectionProxy )
+              relations << value unless self.destroyed?
+            elsif value.is_a?( ActiveRecord::Base )
+              relations << value unless self.destroyed?
+              attributes[ option.to_s + '_id' ] = value.id
+            else
+              attributes[ option ] = value
+            end
+          end
+        end
+        params[ :attributes ] = attributes
+        params[ :sysname ]    = self.class.name
+        params[ :created ]    = self.created_at.to_f
+        params[ :updated ]    = self.updated_at.to_f
+        params[ :destroyed ]  = self.destroyed?
+      end
+      [ params, relations.flatten.compact ]
     end
       
     def clients
-      Nali::Application.clients
+      Nali::Clients.clients
     end
     
     def sync( *watches )
@@ -42,6 +54,12 @@ module Nali
     def notice( name, params )
       clients.each { |client| client.notice self, name, params if client.watch?( self ) }
     end
+    
+    private
+    
+    def access_options
+      Nali::Application.access_options[ self.class.name.to_sym ] or {}
+    end
       
   end
 

data/lib/nali/path.rb

@@ -0,0 +1,7 @@
+module Nali
+  
+  def self.path
+    @gem_path ||= File.expand_path '..', File.dirname( __FILE__ )
+  end
+  
+end

data/lib/nali/version.rb

@@ -1,3 +1,5 @@
 module Nali
-  VERSION = "0.1.2"
+  
+  VERSION = '0.1.3'
+  
 end

data/lib/nali.rb

@@ -7,18 +7,11 @@ require 'sprockets-sass'
 require 'sprockets-helpers'
 require 'coffee-script'
 require 'sass'
-require 'sqlite3'
-
-module Nali
-  
-  def self.gem_path
-    @gem_path ||= File.expand_path '..', File.dirname( __FILE__ )
-  end
-  
-end
 
 require 'nali/extensions'
+require 'nali/path'
 require 'nali/application'
+require 'nali/clients'
 require 'nali/connection'
 require 'nali/controller'
 require 'nali/model'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nali
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
@@ -171,38 +171,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +179,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -219,10 +187,11 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Realtime app
+description: Async web framework
 email:
 - 4urbanoff@gmail.com
-executables: []
+executables:
+- nali
 extensions: []
 extra_rdoc_files: []
 files:
@@ -242,11 +211,41 @@ files:
 - lib/assets/javascripts/nali/connection.js.coffee
 - lib/nali/extensions.rb
 - lib/nali/model.rb
+- lib/nali/clients.rb
 - lib/nali/controller.rb
+- lib/nali/generator.rb
 - lib/nali/connection.rb
 - lib/nali/version.rb
 - lib/nali/helpers.rb
+- lib/nali/path.rb
 - lib/nali/application.rb
+- lib/generator/app/assets/javascripts/models/home.js.coffee
+- lib/generator/app/assets/javascripts/views/home/index.js.coffee
+- lib/generator/app/assets/javascripts/controllers/homes.js.coffee
+- lib/generator/app/assets/javascripts/application.js.coffee
+- lib/generator/app/assets/stylesheets/home/index.css.sass
+- lib/generator/app/assets/stylesheets/notices/info.css.sass
+- lib/generator/app/assets/stylesheets/notices/error.css.sass
+- lib/generator/app/assets/stylesheets/notices/warning.css.sass
+- lib/generator/app/assets/stylesheets/application.css.sass
+- lib/generator/app/models/access.yml
+- lib/generator/app/clients.rb
+- lib/generator/app/templates/application.html.erb
+- lib/generator/app/templates/notice/error.html
+- lib/generator/app/templates/notice/warning.html
+- lib/generator/app/templates/notice/info.html
+- lib/generator/app/templates/home/index.html
+- lib/generator/Rakefile
+- lib/generator/config.ru
+- lib/generator/config/environments/development.rb
+- lib/generator/config/environments/production.rb~
+- lib/generator/config/environments/test.rb
+- lib/generator/config/environments/development.rb~
+- lib/generator/config/environments/production.rb
+- lib/generator/config/database.yml
+- lib/generator/config/application.rb
+- lib/generator/Gemfile
+- bin/nali
 - LICENSE.txt
 - Rakefile
 - Gemfile
@@ -275,5 +274,5 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: summary
+summary: Framework for developing async web applications
 test_files: []