RubyGems - sass-rails - Versions diffs - 3.2.5 → 3.2.6 - Mend

sass-rails 3.2.5 → 3.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (62) hide show

data/test/fixtures/alternate_config_project/public/422.html ADDED

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The change you wanted was rejected (422)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>The change you wanted was rejected.</h1>
+    <p>Maybe you tried to change something you didn't have access to.</p>
+  </div>
+</body>
+</html>

data/test/fixtures/alternate_config_project/public/500.html ADDED

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>We're sorry, but something went wrong (500)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+<body>
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <h1>We're sorry, but something went wrong.</h1>
+    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
+  </div>
+</body>
+</html>

data/test/fixtures/alternate_config_project/public/favicon.ico ADDED

File without changes

data/test/fixtures/alternate_config_project/public/index.html ADDED

@@ -0,0 +1,241 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Ruby on Rails: Welcome aboard</title>
+    <style type="text/css" media="screen">
+      body {
+        margin: 0;
+        margin-bottom: 25px;
+        padding: 0;
+        background-color: #f0f0f0;
+        font-family: "Lucida Grande", "Bitstream Vera Sans", "Verdana";
+        font-size: 13px;
+        color: #333;
+      }
+      h1 {
+        font-size: 28px;
+        color: #000;
+      }
+      a  {color: #03c}
+      a:hover {
+        background-color: #03c;
+        color: white;
+        text-decoration: none;
+      }
+      #page {
+        background-color: #f0f0f0;
+        width: 750px;
+        margin: 0;
+        margin-left: auto;
+        margin-right: auto;
+      }
+      #content {
+        float: left;
+        background-color: white;
+        border: 3px solid #aaa;
+        border-top: none;
+        padding: 25px;
+        width: 500px;
+      }
+      #sidebar {
+        float: right;
+        width: 175px;
+      }
+      #footer {
+        clear: both;
+      }
+      #header, #about, #getting-started {
+        padding-left: 75px;
+        padding-right: 30px;
+      }
+      #header {
+        background-image: url("/assets/rails.png");
+        background-repeat: no-repeat;
+        background-position: top left;
+        height: 64px;
+      }
+      #header h1, #header h2 {margin: 0}
+      #header h2 {
+        color: #888;
+        font-weight: normal;
+        font-size: 16px;
+      }
+      #about h3 {
+        margin: 0;
+        margin-bottom: 10px;
+        font-size: 14px;
+      }
+      #about-content {
+        background-color: #ffd;
+        border: 1px solid #fc0;
+        margin-left: -55px;
+        margin-right: -10px;
+      }
+      #about-content table {
+        margin-top: 10px;
+        margin-bottom: 10px;
+        font-size: 11px;
+        border-collapse: collapse;
+      }
+      #about-content td {
+        padding: 10px;
+        padding-top: 3px;
+        padding-bottom: 3px;
+      }
+      #about-content td.name  {color: #555}
+      #about-content td.value {color: #000}
+      #about-content ul {
+        padding: 0;
+        list-style-type: none;
+      }
+      #about-content.failure {
+        background-color: #fcc;
+        border: 1px solid #f00;
+      }
+      #about-content.failure p {
+        margin: 0;
+        padding: 10px;
+      }
+      #getting-started {
+        border-top: 1px solid #ccc;
+        margin-top: 25px;
+        padding-top: 15px;
+      }
+      #getting-started h1 {
+        margin: 0;
+        font-size: 20px;
+      }
+      #getting-started h2 {
+        margin: 0;
+        font-size: 14px;
+        font-weight: normal;
+        color: #333;
+        margin-bottom: 25px;
+      }
+      #getting-started ol {
+        margin-left: 0;
+        padding-left: 0;
+      }
+      #getting-started li {
+        font-size: 18px;
+        color: #888;
+        margin-bottom: 25px;
+      }
+      #getting-started li h2 {
+        margin: 0;
+        font-weight: normal;
+        font-size: 18px;
+        color: #333;
+      }
+      #getting-started li p {
+        color: #555;
+        font-size: 13px;
+      }
+      #sidebar ul {
+        margin-left: 0;
+        padding-left: 0;
+      }
+      #sidebar ul h3 {
+        margin-top: 25px;
+        font-size: 16px;
+        padding-bottom: 10px;
+        border-bottom: 1px solid #ccc;
+      }
+      #sidebar li {
+        list-style-type: none;
+      }
+      #sidebar ul.links li {
+        margin-bottom: 5px;
+      }
+      .filename {
+        font-style: italic;
+      }
+    </style>
+    <script type="text/javascript">
+      function about() {
+        info = document.getElementById('about-content');
+        if (window.XMLHttpRequest)
+          { xhr = new XMLHttpRequest(); }
+        else
+          { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
+        xhr.open("GET","rails/info/properties",false);
+        xhr.send("");
+        info.innerHTML = xhr.responseText;
+        info.style.display = 'block'
+      }
+    </script>
+  </head>
+  <body>
+    <div id="page">
+      <div id="sidebar">
+        <ul id="sidebar-items">
+          <li>
+            <h3>Browse the documentation</h3>
+            <ul class="links">
+              <li><a href="http://guides.rubyonrails.org/">Rails Guides</a></li>
+              <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
+              <li><a href="http://www.ruby-doc.org/core/">Ruby core</a></li>
+              <li><a href="http://www.ruby-doc.org/stdlib/">Ruby standard library</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+      <div id="content">
+        <div id="header">
+          <h1>Welcome aboard</h1>
+          <h2>You&rsquo;re riding Ruby on Rails!</h2>
+        </div>
+        <div id="about">
+          <h3><a href="rails/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
+          <div id="about-content" style="display: none"></div>
+        </div>
+        <div id="getting-started">
+          <h1>Getting started</h1>
+          <h2>Here&rsquo;s how to get rolling:</h2>
+          <ol>
+            <li>
+              <h2>Use <code>rails generate</code> to create your models and controllers</h2>
+              <p>To see all available options, run it without parameters.</p>
+            </li>
+            <li>
+              <h2>Set up a default route and remove <span class="filename">public/index.html</span></h2>
+              <p>Routes are set up in <span class="filename">config/routes.rb</span>.</p>
+            </li>
+            <li>
+              <h2>Create your database</h2>
+              <p>Run <code>rake db:create</code> to create your database. If you're not using SQLite (the default), edit <span class="filename">config/database.yml</span> with your username and password.</p>
+            </li>
+          </ol>
+        </div>
+      </div>
+      <div id="footer">&nbsp;</div>
+    </div>
+  </body>
+</html>

data/test/fixtures/alternate_config_project/public/robots.txt ADDED

@@ -0,0 +1,5 @@
+# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-Agent: *
+# Disallow: /

data/test/fixtures/alternate_config_project/script/rails ADDED

@@ -0,0 +1,6 @@
+#!/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.
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/test/fixtures/alternate_config_project/vendor/assets/stylesheets/.gitkeep ADDED

File without changes

data/test/fixtures/alternate_config_project/vendor/plugins/.gitkeep ADDED

File without changes

data/test/sass_rails_test.rb CHANGED

@@ -6,6 +6,63 @@ class SassRailsTest < Sass::Rails::TestCase
     assert_kind_of Class, Sass::Rails::CssCompressor
     assert_kind_of Class, Sass::Rails::Railtie
   end
+  test "style config item is honored" do
+    within_rails_app "alternate_config_project" do
+      runcmd "ruby script/rails runner 'puts Rails.application.config.sass.style'", Dir.pwd, true, "Gemfile", {"RAILS_ENV" => "development"}
+      assert_output(/compact/)
+    end
+  end
+  test "css_compressor config item is honored" do
+    within_rails_app "alternate_config_project" do
+      runcmd "ruby script/rails runner 'puts Rails.application.config.assets.css_compressor'", Dir.pwd, true, "Gemfile", {"RAILS_ENV" => "production"}
+      assert_output(/yui/)
+    end
+  end
+  # This tests both the railtie responsible for passing in the :compact style, and the compressor for honoring it
+  test "compressor outputs compact style when specified in config" do
+    command =<<END_OF_COMMAND
+puts Rails.application.config.assets.css_compressor.compress(<<CSS)
+div {
+  color: red;
+}
+span {
+  color: blue;
+}
+CSS
+END_OF_COMMAND
+    within_rails_app "alternate_config_project" do
+      runcmd "ruby script/rails runner '#{command}'", Dir.pwd, true, "Gemfile", {"RAILS_ENV" => "development"}
+      assert_line_count(3)
+    end
+  end
+  test "compressor outputs compressed style when no style is specified but compression is true" do
+    command =<<END_OF_COMMAND
+puts Rails.application.config.assets.css_compressor.compress(<<CSS)
+div {
+  color: red;
+}
+span {
+  color: blue;
+}
+CSS
+END_OF_COMMAND
+    within_rails_app "alternate_config_project" do
+      runcmd "ruby script/rails runner '#{command}'", Dir.pwd, true, "Gemfile", {"RAILS_ENV" => "test"}
+      assert_line_count(1)
+    end
+  end
+  test "sass uses expanded style by default when no compression" do
+    within_rails_app "scss_project" do
+      runcmd "ruby script/rails runner 'puts Rails.application.config.sass.style'", Dir.pwd, true, "Gemfile", {"RAILS_ENV" => "development"}
+      assert_output(/expanded/)
+    end
+  end
   test "scss files are generated during scaffold generation of scss projects" do
     within_rails_app "scss_project" do
       generate_scaffold

data/test/support/sass_rails_test_case.rb CHANGED

@@ -54,6 +54,10 @@ class Sass::Rails::TestCase < ActiveSupport::TestCase
     assert $last_ouput.to_s =~ match, "#{match} was not found in #{$last_ouput.inspect}"
   end
+  def assert_line_count(count)
+    last_count = $last_ouput.lines.count
+    assert last_count == count, "Wrong line count, expected: #{count} but got: #{last_count}"
+  end
   # Copies a rails app fixture to a temp directory
   # and changes to that directory during the yield.
   #

metadata CHANGED

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-rails
 version: !ruby/object:Gem::Version
-  version: 3.2.5
-  prerelease:
+  version: 3.2.6
 platform: ruby
 authors:
 - wycats
@@ -10,41 +9,50 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70125567856900 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.10
   type: :runtime
   prerelease: false
-  version_requirements: *70125567856900
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.10
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70125567855740 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70125567855740
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70125567854800 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70125567854800
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: Sass adapter for the Rails asset pipeline.
 email:
 - wycats@gmail.com
@@ -53,8 +61,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -77,6 +85,61 @@ files:
 - lib/sass/rails/template_handlers.rb
 - lib/sass/rails/version.rb
 - sass-rails.gemspec
+- test/fixtures/alternate_config_project/.gitignore
+- test/fixtures/alternate_config_project/Gemfile
+- test/fixtures/alternate_config_project/README
+- test/fixtures/alternate_config_project/Rakefile
+- test/fixtures/alternate_config_project/app/assets/images/1x1.png
+- test/fixtures/alternate_config_project/app/assets/images/rails.png
+- test/fixtures/alternate_config_project/app/assets/javascripts/application.js
+- test/fixtures/alternate_config_project/app/assets/stylesheets/_top_level_partial.css.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/application.css.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/css_application.css
+- test/fixtures/alternate_config_project/app/assets/stylesheets/globbed/globbed.css.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/globbed/nested/nested_glob.css.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_sass_import.css.sass
+- test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_scss_import.css.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_without_css_ext.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/_relative_sass.css.sass
+- test/fixtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/_relative_scss.css.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/relative_not_a_partial.css.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/another_plain.css
+- test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/plain.css
+- test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/second_level.css.scss
+- test/fixtures/alternate_config_project/app/controllers/application_controller.rb
+- test/fixtures/alternate_config_project/app/helpers/application_helper.rb
+- test/fixtures/alternate_config_project/app/mailers/.gitkeep
+- test/fixtures/alternate_config_project/app/models/.gitkeep
+- test/fixtures/alternate_config_project/app/views/layouts/application.html.erb
+- test/fixtures/alternate_config_project/config.ru
+- test/fixtures/alternate_config_project/config/application.rb
+- test/fixtures/alternate_config_project/config/boot.rb
+- test/fixtures/alternate_config_project/config/database.yml
+- test/fixtures/alternate_config_project/config/environment.rb
+- test/fixtures/alternate_config_project/config/environments/development.rb
+- test/fixtures/alternate_config_project/config/environments/production.rb
+- test/fixtures/alternate_config_project/config/environments/test.rb
+- test/fixtures/alternate_config_project/config/initializers/backtrace_silencers.rb
+- test/fixtures/alternate_config_project/config/initializers/inflections.rb
+- test/fixtures/alternate_config_project/config/initializers/mime_types.rb
+- test/fixtures/alternate_config_project/config/initializers/secret_token.rb
+- test/fixtures/alternate_config_project/config/initializers/session_store.rb
+- test/fixtures/alternate_config_project/config/initializers/wrap_parameters.rb
+- test/fixtures/alternate_config_project/config/locales/en.yml
+- test/fixtures/alternate_config_project/config/routes.rb
+- test/fixtures/alternate_config_project/db/seeds.rb
+- test/fixtures/alternate_config_project/doc/README_FOR_APP
+- test/fixtures/alternate_config_project/lib/tasks/.gitkeep
+- test/fixtures/alternate_config_project/log/.gitkeep
+- test/fixtures/alternate_config_project/public/404.html
+- test/fixtures/alternate_config_project/public/422.html
+- test/fixtures/alternate_config_project/public/500.html
+- test/fixtures/alternate_config_project/public/favicon.ico
+- test/fixtures/alternate_config_project/public/index.html
+- test/fixtures/alternate_config_project/public/robots.txt
+- test/fixtures/alternate_config_project/script/rails
+- test/fixtures/alternate_config_project/vendor/assets/stylesheets/.gitkeep
+- test/fixtures/alternate_config_project/vendor/plugins/.gitkeep
 - test/fixtures/engine_project/.gitignore
 - test/fixtures/engine_project/Gemfile
 - test/fixtures/engine_project/README.rdoc
@@ -229,29 +292,83 @@ files:
 - test/test_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sass-rails
-rubygems_version: 1.8.10
+rubygems_version: 2.0.0.preview3.1
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Sass adapter for the Rails asset pipeline.
 test_files:
+- test/fixtures/alternate_config_project/.gitignore
+- test/fixtures/alternate_config_project/Gemfile
+- test/fixtures/alternate_config_project/README
+- test/fixtures/alternate_config_project/Rakefile
+- test/fixtures/alternate_config_project/app/assets/images/1x1.png
+- test/fixtures/alternate_config_project/app/assets/images/rails.png
+- test/fixtures/alternate_config_project/app/assets/javascripts/application.js
+- test/fixtures/alternate_config_project/app/assets/stylesheets/_top_level_partial.css.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/application.css.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/css_application.css
+- test/fixtures/alternate_config_project/app/assets/stylesheets/globbed/globbed.css.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/globbed/nested/nested_glob.css.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_sass_import.css.sass
+- test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_scss_import.css.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_without_css_ext.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/_relative_sass.css.sass
+- test/fixtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/_relative_scss.css.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/relative_not_a_partial.css.scss
+- test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/another_plain.css
+- test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/plain.css
+- test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/second_level.css.scss
+- test/fixtures/alternate_config_project/app/controllers/application_controller.rb
+- test/fixtures/alternate_config_project/app/helpers/application_helper.rb
+- test/fixtures/alternate_config_project/app/mailers/.gitkeep
+- test/fixtures/alternate_config_project/app/models/.gitkeep
+- test/fixtures/alternate_config_project/app/views/layouts/application.html.erb
+- test/fixtures/alternate_config_project/config.ru
+- test/fixtures/alternate_config_project/config/application.rb
+- test/fixtures/alternate_config_project/config/boot.rb
+- test/fixtures/alternate_config_project/config/database.yml
+- test/fixtures/alternate_config_project/config/environment.rb
+- test/fixtures/alternate_config_project/config/environments/development.rb
+- test/fixtures/alternate_config_project/config/environments/production.rb
+- test/fixtures/alternate_config_project/config/environments/test.rb
+- test/fixtures/alternate_config_project/config/initializers/backtrace_silencers.rb
+- test/fixtures/alternate_config_project/config/initializers/inflections.rb
+- test/fixtures/alternate_config_project/config/initializers/mime_types.rb
+- test/fixtures/alternate_config_project/config/initializers/secret_token.rb
+- test/fixtures/alternate_config_project/config/initializers/session_store.rb
+- test/fixtures/alternate_config_project/config/initializers/wrap_parameters.rb
+- test/fixtures/alternate_config_project/config/locales/en.yml
+- test/fixtures/alternate_config_project/config/routes.rb
+- test/fixtures/alternate_config_project/db/seeds.rb
+- test/fixtures/alternate_config_project/doc/README_FOR_APP
+- test/fixtures/alternate_config_project/lib/tasks/.gitkeep
+- test/fixtures/alternate_config_project/log/.gitkeep
+- test/fixtures/alternate_config_project/public/404.html
+- test/fixtures/alternate_config_project/public/422.html
+- test/fixtures/alternate_config_project/public/500.html
+- test/fixtures/alternate_config_project/public/favicon.ico
+- test/fixtures/alternate_config_project/public/index.html
+- test/fixtures/alternate_config_project/public/robots.txt
+- test/fixtures/alternate_config_project/script/rails
+- test/fixtures/alternate_config_project/vendor/assets/stylesheets/.gitkeep
+- test/fixtures/alternate_config_project/vendor/plugins/.gitkeep
 - test/fixtures/engine_project/.gitignore
 - test/fixtures/engine_project/Gemfile
 - test/fixtures/engine_project/README.rdoc