RubyGems - nali - Versions diffs - 0.2.2 → 0.2.3 - Mend

nali 0.2.2 → 0.2.3

Files changed (58) hide show

@@ -2,11 +2,11 @@ source 'https://rubygems.org'
 gem 'nali'
-group :development, :test do
-  gem 'debugger'
-  gem 'sqlite3'
-end
-group :production do
-  gem 'uglifier'
-end
+# Use sqlite3 as the database for Active Record
+gem 'sqlite3'
+# Use Uglifier as compressor for JavaScript client
+gem 'uglifier'
+# Use debugger
+#gem 'debugger'

data/lib/generator/app/{assets → client}/javascripts/application.js.coffee RENAMED

@@ -1,4 +1,4 @@
 #= require nali
 #= require_tree .
-Nali.Application.run()
+Nali.Application.run()

data/lib/generator/app/{assets → client}/javascripts/controllers/homes.js.coffee RENAMED

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

data/lib/generator/app/client/javascripts/models/home.js.coffee ADDED

@@ -0,0 +1,5 @@
+Nali.Model.extend Home:
+  attributes: {}
+  forced: true

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

@@ -0,0 +1,9 @@
+Nali.View.extend HomeIndex:
+  events:  []
+  helpers: {}
+  onShow:  ->
+  onHide:  ->

data/lib/generator/app/{assets → client}/stylesheets/application.css.sass RENAMED

@@ -4,4 +4,4 @@
  */
 body
-  margin: 0
+  margin: 0

data/lib/generator/app/{assets → client}/stylesheets/home/index.css.sass RENAMED

@@ -4,15 +4,15 @@
   height:         100vh
   display:        table-cell
   vertical-align: middle
-  font-family:    Lucida Grande, Arial, tahoma, verdana, sans-serif
+  font-family:    Lucida Grande, Arial, tahoma, verdana, sans-serif
   .welcome, .title
     text-align:   center
   .welcome
     font-size:    10vmin
     color:        #ECF0F1
   .title
     font-size:    3vmin
-    color:        #BDC3C7
+    color:        #BDC3C7

data/lib/generator/app/{assets → client}/stylesheets/notices/error.css.sass RENAMED

@@ -8,4 +8,4 @@
   border-radius: 0.3rem
   box-shadow:    0px 2px 5px rgba(0, 0, 0, 0.7)
   color:         #F75E4E
-  padding:       1.3rem
+  padding:       1.3rem

data/lib/generator/app/{assets → client}/stylesheets/notices/info.css.sass RENAMED

@@ -8,4 +8,4 @@
   border-radius: 0.3rem
   box-shadow:    0px 2px 5px rgba(0, 0, 0, 0.7)
   color:         #58EB96
-  padding:       1.3rem
+  padding:       1.3rem

data/lib/generator/app/{assets → client}/stylesheets/notices/warning.css.sass RENAMED

@@ -8,4 +8,4 @@
   border-radius: 0.3rem
   box-shadow:    0px 2px 5px rgba(0, 0, 0, 0.7)
   color:         #FED93A
-  padding:       1.3rem
+  padding:       1.3rem

data/lib/generator/app/{templates → client/templates}/application.html.erb RENAMED

@@ -8,4 +8,4 @@
   </head>
   <body>
   </body>
-</html>
+</html>

data/lib/generator/app/{templates → client/templates}/home/index.html RENAMED

@@ -1,2 +1,2 @@
 <div class="welcome">Welcome to Nali</div>
-<div class="title">Framework for developing async web applications</div>
+<div class="title">Framework for developing async web applications</div>

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

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

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

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

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

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

data/lib/generator/app/server/clients.rb ADDED

@@ -0,0 +1,15 @@
+module Nali::Clients
+  def client_connected( client )
+  end
+  def on_message( client, message )
+  end
+  def client_disconnected( client )
+  end
+end

data/lib/generator/app/{controllers → server/controllers}/application_controller.rb RENAMED

@@ -1,3 +1,3 @@
 class ApplicationController
-end
+end

data/lib/generator/app/{models → server/models}/access.yml RENAMED

File without changes

data/lib/generator/{config → app/server}/routes.rb RENAMED

@@ -1,7 +1,7 @@
 Nali::Application.configure do |routes|
 #  routes.get '/test' do
 #    Your code
 #  end
-end
+end

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

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

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

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

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

@@ -2,12 +2,12 @@ Nali::Application.configure :test do |config|
 # ActiveRecord::Base.logger    = false
