Skip to content

Commit

Permalink
Sprockets is now working correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
LightGuard committed Jul 17, 2013
1 parent 2f01c50 commit 6382cbe
Show file tree
Hide file tree
Showing 14 changed files with 1,511 additions and 26 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ gem 'uglifier', '~> 2.1'
gem 'octokit', '~> 1.24'
gem 'git', '~> 1.2'
gem 'rack-ssl', '~> 1.3'
gem 'sprockets-sass', '~> 1.0'
gem 'execjs', '~> 1.4.0'

# Gems related to the use of awestruct
group :awestruct do
Expand Down
5 changes: 5 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ GEM
tilt (~> 1.1, != 1.3.0)
sprockets-helpers (1.0.1)
sprockets (~> 2.0)
sprockets-sass (1.0.1)
sprockets (~> 2.0)
tilt (~> 1.1)
temple (0.6.5)
thor (0.18.1)
tilt (1.4.1)
Expand All @@ -145,6 +148,7 @@ DEPENDENCIES
awestruct (~> 0.5.2)
bootstrap-sass (~> 2.3)
compass (~> 0.12)
execjs (~> 1.4.0)
git (~> 1.2)
guard (~> 1.8)
guard-rspec (~> 3.0)
Expand All @@ -160,5 +164,6 @@ DEPENDENCIES
sinatra-contrib (~> 1.4)
slim (~> 2.0)
sprockets-helpers (~> 1.0)
sprockets-sass (~> 1.0)
uglifier (~> 2.1)
zurb-foundation (~> 4.2)
4 changes: 1 addition & 3 deletions app.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require 'sinatra/base'
require 'sinatra/json'
require 'json'
require 'rack'
require 'rack/ssl'
Expand All @@ -12,10 +11,9 @@
module AwestructWebEditor
class SecureApp < Sinatra::Base
set :ssl, lambda { |_| development? }
register Sinatra::Sprockets::Helpers

use AwestructWebEditor::PublicApp
use Rack::SSL, :exclude => lambda { |env| development? }
use Rack::SSL, :exclude => lambda { |_| development? }

configure :development do
require 'sinatra/reloader'
Expand Down
4 changes: 2 additions & 2 deletions assets/sass/app.scss → assets/sass/app.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// @import "compass";
// Compiled the above into a static CSS file to save ~10 seconds every file save

@import "start.css";
@import "start";
@import "compass/css3";

* { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; }
Expand Down Expand Up @@ -543,4 +543,4 @@ button, .button {
&:hover {
background:darken($green, 10%);
}
}
}
7 changes: 3 additions & 4 deletions config.ru
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ require 'rubygems'
require 'bundler/setup'
require 'sinatra'
require 'slim'
require 'sass'
require 'compass'
require 'uglifier'

require File.join(File.dirname(__FILE__), 'app.rb')

Expand All @@ -12,8 +15,4 @@ map '/assets' do
run AwestructWebEditor::PublicApp.sprockets
end

map '/font' do
run AwestructWebEditor::PublicApp.sprockets
end

run AwestructWebEditor::SecureApp
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 6382cbe

Please sign in to comment.