Skip to content
This repository was archived by the owner on Dec 4, 2021. It is now read-only.

Commit d8cbbef

Browse files
committed
assets pipeline
1 parent da25dee commit d8cbbef

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+82
-45
lines changed
File renamed without changes.
File renamed without changes.
+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
//= require_tree ./vendors/
2+
//= require logs.js.coffee

lib/mongodb_logger/server/public/stylesheets/group-buttons.css app/assets/stylesheets/group-buttons.css.erb

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@
7171
.start {
7272
display: inline-block;
7373
padding-left: 13px;
74-
background: url(../images/play-icon.png) no-repeat 0 -35px;
74+
background: url(<%= asset_path('play-icon.png') %>) no-repeat 0 -35px;
7575
}
7676

7777
.stop {
7878
display: inline-block;
7979
padding-left: 13px;
80-
background: url(../images/stop-icon.png) no-repeat 0 5px;
80+
background: url(<%= asset_path('stop-icon.png') %>) no-repeat 0 5px;
8181
}

lib/mongodb_logger/server/public/stylesheets/library.css app/assets/stylesheets/library.css.erb

+8-8
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ a:hover, a:active {
4646

4747
.success {
4848
padding-right: 15px;
49-
background: url(../images/success.png) no-repeat 100% 50%;
49+
background: url(<%= asset_path('success.png') %>) no-repeat 100% 50%;
5050
}
5151

5252
.failure {
5353
padding-right: 15px;
54-
background: url(../images/failure.png) no-repeat 100% 50%;
54+
background: url(<%= asset_path('failure.png') %>) no-repeat 100% 50%;
5555
}
5656

5757
.notice {
@@ -62,7 +62,7 @@ a:hover, a:active {
6262
display: inline-block;
6363
margin-right: 5px;
6464
margin-left: -17px;
65-
/* background: url(../images/success.png) no-repeat 0 0; */
65+
/* background: url(<%= asset_path('success.png') %>) no-repeat 0 0; */
6666
}
6767

6868
.error {
@@ -73,16 +73,16 @@ a:hover, a:active {
7373
display: inline-block;
7474
margin-right: 5px;
7575
margin-left: -17px;
76-
background: url(../images/failure.png) no-repeat 0 0;
76+
background: url(<%= asset_path('failure.png') %>) no-repeat 0 0;
7777
}
7878

7979
.arrow-down {
8080
padding-right: 15px;
81-
background: url(../images/arrow-down.png) no-repeat 100% 50%;
81+
background: url(<%= asset_path('arrow-down.png') %>) no-repeat 100% 50%;
8282
}
8383

8484
.arrow-down.rotate {
85-
background: url(../images/arrow-up.png) no-repeat 100% 50%;
85+
background: url(<%= asset_path('arrow-up.png') %>) no-repeat 100% 50%;
8686
}
8787

8888
code {
@@ -156,7 +156,7 @@ code {
156156
font: 12px arial, sans-serif;
157157
vertical-align: middle;
158158
border: 1px solid #bbb;
159-
background: #fff url(../images/date.png) no-repeat 9px 50%;
159+
background: #fff url(<%= asset_path('date.png') %>) no-repeat 9px 50%;
160160
border-radius: 3px;
161161
box-shadow: 0 1px 2px #e6e6e6 inset, 0 1px 0 #fff;
162162
}
@@ -230,7 +230,7 @@ li.message_tab {
230230

231231
a[target="_blank"] {
232232
display: inline-block;
233-
background: url(../images/external.png) no-repeat 0 3px;
233+
background: url(<%= asset_path('external.png') %>) no-repeat 0 3px;
234234
padding-left: 17px;
235235
}
236236

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* This is a manifest file that'll automatically include all the stylesheets available in this directory
3+
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
4+
* the top of the compiled file, but it's generally better to create a new file per style scope.
5+
*= require "reset.css"
6+
*= require "grids.css"
7+
*= require "spaces.css"
8+
*= require "layout.css"
9+
*= require "library.css.erb"
10+
*= require "group-headers.css"
11+
*= require "group-buttons.css.erb"
12+
*= require "group-forms.css"
13+
*= require "group-tables.css"
14+
*= require "humanity/jquery-ui-1.8.16.custom.css"
15+
*= require "highlight/zenburn.css"
16+
*/

lib/mongodb_logger.rb

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
require 'mongodb_logger/config'
55
require 'mongodb_logger/logger'
66
require 'mongodb_logger/railtie' if defined?(Rails::Railtie)
7+
require 'mongodb_logger/engine' if defined?(Rails::Engine)
78
require 'mongodb_logger/version'
89

910
module MongodbLogger

lib/mongodb_logger/engine.rb

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module MongodbLogger
2+
class Engine < Rails::Engine
3+
# auto wire assets
4+
end
5+
end

lib/mongodb_logger/server.rb

+4-7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
require 'mongodb_logger/server/view_helpers'
77
require 'mongodb_logger/server/partials'
88
require 'mongodb_logger/server/content_for'
9+
require 'mongodb_logger/server/sprokets'
910

1011
require 'mongodb_logger/server/model/additional_filter'
1112
require 'mongodb_logger/server/model/filter'
@@ -26,18 +27,14 @@ class Server < Sinatra::Base
2627
dir = File.dirname(File.expand_path(__FILE__))
2728

2829
set :views, "#{dir}/server/views"
29-
30-
if respond_to? :public_folder
31-
set :public_folder, "#{dir}/server/public"
32-
else
33-
set :public, "#{dir}/server/public"
34-
end
3530
#set :environment, :production
3631
set :static, true
3732

3833
helpers do
3934
include Rack::Utils
4035
alias_method :h, :escape_html
36+
# pipeline
37+
include AssetHelpers
4138

4239
def current_page
4340
url_path request.path_info.sub('/','')
@@ -167,7 +164,7 @@ def show(page, layout = true)
167164
end
168165

169166
error do
170-
erb :error, {:layout => false}, :error => 'Sorry there was a nasty error. Maybe no connection to MongoDB. Debug: ' + env['sinatra.error'].inspect
167+
erb :error, {:layout => false}, :error => 'Sorry there was a nasty error. Maybe no connection to MongoDB. Debug: ' + env['sinatra.error'].inspect + '<br />' + env.inspect
171168
end
172169

173170
end

lib/mongodb_logger/server/public/javascripts/logs.js

-1
This file was deleted.

lib/mongodb_logger/server/public/stylesheets/all.css

-12
This file was deleted.

lib/mongodb_logger/server/sprokets.rb

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
require 'sprockets'
2+
3+
module MongodbLogger
4+
5+
module AssetHelpers
6+
def asset_path(source)
7+
"/assets/#{Assets.instance.find_asset(source).digest_path}" unless Assets.instance.find_asset(source).nil?
8+
end
9+
end
10+
11+
class Assets < Sprockets::Environment
12+
class << self
13+
def instance(root = nil)
14+
assets_path = File.expand_path('../../../../app/assets', __FILE__)
15+
@instance ||= new(assets_path)
16+
end
17+
end
18+
19+
def initialize(assets_path)
20+
super
21+
append_path(File.join(assets_path, 'stylesheets'))
22+
append_path(File.join(assets_path, 'javascripts'))
23+
append_path(File.join(assets_path, 'images'))
24+
25+
context_class.instance_eval do
26+
include AssetHelpers
27+
end
28+
end
29+
end
30+
31+
end

lib/mongodb_logger/server/views/layout.erb

+3-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<title>MongoDB Logger</title>
5-
<link href="<%=u 'stylesheets/all.css' %>" media="screen" rel="stylesheet" type="text/css">
5+
<link href="<%= asset_path('mongodb_logger.css') %>" media="screen" rel="stylesheet" type="text/css">
66
</head>
77
<body>
88
<div class="page">
@@ -17,7 +17,7 @@
1717
<%= partial(:"shared/collection_stats", :object => @collection_stats) %>
1818
</div>
1919
</div>
20-
<a href="<%=h url_path("overview") %>" class="logo" data-pjax='#main_pjax'><img src="<%=u 'images/logo.png'%>" alt="MongoDB Logger"></a>
20+
<a href="<%=h url_path("overview") %>" class="logo" data-pjax='#main_pjax'><img src="<%= asset_path 'logo.png' %>" alt="MongoDB Logger"></a>
2121
</div> <!-- wrapper -->
2222
</div> <!-- header -->
2323
<div class="content">
@@ -30,11 +30,7 @@
3030
</div>
3131

3232
<!-- scripts -->
33-
<script src="<%=u 'javascripts/vendors/jquery-1.7.1.min.js' %>" type="text/javascript"></script>
34-
<script src="<%=u 'javascripts/vendors/jquery-ui-1.8.16.min.js' %>" type="text/javascript"></script>
35-
<script src="<%=u 'javascripts/vendors/jquery.pjax.min.js' %>" type="text/javascript"></script>
36-
<script src="<%=u 'javascripts/vendors/highlight.pack.js' %>" type="text/javascript"></script>
37-
<script src="<%=u 'javascripts/logs.js' %>" type="text/javascript"></script>
33+
<script src="<%= asset_path('mongodb_logger.js') %>" type="text/javascript"></script>
3834

3935
<!-- charts -->
4036
<script type="text/javascript" src="https://www.google.com/jsapi"></script>

lib/mongodb_logger/server/views/shared/_top_panel.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<div class="unit-right">
44
<% yield_content :right_top_panel %>
55
</div> <!-- unit-right -->
6-
<div id="ajax_loader"><img src="<%=u 'images/spinner.gif'%>" alt="loading..."></div>
6+
<div id="ajax_loader"><img src="<%= asset_path 'spinner.gif' %>" alt="loading..."></div>
77
</div> <!-- topline -->

mongodb_logger.gemspec

+8-7
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,23 @@ Gem::Specification.new do |gem|
1515
gem.add_development_dependency "rspec", ">= 2.8.0"
1616
gem.add_development_dependency "shoulda", ">= 2.0.0"
1717
gem.add_development_dependency "mocha", ">= 0.10.0"
18-
gem.add_development_dependency "cucumber", "~> 1.1.2"
19-
gem.add_development_dependency "capybara", "~> 1.1.2"
20-
gem.add_development_dependency "coffee-script", "~> 2.2.0"
18+
gem.add_development_dependency "cucumber", ">= 1.1.2"
19+
gem.add_development_dependency "capybara", ">= 1.1.2"
20+
gem.add_development_dependency "coffee-script", ">= 2.2.0"
2121
gem.add_development_dependency "uglifier", ">= 1.2.0"
2222
gem.add_development_dependency "therubyracer", ">= 0.9.9"
2323

24-
gem.add_runtime_dependency "rake", "~> 0.9.0"
25-
gem.add_runtime_dependency "mongo", "~> 1.6.1"
26-
gem.add_runtime_dependency "bson_ext", "~> 1.6.1"
24+
gem.add_runtime_dependency "rake", ">= 0.9.0"
25+
gem.add_runtime_dependency "mongo", ">= 1.6.1"
26+
gem.add_runtime_dependency "bson_ext", ">= 1.6.1"
2727
gem.add_runtime_dependency "i18n", ">= 0.4.1"
2828
gem.add_runtime_dependency "json", ">= 1.6.1"
2929
gem.add_runtime_dependency "activesupport", ">= 3.0.0"
3030
gem.add_runtime_dependency "actionpack", ">= 3.0.0"
31+
gem.add_runtime_dependency "sprockets", ">= 2.0.0"
3132
gem.add_runtime_dependency "sinatra", ">= 1.2.0"
3233
gem.add_runtime_dependency "erubis", ">= 2.6.6"
33-
gem.add_runtime_dependency "vegas", "~> 0.1.2"
34+
gem.add_runtime_dependency "vegas", ">= 0.1.2"
3435

3536
gem.rubyforge_project = "mongodb_logger"
3637

mongodb_logger.java.gemspec

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Gem::Specification.new do |gem|
2626
gem.add_runtime_dependency "json", ">= 1.6.1"
2727
gem.add_runtime_dependency "activesupport", ">= 3.0.0"
2828
gem.add_runtime_dependency "actionpack", ">= 3.0.0"
29+
gem.add_runtime_dependency "sprockets", ">= 2.0.0"
2930
gem.add_runtime_dependency "sinatra", ">= 1.2.0"
3031
gem.add_runtime_dependency "erubis", ">= 2.6.6"
3132
gem.add_runtime_dependency "vegas", "~> 0.1.2"

0 commit comments

Comments
 (0)