nali 0.3.6 → 0.3.7

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

@@ -48,8 +48,6 @@ Nali.extend View:
       @trigger 'show'
       @visible = true
       @runModelCallback 'afterShow'
-    else
-      @draw()
     @
 
   hide: ( delay = 0 ) ->
@@ -58,15 +56,14 @@ Nali.extend View:
       @onHide?()
       @trigger 'hide'
       @runAssistants 'hide'
-      @hideElement delay or @hideDelay
+      @hideElement if delay and typeof( delay ) is 'number' then delay else @hideDelay
       @destroyObservation()
       @visible = false
       @runModelCallback 'afterHide'
     @
 
   hideElement: ( delay ) ->
-    if delay and typeof( delay ) is 'number'
-      setTimeout ( => @removeElement() ), delay
+    if delay then setTimeout ( => @removeElement() ), delay
     else @removeElement()
     @
 

data/lib/nali/tasks.rb

@@ -7,59 +7,68 @@ module Nali
       define
     end
     
-    def define
-      
-      namespace :client do
-        desc "Compile client files"
-        task :compile do
-          sprockets_tasks
-          
-          Rake::Task[ 'client:clean' ].invoke
-          Rake::Task[ 'client:cache:clean' ].invoke
-          Rake::Task[ 'assets' ].invoke
-          
-          compiled_path = File.join @settings.public_folder, 'client'
-          Dir[ compiled_path + '/*' ]
-          .select { |file| file =~ /.*?\.gz/ }
-          .each { |file| File.delete file }
-          Dir[ compiled_path + '/*' ]
-          .select { |file| file =~ /application.*?\.html/ }
-          .each do |file| 
-            filename    = File.basename( file ).split '.' 
-            filename[0] = 'index'
-            filename    = filename.join '.'
-            File.rename file, File.join( @settings.public_folder, filename )
+    private
+
+      def define
+
+        namespace :client do
+          desc "Compile client files"
+          task :compile do
+            sprockets_tasks
+            remove_cached_files
+            remove_compiled_files
+            Rake::Task[ 'assets' ].invoke
+
+            compiled_path = File.join @settings.public_folder, 'client'
+            Dir[ compiled_path + '/*' ]
+            .select { |file| file =~ /.*?\.gz/ }
+            .each { |file| File.delete file }
+            Dir[ compiled_path + '/*' ]
+            .select { |file| file =~ /application.*?\.html/ }
+            .each do |file|
+              filename    = File.basename( file ).split '.'
+              filename[0] = 'index'
+              filename    = filename.join '.'
+              File.rename file, File.join( @settings.public_folder, filename )
+            end
+            remove_cached_files
+            puts 'Client files compiled'
           end
-          puts 'Client files compiled'
-        end
-        
-        desc 'Remove compiled client files'
-        task :clean do
-          FileUtils.rm_rf File.join( @settings.public_folder, 'client' )
-          index = File.join( @settings.public_folder, 'index.html' )
-          File.delete( index ) if File.exists?( index )
-          puts 'Compiled client files removed'
-        end
-        
-        namespace :cache do
-          desc 'Remove cached client files'
+
+          desc 'Remove compiled client files'
           task :clean do
-            FileUtils.rm_rf File.join( @settings.root, 'tmp/cache' )
-            puts 'Cached client files removed'
+            remove_compiled_files
+            puts 'Compiled client files removed'
+          end
+
+          namespace :cache do
+            desc 'Remove cached client files'
+            task :clean do
+              remove_compiled_files
+            end
           end
+
         end
+      end
 
+      def remove_cached_files
+        FileUtils.rm_rf File.join( @settings.root, 'tmp/cache' )
       end
-    end
-    
-    def sprockets_tasks
-      require 'rake/sprocketstask'
-      Rake::SprocketsTask.new do |task|
-        task.environment = @settings.client
-        task.output      = File.join( @settings.public_folder, 'client' )
-        task.assets      = %w( application.html application.js application.css )
+
+      def remove_compiled_files
+        FileUtils.rm_rf File.join( @settings.public_folder, 'client' )
+        index = File.join( @settings.public_folder, 'index.html' )
+        File.delete( index ) if File.exists?( index )
+      end
+
+      def sprockets_tasks
+        require 'rake/sprocketstask'
+        Rake::SprocketsTask.new do |task|
+          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.3.6'
+  VERSION = '0.3.7'
   
 end

metadata

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