sass-rails 3.2.5 → 3.2.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (62) hide show
  1. checksums.yaml +7 -0
  2. data/lib/sass/rails/compressor.rb +5 -1
  3. data/lib/sass/rails/railtie.rb +6 -4
  4. data/lib/sass/rails/version.rb +1 -1
  5. data/test/fixtures/alternate_config_project/.gitignore +5 -0
  6. data/test/fixtures/alternate_config_project/Gemfile +7 -0
  7. data/test/fixtures/alternate_config_project/README +261 -0
  8. data/test/fixtures/alternate_config_project/Rakefile +7 -0
  9. data/test/fixtures/alternate_config_project/app/assets/images/1x1.png +0 -0
  10. data/test/fixtures/alternate_config_project/app/assets/images/rails.png +0 -0
  11. data/test/fixtures/alternate_config_project/app/assets/javascripts/application.js +9 -0
  12. data/test/fixtures/alternate_config_project/app/assets/stylesheets/_top_level_partial.css.scss +3 -0
  13. data/test/fixtures/alternate_config_project/app/assets/stylesheets/application.css.scss +32 -0
  14. data/test/fixtures/alternate_config_project/app/assets/stylesheets/css_application.css +7 -0
  15. data/test/fixtures/alternate_config_project/app/assets/stylesheets/globbed/globbed.css.scss +3 -0
  16. data/test/fixtures/alternate_config_project/app/assets/stylesheets/globbed/nested/nested_glob.css.scss +3 -0
  17. data/test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_sass_import.css.sass +5 -0
  18. data/test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_scss_import.css.scss +9 -0
  19. data/test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_without_css_ext.scss +3 -0
  20. data/test/fixtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/_relative_sass.css.sass +2 -0
  21. data/test/fixtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/_relative_scss.css.scss +3 -0
  22. data/test/fixtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/relative_not_a_partial.css.scss +3 -0
  23. data/test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/another_plain.css +3 -0
  24. data/test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/plain.css +3 -0
  25. data/test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/second_level.css.scss +1 -0
  26. data/test/fixtures/alternate_config_project/app/controllers/application_controller.rb +3 -0
  27. data/test/fixtures/alternate_config_project/app/helpers/application_helper.rb +2 -0
  28. data/test/fixtures/alternate_config_project/app/mailers/.gitkeep +0 -0
  29. data/test/fixtures/alternate_config_project/app/models/.gitkeep +0 -0
  30. data/test/fixtures/alternate_config_project/app/views/layouts/application.html.erb +14 -0
  31. data/test/fixtures/alternate_config_project/config.ru +4 -0
  32. data/test/fixtures/alternate_config_project/config/application.rb +49 -0
  33. data/test/fixtures/alternate_config_project/config/boot.rb +6 -0
  34. data/test/fixtures/alternate_config_project/config/database.yml +25 -0
  35. data/test/fixtures/alternate_config_project/config/environment.rb +5 -0
  36. data/test/fixtures/alternate_config_project/config/environments/development.rb +29 -0
  37. data/test/fixtures/alternate_config_project/config/environments/production.rb +55 -0
  38. data/test/fixtures/alternate_config_project/config/environments/test.rb +43 -0
  39. data/test/fixtures/alternate_config_project/config/initializers/backtrace_silencers.rb +7 -0
  40. data/test/fixtures/alternate_config_project/config/initializers/inflections.rb +10 -0
  41. data/test/fixtures/alternate_config_project/config/initializers/mime_types.rb +5 -0
  42. data/test/fixtures/alternate_config_project/config/initializers/secret_token.rb +7 -0
  43. data/test/fixtures/alternate_config_project/config/initializers/session_store.rb +8 -0
  44. data/test/fixtures/alternate_config_project/config/initializers/wrap_parameters.rb +12 -0
  45. data/test/fixtures/alternate_config_project/config/locales/en.yml +5 -0
  46. data/test/fixtures/alternate_config_project/config/routes.rb +58 -0
  47. data/test/fixtures/alternate_config_project/db/seeds.rb +7 -0
  48. data/test/fixtures/alternate_config_project/doc/README_FOR_APP +2 -0
  49. data/test/fixtures/alternate_config_project/lib/tasks/.gitkeep +0 -0
  50. data/test/fixtures/alternate_config_project/log/.gitkeep +0 -0
  51. data/test/fixtures/alternate_config_project/public/404.html +26 -0
  52. data/test/fixtures/alternate_config_project/public/422.html +26 -0
  53. data/test/fixtures/alternate_config_project/public/500.html +26 -0
  54. data/test/fixtures/alternate_config_project/public/favicon.ico +0 -0
  55. data/test/fixtures/alternate_config_project/public/index.html +241 -0
  56. data/test/fixtures/alternate_config_project/public/robots.txt +5 -0
  57. data/test/fixtures/alternate_config_project/script/rails +6 -0
  58. data/test/fixtures/alternate_config_project/vendor/assets/stylesheets/.gitkeep +0 -0
  59. data/test/fixtures/alternate_config_project/vendor/plugins/.gitkeep +0 -0
  60. data/test/sass_rails_test.rb +57 -0
  61. data/test/support/sass_rails_test_case.rb +4 -0
  62. metadata +140 -23
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: fa4a7fa667738b4b4b87420b11c2f45c34cbc250
4
+ data.tar.gz: f0289349cd742f30ff7fe4cb3f2f192302d4ca80
5
+ SHA512:
6
+ metadata.gz: 1705f5d67250608735a26f63551ea6c631f3f4fa5786c48470e43a99b907932cdba903cb672573ff0186602880bb061552ddf6645f98982a87be23b60ad1aebd
7
+ data.tar.gz: 5ec965ecbce68f8fa165c5eddbb17b00bc4d3ae9455073d4a1ab2928f5996bcb6f4cd6a2cce599e3ff02b81ad0dad66deed0d36891fec438b04bb527c5a72005
@@ -3,13 +3,17 @@ require 'sass'
3
3
  module Sass
