nali 0.2.2 → 0.2.3

data/lib/nali/generator.rb

@@ -38,11 +38,19 @@ module Nali
         end
         filename  = name.downcase
         classname = name.camelize
-        File.open( File.join( Dir.pwd, "app/assets/javascripts/models/#{ filename }.js.coffee" ), 'w' ) do |f|     
-          f.write( "Nali.Model.extend #{ classname }: {}" )   
+        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/assets/javascripts/controllers/#{ filename }s.js.coffee" ), 'w' ) do |f|     
-          f.write( "Nali.Controller.extend #{ classname }s: {}" )   
+        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/models/#{ filename }.rb" ), 'w' ) do |f|     
           f.write( 
@@ -68,23 +76,20 @@ end"
         end
         File.open( File.join( Dir.pwd, "app/models/access.yml" ), 'a' ) do |f|     
           f.write( 
-"#{ classname }:
+"
+
+#{ classname }:
   create:
-    unknown:
   read:
-    unknown:
   update:
-    unknown:
   destroy:
-    unknown:
-
 
 " 
             )
         end
         FileUtils.rm_rf( File.join( Dir.pwd, "tmp/cache" ) )
-        puts "Created: app/assets/javascripts/models/#{ filename }.js.coffee"
-        puts "Created: app/assets/javascripts/controllers/#{ filename }s.js.coffee"
+        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"
@@ -98,25 +103,35 @@ end"
         classname = name.underscore.camelize
         if not dirname.empty? and not filename.empty? and not classname.empty?
           dirs = []
-          dirs << File.join( Dir.pwd, "app/assets/javascripts/views/#{ dirname }" )
-          dirs << File.join( Dir.pwd, "app/assets/stylesheets/#{ dirname }" ) 
-          dirs << File.join( Dir.pwd, "app/templates/#{ dirname }" ) 
+          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/assets/javascripts/views/#{ dirname }/#{ filename }.js.coffee" ), 'w' ) do |f|     
-            f.write( "Nali.View.extend #{ classname }: {}" )   
+          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: {}
+
+  onShow:  ->
+
+  onHide:  ->"
+              )
           end 
-          File.open( File.join( Dir.pwd, "app/assets/stylesheets/#{ dirname }/#{ filename }.css.sass" ), 'w' ) do |f|     
+          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/templates/#{ dirname }/#{ filename }.html" ), 'w' ) {}
+          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/assets/javascripts/views/#{ dirname }/#{ filename }.js.coffee"
-          puts "Created: app/assets/stylesheets/#{ dirname }/#{ filename }.css.sass"
-          puts "Created: app/templates/#{ dirname }/#{ filename }.html"
+          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"
         else puts 'Invalid view name' end
       else puts 'Please go to the application folder' end
     end    
         
   end
   
-end
+end

data/lib/nali/helpers.rb

@@ -3,11 +3,11 @@ module Sprockets
     
     def templates_tags
       result = ''
-      Dir[ File.join( './app/templates/*/*' ) ].each do |path|
+      Dir[ File.join( './app/client/templates/*/*' ) ].each do |path|
         arr      = path.split( '/' ).reverse
         id       = arr[1] + '_' + arr[0].split( '.' )[0]
         asset    = environment[ path ]
