nali 0.3.5 → 0.3.6

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

@@ -6,7 +6,7 @@ Nali.extend Connection:
 
   open: ->
     @dispatcher = new WebSocket @Application.wsServer
-    @dispatcher.onopen    = ( event ) => @onOpen    event
+    @dispatcher.onopen    = ( event ) => @identification()
     @dispatcher.onclose   = ( event ) => @onClose   event
     @dispatcher.onerror   = ( event ) => @onError   event
     @dispatcher.onmessage = ( event ) => @onMessage JSON.parse event.data
@@ -17,7 +17,7 @@ Nali.extend Connection:
   journal:        []
   reconnectDelay: 0
 
-  onOpen: ( event ) ->
+  onOpen: ->
     @reconnectDelay = 0
     @trigger 'open'
 
@@ -49,10 +49,18 @@ Nali.extend Connection:
     @keepAlive()
     @
 
+  identification: ->
+    @send nali_browser_id: @Cookie.get( 'nali_browser_id' ) or @Cookie.set 'nali_browser_id', @Model.guid()
+    @
+
   sync: ( message ) ->
     @Model.sync message.params
     @
 
+  appRun: ( { method, params } ) ->
+    @Application[ method ]? params
+    @
+
   callMethod: ( { model, method, params } ) ->
     if model is 'Notice' then @Notice[ method ] params
     else

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

@@ -2,7 +2,6 @@
 //= require ./form2js.min
 //= require ./extensions
 //= require ./nali
-//= require ./deferred
 //= require ./application
 //= require ./connection
 //= require ./router

data/lib/generator/{Rakefile → application/Rakefile}

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

data/lib/generator/application/config.ru

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

data/lib/generator/{config → application/config}/application.rb

@@ -3,7 +3,7 @@ require 'bundler/setup'
 Bundler.require
 
 module Nali
-  
+
   class Application
 
     configure do |config|
@@ -13,5 +13,5 @@ module Nali
     end
 
   end
-  
+
 end

data/lib/generator/{config → application/config}/database.yml

@@ -14,4 +14,4 @@ production:
   adapter:  sqlite3
   database: db/production.sqlite3
   pool:     5
-  timeout:  5000  
+  timeout:  5000

data/lib/generator/{config → application/config}/environments/development.rb

@@ -1,7 +1,7 @@
 Nali::Application.configure :development do |config|
-  
+
   config.client_debug       = true
-  
+
   ActiveRecord::Base.logger = false #Logger.new STDOUT
- 
+
 end

data/lib/generator/{config → application/config}/environments/production.rb

@@ -1,11 +1,11 @@
 Nali::Application.configure :production do |config|
-  
+
   ActiveRecord::Base.logger    = false
-  
+
   config.client_digest         = true
-  
+
   config.client.js_compressor  = :uglify
 
   config.client.css_compressor = :scss
-  
+
 end

data/lib/generator/{config → application/config}/environments/test.rb

@@ -1,13 +1,13 @@
 Nali::Application.configure :test do |config|
-  
+
 # ActiveRecord::Base.logger    = false
-  
+
 # config.client_digest         = true
-  
+
 # config.client_debug          = true
-  
+
 # config.client.js_compressor  = :uglify
-  
+
 # config.client.css_compressor = :scss
-  
+
 end

data/lib/generator/templates/client_controller.tpl

@@ -0,0 +1,3 @@
+Nali.Controller.extend <%= classname %>s:
+
+  actions: {}

data/lib/generator/templates/client_model.tpl

@@ -0,0 +1,3 @@
+Nali.Model.extend <%= classname %>:
+
+  attributes: {}

data/lib/generator/templates/client_view.tpl

@@ -0,0 +1,11 @@
+Nali.View.extend <%= classname %>:
+
+  events:  []
+
+  helpers: {}
+
+  onDraw:  ->
+
+  onShow:  ->
+
+  onHide:  ->

data/lib/generator/templates/client_view_styles.tpl

@@ -0,0 +1 @@
+.<%= classname %>

data/lib/generator/templates/server_controller.tpl

@@ -0,0 +1,5 @@
+class <%= classname %>sController < ApplicationController
+
+  include Nali::Controller
+
+end

data/lib/generator/templates/server_model.tpl

@@ -0,0 +1,9 @@
+class <%= classname %> < ActiveRecord::Base
+
+  include Nali::Model
+
+  def access_level( client )
+    :unknown
+  end
+
+end

data/lib/generator/templates/server_model_access.tpl

@@ -0,0 +1,6 @@
+
+<%= classname %>:
+  create:
+  read:
+  update:
+  destroy:

data/lib/nali/clients.rb