4
4
  module Rails
5
5
  class CssCompressor
6
+ def initialize(options={})
7
+ @options = {:style => :compressed}.merge(options)
8
+ end
9
+
6
10
  def compress(css)
7
11
  if css.count("\n") > 2
8
12
  Sass::Engine.new(css,
9
13
  :syntax => :scss,
10
14
  :cache => false,
11
15
  :read_cache => false,
12
- :style => :compressed).render
16
+ :style => @options[:style]).render # note: style is set by railtie or by config
13
17
  else
14
18
  css
15
19
  end
@@ -11,8 +11,6 @@ module Sass::Rails
11
11
  # Establish static configuration defaults
12
12
  # Emit scss files during stylesheet generation of scaffold
13
13
  config.sass.preferred_syntax = :scss
14
- # Use expanded output instead of the sass default of :nested
15
- config.sass.style = :expanded
16
14
  # Write sass cache files for performance
17
15
  config.sass.cache = true
18
16
  # Read sass cache files for performance
@@ -74,8 +72,12 @@ module Sass::Rails
74
72
 
75
73
  initializer :setup_compression, :group => :all do |app|
76
74
  if app.config.assets.compress
77
- app.config.sass.style = :compressed
78
- app.config.assets.css_compressor = CssCompressor.new
75
+ # Use compressed style if none specified
76
+ app.config.sass.style ||= :compressed
77
+ app.config.assets.css_compressor ||= CssCompressor.new(:style => app.config.sass.style)
78
+ else
79
+ # Use expanded output instead of the sass default of :nested unless specified
80
+ app.config.sass.style ||= :expanded
79
81
  end
80
82
  end
81
83
  end
@@ -1,5 +1,5 @@
1
1
  module Sass
2
2
  module Rails
3
- VERSION = "3.2.5"
3
+ VERSION = "3.2.6"
4
4
  end
5
5
  end
