nali 0.3.2 → 0.3.3

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

@@ -60,10 +60,12 @@ Nali.extend Model:
 
   save: ( success, failure ) ->
     # отправляет на сервер запрос на сохранение модели, вызывает success в случае успеха и failure при неудаче
+    @beforeSave?()
     if @isValid()
       @query "#{ @_name.lower() }s.save", @attributes,
         ( { attributes, created, updated } ) =>
           @update( attributes, updated, created ).write()
+          @afterSave?()
           success? @
     else failure? @
     @
@@ -72,7 +74,10 @@ Nali.extend Model:
     # синхронизирует пришедшую с сервера модель с локальной, либо создает новую
     if model = @extensions[ _name ].find attributes.id
       if destroyed then model.remove()
-      else model.update attributes, updated, created
+      else if updated > @updated
+        model.updated = updated
+        model.created = created
+        model.update attributes
     else
       model = @extensions[ _name ].new attributes
       model.updated = updated
@@ -127,23 +132,20 @@ Nali.extend Model:
     # создает модель, и сохраняет её на сервере, вызывает success в случае успеха и failure при неудаче
     @new( attributes ).save success, failure
 
-  update: ( attributes, updated = 0, created = 0 ) ->
+  update: ( attributes, checkValidation = true ) ->
     # обновляет атрибуты модели, проверяя их валидность, генерирует событие update
-    if not updated or updated > @updated
-      @created = created if created
-      changed = []
-      changed.push name for name, value of attributes when @updateProperty name, value
-      if changed.length
-        @updated = updated if updated
-        @onUpdate? changed
-        @trigger 'update', changed
-        @Model.trigger "update.#{ @_name.lower() }", @
+    changed = []
+    changed.push name for name, value of attributes when @updateProperty name, value, checkValidation
+    if changed.length
+      @onUpdate? changed
+      @trigger 'update', changed
+      @Model.trigger "update.#{ @_name.lower() }", @
     @
 
-  updateProperty: ( name, value ) ->
+  updateProperty: ( name, value, checkValidation = true ) ->
     # обновляет один атрибут модели, проверяя его валидность, генерирует событие update.propertyName
     value = @normalizeValue value
-    if @[ name ] isnt value and @isValidAttributeValue( name, value )
+    if @[ name ] isnt value and ( not checkValidation or @isValidAttributeValue( name, value ) )
       @[ name ] = value
       @[ 'onUpdate' + name.capitalize() ]?()
       @trigger "update.#{ name }"

data/lib/nali/application.rb

@@ -65,20 +65,18 @@ module Nali
     end
     
     def self.access_options
-      if settings.environment == :development
-        YAML.load_file( File.join( root, 'app/server/models/access.yml' ) ).keys_to_sym!
-      else
-        @access_options ||= YAML.load_file( File.join( root, 'app/server/models/access.yml' ) ).keys_to_sym!
-      end
+      settings.environment == :development ? get_access_options : @access_options ||= get_access_options
     end
     
     def self.initialize!
-      Dir[ File.join( root, 'lib/*/**/*.rb' ) ].each { |file| require( file ) }
-      require File.join( root, 'app/server/controllers/application_controller.rb' )
-      Dir[ File.join( root, 'app/server/**/*.rb'   ) ].each { |file| require( file ) }
-      require File.join( root, 'config/application' )
-      require File.join( root, 'app/server/clients' )
-      Dir[ File.join( root, 'config/initializers/**/*.rb'   ) ].each { |file| require( file ) }
+      %w(
+        lib/*/**/*.rb
+        app/server/controllers/application_controller.rb
+        app/server/**/*.rb
+        config/application
+        app/server/clients
+        config/initializers/**/*.rb
+      ).each { |path| Dir[ File.join( root, path ) ].each { |file| require( file ) } }
       self
     end
     
@@ -89,6 +87,28 @@ module Nali
       require 'nali/tasks'
       Nali::Tasks.new 
     end
+
+    private
+
+      def self.get_access_options
+        YAML.load_file( File.join( root, 'app/server/models/access.yml' ) ).keys_to_sym!.each_value do |sections|
+          [ :create, :read, :update ].each do |type|
+            if section = sections[ type ]
+              section.each_key { |level| parse_access_level section, level }
+            end
+          end
+        end
+      end
+
+      def self.parse_access_level( section, level )
+        parsed = []
+        if section[ level ]
+          section[ level ].each do |value|
+            value =~ /^\+/ ? parsed += parse_access_level( section, value[ /[^\+]+/ ].to_sym ) : parsed << value
+          end
+        end
+        section[ level ] = parsed
+      end
       
   end  
 

data/lib/nali/version.rb

@@ -1,5 +1,5 @@
 module Nali
   
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
   
 end

metadata

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