@@ -12,13 +12,16 @@ module Nali
     
     def on_client_connected( client )
       clients << client
-      client_connected( client ) if respond_to?( :client_connected )
     end
     
     def on_received_message( client, message )
-      if message[ :ping ]
+      if message[ :nali_browser_id ]
+        client.browser_id = message[ :nali_browser_id ]
+        client_connected( client ) if respond_to?( :client_connected )
+        client.send_json action: :onOpen
+      elsif message[ :ping ]
         client.send_json action: :pong
-      else
+      elsif message[ :controller ]
         name = message[ :controller ].capitalize + 'Controller'
         if Math.const_defined?( name ) and controller = Object.const_get( name )
           controller = controller.new( client, message )

data/lib/nali/connection.rb

@@ -2,9 +2,24 @@ module EventMachine
   module WebSocket
     class Connection
          
+      attr_accessor :browser_id
+
+      def all_tabs
+        Nali::Clients.list
+          .select { |client| client.browser_id == self.browser_id }
+          .each{ |client| yield( client ) if block_given? }
+      end
+
+      def other_tabs
+        Nali::Clients.list
+          .select { |client| client != self and client.browser_id == self.browser_id }
+          .each{ |client| yield( client ) if block_given? }
+      end
+
       def reset
         @storage = {} 
         @watches = {} 
+        self
       end
 
       def storage
@@ -45,6 +60,7 @@ module EventMachine
         
       def send_json( hash )
         send hash.to_json
+        self
       end
         
       def sync( *models )
@@ -56,27 +72,38 @@ module EventMachine
             send_json action: :sync, params: params
           end
         end
+        self
       end
         
       def call_method( method, model, params = nil )
         model = "#{ model.class.name }.#{ model.id }" if model.is_a?( ActiveRecord::Base )
         send_json action: 'callMethod', model: model, method: method, params: params
+        self
       end
 
       def notice( method, params = nil )
         call_method method, 'Notice', params
+        self
       end
         
       def info( params )
         notice :info, params
+        self
       end
         
       def warning( params )
         notice :warning, params
+        self
       end
         
       def error( params )
         notice :error, params
+        self
+      end
+
+      def app_run( method, params = nil )
+        send_json action: 'appRun', method: method, params: params
+        self
       end
         
     end

data/lib/nali/generator.rb

@@ -16,90 +16,55 @@ module Nali
     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, 'db' )
-      dirs << File.join( target_path, 'db/migrate' )
-      dirs << File.join( target_path, 'lib' )
-      dirs << File.join( target_path, 'lib/client' )
-      dirs << File.join( target_path, 'lib/client/javascripts' )
-      dirs << File.join( target_path, 'lib/client/stylesheets' )
-      dirs << File.join( target_path, 'public' )
-      dirs << File.join( target_path, 'public/client' )
-      dirs << File.join( target_path, 'tmp' )
-      dirs << File.join( target_path, 'vendor' )
-      dirs << File.join( target_path, 'vendor/client' )
-      dirs << File.join( target_path, 'vendor/client/javascripts' )
-      dirs << File.join( target_path, 'vendor/client/stylesheets' )
-      dirs << File.join( target_path, 'config/initializers' )
-      dirs.each { |path| Dir.mkdir( path ) unless Dir.exists?( path ) }
+      source = File.join Nali.path, 'generator/application/.'
+      target = File.join Dir.pwd, name
+      FileUtils.cp_r source, target
+      %w(
+        db
+        db/migrate
+        lib
+        lib/client
+        lib/client/javascripts
+        lib/client/stylesheets
+        public
+        public/client
+        tmp
+        vendor
+        vendor/client
+        vendor/client/javascripts
+        vendor/client/stylesheets
+        config/initializers
+      ).each { |dir| unless Dir.exists?( path = File.join( target, dir ) ) then Dir.mkdir( path ) end }
       puts "Application #{ name } created"
     end
+
+    def render( name, classname )
+      require 'erb'
+      ERB.new( File.read( File.join( Nali.path, 'generator/templates', "#{ name }.tpl" )  ) ).result binding
+    end
+
+    def write( path, content, mode = 'w' )
+      File.open( File.join( Dir.pwd, path ), mode ) { |file| file.write( content ) }
+      puts ( mode == 'a' ? 'Updated: ' : 'Created: ' ) + path
+    end
+
+    def clean_cache
+      FileUtils.rm_rf File.join( Dir.pwd, 'tmp/cache' )
+    end
         
     def create_model( name )
       if Dir.exists?( File.join( Dir.pwd, 'app' ) )
         if name.scan( '_' ).size > 0
           return puts 'Please don\'t use the underscore'
         end
