diff --git a/Gemfile b/Gemfile index 88e9a67..95c5307 100644 --- a/Gemfile +++ b/Gemfile @@ -26,6 +26,7 @@ gem 'redis-namespace' gem '7digital' # for asset packaging +gem 'closure' gem 'jammit' gem 'win32-open3-19' # win32-open3 in order to use POpen4 on Win32 (dependency of jammit) diff --git a/Gemfile.lock b/Gemfile.lock index 5b3095e..2e6cace 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,6 +40,8 @@ GEM bcrypt-ruby (2.1.4) bcrypt-ruby (2.1.4-x86-mingw32) builder (2.1.2) + closure (1.2.701) + rack (>= 1.0.0) daemons (1.0.10) devise (1.3.4) bcrypt-ruby (~> 2.1.2) @@ -162,6 +164,7 @@ PLATFORMS DEPENDENCIES 7digital + closure devise haml-rails hashie diff --git a/Rakefile b/Rakefile index 30851a6..e8e03b8 100644 --- a/Rakefile +++ b/Rakefile @@ -3,10 +3,12 @@ require File.expand_path('../config/application', __FILE__) require 'rake' +# require 'jammit' module ::Nineminutes class Application include Rake::DSL + # Jammit.package! end end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ae5bf27..7e51c88 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,9 +1,5 @@ -require 'jammit' - -class ApplicationController < ActionController::Base +class ApplicationController < ActionController::Base protect_from_forgery - #Jammit.package! - before_filter { |c| @youtube_client = YouTubeIt::Client.new(:dev_key=>"AI39si600H1fRQ6HW1pHG89e-23Uxf44YHu5TsCJMhNf5hFaYWSSSyyrOIEcOX451sFeh_OZdbbA48_g6OInfTv042-Id163tg") } end diff --git a/config/assets.yml b/config/assets.yml index a338e6a..05c5358 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -1,3 +1,7 @@ +embed_assets: on +javascript_compressor: closure + + javascripts: jquery: - public/javascripts/jquery.js @@ -11,7 +15,6 @@ javascripts: - public/javascripts/caching.js - public/javascripts/ajax/*.js - public/javascripts/animations/*.js - - public/javascripts/helper/*.js - public/javascripts/layout.js stylesheets: common: