Permalink
Browse files

Merge pull request #105 from dgm/3-2-stable

Honor sass.style and assets.css_compressor config settings
  • Loading branch information...
2 parents 9393c98 + d14fd1c commit bdfeb7ba71eae9ab0b214190319e109bbb0a9fe7 @drogus drogus committed May 26, 2012
Showing with 1,127 additions and 5 deletions.
  1. +5 −1 lib/sass/rails/compressor.rb
  2. +6 −4 lib/sass/rails/railtie.rb
  3. +5 −0 test/fixtures/alternate_config_project/.gitignore
  4. +7 −0 test/fixtures/alternate_config_project/Gemfile
  5. +261 −0 test/fixtures/alternate_config_project/README
  6. +7 −0 test/fixtures/alternate_config_project/Rakefile
  7. BIN test/fixtures/alternate_config_project/app/assets/images/1x1.png
  8. BIN test/fixtures/alternate_config_project/app/assets/images/rails.png
  9. +9 −0 test/fixtures/alternate_config_project/app/assets/javascripts/application.js
  10. +3 −0 test/fixtures/alternate_config_project/app/assets/stylesheets/_top_level_partial.css.scss
  11. +32 −0 test/fixtures/alternate_config_project/app/assets/stylesheets/application.css.scss
  12. +7 −0 test/fixtures/alternate_config_project/app/assets/stylesheets/css_application.css
  13. +3 −0 test/fixtures/alternate_config_project/app/assets/stylesheets/globbed/globbed.css.scss
  14. +3 −0 test/fixtures/alternate_config_project/app/assets/stylesheets/globbed/nested/nested_glob.css.scss
  15. +5 −0 test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_sass_import.css.sass
  16. +9 −0 test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_scss_import.css.scss
  17. +3 −0 test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_without_css_ext.scss
  18. +2 −0 ...xtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/_relative_sass.css.sass
  19. +3 −0 ...xtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/_relative_scss.css.scss
  20. +3 −0 ...lternate_config_project/app/assets/stylesheets/partials/subfolder/relative_not_a_partial.css.scss
  21. +3 −0 test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/another_plain.css
  22. +3 −0 test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/plain.css
  23. +1 −0 test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/second_level.css.scss
  24. +3 −0 test/fixtures/alternate_config_project/app/controllers/application_controller.rb
  25. +2 −0 test/fixtures/alternate_config_project/app/helpers/application_helper.rb
  26. 0 test/fixtures/alternate_config_project/app/mailers/.gitkeep
  27. 0 test/fixtures/alternate_config_project/app/models/.gitkeep
  28. +14 −0 test/fixtures/alternate_config_project/app/views/layouts/application.html.erb
  29. +4 −0 test/fixtures/alternate_config_project/config.ru
  30. +49 −0 test/fixtures/alternate_config_project/config/application.rb
  31. +6 −0 test/fixtures/alternate_config_project/config/boot.rb
  32. +25 −0 test/fixtures/alternate_config_project/config/database.yml
  33. +5 −0 test/fixtures/alternate_config_project/config/environment.rb
  34. +29 −0 test/fixtures/alternate_config_project/config/environments/development.rb
  35. +55 −0 test/fixtures/alternate_config_project/config/environments/production.rb
  36. +43 −0 test/fixtures/alternate_config_project/config/environments/test.rb
  37. +7 −0 test/fixtures/alternate_config_project/config/initializers/backtrace_silencers.rb
  38. +10 −0 test/fixtures/alternate_config_project/config/initializers/inflections.rb
  39. +5 −0 test/fixtures/alternate_config_project/config/initializers/mime_types.rb
  40. +7 −0 test/fixtures/alternate_config_project/config/initializers/secret_token.rb
  41. +8 −0 test/fixtures/alternate_config_project/config/initializers/session_store.rb
  42. +12 −0 test/fixtures/alternate_config_project/config/initializers/wrap_parameters.rb
  43. +5 −0 test/fixtures/alternate_config_project/config/locales/en.yml
  44. +58 −0 test/fixtures/alternate_config_project/config/routes.rb
  45. +7 −0 test/fixtures/alternate_config_project/db/seeds.rb
  46. +2 −0 test/fixtures/alternate_config_project/doc/README_FOR_APP
  47. 0 test/fixtures/alternate_config_project/lib/tasks/.gitkeep
  48. 0 test/fixtures/alternate_config_project/log/.gitkeep
  49. +26 −0 test/fixtures/alternate_config_project/public/404.html
  50. +26 −0 test/fixtures/alternate_config_project/public/422.html
  51. +26 −0 test/fixtures/alternate_config_project/public/500.html
  52. 0 test/fixtures/alternate_config_project/public/favicon.ico
  53. +241 −0 test/fixtures/alternate_config_project/public/index.html
  54. +5 −0 test/fixtures/alternate_config_project/public/robots.txt
  55. +6 −0 test/fixtures/alternate_config_project/script/rails
  56. 0 test/fixtures/alternate_config_project/vendor/assets/stylesheets/.gitkeep
  57. 0 test/fixtures/alternate_config_project/vendor/plugins/.gitkeep
  58. +57 −0 test/sass_rails_test.rb
  59. +4 −0 test/support/sass_rails_test_case.rb