@@ -0,0 +1,5 @@
1
+ .bundle
2
+ db/*.sqlite3
3
+ log/*.log
4
+ tmp/
5
+ .sass-cache/
@@ -0,0 +1,7 @@
1
+ source 'http://rubygems.org'
2
+
3
+ gem 'rails', "~> 3.2.0.rc1"
4
+ gem 'sqlite3'
5
+
6
+ # Asset template engines
7
+ gem 'sass-rails', :path => File.expand_path('../../../..', __FILE__)
@@ -0,0 +1,261 @@
1
+ == Welcome to Rails
2
+
3
+ Rails is a web-application framework that includes everything needed to create
4
+ database-backed web applications according to the Model-View-Control pattern.
5
+
6
+ This pattern splits the view (also called the presentation) into "dumb"
7
+ templates that are primarily responsible for inserting pre-built data in between
8
+ HTML tags. The model contains the "smart" domain objects (such as Account,
9
+ Product, Person, Post) that holds all the business logic and knows how to
10
+ persist themselves to a database. The controller handles the incoming requests
11
+ (such as Save New Account, Update Product, Show Post) by manipulating the model
12
+ and directing data to the view.
13
+
14
+ In Rails, the model is handled by what's called an object-relational mapping
15
+ layer entitled Active Record. This layer allows you to present the data from
16
+ database rows as objects and embellish these data objects with business logic
17
+ methods. You can read more about Active Record in
18
+ link:files/vendor/rails/activerecord/README.html.
19
+
20
+ The controller and view are handled by the Action Pack, which handles both
21
+ layers by its two parts: Action View and Action Controller. These two layers
22
+ are bundled in a single package due to their heavy interdependence. This is
23
+ unlike the relationship between the Active Record and Action Pack that is much
24
+ more separate. Each of these packages can be used independently outside of
25
+ Rails. You can read more about Action Pack in
26
+ link:files/vendor/rails/actionpack/README.html.
27
+
28
+
29
+ == Getting Started
30
+
31
+ 1. At the command prompt, create a new Rails application:
32
+ <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
33
+
34
+ 2. Change directory to <tt>myapp</tt> and start the web server:
35
+ <tt>cd myapp; rails server</tt> (run with --help for options)
36
+
37
+ 3. Go to http://localhost:3000/ and you'll see:
38
+ "Welcome aboard: You're riding Ruby on Rails!"
39
+
40
+ 4. Follow the guidelines to start developing your application. You can find
41
+ the following resources handy:
42
+
43
+ * The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
44
+ * Ruby on Rails Tutorial Book: http://www.railstutorial.org/
45
+
46
+
47
+ == Debugging Rails
48
+
49
+ Sometimes your application goes wrong. Fortunately there are a lot of tools that
50
+ will help you debug it and get it back on the rails.
51
+
52
+ First area to check is the application log files. Have "tail -f" commands
53
+ running on the server.log and development.log. Rails will automatically display
54
+ debugging and runtime information to these files. Debugging info will also be
55
+ shown in the browser on requests from 127.0.0.1.
56
+
57
+ You can also log your own messages directly into the log file from your code
58
+ using the Ruby logger class from inside your controllers. Example:
59
+
60
+ class WeblogController < ActionController::Base
61
+ def destroy
62
+ @weblog = Weblog.find(params[:id])
63
+ @weblog.destroy
64
+ logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
65
+ end
66
+ end
67
+
68
+ The result will be a message in your log file along the lines of:
69
+
70
+ Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
71
+
72
+ More information on how to use the logger is at http://www.ruby-doc.org/core/
73
+
74
+ Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
75
+ several books available online as well:
76
+
77
+ * Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
78
+ * Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
79
+
80
+ These two books will bring you up to speed on the Ruby language and also on
81
+ programming in general.
82
+
83
+
84
+ == Debugger
85
+
86
+ Debugger support is available through the debugger command when you start your
87
+ Mongrel or WEBrick server with --debugger. This means that you can break out of
88
+ execution at any point in the code, investigate and change the model, and then,
89
+ resume execution! You need to install ruby-debug to run the server in debugging
90
+ mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
91
+
92
+ class WeblogController < ActionController::Base
93
+ def index
94
+ @posts = Post.all
95
+ debugger
96
+ end
97
+ end
98
+
99
+ So the controller will accept the action, run the first line, then present you
100
+ with a IRB prompt in the server window. Here you can do things like:
101
+
102
+ >> @posts.inspect
103
+ => "[#<Post:0x14a6be8
104
+ @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
105
+ #<Post:0x14a6620
106
+ @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
107
+ >> @posts.first.title = "hello from a debugger"
108
+ => "hello from a debugger"
109
+
110
+ ...and even better, you can examine how your runtime objects actually work:
111
+
112
+ >> f = @posts.first
113
+ => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
114
+ >> f.
115
+ Display all 152 possibilities? (y or n)
116
+
117
+ Finally, when you're ready to resume execution, you can enter "cont".
118
+
119
+
120
+ == Console
121
+
122
+ The console is a Ruby shell, which allows you to interact with your
123
+ application's domain model. Here you'll have all parts of the application
124
+ configured, just like it is when the application is running. You can inspect
125
+ domain models, change values, and save to the database. Starting the script
126
+ without arguments will launch it in the development environment.
127
+
128
+ To start the console, run <tt>rails console</tt> from the application
129
+ directory.
130
+
131
+ Options:
132
+
133
+ * Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
134
+ made to the database.
135
+ * Passing an environment name as an argument will load the corresponding
136
+ environment. Example: <tt>rails console production</tt>.
137
+
138
+ To reload your controllers and models after launching the console run
139
+ <tt>reload!</tt>
140
+
141
+ More information about irb can be found at:
142
+ link:http://www.rubycentral.org/pickaxe/irb.html
143
+
144
+
145
+ == dbconsole
146
+
147
+ You can go to the command line of your database directly through <tt>rails
148
+ dbconsole</tt>. You would be connected to the database with the credentials
149
+ defined in database.yml. Starting the script without arguments will connect you
150
+ to the development database. Passing an argument will connect you to a different
151
+ database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
152
+ PostgreSQL and SQLite 3.
153
+
154
+ == Description of Contents
155
+
156
+ The default directory structure of a generated Ruby on Rails application:
157
+
158
+ |-- app
159
+ | |-- assets
160
+ | |-- images
161
+ | |-- javascripts
162
+ | `-- stylesheets
163
+ | |-- controllers
164
+ | |-- helpers
165
+ | |-- mailers
166
+ | |-- models
167
+ | `-- views
168
+ | `-- layouts
169
+ |-- config
170
+ | |-- environments
171
+ | |-- initializers
172
+ | `-- locales
173
+ |-- db
174
+ |-- doc
175
+ |-- lib
176
+ | `-- tasks
177
+ |-- log
178
+ |-- public
179
+ |-- script
180
+ |-- test
181
+ | |-- fixtures
182
+ | |-- functional
183
+ | |-- integration
184
+ | |-- performance
185
+ | `-- unit
186
+ |-- tmp
187
+ | |-- cache
188
+ | |-- pids
189
+ | |-- sessions
190
+ | `-- sockets
191
+ `-- vendor
192
+ |-- assets
193
+ `-- stylesheets
194
+ `-- plugins
195
+
196
+ app
197
+ Holds all the code that's specific to this particular application.
198
+
199
+ app/assets
200
+ Contains subdirectories for images, stylesheets, and JavaScript files.
201
+
202
+ app/controllers
203
+ Holds controllers that should be named like weblogs_controller.rb for
204
+ automated URL mapping. All controllers should descend from
205
+ ApplicationController which itself descends from ActionController::Base.
206
+
207
+ app/models
208
+ Holds models that should be named like post.rb. Models descend from
209
+ ActiveRecord::Base by default.
210
+
211
+ app/views
212
+ Holds the template files for the view that should be named like
213
+ weblogs/index.html.erb for the WeblogsController#index action. All views use
214
+ eRuby syntax by default.
215
+
216
+ app/views/layouts
217
+ Holds the template files for layouts to be used with views. This models the
218
+ common header/footer method of wrapping views. In your views, define a layout
219
+ using the <tt>layout :default</tt> and create a file named default.html.erb.
220
+ Inside default.html.erb, call <% yield %> to render the view using this
221
+ layout.
222
+
223
+ app/helpers
224
+ Holds view helpers that should be named like weblogs_helper.rb. These are
225
+ generated for you automatically when using generators for controllers.
226
+ Helpers can be used to wrap functionality for your views into methods.
227
+
228
+ config
229
+ Configuration files for the Rails environment, the routing map, the database,
230
+ and other dependencies.
231
+
232
+ db
233
+ Contains the database schema in schema.rb. db/migrate contains all the
234
+ sequence of Migrations for your schema.
235
+
236
+ doc
237
+ This directory is where your application documentation will be stored when
238
+ generated using <tt>rake doc:app</tt>
239
+
240
+ lib
241
+ Application specific libraries. Basically, any kind of custom code that
242
+ doesn't belong under controllers, models, or helpers. This directory is in
243
+ the load path.
244
+
245
+ public
246
+ The directory available for the web server. Also contains the dispatchers and the
247
+ default HTML files. This should be set as the DOCUMENT_ROOT of your web
248
+ server.
249
+
250
+ script
251
+ Helper scripts for automation and generation.
252
+
253
+ test
254
+ Unit and functional tests along with fixtures. When using the rails generate
255
+ command, template test files will be generated for you and placed in this
256
+ directory.
257
+
258
+ vendor
259
+ External libraries that the application depends on. Also includes the plugins
260
+ subdirectory. If the app has frozen rails, those gems also go here, under
261
+ vendor/rails/. This directory is in the load path.
@@ -0,0 +1,7 @@
1
+ #!/usr/bin/env rake
2
+ # Add your own tasks in files placed in lib/tasks ending in .rake,
3
+ # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
4
+
5
+ require File.expand_path('../config/application', __FILE__)
6
+
7
+ AlternateConfigProject::Application.load_tasks
@@ -0,0 +1,9 @@
1
+ // This is a manifest file that'll be compiled into including all the files listed below.
2
+ // Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
3
+ // be included in the compiled file accessible from http://example.com/assets/application.js
4
+ // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
5
+ // the compiled file.
6
+ //
7
+ //= require jquery
8
+ //= require jquery_ujs
9
+ //= require_tree .
@@ -0,0 +1,32 @@
1
+ @import "partials/sass_import";
2
+ @import "partials/scss_import";
3
+ @import "globbed/**/*";
4
+ @import "subfolder/plain";
5
+ @import "subfolder/second_level";
6
+ @import "partials/without_css_ext";
7
+
8
+ .main {
9
+ color: yellow;
10
+ @include background-from-partial(red);
11
+ }
12
+
13
+ .rails {
14
+ asset-path: asset-path("rails.png", image);
15
+ asset-url: asset-url("rails.png", image);
16
+ image-path: image-path("rails.png");
17
+ image-url: image-url("rails.png");
18
+ video-path: video-path("rails.mp4");
19
+ video-url: video-url("rails.mp4");
20
+ audio-path: audio-path("rails.mp3");
21
+ audio-url: audio-url("rails.mp3");
22
+ font-path: font-path("rails.ttf");
23
+ font-url: font-url("rails.ttf");
24
+ font-url-with-query-hash: font-url("rails.ttf?#iefix");
25
+ javascript-path: javascript-path("rails.js");
26
+ javascript-url: javascript-url("rails.js");
27
+ stylesheet-path: stylesheet-path("rails.css");
28
+ stylesheet-url: stylesheet-url("rails.css");
29
+ asset-data-url: asset-data-url("1x1.png");
30
+ }
31
+
32
+ @include without-css-ext;
@@ -0,0 +1,7 @@
1
+ /*
2
+ *= require partials/_sass_import
3
+ *= require partials/_scss_import
4
+ *= require_tree ./globbed
5
+ *= require subfolder/plain
6
+ *= require subfolder/second_level
7
+ */
@@ -0,0 +1,5 @@
1
+ .partial-sass
2
+ color: green
3
+
4
+ @import "top_level_partial"
5
+ @import "subfolder/relative_scss"
@@ -0,0 +1,9 @@
1
+ .partial-scss {
2
+ color: blue; }
3
+
4
+ @mixin background-from-partial($color) {
5
+ background-color: $color
6
+ }
7
+
8
+ @import "subfolder/relative_sass";
9
+ @import "subfolder/relative_not_a_partial";
@@ -0,0 +1,3 @@
1
+ @mixin without-css-ext {
2
+ .without-css-ext { should: work; }
3
+ }