images, fonts and other assets added + generated sprites only present in final dist folder

.gitignore

@@ -10,6 +10,9 @@ public/system
 public/uploads
 public/javascripts
 public/stylesheets
+public/images
+public/fonts
+public/flash
 app/assets/stylesheets/tmp/
 db/schema.rb
 *.pyc
@@ -34,6 +37,7 @@ cartodb.sublime-workspace
 cartodb.sublime-project
 lib/build/dist
 lib/build/node_modules
+app/assets/images/sprites/*.png
 npm-debug.log
 .idea
 .ruby-gemset

app/views/admin/visualizations/show.html.erb

@@ -3,8 +3,7 @@
   <% end %>
 
   <% content_for(:css) do %>
-    <%= stylesheet_link_tag 'cdb/themes/css/cartodb.css' %>
-    <%= stylesheet_link_tag 'common.css', 'table.css', 'map.css', :media => 'all' %>
+    <%= stylesheet_link_tag 'common.css', 'table.css', 'cdb.css', 'map.css', :media => 'all' %>
   <% end %>
 
   <script src="https://www.google.com/jsapi?key=<%= Cartodb.config[:gdrive]['api_key'] %>"></script>

app/views/layouts/front_layout.html.erb

@@ -9,8 +9,8 @@
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
     <title>CartoDB | Login</title>
     <link rel="shortcut icon" href="/favicons/favicon.ico" />
-    <%= stylesheet_link_tag :common, :front, :media => 'all' %>
-    <!--[if gt IE 8]><%= stylesheet_link_tag :fonts_ie %><![endif]-->
+    <%= stylesheet_link_tag "common.css", "front.css", :media => 'all' %>
+    <!--[if gt IE 8]><%= stylesheet_link_tag "fonts_ie.css" %><![endif]-->
     <%= insert_rollbar() %>
     <%= insert_google_analytics('primary') %>
     <%= yield :js %>

app/views/sessions/new.html.erb

@@ -1,5 +1,5 @@
 <%= content_for(:js) do %>
-  <%= javascript_include_tag :cdb, :application, :login %>
+  <%= javascript_include_tag "cdb.js", "application.js", "login.js" %>
 <% end %>
 
 <section class="sessions shadow">

config/application.rb

@@ -56,8 +56,8 @@ module CartoDB
     config.assets.enabled = false
 
     # Default setting is [/\w+\.(?!js|css).+/, /application.(css|js)$/]
-    config.assets.precompile = %w( cdb.js models.js templates.js templates_mustache.js application.js common_data.js table.js)
-    config.assets.precompile += %w( common.css organization.css keys.css leaflet.css tables.css pages.css map.css table.css front.css embeds/password_protected.css embeds/public_map.css cdb/themes/css/cartodb.css cdb/themes/css/cartodb.ie.css specs.css map/leaflet.ie.css plugins/tipsy.css fonts_ie.css dashboard.css )
+    config.assets.precompile = %w( cdb.js models.js templates.js templates_mustache.js application.js common_data.js table.js login.js)
+    config.assets.precompile += %w( common.css cartodb.css organization.css keys.css leaflet.css tables.css pages.css map.css table.css front.css embeds/password_protected.css embeds/public_map.css specs.css map/leaflet.ie.css plugins/tipsy.css fonts_ie.css dashboard.css )
     config.assets.precompile += %w( *.jpg *.ico *.gif *.png *.eot *.otf *.svg *.woff *.ttf *.swf )
 
     # Version of your assets, change this if you want to expire all your assets

lib/assets/javascripts/cartodb/keys/keys.js

@@ -53,7 +53,7 @@ $(function() {
 
       _initCopy: function() {
         $("a.copy").zclip({
-          path: "/assets/ZeroClipboard.swf",
+          path: "/flash/ZeroClipboard.swf",
           copy: function(){
             return $(this).parent().find("input").val();
           }

lib/assets/javascripts/cartodb/table/header/share_dialog.js

@@ -607,7 +607,7 @@
 
       setTimeout(function() { // Hack for ZeroClipboard, it doesn't like effects :S
         self.$el.find("a.copy").zclip({
-          path: "/assets/ZeroClipboard.swf",
+          path: "/flash/ZeroClipboard.swf",
           copy: function(){
             return $(this).parent().find("input").val();
           }

lib/build/Gruntfile.js

@@ -57,15 +57,24 @@ module.exports = function(grunt) {
     compass: {                  // Task
       dist: {                   // Target
         options: {              // Target options
-          importPath: '../../app/assets/stylesheets/tmp/common',
-          imagesDir: '../../app/assets/images/',
-          sassDir: '../../app/assets/stylesheets/tmp',
-          cssDir: '../../public/stylesheets',
-          environment: 'production',
-          outputStyle: 'compressed',
-          noLineComments: true,
-          force: false,
-          time: true
+          importPath:               '../../app/assets/stylesheets/tmp/common',
+          
+          sassDir:                  '../../app/assets/stylesheets/tmp',
+          cssDir:                   '../../public/stylesheets',
+          fontsDir:                 '../../public/fonts',
+          httpFontsPath:            '/fonts/',
+          httpFontsDir:             '/fonts/',
+
+          imagesDir:                '../../app/assets/images/',
+          generatedImagesDir:       '../../public/images/',
+          httpImagesPath:           '/images/',
+          httpGeneratedImagesPath:  '/images/',
+
+          environment:              'production',
+          outputStyle:              'compressed',
+          noLineComments:           true,
+          force:                    false,
+          time:                     true
         }
       },
     },
@@ -74,7 +83,11 @@ module.exports = function(grunt) {
       dist: {
         files: [
 
-          // App stylesheets
+          /**
+           *  Stylesheets
+           */
+
+            // App stylesheets
           {
             expand: true,
             cwd: '../../app/assets/stylesheets/',
@@ -85,7 +98,7 @@ module.exports = function(grunt) {
             }
           },
 