@@ -3,13 +3,17 @@
module Sass
module Rails
class CssCompressor
+ def initialize(options={})
+ @options = {:style => :compressed}.merge(options)
+ end
+
def compress(css)
if css.count("\n") > 2
Sass::Engine.new(css,
:syntax => :scss,
:cache => false,
:read_cache => false,
- :style => :compressed).render
+ :style => @options[:style]).render # note: style is set by railtie or by config
else
css
end
View
@@ -11,8 +11,6 @@ module SassContext
# Establish static configuration defaults
# Emit scss files during stylesheet generation of scaffold
config.sass.preferred_syntax = :scss
- # Use expanded output instead of the sass default of :nested
- config.sass.style = :expanded
# Write sass cache files for performance
config.sass.cache = true
# Read sass cache files for performance
@@ -74,8 +72,12 @@ module SassContext
initializer :setup_compression, :group => :all do |app|
if app.config.assets.compress
- app.config.sass.style = :compressed
- app.config.assets.css_compressor = CssCompressor.new
+ # Use compressed style if none specified
+ app.config.sass.style ||= :compressed
+ app.config.assets.css_compressor ||= CssCompressor.new(:style => app.config.sass.style)
+ else
+ # Use expanded output instead of the sass default of :nested unless specified
+ app.config.sass.style ||= :expanded
end
end
end
@@ -0,0 +1,5 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/
+.sass-cache/
@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+gem 'rails', "~> 3.2.0.rc1"
+gem 'sqlite3'
+
+# Asset template engines
+gem 'sass-rails', :path => File.expand_path('../../../..', __FILE__)
@@ -0,0 +1,261 @@
+== Welcome to Rails
+
+Rails is a web-application framework that includes everything needed to create
+database-backed web applications according to the Model-View-Control pattern.
+
+This pattern splits the view (also called the presentation) into "dumb"
+templates that are primarily responsible for inserting pre-built data in between
+HTML tags. The model contains the "smart" domain objects (such as Account,
+Product, Person, Post) that holds all the business logic and knows how to
+persist themselves to a database. The controller handles the incoming requests
+(such as Save New Account, Update Product, Show Post) by manipulating the model
+and directing data to the view.
+
+In Rails, the model is handled by what's called an object-relational mapping
+layer entitled Active Record. This layer allows you to present the data from
+database rows as objects and embellish these data objects with business logic
+methods. You can read more about Active Record in
+link:files/vendor/rails/activerecord/README.html.
+
+The controller and view are handled by the Action Pack, which handles both
+layers by its two parts: Action View and Action Controller. These two layers
+are bundled in a single package due to their heavy interdependence. This is
+unlike the relationship between the Active Record and Action Pack that is much
+more separate. Each of these packages can be used independently outside of
+Rails. You can read more about Action Pack in
+link:files/vendor/rails/actionpack/README.html.
+
+
+== Getting Started
+
+1. At the command prompt, create a new Rails application:
+ <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
+
+2. Change directory to <tt>myapp</tt> and start the web server:
+ <tt>cd myapp; rails server</tt> (run with --help for options)
+
+3. Go to http://localhost:3000/ and you'll see:
+ "Welcome aboard: You're riding Ruby on Rails!"
+
+4. Follow the guidelines to start developing your application. You can find
+the following resources handy:
+
+* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
+* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
+
+
+== Debugging Rails
+
+Sometimes your application goes wrong. Fortunately there are a lot of tools that
+will help you debug it and get it back on the rails.
+
+First area to check is the application log files. Have "tail -f" commands
+running on the server.log and development.log. Rails will automatically display
+debugging and runtime information to these files. Debugging info will also be
+shown in the browser on requests from 127.0.0.1.
+
+You can also log your own messages directly into the log file from your code
+using the Ruby logger class from inside your controllers. Example:
+
+ class WeblogController < ActionController::Base
+ def destroy
+ @weblog = Weblog.find(params[:id])
+ @weblog.destroy
+ logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
+ end
+ end
+
+The result will be a message in your log file along the lines of:
+
+ Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
+
+More information on how to use the logger is at http://www.ruby-doc.org/core/
+
+Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
+several books available online as well:
+
+* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
+* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
+
+These two books will bring you up to speed on the Ruby language and also on
+programming in general.
+
+
+== Debugger
+
+Debugger support is available through the debugger command when you start your
+Mongrel or WEBrick server with --debugger. This means that you can break out of
+execution at any point in the code, investigate and change the model, and then,
+resume execution! You need to install ruby-debug to run the server in debugging
+mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
+
+ class WeblogController < ActionController::Base
+ def index
+ @posts = Post.all
+ debugger
+ end
+ end
+
+So the controller will accept the action, run the first line, then present you
+with a IRB prompt in the server window. Here you can do things like:
+
+ >> @posts.inspect
+ => "[#<Post:0x14a6be8
+ @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
+ #<Post:0x14a6620
+ @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
+ >> @posts.first.title = "hello from a debugger"
+ => "hello from a debugger"
+
+...and even better, you can examine how your runtime objects actually work:
+
+ >> f = @posts.first
+ => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
+ >> f.
+ Display all 152 possibilities? (y or n)
+
+Finally, when you're ready to resume execution, you can enter "cont".
+
+
+== Console
+
+The console is a Ruby shell, which allows you to interact with your
+application's domain model. Here you'll have all parts of the application
+configured, just like it is when the application is running. You can inspect
+domain models, change values, and save to the database. Starting the script
+without arguments will launch it in the development environment.
+
+To start the console, run <tt>rails console</tt> from the application
+directory.
+
+Options:
+
+* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
+ made to the database.
+* Passing an environment name as an argument will load the corresponding
+ environment. Example: <tt>rails console production</tt>.
+
+To reload your controllers and models after launching the console run
+<tt>reload!</tt>
+
+More information about irb can be found at:
+link:http://www.rubycentral.org/pickaxe/irb.html
+
+
+== dbconsole
+
+You can go to the command line of your database directly through <tt>rails
+dbconsole</tt>. You would be connected to the database with the credentials
+defined in database.yml. Starting the script without arguments will connect you
+to the development database. Passing an argument will connect you to a different
+database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
+PostgreSQL and SQLite 3.
+
+== Description of Contents
+
+The default directory structure of a generated Ruby on Rails application:
+
+ |-- app
+ | |-- assets
+ | |-- images
+ | |-- javascripts
+ | `-- stylesheets
+ | |-- controllers
+ | |-- helpers
+ | |-- mailers
+ | |-- models
+ | `-- views
+ | `-- layouts
+ |-- config
+ | |-- environments
+ | |-- initializers
+ | `-- locales
+ |-- db
+ |-- doc
+ |-- lib
+ | `-- tasks
+ |-- log
+ |-- public
+ |-- script
+ |-- test
+ | |-- fixtures
+ | |-- functional
+ | |-- integration
+ | |-- performance
+ | `-- unit
+ |-- tmp
+ | |-- cache
+ | |-- pids
+ | |-- sessions
+ | `-- sockets
+ `-- vendor
+ |-- assets
+ `-- stylesheets
+ `-- plugins
+
+app
+ Holds all the code that's specific to this particular application.
+
+app/assets
+ Contains subdirectories for images, stylesheets, and JavaScript files.
+
+app/controllers
+ Holds controllers that should be named like weblogs_controller.rb for
+ automated URL mapping. All controllers should descend from
+ ApplicationController which itself descends from ActionController::Base.
+
+app/models
+ Holds models that should be named like post.rb. Models descend from
+ ActiveRecord::Base by default.
+
+app/views
+ Holds the template files for the view that should be named like
+ weblogs/index.html.erb for the WeblogsController#index action. All views use
+ eRuby syntax by default.
+
+app/views/layouts
+ Holds the template files for layouts to be used with views. This models the
+ common header/footer method of wrapping views. In your views, define a layout
+ using the <tt>layout :default</tt> and create a file named default.html.erb.
+ Inside default.html.erb, call <% yield %> to render the view using this
+ layout.
+
+app/helpers
+ Holds view helpers that should be named like weblogs_helper.rb. These are
+ generated for you automatically when using generators for controllers.
+ Helpers can be used to wrap functionality for your views into methods.
+
+config
+ Configuration files for the Rails environment, the routing map, the database,
+ and other dependencies.
+
+db
+ Contains the database schema in schema.rb. db/migrate contains all the
+ sequence of Migrations for your schema.
+
+doc
+ This directory is where your application documentation will be stored when
+ generated using <tt>rake doc:app</tt>
+
+lib
+ Application specific libraries. Basically, any kind of custom code that
+ doesn't belong under controllers, models, or helpers. This directory is in
+ the load path.
+
+public
+ The directory available for the web server. Also contains the dispatchers and the
+ default HTML files. This should be set as the DOCUMENT_ROOT of your web
+ server.
+
+script
+ Helper scripts for automation and generation.
+
+test
+ Unit and functional tests along with fixtures. When using the rails generate
+ command, template test files will be generated for you and placed in this
+ directory.
+
+vendor
+ External libraries that the application depends on. Also includes the plugins
+ subdirectory. If the app has frozen rails, those gems also go here, under
+ vendor/rails/. This directory is in the load path.
@@ -0,0 +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__)
+
+AlternateConfigProject::Application.load_tasks
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,9 @@
+// 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_tree .
@@ -0,0 +1,3 @@
+.top-level {
+ font-color: bold;
+}
@@ -0,0 +1,32 @@
+@import "partials/sass_import";
+@import "partials/scss_import";
+@import "globbed/**/*";
+@import "subfolder/plain";
+@import "subfolder/second_level";
+@import "partials/without_css_ext";
+
+.main {
+ color: yellow;
+ @include background-from-partial(red);
+}
+
+.rails {
+ asset-path: asset-path("rails.png", image);
+ asset-url: asset-url("rails.png", image);
+ image-path: image-path("rails.png");
+ image-url: image-url("rails.png");
+ video-path: video-path("rails.mp4");
+ video-url: video-url("rails.mp4");
+ audio-path: audio-path("rails.mp3");
+ audio-url: audio-url("rails.mp3");
+ font-path: font-path("rails.ttf");
+ font-url: font-url("rails.ttf");
+ font-url-with-query-hash: font-url("rails.ttf?#iefix");
+ javascript-path: javascript-path("rails.js");
+ javascript-url: javascript-url("rails.js");
+ stylesheet-path: stylesheet-path("rails.css");
+ stylesheet-url: stylesheet-url("rails.css");
+ asset-data-url: asset-data-url("1x1.png");
+}
+
+@include without-css-ext;
@@ -0,0 +1,7 @@
+/*
+ *= require partials/_sass_import
+ *= require partials/_scss_import
+ *= require_tree ./globbed
+ *= require subfolder/plain
+ *= require subfolder/second_level
+ */
@@ -0,0 +1,3 @@
+.globbed {
+ color: green;
+}
@@ -0,0 +1,3 @@
+.nested-glob {
+ color: blue;
+}
@@ -0,0 +1,5 @@
+.partial-sass
+ color: green
+
+@import "top_level_partial"
+@import "subfolder/relative_scss"
Oops, something went wrong.

0 comments on commit bdfeb7b

Please sign in to comment.