-        template = asset.body.force_encoding( 'UTF-8' ).strip.gsub( "\n", "\n      " )
+        template = asset.body.force_encoding( 'UTF-8' ).strip.gsub( /\n\s*\n/, "\n" ).gsub( "\n", "\n      " )
         result  += %Q(\n    <script type=\"text/template\" id=\"#{ id }\">\n      #{ template }\n    </script>)
         depend_on asset.pathname
       end
@@ -15,4 +15,4 @@ module Sprockets
     end
   
   end
-end
+end

data/lib/nali/model.rb

@@ -2,8 +2,15 @@ module Nali
 
   module Model
 
+    def self.included( base )
+      base.extend self
+      base.class_eval do
+        after_destroy { sync }
+      end
+    end
+
     def access_level( client )
-      :default
+      :unknown
     end
     
     def access_action( action, client )
@@ -18,29 +25,36 @@ module Nali
     def get_sync_params( client )
       params    = {}
       relations = []
-      access_action( :read, client ) do |options|
-        attributes = { id: self.id }
-        options.each do |option| 
-          if self.respond_to?( option )
-            value = self.send( option )
-            if value.is_a?( ActiveRecord::Associations::CollectionProxy )
-              relations << value unless self.destroyed?
-            elsif value.is_a?( ActiveRecord::Base )
-              relations << value unless self.destroyed?
-              attributes[ option.to_s + '_id' ] = value.id
-            else
-              attributes[ option ] = value
+      if self.destroyed?
+        sync_initial params
+        params[ :destroyed ] = true
+      else
+        access_action( :read, client ) do |options|
+          sync_initial params
+          options.each do |option|
+            if self.respond_to?( option )
+              value = self.send option
+              if value.is_a?( ActiveRecord::Relation )
+                relations << value
+              elsif value.is_a?( ActiveRecord::Base )
+                relations << value
+                params[ :attributes ][ option.to_s + '_id' ] = value.id
+              else
+                params[ :attributes ][ option ] = value
+              end
             end
           end
+          params[ :created ] = self.created_at.to_f
+          params[ :updated ] = self.updated_at.to_f
         end
-        params[ :attributes ] = attributes
-        params[ :_name ]      = self.class.name
-        params[ :created ]    = self.created_at.to_f
-        params[ :updated ]    = self.updated_at.to_f
-        params[ :destroyed ]  = self.destroyed?
       end
       [ params, relations.flatten.compact ]
     end
+
+    def sync_initial( params )
+      params[ :_name ]      = self.class.name
+      params[ :attributes ] = { id: self.id }
+    end
       
     def clients
       Nali::Clients.list
@@ -48,7 +62,7 @@ module Nali
     
     def sync( *watches )
       watches.flatten.each { |client| client.watch self }
-      clients.each { |client| client.sync self if client.watch?( self ) or client.filter?( self ) }
+      clients.each { |client| client.sync self if client.watch?( self ) }
     end
       
     def notice( name, params )
@@ -57,9 +71,9 @@ module Nali
     
     private
     
-    def access_options
-      Nali::Application.access_options[ self.class.name.to_sym ] or {}
-    end
+      def access_options
+        Nali::Application.access_options[ self.class.name.to_sym ] or {}
+      end
       
   end
 

data/lib/nali/tasks.rb

@@ -9,47 +9,38 @@ module Nali
     
     def define
       
-      namespace :assets do
-        desc "Compile assets" 
+      namespace :client do
+        desc "Compile client files"
         task :compile do
           sprockets_tasks
           
-          Rake::Task[ 'assets:clobber' ].invoke
-          Rake::Task[ 'assets:cache:clean' ].invoke
+          Rake::Task[ 'client:clean' ].invoke
+          Rake::Task[ 'client:cache:clean' ].invoke
           Rake::Task[ 'assets' ].invoke
           
-          assets_folder = File.join @settings.public_folder, 'assets/'
-          Dir[ assets_folder + '*' ]
+          compiled_path = File.join @settings.public_folder, 'client'
+          Dir[ compiled_path + '/*' ]
           .select { |file| file =~ /application.*?\.html/ }
           .each do |file| 
             filename    = File.basename( file ).split '.' 
             filename[0] = 'application'
             filename    = filename.join '.'
-            File.rename file, assets_folder + filename
+            File.rename file, File.join( compiled_path, filename )
           end
-          
-          puts 'Assets compiled'
-
+          puts 'Client files compiled'
         end
         
-        desc 'Remove old assets'
+        desc 'Remove compiled client files'
         task :clean do
-          sprockets_tasks
-          Rake::Task[ 'clean_assets' ].invoke
-          puts 'Old assets removed'
-        end
-        
-        desc 'Remove all assets'
-        task :clobber do
-          FileUtils.rm_rf File.join( @settings.root, 'public/assets' )
-          puts 'All assets removed'
+          FileUtils.rm_rf File.join( @settings.public_folder, 'client' )
+          puts 'Compiled client files removed'
         end
         
         namespace :cache do
-          desc 'Remove cached files'
+          desc 'Remove cached client files'
           task :clean do
             FileUtils.rm_rf File.join( @settings.root, 'tmp/cache' )
-            puts 'Cached files removed'
+            puts 'Cached client files removed'
           end
         end
 
@@ -59,11 +50,11 @@ module Nali
     def sprockets_tasks
       require 'rake/sprocketstask'
       Rake::SprocketsTask.new do |task|
-        task.environment = @settings.assets
-        task.output      = File.join( @settings.public_folder, 'assets' )
+        task.environment = @settings.client
+        task.output      = File.join( @settings.public_folder, 'client' )
         task.assets      = %w( application.html application.js application.css )
       end
     end
     
   end
-end
+end

data/lib/nali/version.rb

@@ -1,5 +1,5 @@
 module Nali
   
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nali
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-18 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,31 +26,31 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
-  name: sinatra-websocket
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,135 +58,135 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: sinatra-activerecord
+  name: sinatra-websocket
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: sinatra-reloader
+  name: sinatra-activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: sinatra-reloader
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: sprockets-sass
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: sprockets-helpers
+  name: sprockets-sass
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: coffee-script
+  name: sprockets-helpers
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 description: Async web framework
 email:
 - 4urbanoff@gmail.com
@@ -195,20 +195,21 @@ executables:
 extensions: []
 extra_rdoc_files: []
 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
+- lib/client/javascripts/nali/extensions.js.coffee
+- lib/client/javascripts/nali/model.js.coffee
+- lib/client/javascripts/nali/router.js.coffee
+- lib/client/javascripts/nali/collection.js.coffee
+- lib/client/javascripts/nali/application.js.coffee
+- lib/client/javascripts/nali/index.js
+- lib/client/javascripts/nali/connection.js.coffee
 - lib/nali.rb
-- lib/assets/javascripts/nali/view.js.coffee
-- lib/assets/javascripts/nali/cookie.js.coffee
-- lib/assets/javascripts/nali/nali.js.coffee
-- lib/assets/javascripts/nali/notice.js.coffee
-- lib/assets/javascripts/nali/controller.js.coffee
-- lib/assets/javascripts/nali/jbone.min.js
-- lib/assets/javascripts/nali/extensions.js.coffee
-- lib/assets/javascripts/nali/model.js.coffee
-- lib/assets/javascripts/nali/router.js.coffee
-- lib/assets/javascripts/nali/collection.js.coffee
-- lib/assets/javascripts/nali/application.js.coffee
-- lib/assets/javascripts/nali/index.js
-- lib/assets/javascripts/nali/connection.js.coffee
 - lib/nali/extensions.rb
 - lib/nali/model.rb
 - lib/nali/clients.rb
@@ -220,31 +221,29 @@ files:
 - lib/nali/helpers.rb
 - lib/nali/path.rb
 - lib/nali/application.rb
-- lib/generator/app/assets/javascripts/models/home.js.coffee
-- lib/generator/app/assets/javascripts/views/home/index.js.coffee
-- lib/generator/app/assets/javascripts/controllers/homes.js.coffee
-- lib/generator/app/assets/javascripts/application.js.coffee
-- lib/generator/app/assets/stylesheets/home/index.css.sass
-- lib/generator/app/assets/stylesheets/notices/info.css.sass
-- lib/generator/app/assets/stylesheets/notices/error.css.sass
-- lib/generator/app/assets/stylesheets/notices/warning.css.sass
-- lib/generator/app/assets/stylesheets/application.css.sass
-- lib/generator/app/models/access.yml
-- lib/generator/app/controllers/application_controller.rb
-- lib/generator/app/templates/application.html.erb
-- lib/generator/app/templates/notice/error.html
-- lib/generator/app/templates/notice/warning.html
-- lib/generator/app/templates/notice/info.html
-- lib/generator/app/templates/home/index.html
+- 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/home/index.css.sass
+- lib/generator/app/client/stylesheets/notices/info.css.sass
+- lib/generator/app/client/stylesheets/notices/error.css.sass
+- lib/generator/app/client/stylesheets/notices/warning.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/production.rb~
 - lib/generator/config/environments/test.rb
-- lib/generator/config/environments/development.rb~
 - lib/generator/config/environments/production.rb
-- lib/generator/config/routes.rb
-- lib/generator/config/clients.rb
 - lib/generator/config/database.yml
 - lib/generator/config/application.rb
 - lib/generator/Gemfile
@@ -274,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Framework for developing async web applications