nali 0.2.7 → 0.2.8

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

@@ -16,3 +16,5 @@ String::camel = ->
 String::underscore = ->
   str = @replace /([A-Z])/g, ( match ) -> '_' + match.lower()
   if str[ 0...1 ] is '_' then str[ 1.. ] else str
+
+window.__ = ( args... ) -> console.log args...

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

@@ -34,7 +34,7 @@ Nali.extend Model:
         @views[ short = view._shortName ] = view
         shortCap = short.capitalize()
         unless @[ viewMethod = 'view' + shortCap ]? then @[ viewMethod ] = -> @view short
-        unless @[ showMethod = 'show' + shortCap ]? then @[ showMethod ] = -> @show short
+        unless @[ showMethod = 'show' + shortCap ]? then @[ showMethod ] = ( insertTo ) -> @show short, insertTo
         unless @[ hideMethod = 'hide' + shortCap ]? then @[ hideMethod ] = -> @hide short
     @
 
@@ -156,6 +156,11 @@ Nali.extend Model:
       true
     else false
 
+  upgrade: ( attributes, success, failure ) ->
+    # обновляет атрибуты модели и сохраняет её на сервер
+    @update( attributes ).save success, failure
+    @
+
   destroy: ( success, failure ) ->
     # отправляет на сервер запрос на удаление модели, вызывает success в случае успеха и failure при неудаче
     @query @_name.lower() + 's.destroy', @attributes, success, failure

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

@@ -1,5 +1,3 @@
-window.__ = ( args... ) -> console.log args...
-
 window.Nali =
 
   _name:      'Nali'

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

@@ -98,19 +98,29 @@ Nali.extend View:
     @runUrl event.currentTarget.getAttribute( 'action' ), @formToHash event.currentTarget
     @
 
-  runUrl: ( url, params = {} ) ->
+  runUrl: ( url, params ) ->
     if match = url.match /^(@@?)(.+)/
-      [ method, data ] = match[2].split '?'
-      if data
-        for specification in data.split /&|&/ when specification
-          [ name, value ] = specification.split '='
-          params[ name ]  = value
-      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
+      [ chain, segments... ] = match[2].split '/'
+      if result = @analizeChain chain, ( if match[1].length is 1 then @ else @model )
+        [ source, method ] = result
+        args = @parseUrlSegments segments
+        args.unshift params if params
+        source[ method ] args...
+      else console.warn "Method %s not exists", chain
     else @redirect url, params
     @
 
+  parseUrlSegments: ( segments ) ->
+    params = []
+    for segment in segments
+      [ name, value ] = segment.split ':'
+      if value
+        last = params[ params.length - 1 ]
+        params.push last = {} if typeof last isnt 'object'
+        last[ name ] = value
+      else params.push name
+    params
+
   formToHash: ( form ) ->
     params = {}
     for element in form.elements
@@ -286,20 +296,19 @@ Nali.extend View:
         source.subscribe? @, "update.#{ property }", @onSourceUpdated if source isnt @model
         if match[2] is '?'
           if source[ property ] then property else ''
-        else source[ property ]
+        else if source[ property ]? then source[ property ] else ''
       else ''
     else if match = sub.match /^[=|\+](\w+)$/
       @helpers?[ match[1] ]?.call @
     else undefined
 
-  analizeChain: ( chain ) ->
+  analizeChain: ( chain, source = @model ) ->
     segments = chain.split '.'
     property = segments.pop()
-    source   = @model
     for segment in segments
       if segment of source then source = source[ segment ]
       else break
     unless property of source
-      console.warn "%s: chain \"%s\" is invalid, \"%s\" is not Object", @_name, chain, segment
+      console.warn "%s: chain \"%s\" is invalid", @_name, chain
       return null
     [ source, property ]

data/lib/generator/config/application.rb

@@ -8,9 +8,7 @@ module Nali
 
     configure do |config|
 
-#      Your configure settings
-#      config.client.append_path 'public/client/images'
-#      Add folder to sprockets
+      #Your configure settings for all environments
 
     end
 

data/lib/nali/version.rb

@@ -1,5 +1,5 @@
 module Nali
   
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
   
 end

metadata

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