-          // Jasmine stylesheets
+            // Jasmine stylesheets
           {
             expand: true,
             cwd: '../../lib/assets/test/lib/jasmine-1.3.1/',
@@ -96,7 +109,18 @@ module.exports = function(grunt) {
             }
           },
 
-          // Vendor stylesheets
+            // CartoDB theme stylesheet
+          {
+            expand: true,
+            cwd: '../../lib/assets/javascript/cdb/dist/',
+            src: ['**/*.css'],
+            dest: '../../app/assets/stylesheets/tmp/',
+            rename: function(dest, src) {
+              return dest + src.replace(/\.css$/, ".scss");
+            }
+          },
+
+            // Vendor stylesheets
           {
             expand: true,
             cwd: '../../vendor/assets/stylesheets/',
@@ -105,6 +129,39 @@ module.exports = function(grunt) {
             rename: function(dest, src) {
               return dest + src.replace(/\.css$/, ".scss");
             }
+          },
+
+          /**
+           *  Images
+           */
+
+          {
+            expand: true,
+            cwd: '../../app/assets/images/',
+            src: ['**/*'],
+            dest: '../../public/images/'
+          },
+
+          /**
+           *  Fonts
+           */
+
+          {
+            expand: true,
+            cwd: '../../app/assets/fonts/',
+            src: ['**/*'],
+            dest: '../../public/fonts/'
+          },
+
+          /**
+           *  Flash
+           */
+
+          {
+            expand: true,
+            cwd: '../../app/assets/flash/',
+            src: ['**/*'],
+            dest: '../../public/flash/'
           }
         ]
       }
@@ -120,6 +177,20 @@ module.exports = function(grunt) {
     //   }
     // },
 
+    clean: {
+      options: {
+        force: true  
+      },
+      src: [
+        "../../app/assets/stylesheets/tmp",
+        "../../public/flash",
+        "../../public/fonts",
+        "../../public/images",
+        "../../public/javascripts",
+        "../../public/stylesheets"
+      ]
+    },
+
     jasmine: {
       pivotal: {
           src: cartodb_files.all.concat(['user_data.js', '../../public/javascripts/templates_mustache.js', '../../public/javascripts/templates.js', 'test_init.js']),
@@ -139,11 +210,12 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-sass');
   grunt.loadNpmTasks('grunt-contrib-compass');
   grunt.loadNpmTasks('grunt-contrib-copy');
+  grunt.loadNpmTasks('grunt-contrib-clean');
 
   // Default task(s).
   //grunt.registerTask('default', ['uglify']);
   grunt.registerTask('test', ['concat:js', 'jst', 'jasmine']);
   grunt.registerTask('css', ['copy', 'compass', 'concat:css']);
-  grunt.registerTask('default', ['concat:js', 'css', 'jst']);
+  grunt.registerTask('default', ['clean', 'concat:js', 'css', 'jst']);
 };
 

lib/build/package.json

@@ -25,11 +25,11 @@
     "grunt": "~0.4.2",
     "grunt-contrib-concat": "",
     "grunt-contrib-jasmine": "",
+    "grunt-contrib-clean": "",
     "grunt-contrib-copy": "",
     "grunt-contrib-jst": "git://github.com/javisantana/grunt-contrib-jst.git#master",
     "grunt-mustache": "~0.1.6",
-    "grunt-contrib-sass": "~0.7.1",
-    "grunt-compass-multiple": ""
+    "grunt-contrib-sass": "~0.7.1"
   },
   "files": [
     "dist"