stringer-rss#45 - Implement sinatra-assetpack to manage assets as a king

petersonfs · petersonfs · commit 0288a96d3481 · 2013-05-12T18:13:40.000-03:00
diff --git a/Rakefile b/Rakefile
@@ -34,4 +34,4 @@ end
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => [:speedy_tests]
+task :default => [:speedy_tests]
diff --git a/app.rb b/app.rb
@@ -2,6 +2,7 @@
 require "sinatra/activerecord"
 require "sinatra/flash"
 require "sinatra/contrib/all"
+require "sinatra/assetpack"
 require "json"
 require "i18n"
 require "will_paginate"
@@ -17,17 +18,42 @@ class Stringer < Sinatra::Base
     set :database_file, "config/database.yml"
     set :views, "app/views"
     set :public_dir, "app/public"
+    set :root, File.dirname(__FILE__)
 
     enable :sessions
     set :session_secret, ENV["SECRET_TOKEN"] || "secret!"
-
     enable :logging
 
     register Sinatra::ActiveRecordExtension
     register Sinatra::Flash
     register Sinatra::Contrib
+    register Sinatra::AssetPack
   end
 
+  assets {
+    serve "/js",    from: "app/public/js"
+    serve "/css",   from: "app/public/css"
+    serve "/img",   from: "app/public/img"
+    serve "/fonts", from: "app/public/fonts"
+
+    js :application, "/js/application.js", [
+      "/js/jquery-1.9.1.min.js",
+      "/js/mousetrap.min.js",
+      "/js/bootstrap.min.js",
+      "/js/app.js"
+    ]
+
+    css :application, "/css/application.css", [
+      "/css/bootstrap.min.css",
+      "/css/flat-ui-no-icons.css",
+      "/css/font-awesome.min.css",
+      "/css/styles.css"
+    ]
+
+    js_compression  :uglify
+    css_compression :simple
+  }
+
   helpers do
     include Sinatra::AuthenticationHelpers
 
diff --git a/app/views/layout.erb b/app/views/layout.erb
@@ -8,15 +8,9 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <link rel="shortcut icon" href="/img/favicon.png">
 
-    <link rel="stylesheet" type="text/css" href="/css/bootstrap.min.css">
-    <link rel="stylesheet" type="text/css" href="/css/flat-ui-no-icons.css">
-    <link rel="stylesheet" type="text/css" href="/css/font-awesome.min.css">
-    <link rel="stylesheet" type="text/css" href="/css/styles.css">
+    <%= css :application %>
 
-    <script type="text/javascript" src="/js/jquery-1.9.1.min.js"></script>
-    <script type="text/javascript" src="/js/mousetrap.min.js"></script>
-    <script type="text/javascript" src="/js/bootstrap.min.js"></script>
-    <script type="text/javascript" src="/js/app.js"></script>
+    <%= js  :application %>
 
     <%= yield_content :head %>
   </head>

Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,4 @@ end`
`34`	`34`
`35`	`35`	`RSpec::Core::RakeTask.new(:spec)`
`36`	`36`
`37`		`-task :default => [:speedy_tests]`
	`37`	`+task :default => [:speedy_tests]`