+        clean_cache
         filename  = name.downcase
         classname = name.camelize
-        File.open( File.join( Dir.pwd, "app/client/javascripts/models/#{ filename }.js.coffee" ), 'w' ) do |f|
-          f.write(
-"Nali.Model.extend #{ classname }:
-
-  attributes: {}"
-            )
-        end
-        File.open( File.join( Dir.pwd, "app/client/javascripts/controllers/#{ filename }s.js.coffee" ), 'w' ) do |f|
-          f.write(
-"Nali.Controller.extend #{ classname }s:
-
-  actions: {}"
-            )
-        end
-        File.open( File.join( Dir.pwd, "app/server/models/#{ filename }.rb" ), 'w' ) do |f|
-          f.write( 
-"class #{ classname } < ActiveRecord::Base
-
-  include Nali::Model
-
-  def access_level( client )
-    :unknown
-  end
-
-end" 
-            )
-        end
-        File.open( File.join( Dir.pwd, "app/server/controllers/#{ filename }s_controller.rb" ), 'w' ) do |f|
-          f.write( 
-"class #{ classname }sController < ApplicationController
-  
-  include Nali::Controller
-  
-end" 
-            )
-        end
-        File.open( File.join( Dir.pwd, "app/server/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/client/javascripts/models/#{ filename }.js.coffee"
-        puts "Created: app/client/javascripts/controllers/#{ filename }s.js.coffee"
-        puts "Created: app/server/models/#{ filename }.rb"
-        puts "Created: app/server/controllers/#{ filename }s_controller.rb"
-        puts "Updated: app/server/models/access.yml"
+        write "app/client/javascripts/models/#{ filename }.js.coffee", render( 'client_model', classname )
+        write "app/client/javascripts/controllers/#{ filename }s.js.coffee", render( 'client_controller', classname )
+        write "app/server/models/#{ filename }.rb", render( 'server_model', classname )
+        write "app/server/controllers/#{ filename }s_controller.rb", render( 'server_controller', classname )
+        write "app/server/models/access.yml", render( 'server_model_access', classname ), 'a'
       else puts 'Please go to the application folder' end
     end
         
@@ -109,34 +74,15 @@ end"
         filename  = filename.join( '_' )
         classname = name.underscore.camelize
         if not dirname.empty? and not filename.empty? and not classname.empty?
-          dirs = []
-          dirs << File.join( Dir.pwd, "app/client/javascripts/views/#{ dirname }" )
-          dirs << File.join( Dir.pwd, "app/client/stylesheets/#{ dirname }" )
-          dirs << File.join( Dir.pwd, "app/client/templates/#{ dirname }" )
-          dirs.each { |path| Dir.mkdir( path ) unless Dir.exists?( path ) }
-          File.open( File.join( Dir.pwd, "app/client/javascripts/views/#{ dirname }/#{ filename }.js.coffee" ), 'w' ) do |f|
-            f.write(
-"Nali.View.extend #{ classname }:
-
-  events:  []
-
-  helpers: {}
-
-  onDraw:  ->
-
-  onShow:  ->
-
-  onHide:  ->"
-              )
-          end 
-          File.open( File.join( Dir.pwd, "app/client/stylesheets/#{ dirname }/#{ filename }.css.sass" ), 'w' ) do |f|
-            f.write( ".#{ classname }" )
-          end 
-          File.open( File.join( Dir.pwd, "app/client/templates/#{ dirname }/#{ filename }.html" ), 'w' ) {}
-          FileUtils.rm_rf( File.join( Dir.pwd, "tmp/cache" ) )
-          puts "Created: app/client/javascripts/views/#{ dirname }/#{ filename }.js.coffee"
-          puts "Created: app/client/stylesheets/#{ dirname }/#{ filename }.css.sass"
-          puts "Created: app/client/templates/#{ dirname }/#{ filename }.html"
+          clean_cache
+          [
+            "app/client/javascripts/views/#{ dirname }",
+            "app/client/stylesheets/#{ dirname }",
+            "app/client/templates/#{ dirname }"
+          ].each { |dir| unless Dir.exists?( path = File.join( Dir.pwd, dir ) ) then Dir.mkdir( path ) end }
+          write "app/client/javascripts/views/#{ dirname }/#{ filename }.js.coffee", render( 'client_view', classname )
+          write "app/client/stylesheets/#{ dirname }/#{ filename }.css.sass", render( 'client_view_styles', classname )
+          write "app/client/templates/#{ dirname }/#{ filename }.html", ''
         else puts 'Invalid view name' end
       else puts 'Please go to the application folder' end
     end    

data/lib/nali/version.rb

@@ -1,5 +1,5 @@
 module Nali
   
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nali
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
@@ -198,7 +198,6 @@ files:
 - lib/client/javascripts/nali/view.js.coffee
 - lib/client/javascripts/nali/cookie.js.coffee
 - lib/client/javascripts/nali/nali.js.coffee
-- lib/client/javascripts/nali/deferred.js.coffee
 - lib/client/javascripts/nali/notice.js.coffee
 - lib/client/javascripts/nali/controller.js.coffee
 - lib/client/javascripts/nali/jbone.min.js
@@ -222,32 +221,39 @@ files:
 - lib/nali/helpers.rb
 - lib/nali/path.rb
 - lib/nali/application.rb
-- lib/generator/app/client/javascripts/models/home.js.coffee
-- lib/generator/app/client/javascripts/views/home/index.js.coffee
-- lib/generator/app/client/javascripts/controllers/homes.js.coffee
-- lib/generator/app/client/javascripts/application.js.coffee
-- lib/generator/app/client/templates/application.html.erb
-- lib/generator/app/client/templates/notice/error.html
-- lib/generator/app/client/templates/notice/warning.html
-- lib/generator/app/client/templates/notice/info.html
-- lib/generator/app/client/templates/home/index.html
-- lib/generator/app/client/stylesheets/notice/info.css.sass
-- lib/generator/app/client/stylesheets/notice/error.css.sass
-- lib/generator/app/client/stylesheets/notice/warning.css.sass
-- lib/generator/app/client/stylesheets/home/index.css.sass
-- lib/generator/app/client/stylesheets/application.css.sass
-- lib/generator/app/server/models/access.yml
-- lib/generator/app/server/routes.rb
-- lib/generator/app/server/clients.rb
-- lib/generator/app/server/controllers/application_controller.rb
-- lib/generator/Rakefile
-- lib/generator/config.ru
-- lib/generator/config/environments/development.rb
-- lib/generator/config/environments/test.rb
-- lib/generator/config/environments/production.rb
-- lib/generator/config/database.yml
-- lib/generator/config/application.rb
-- lib/generator/Gemfile
+- lib/generator/templates/server_model.tpl
+- lib/generator/templates/client_model.tpl
+- lib/generator/templates/client_view.tpl
+- lib/generator/templates/client_view_styles.tpl
+- lib/generator/templates/server_controller.tpl
+- lib/generator/templates/server_model_access.tpl
+- lib/generator/templates/client_controller.tpl
+- lib/generator/application/app/client/javascripts/models/home.js.coffee
+- lib/generator/application/app/client/javascripts/views/home/index.js.coffee
+- lib/generator/application/app/client/javascripts/controllers/homes.js.coffee
+- lib/generator/application/app/client/javascripts/application.js.coffee
+- lib/generator/application/app/client/templates/application.html.erb
+- lib/generator/application/app/client/templates/notice/error.html
+- lib/generator/application/app/client/templates/notice/warning.html
+- lib/generator/application/app/client/templates/notice/info.html
+- lib/generator/application/app/client/templates/home/index.html
+- lib/generator/application/app/client/stylesheets/notice/info.css.sass
+- lib/generator/application/app/client/stylesheets/notice/error.css.sass
+- lib/generator/application/app/client/stylesheets/notice/warning.css.sass
+- lib/generator/application/app/client/stylesheets/home/index.css.sass
+- lib/generator/application/app/client/stylesheets/application.css.sass
+- lib/generator/application/app/server/models/access.yml
+- lib/generator/application/app/server/routes.rb
+- lib/generator/application/app/server/clients.rb
+- lib/generator/application/app/server/controllers/application_controller.rb
+- lib/generator/application/Rakefile
+- lib/generator/application/config.ru
+- lib/generator/application/config/environments/development.rb
+- lib/generator/application/config/environments/test.rb
+- lib/generator/application/config/environments/production.rb
+- lib/generator/application/config/database.yml
+- lib/generator/application/config/application.rb
+- lib/generator/application/Gemfile
 - bin/nali
 - LICENSE.txt
 - Rakefile

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

@@ -1,16 +0,0 @@
-#Nali.extend Deferred:
-#
-#  new: ( callback ) ->
-#    obj         = Object.create @
-#    obj.defer   = callback
-#    obj.awaits  = []
-#    obj.results = []
-#    obj
-#
-#  await: ( callback ) ->
-#    wrapper = ( args... ) =>
-#      @results.push callback args...
-#      @awaits.splice @awaits.indexOf( wrapper ), 1
-#      @defer @results unless @awaits.length
-#    @awaits.push wrapper
-#    wrapper

data/lib/generator/config.ru

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