nali 0.2.5 → 0.2.6

data/lib/generator/config/application.rb

@@ -6,6 +6,14 @@ module Nali
   
   class Application
 
+    configure do |config|
+
+#      Your configure settings
+#      config.client.append_path 'public/client/images'
+#      Add folder to sprockets
+
+    end
+
   end
   
-end
+end

data/lib/nali/application.rb

@@ -25,7 +25,7 @@ module Nali
       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
+          lib/client/javascripts public/client vendor/client/stylesheets vendor/client/javascripts
       ).each { |path| client.append_path File.join( root, path ) }
 
       Sprockets::Helpers.configure do |config|
@@ -49,7 +49,7 @@ module Nali
 
     get '/*' do
       if !request.websocket?
-        compiled_path = File.join settings.public_folder, 'client/application.html'
+        compiled_path = File.join settings.public_folder, 'index.html'
         if settings.environment != :development and File.exists?( compiled_path )
           send_file compiled_path
         else

data/lib/nali/generator.rb

@@ -24,6 +24,7 @@ module Nali
       dirs << File.join( target_path, 'db/migrate' )
       dirs << File.join( target_path, 'lib' )
       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, 'config/initializers' )

data/lib/nali/tasks.rb

@@ -20,19 +20,27 @@ module Nali
           
           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] = 'application'
+            filename[0] = 'index'
             filename    = filename.join '.'
-            File.rename file, File.join( compiled_path, filename )
+            File.rename file, File.join( @settings.public_folder, filename )
           end
           puts 'Client files compiled'
         end
         
         desc 'Remove compiled client files'
         task :clean do
-          FileUtils.rm_rf File.join( @settings.public_folder, 'client' )
+          compiled_path = File.join @settings.public_folder, 'client'
+          Dir[ compiled_path + '/*' ]
+          .select { |file| file =~ /(application|manifest).*?\.(js|css|json)/ }
+          .each { |file| File.delete file }
+          index = File.join( @settings.public_folder, 'index.html' )
+          File.delete( index ) if File.exists?( index )
           puts 'Compiled client files removed'
         end
         

data/lib/nali/version.rb

@@ -1,5 +1,5 @@
 module Nali
   
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nali
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors: