bettertabs 1.2.3 → 1.3

data/.gitignore

@@ -3,3 +3,4 @@ pkg/*
 .bundle
 log
 tmp
+spec/dummy/public/assets/*

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -1,4 +1,14 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in bettertabs.gemspec
+# Declare your gem's dependencies in engine-test.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
 gemspec
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
+
+# To use debugger
+# gem 'ruby-debug19', :require => 'ruby-debug'

data/Gemfile.lock

@@ -1,14 +1,119 @@
 PATH
   remote: .
   specs:
-    bettertabs (1.2.1)
+    bettertabs (1.3)
+      jquery-rails
+      rails (~> 3.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
+      mail (~> 2.3.0)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.0)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    haml (3.1.3)
+    haml-rails (0.3.4)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      haml (~> 3.0)
+      railties (~> 3.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jquery-rails (1.0.14)
+      railties (~> 3.0)
+      thor (~> 0.14)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    multi_json (1.0.3)
+    polyglot (0.3.2)
+    rack (1.3.2)
+    rack-cache (1.0.3)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
+      bundler (~> 1.0)
+      railties (= 3.1.0)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2)
+    rdoc (3.9.4)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.6.0)
+    sprockets (2.0.0)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.29)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bettertabs!
+  haml-rails
+  rspec-rails

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2011 Mario Izquierdo
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -3,31 +3,32 @@ Bettertabs for Rails
 
 We know that splitting content into several tabs is easy, but doing well, clean, DRY, accessible, usable, fast and testable is not so simple after all.
 
-Bettertabs is a helper for Rails that renders the markup for a tabbed area in a easy and declarative way, forcing you to keep things simple and ensuring accessibility and usability, no matter if the content is loaded statically or via ajax.
+Bettertabs is a simple engine for Rails that includes a helper and a jquery plugin to render the needed markup and javascript for a section with tabs in a easy and declarative way, forcing you to keep things simple and ensuring accessibility and usability, no matter if the content is loaded statically or via ajax.
 
 Easy for beginners, complete for experts.
 
 
 ## Features ##
 
-  * Rails helper to easily generate tabs and content markup
-  * Provides a jQuery plugin to handle the JavaScript behavior
-  * Simplicity: Easy to install and easy to use
+  * Rails 3.1 Engine that includes:
+    * helper to easily generate tabs and content markup
+    * jQuery plugin to handle the JavaScript behavior
+  * Simplicity: Easy to install, easy to use, easy to update
   * Flexible and customizable
   * Forces you to DRY-up your views for your tabbed content
-  * Forces you to make it awesome accessible and usable:
+  * Forces you to make it very accessible and usable:
     * Designed to work with and without JavaScript
     * When click on a tab, the address bar url is changed (only in HTML5 browsers), so:
       * The browser's back and reload buttons will still work as expected
       * All tabbed sections can be permalinked, keeping the selected tab
-  * Makes testing views simple. Because its easy to make it works without javascript, you can assert view components with the rails built-in functional and integration tests
-  * The CSS styles are up to you
+  * Makes testing views simple. Because its easy to make it working without javascript, you can test view components with the rails built-in functional and integration tests
+  * The CSS styles are up to you, although we include some [reference CSS](https://github.com/agoragames/bettertabs/blob/master/doc/STYLESHEETS-GUIDE.md) to start with
 
 
 ## Requirements: ##
   * Ruby 1.9.2
-  * Rails 3
-  * [jQuery](http://jquery.com/) 1.3 or higher, in order to use the [Bettertabs jQuery plugin](https://github.com/agoragames/bettertabs/raw/master/lib/bettertabs/javascripts/jquery.bettertabs.min.js)
+  * Rails 3.1
+  * [jquery-ujs](https://github.com/rails/jquery-ujs) with jQuery 1.3 or higher
 
 Anyway you can use bettertabs without javascript (or use your own javascript handler) since the bettertabs helper only generates the appropriate markup.
 
@@ -37,14 +38,18 @@ Anyway you can use bettertabs without javascript (or use your own javascript han
 Gem dependency. Add bettertabs to your gem file and run `bundle install`.
 
     gem 'bettertabs'
-  
 
-Download the [bettertabs.jquery.min plugin](https://github.com/agoragames/bettertabs/raw/master/lib/bettertabs/javascripts/jquery.bettertabs.min.js) (or the [uncompressed version](https://github.com/agoragames/bettertabs/raw/master/lib/bettertabs/javascripts/jquery.bettertabs.js)), put it in your `public/javascripts` folder and include it in your layout after the jQuery library, for example:
+To include the [jquery.bettertabs plugin](https://github.com/agoragames/bettertabs/raw/master/app/assets/javascripts/jquery.bettertabs.js.coffee)
+add these line to the top of your `app/assets/javascripts/application.js` file:
 
-    <%= javascript_include_tag 'jquery', 'rails', 'jquery.bettertabs.min' %>
+    //= require jquery.bettertabs
+
+Or if you prefer the compressed version:
+
+    //= require jquery.bettertabs.min
+
+This works the same way as [jquery-ujs](https://github.com/rails/jquery-ujs); you don't need to copy-paste the javascript code in your app because it will be served using the Asset Pipeline.
 
-Now you can use the `bettertabs` helper as in the examples below.
-    
 
 ## Usage and examples ##
 
@@ -64,15 +69,15 @@ An usage example should be self explanatory (using HAML, but it also works with
       = tab.ajax :friends, :partial => 'shared/friends'
       
       = tab.link :groups do
-        =  render :partial => 'groups/user_groups', :locals => {user => @user}
+        =  render :partial => 'groups/user_groups', :locals => { :user => @user }
 
 ### More examples and documentation: ###
 
-  * [EXAMPLES document](https://github.com/agoragames/bettertabs/blob/master/EXAMPLES.md)
-  * [Bettertabs Styles reference guide](https://github.com/agoragames/bettertabs/blob/master/lib/bettertabs/stylesheets/README.md)
-  * [Bettertabs helper](https://github.com/agoragames/bettertabs/blob/master/lib/bettertabs/bettertabs_helper.rb) (params and options)
-  * [Rails3 test demo application](https://github.com/agoragames/bettertabs/tree/master/test/ruby_1_9/rails_3_0)
-  * Anyway, don't be afraid of digging into the code, it's very straightforward.
+  * [EXAMPLES document](https://github.com/agoragames/bettertabs/blob/master/doc/EXAMPLES.md)
+  * [Bettertabs Styles reference guide](https://github.com/agoragames/bettertabs/blob/master/doc/STYLESHEETS-GUIDE.md)
+  * [Bettertabs helper](https://github.com/agoragames/bettertabs/blob/master/app/helpers/bettertabs_helper.rb) (params and options)
+  * [Rails3 test demo application](https://github.com/agoragames/bettertabs/tree/master/spec/dummy)
+  * Anyway, don't be afraid and dig into the code!
   
 
 ## Tabs Routes ##
@@ -106,19 +111,19 @@ So now the tabs links will point to the following URLs:
   * :friends tab href: `/profile/dude/friends`
   
   
-## JavaScript with the jquery.bettertabs plugin ##
+## JavaScript with the jquery.bettertabs plugin #
 
-Installing the `bettertabs` gem in a rails project makes the bettertabs helper instantly available. This helper will generate markup that is prepared to be modified by JavaScript, and also includes an inline script at the bottom:
+The bettertabs helper will generate the needed markup that has an inline script at the bottom:
 
     jQuery(function($){ $('#bettertabs_id').bettertabs(); });
 
-Which expects jQuery and jquery.bettertabs plugin to be loaded.
+Which expects jQuery and jquery.bettertabs plugin to be present.
 
-The jquery.bettertabs plugin can be downloaded directly from the github repo:
+You can see the jquery.bettertabs source code in the github repo:
 
-  * [CoffeeScript version](https://github.com/agoragames/bettertabs/raw/master/lib/bettertabs/javascripts/jquery.bettertabs.coffee)
-  * [JavaScript (generated by coffee) version](https://github.com/agoragames/bettertabs/raw/master/lib/bettertabs/javascripts/jquery.bettertabs.js)
-  * [Compressed JavaScript](https://github.com/agoragames/bettertabs/raw/master/lib/bettertabs/javascripts/jquery.bettertabs.min.js)
+  * [CoffeeScript version](https://github.com/agoragames/bettertabs/raw/master/app/assets/javascripts/jquery.bettertabs.js.coffee)
+  * [JavaScript (generated by coffee) version](https://github.com/agoragames/bettertabs/raw/master/app/assets/javascripts/jquery.bettertabs.js)
+  * [Compressed JavaScript](https://github.com/agoragames/bettertabs/raw/master/app/assets/javascripts/jquery.bettertabs.min.js)
   
 The plugin defines one single jQuery method `jQuery(selector).bettertabs();` that is applied to the generated markup.
 
@@ -144,7 +149,7 @@ You can interact with the bettertabs widget in the following ways:
 
   * **Activate a tab**: use the function `jQuery.Bettertabs.select_tab(bettertabsid, tabid);`, for the previous example could be *jQuery.Bettertabs.select_tab('profile_tabs', 'friends');*. You can also just simulate a click on the tab link with `jQuery('#tabid_bettertabsid_tab a').click();`
   * **Hook some behavior when a tab is clicked**: attach a 'click' handler to the tab link or use any of the provided custom events.
-  * **Show a loading clock while ajax is loading**: or any other kind of feedback to the user, use any of the provided custom events. You can also handle it styling the CSS class `.ajax-loading` that is added to the ajax tab link while ajax content is loading (see the [Styles Reference Guide](https://github.com/agoragames/bettertabs/blob/master/lib/bettertabs/stylesheets/README.md))
+  * **Show a loading clock while ajax is loading**: or any other kind of feedback to the user, use any of the provided custom events. You can also handle it styling the CSS class `.ajax-loading` that is added to the ajax tab link while ajax content is loading (see the [Styles Reference Guide](https://github.com/agoragames/bettertabs/blob/master/doc/STYLESHEETS-GUIDE.md))
   * **Change the browser URL**: in the same way the plugin does when a tab is clicked, use `jQuery.Bettertabs.change_browser_url(new_url);`
   
 Custom events that are attached to each tab content:
@@ -179,7 +184,7 @@ Perhaps the most important CSS rule here is to define `display: none;` for `div.
 
       div.bettertabs div.content.hidden { display: none; }
 
-Use the [Bettertabs Styles Reference Guide](https://github.com/agoragames/bettertabs/blob/master/lib/bettertabs/stylesheets/README.md) to get a stylesheet that you can use as a starting point.
+Use the [Bettertabs Styles Reference Guide](https://github.com/agoragames/bettertabs/blob/master/doc/STYLESHEETS-GUIDE.md) to get a stylesheet that you can use as a starting point.
 
 
 ## How to help make Bettertabs even Better ##
@@ -194,6 +199,6 @@ Use the [Bettertabs Styles Reference Guide](https://github.com/agoragames/better
 
 ## Future work ##
 
-  * Improve the Rails testing application: it should use rspec and capybabra to test even the javascript (http://media.railscasts.com/videos/257_request_specs_and_capybara.mov)
   * Try to make it compatible with ruby 1.8.x
+  * Improve tests to check the JavaScript code (Jasmine, Evergreen, Capybara, whatever)
   

data/Rakefile

@@ -1,2 +1,16 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+
+load 'rails/tasks/engine.rake'
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
+
+Bundler::GemHelper.install_tasks

data/bettertabs.gemspec

@@ -1,17 +1,24 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
+
+# Maintain your gem's version:
 require "bettertabs/version"
 
+# Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "bettertabs"
   s.version     = Bettertabs::VERSION
-  s.platform    = Gem::Platform::RUBY
   s.authors     = ["Mario Izquierdo"]
   s.email       = ["tothemario@gmail.com"]
   s.homepage    = "https://github.com/agoragames/bettertabs"
-  s.summary     = %q{The better (simple, accessible, usable, flexible and fast) way to split content in tabs for Rails.}
-  s.description = %q{Bettertabs Rails helper (and jQuery plugin) defines the markup for a tabbed area in a easy and declarative way, using the appropiate JavaScript but ensuring accessibility and usability, no matter if the content is loaded statically, via ajax or the tabs are links. In the other hand, the CSS styles are up to you. }
+  s.summary     = %q{Just a simple, accessible, usable, flexible and fast way to split view content in tabs in a rails application.}
+  s.description = %q{Bettertabs is a Rails 3.1 engine that adds a helper and jQuery plugin to define the markup and behavior for a tabbed area in a easy and declarative way, using the appropiate JavaScript but ensuring accessibility and usability, no matter if the content is loaded statically, via ajax or just with links. }
 
-  s.files         = `git ls-files`.split("\n")
-  s.require_paths = ["lib"]
+  s.files = `git ls-files`.split("\n")
+  
+  s.add_dependency "rails", "~> 3.1.0"
+  s.add_dependency "jquery-rails"
+  
+  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'haml-rails'
 end

data/lib/bettertabs/engine.rb

@@ -0,0 +1,6 @@
+require 'rails'
+
+module Bettertabs
+  class Engine < Rails::Engine
+  end
+end

data/lib/bettertabs/version.rb

@@ -1,3 +1,3 @@
 module Bettertabs
-  VERSION = "1.2.3"
-end
+  VERSION = "1.3"
+end

data/lib/bettertabs.rb

@@ -1,7 +1,2 @@
-require 'bettertabs/bettertabs_builder'
-require 'bettertabs/bettertabs_helper'
-
-# Include bettertabs in the Application
-module ApplicationHelper
-  include BettertabsHelper
-end
+require 'bettertabs/engine'
+require 'bettertabs/bettertabs_builder'

data/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_PATH = File.expand_path('../..',  __FILE__)
+load File.expand_path('../../spec/dummy/script/rails',  __FILE__)

data/{test/ruby_1_9/rails_3_0 → spec/dummy}/Rakefile

@@ -1,7 +1,7 @@
+#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
-require 'rake'
 
-Rails30::Application.load_tasks
+Dummy::Application.load_tasks

data/spec/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,10 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require jquery.bettertabs
+//= require_tree .

data/spec/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require bettertabs
+*/
+body {
+  background-color: white;
+  margin: 10px;
+  font-size: 12px;
+  font-family: Arial, Helvetica Neue, Helvetica, sans-serif;
+}
+div.nav { margin: 10px 0 20px 24px; padding: 0; }
+div.nav a { padding: 0 5px 0 6px; }

data/{test/ruby_1_9/rails_3_0 → spec/dummy}/app/views/layouts/application.html.erb

@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Rails30</title>
-  <%= stylesheet_link_tag 'layout', 'bettertabs' %>
-  <%= javascript_include_tag 'jquery-1.3.min', 'rails', 'jquery.bettertabs' %>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application" %>
+  <%= javascript_include_tag "application" %>
   <%= csrf_meta_tag %>
 </head>
 <body>
 
-<h1>Bettertabs Demo</h1>
+<h1>Bettertabs Dummy App</h1>
 <div class="nav">
   <%= link_to 'static', { action: 'static'}, title: 'Using only static tabs' %> | 
   <%= link_to 'link', { action: 'link_tab_1'}, title: 'Using only link tabs' %> | 

data/{test/ruby_1_9/rails_3_0 → spec/dummy}/config/application.rb

@@ -6,12 +6,15 @@ require "action_controller/railtie"
 require "action_mailer/railtie"
 require "active_resource/railtie"
 require "rails/test_unit/railtie"
+require "sprockets/railtie"
 
-# If you have a Gemfile, require the gems listed there, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env) if defined?(Bundler)
+# Auto-require default libraries and those for the current Rails environment. 
+Bundler.require :default, Rails.env
 
-module Rails30
+require "bettertabs"
+require "jquery-rails"
+
+module Dummy
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
@@ -35,13 +38,17 @@ module Rails30
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # JavaScript files you want as :defaults (application.js is always included).
-    config.action_view.javascript_expansions[:defaults] = %w()
-
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
   end
 end
+

data/spec/dummy/config/boot.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+
+if File.exist?(gemfile)
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+end
+
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/{test/ruby_1_9/rails_3_0 → spec/dummy}/config/environment.rb

@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
-Rails30::Application.initialize!
+Dummy::Application.initialize!

data/{test/ruby_1_9/rails_3_0 → spec/dummy}/config/environments/development.rb

@@ -1,9 +1,9 @@
-Rails30::Application.configure do
+Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
@@ -11,7 +11,6 @@ Rails30::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
@@ -22,5 +21,10 @@ Rails30::Application.configure do
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
-end
 
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end