nali 0.2.8 → 0.2.9

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

@@ -12,8 +12,6 @@ Nali.extend Model:
     @views = {}
 
   tables:      {}
-  hasOne:      []
-  hasMany:     []
   attributes:  {}
   updated:     0
   noticesWait: []

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

@@ -21,6 +21,9 @@ Nali.extend View:
     @redrawOn source, "update.#{ property }"
     source[ property ]
 
+  getMy: ( property ) ->
+    @getOf @model, property
+
   redrawOn: ( source, event ) ->
     @subscribeTo source, event, @onSourceUpdated
 
@@ -39,10 +42,8 @@ Nali.extend View:
       @runModelCallback 'beforeShow'
       @draw().bindEvents()
       @runAssistants 'show'
-      @subscribeTo @model, 'update',  @onSourceUpdated
       @subscribeTo @model, 'destroy', @onSourceDestroyed
       @element.appendTo insertTo
-      @showRelations()
       setTimeout ( => @onShow() ), 5 if @onShow?
       @visible = true
       @runModelCallback 'afterShow'
@@ -75,19 +76,6 @@ Nali.extend View:
     @model[ type ]?[ @_shortName ]?.call @model
     @
 
-  showRelations: ->
-    for { selector, name, view } in @relationsMap
-      if ( relation = @model[ name ] )?
-        insertTo = @element.find selector
-        if relation.childOf 'Collection'
-          relation.show view, insertTo, true
-          relation.subscribeTo @, 'hide', relation.reset
-        else
-          view = relation.show view, insertTo
-          view.subscribeTo @, 'hide', view.hide
-      else console.warn "Relation %s does not exist of model %O", name, @model
-    @
-
   runLink: ( event ) ->
     event.preventDefault()
     @runUrl event.currentTarget.getAttribute 'href'
@@ -181,20 +169,11 @@ Nali.extend View:
         .replace( /{\s*yield\s*}/g, '<div class="yield"></div>' )
       unless RegExp( "^<[^>]+" + @_name ).test @template
         @template = "<div class=\"#{ @_name }\">#{ @template }</div>"
-      @parseRelations()
+      @parseAssistants()
       container.parentNode.removeChild container
     else console.warn 'Template %s not exists', @_name
     @
 
-  parseRelations: ->
-    @relationsMap = []
-    @template = @template.replace  /{\s*(\w+) of @(\w+)\s*}/g, ( match, view, relation ) =>
-      className =  relation.capitalize() + view.capitalize() + 'Relation'
-      @relationsMap.push selector: '.' + className, name: relation, view: view
-      "<div class=\"#{ className }\"></div>"
-    @parseAssistants()
-    @
-
   parseAssistants: ->
     @assistantsMap = []
     if /{\s*.+?\s*}|bind=".+?"/.test @template
@@ -204,8 +183,11 @@ Nali.extend View:
     @
 
   scanAssistants: ( node, path = [] ) ->
-    if node.nodeType is 3 and /{\s*.+?\s*}/.test node.textContent
-      @assistantsMap.push nodepath: path, type: 'Text'
+    if node.nodeType is 3
+      if /^{\s*\w+ of @\w*\s*}$/.test( node.textContent.trim() ) and node.parentNode.childNodes.length is 1
+        @assistantsMap.push nodepath: path, type: 'Relation'
+      else if /{\s*.+?\s*}/.test node.textContent
+        @assistantsMap.push nodepath: path, type: 'Text'
     else if node.nodeName is 'ASSIST'
       @assistantsMap.push nodepath: path, type: 'Html'
     else
@@ -286,6 +268,19 @@ Nali.extend View:
         _node.off 'change'
     @
 
+  addRelationAssistant: ( node ) ->
+    [ match, name, chain ] = node.textContent.match /{\s*(\w+) of @(\w*)\s*}/
+    ( insertTo = node.parentNode ).removeChild node
+    segments = if chain.length then chain.split '.' else []
+    @assistants[ 'show' ].push ->
+      if relation = @getSource segments
+        if relation.childOf 'Collection'
+          relation.show name, insertTo, true
+          relation.subscribeTo @, 'hide', relation.reset
+        else
+          view = relation.show name, insertTo
+          view.subscribeTo @, 'hide', view.hide
+
   analize: ( value ) ->
     value.replace /{\s*(.+?)\s*}/g, ( match, sub ) => @analizeMatch sub
 
@@ -293,22 +288,25 @@ Nali.extend View:
     if match = sub.match /^@([\w\.]+)(\?)?$/
       if result = @analizeChain match[1]
         [ source, property ] = result
-        source.subscribe? @, "update.#{ property }", @onSourceUpdated if source isnt @model
+        source.subscribe? @, "update.#{ property }", @onSourceUpdated
         if match[2] is '?'
           if source[ property ] then property else ''
         else if source[ property ]? then source[ property ] else ''
       else ''
     else if match = sub.match /^[=|\+](\w+)$/
       @helpers?[ match[1] ]?.call @
-    else undefined
+    else sub
+
+  getSource: ( segments, source = @model ) ->
+    for segment in segments
+      if segment of source then source = source[ segment ]
+      else
+        console.warn "%s: chain \"%s\" is invalid, segment \"%s\" not exists in %O", @_name, segments.join( '.' ), segment, source
+        return null
+    source
 
   analizeChain: ( chain, source = @model ) ->
     segments = chain.split '.'
     property = segments.pop()
-    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", @_name, chain
-      return null
+    return null unless source = @getSource segments, source
     [ source, property ]

data/lib/nali/generator.rb

@@ -53,7 +53,7 @@ module Nali
   actions: {}"
             )
         end
-        File.open( File.join( Dir.pwd, "app/models/#{ filename }.rb" ), 'w' ) do |f|     
+        File.open( File.join( Dir.pwd, "app/server/models/#{ filename }.rb" ), 'w' ) do |f|
           f.write( 
 "class #{ classname } < ActiveRecord::Base
 
@@ -66,7 +66,7 @@ module Nali
 end" 
             )
         end
-        File.open( File.join( Dir.pwd, "app/controllers/#{ filename }s_controller.rb" ), 'w' ) do |f|     
+        File.open( File.join( Dir.pwd, "app/server/controllers/#{ filename }s_controller.rb" ), 'w' ) do |f|
           f.write( 
 "class #{ classname }sController < ApplicationController
   
@@ -75,7 +75,7 @@ end"
 end" 
             )
         end
-        File.open( File.join( Dir.pwd, "app/models/access.yml" ), 'a' ) do |f|     
+        File.open( File.join( Dir.pwd, "app/server/models/access.yml" ), 'a' ) do |f|
           f.write( 
 "
 
@@ -91,9 +91,9 @@ end"
         FileUtils.rm_rf( File.join( Dir.pwd, "tmp/cache" ) )
         puts "Created: app/client/javascripts/models/#{ filename }.js.coffee"
         puts "Created: app/client/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"
+        puts "Created: app/server/models/#{ filename }.rb"
+        puts "Created: app/server/controllers/#{ filename }s_controller.rb"
+        puts "Updated: app/server/models/access.yml"
       else puts 'Please go to the application folder' end
     end
         

data/lib/nali/version.rb

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

metadata

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