-# config.assets_digest = true
+# config.client_digest         = true
-# config.assets_debug = true
+# config.client_debug          = true
-# config.assets.js_compressor  = Uglifier.new( mangle: true )
+# config.client.js_compressor  = :uglify
-# config.assets.css_compressor = YUI::CssCompressor.new
+# config.client.css_compressor = :scss
-end
+end

data/lib/nali/application.rb CHANGED

@@ -4,9 +4,9 @@ module Nali
     set :root,          File.expand_path( '.' )
     set :database_file, File.join( root, 'config/database.yml' )
-    set :assets,        Sprockets::Environment.new( root )
-    set :assets_digest, false
-    set :assets_debug,  false
+    set :client,        Sprockets::Environment.new( root )
+    set :client_digest, false
+    set :client_debug,  false
     set :static,        true
     register Sinatra::ActiveRecordExtension
@@ -20,39 +20,40 @@ module Nali
     configure do
-      assets.cache = Sprockets::Cache::FileStore.new File.join( root, 'tmp/cache' )
+      client.cache = Sprockets::Cache::FileStore.new File.join( root, 'tmp/cache' )
-      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
-      ).each { |path| assets.append_path File.join( root, path ) }
+      client.append_path File.join( Nali.path, 'client/javascripts' )
+      %w( app/client/templates app/client/stylesheets app/client/javascripts lib/client/stylesheets
+          lib/client/javascripts vendor/client/stylesheets vendor/client/javascripts
+      ).each { |path| client.append_path File.join( root, path ) }
       Sprockets::Helpers.configure do |config|
-        config.environment = assets
-        config.debug       = assets_debug
-        config.digest      = assets_digest
+        config.environment = client
+        config.debug       = client_debug
+        config.digest      = client_digest
+        config.prefix      = '/client'
       end
     end
-    get '/assets/*.*' do |path, ext|
-      pass if ext == 'html' or not asset = settings.assets[ path + '.' + ext ]
+    get '/client/*.*' do |path, ext|
+      pass if ext == 'html' or not asset = settings.client[ path + '.' + ext ]
       content_type asset.content_type
       params[ :body ] ? asset.body : asset
     end
-    require File.join( root, 'config/routes' )
+    require File.join( root, 'app/server/routes' )
     include Nali::Clients
     get '/*' do
       if !request.websocket?
-        compiled_path = File.join settings.public_folder, 'assets/application.html'
+        compiled_path = File.join settings.public_folder, 'client/application.html'
         if settings.environment != :development and File.exists?( compiled_path )
           send_file compiled_path
         else
-          settings.assets[ 'application.html' ]
+          settings.client[ 'application.html' ]
         end
       else
         request.websocket do |client|
@@ -65,18 +66,18 @@ module Nali
     def self.access_options
       if settings.environment == :development
-        YAML.load_file( File.join( root, 'app/models/access.yml' ) ).keys_to_sym!
+        YAML.load_file( File.join( root, 'app/server/models/access.yml' ) ).keys_to_sym!
       else
-        @access_options ||= YAML.load_file( File.join( root, 'app/models/access.yml' ) ).keys_to_sym!
+        @access_options ||= YAML.load_file( File.join( root, 'app/server/models/access.yml' ) ).keys_to_sym!
       end
     end
     def self.initialize!
       Dir[ File.join( root, 'lib/*/**/*.rb' ) ].each { |file| require( file ) }
-      require File.join( root, 'app/controllers/application_controller.rb' )
-      Dir[ File.join( root, 'app/**/*.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, 'config/clients' )
+      require File.join( root, 'app/server/clients' )
       Dir[ File.join( root, 'config/initializers/**/*.rb'   ) ].each { |file| require( file ) }
       self
     end
@@ -91,4 +92,4 @@ module Nali
   end
-end
+end

data/lib/nali/connection.rb CHANGED

@@ -3,33 +3,10 @@ module EventMachine
     class Connection
       def reset
-        @filters = {}
         @storage = {}
         @watches = {}
       end
-      def filters( model_name )
-        @filters ||= {}
-        @filters[ model_name ] ||= []
-      end
-      def filters_add( model_name, new_filter )
-        unless( new_filter.keys.include?( :id ) and new_filter.keys.length == 1 )
-          exist = false
-          filters( model_name ).each { |filter| exist = true if filter.sort.to_s == new_filter.sort.to_s }
-          filters( model_name ) << new_filter unless exist
-        end
-      end
-      def filter?( model )
-        filters( model.class.name.to_sym ).each do |filter|
-          result = true
-          filter.each { |key, value| result = false if model[ key ] != value }
-          return result if result
-        end
-        false
-      end
       def []( name )
         @storage ||= {}
         @storage[ name ] or nil
@@ -47,6 +24,10 @@ module EventMachine
       def watch( model )
         watches[ model.class.name + model.id.to_s ] ||= 0
       end
+      def unwatch( model )
+        watches.delete model.class.name + model.id.to_s
+      end
       def watch?( model )
         if watches[ model.class.name + model.id.to_s ] then true else false end
@@ -64,12 +45,14 @@ module EventMachine
         send hash.to_json
       end
-      def sync( model )
-        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
-          relations.each { |relation| sync relation }
-          send_json action: :sync, params: params
+      def sync( *models )
+        models.flatten.compact.each do |model|
+          params, relations = model.get_sync_params( self )
+          if not params.empty? and ( watch_time( model ) < model.updated_at.to_f or model.destroyed? )
+            if model.destroyed? then unwatch( model ) else watch_time_up model end
+            relations.each { |relation| sync relation }
+            send_json action: :sync, params: params
+          end
         end
       end
@@ -99,4 +82,4 @@ module EventMachine
     end
   end
-end
+end

data/lib/nali/controller.rb CHANGED

@@ -2,19 +2,23 @@ module Nali
   module Controller
-    attr_reader :client, :params, :message
+    attr_reader :client, :params
     def self.included( base )
       base.extend self
       base.class_eval do
-        self.class_variable_set :@@befores, []
-        self.class_variable_set :@@afters,  []
+        self.class_variable_set :@@befores,   []
+        self.class_variable_set :@@afters,    []
+        self.class_variable_set :@@selectors, {}
         def self.befores
           self.class_variable_get :@@befores
         end
         def self.afters
           self.class_variable_get :@@afters
         end
+        def self.selectors
+          self.class_variable_get :@@selectors
+        end
       end
     end
@@ -29,7 +33,7 @@ module Nali
     end
     def save
-      params[ :id ] ? update : create
+      params[ :id ].to_i.to_s == params[ :id ].to_s ? update : create
     end
     def create
@@ -38,7 +42,7 @@ module Nali
         permit_params options
         if ( model = model_class.new( params ) ).save
           trigger_success model.get_sync_params( client )[0]
-          model.sync client
+          client.sync model
         else trigger_failure end
       end
     end
@@ -54,28 +58,22 @@ module Nali
         end
       end
     end
-    def select
-      model_class.where( params ).each { |model| client.sync model }
-      client.filters_add model_name, params
-    end
     def destroy
       if model = model_class.find_by_id( params[ :id ] )
         model.access_action( :destroy, client ) do |options|
           model.destroy()
-          trigger_success model.id
-          model.sync
+          trigger_success model.id
         end
       else trigger_failure end
     end
     def trigger_success( params = nil )
-      client.send_json( { action: 'success', params: params, journal_id: message[ :journal_id ] } )
+      client.send_json( { action: 'success', params: params, journal_id: @message[ :journal_id ] } )
     end
     def trigger_failure( params = nil )
-      client.send_json( { action: 'failure', params: params, journal_id: message[ :journal_id ] } )
+      client.send_json( { action: 'failure', params: params, journal_id: @message[ :journal_id ] } )
     end
     def before( &closure )
@@ -101,11 +99,33 @@ module Nali
     def after_except( *methods, &closure )
       register_after closure: closure, except: methods
     end
+    def selector( name, &closure )
+      selectors[ name ] = closure
+    end
-    def runAction( name )
+    def select( name )
+      selected = nil
       self.runFilters name
-      self.send( name ) unless @stopped
+      if !@stopped and selector = self.class.selectors[ name ]
+        selected = instance_eval( &selector )
+      end
       self.runFilters name, :after
+      if !@stopped and selected and ( selected.is_a?( ActiveRecord::Relation ) or selected.is_a?( ActiveRecord::Base ) )
+        client.sync selected
+      end
+    end
+    def runAction( name )
+      if name == :select
+        selector = params[ :selector ].to_sym
+        @params  = params[ :params ]
+        self.select selector
+      else
+        self.runFilters name
+        self.send( name ) unless @stopped
+        self.runFilters name, :after
+      end
     end
     def stop