compass 0.10.6 → 0.11.alpha.0

data/lib/compass/sass_extensions/functions/if.rb

@@ -0,0 +1,9 @@
+module Compass::SassExtensions::Functions::If
+  def if(truth, if_true, if_false = nil)
+    if truth.to_bool
+      if_true
+    else
+      if_false || Sass::Script::Bool.new(false)
+    end
+  end
+end

data/lib/compass/sass_extensions/functions/inline_image.rb

@@ -3,8 +3,7 @@ module Compass::SassExtensions::Functions::InlineImage
   def inline_image(path, mime_type = nil)
     path = path.value
     real_path = File.join(Compass.configuration.images_path, path)
-    url = "url('data:#{compute_mime_type(path,mime_type)};base64,#{data(real_path)}')"
-    Sass::Script::String.new(url)
+    inline_image_string(data(real_path), compute_mime_type(path, mime_type))
   end
 
   def inline_font_files(*args)
@@ -19,6 +18,13 @@ module Compass::SassExtensions::Functions::InlineImage
     Sass::Script::String.new(files.join(", "))
   end
 
+protected
+  def inline_image_string(data, mime_type)
+    data = [data].flatten.pack('m').gsub("\n","")
+    url = "url('data:#{mime_type};base64,#{data}')"
+    Sass::Script::String.new(url)
+  end
+
 private
   def compute_mime_type(path, mime_type = nil)
     return mime_type if mime_type
@@ -46,7 +52,7 @@ private
 
   def data(real_path)
     if File.readable?(real_path)
-      [File.open(real_path, "rb") {|io| io.read}].pack('m').gsub("\n","")
+      File.open(real_path, "rb") {|io| io.read}
     else
       raise Compass::Error, "File not found or cannot be read: #{real_path}"
     end

data/lib/compass/sass_extensions/functions/trig.rb

@@ -0,0 +1,27 @@
+module Compass::SassExtensions::Functions::Trig
+
+  def pi()
+    Sass::Script::Number.new(Math::PI)
+  end
+
+  def sin(number)
+    trig(:sin, number)
+  end
+
+  def cos(number)
+    trig(:cos, number)
+  end
+
+  def tan(number)
+    trig(:tan, number)
+  end
+  
+  private
+  def trig(operation, number)
+    if number.numerator_units == ["deg"] && number.denominator_units == []
+      Sass::Script::Number.new(Math.send(operation, Math::PI * number.value / 360))
+    else
+      Sass::Script::Number.new(Math.send(operation, number.value), number.numerator_units, number.denominator_units)
+    end
+  end
+end

data/lib/compass/version.rb

@@ -24,8 +24,13 @@ module Compass
       require 'yaml'
       @version = YAML::load(File.read(scope('VERSION.yml')))
       @version[:teeny] = @version[:patch]
-      @version[:string] = "#{@version[:major]}.#{@version[:minor]}.#{@version[:patch]}"
+      @version[:string] = "#{@version[:major]}.#{@version[:minor]}"
+      @version[:string] << ".#{@version[:patch]}" if @version[:patch]
+      @version[:string] << ".#{@version[:state]}" if @version[:state]
       @version[:string] << ".#{@version[:build]}" if @version[:build]
+      if !ENV['OFFICIAL'] && r = revision
+        @version[:string] << ".#{r[0..6]}"
+      end
       @version
     end
 

data/lib/rails/init.rb

@@ -0,0 +1,2 @@
+require 'compass'
+require 'compass/app_integration/rails'

data/test/command_line_test.rb

@@ -15,17 +15,16 @@ class CommandLineTest < Test::Unit::TestCase
 
   def test_print_version
     compass "-vq"
-    assert_match /\d+\.\d+\.\d+( [0-9a-f]+)?/, @last_result
+    assert_match /\d+\.\d+\.(\d+|((alpha|beta|rc)\.\d+\.[0-9a-f]+))?/, @last_result
   end
 
   def test_basic_install
     within_tmp_directory do
       compass "--boring", "basic"
-      assert File.exists?("basic/src/screen.scss")
+      assert File.exists?("basic/sass/screen.scss")
       assert File.exists?("basic/stylesheets/screen.css")
       assert_action_performed :directory, "basic/"
-      assert_action_performed    :create, "basic/src/screen.scss"
-      assert_action_performed   :compile, "basic/src/screen.scss"
+      assert_action_performed    :create, "basic/sass/screen.scss"
       assert_action_performed    :create, "basic/stylesheets/screen.css"
     end
   end
@@ -35,11 +34,10 @@ class CommandLineTest < Test::Unit::TestCase
     define_method "test_#{framework.name}_installation" do
       within_tmp_directory do
         compass *%W(--boring --framework #{framework.name} #{framework.name}_project)
-        assert File.exists?("#{framework.name}_project/src/screen.scss"), "src/screen.scss is missing. Found: #{Dir.glob("#{framework.name}_project/**/*").join(", ")}"
+        assert File.exists?("#{framework.name}_project/sass/screen.scss"), "sass/screen.scss is missing. Found: #{Dir.glob("#{framework.name}_project/**/*").join(", ")}"
         assert File.exists?("#{framework.name}_project/stylesheets/screen.css")
         assert_action_performed :directory, "#{framework.name}_project/"
-        assert_action_performed    :create, "#{framework.name}_project/src/screen.scss"
-        assert_action_performed   :compile, "#{framework.name}_project/src/screen.scss"
+        assert_action_performed    :create, "#{framework.name}_project/sass/screen.scss"
         assert_action_performed    :create, "#{framework.name}_project/stylesheets/screen.css"
       end
     end
@@ -51,10 +49,9 @@ class CommandLineTest < Test::Unit::TestCase
       Dir.chdir "basic" do
         # basic update with timestamp caching
         compass "--boring"
-        assert_action_performed :unchanged, "src/screen.scss"
+        assert_action_performed :unchanged, "sass/screen.scss"
         # basic update with force option set
         compass "--force", "--boring"
-        assert_action_performed :compile, "src/screen.scss"
         assert_action_performed :identical, "stylesheets/screen.css"
       end
     end

data/test/compass_test.rb

@@ -1,6 +1,8 @@
 require 'test_helper'
 require 'fileutils'
 require 'compass'
+require 'compass/logger'
+require 'sass/plugin'
 
 class CompassTest < Test::Unit::TestCase
   include Compass::TestCaseHelper

data/test/configuration_test.rb

@@ -24,6 +24,14 @@ class ConfigurationTest < Test::Unit::TestCase
       output_style = :nested
       # To enable relative paths to assets via compass helper functions. Uncomment:
       # relative_assets = true
+      # To disable debugging comments that display the original location of your selectors. Uncomment:
+      # line_comments = false
+      
+      # If you prefer the indented syntax, you might want to regenerate this
+      # project again passing --syntax sass, or you can uncomment this:
+      # preferred_syntax = :sass
+      # and then run:
+      # sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
     CONFIG
 
     Compass.add_configuration(contents, "test_parse")
@@ -90,9 +98,13 @@ project_path = "/home/chris/my_compass_project"
 # Set this to the root of your project when deployed:
 http_path = "/"
 css_dir = "css"
+# You can select your preferred output style here (can be overridden via the command line):
+# output_style = :expanded or :nested or :compact or :compressed
 # To enable relative paths to assets via compass helper functions. Uncomment:
 # relative_assets = true
 additional_import_paths = ["../foo", "/path/to/my/framework"]
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+# line_comments = false
 EXPECTED
     assert_equal "/", Compass.configuration.http_path
     assert_equal expected_serialization.split("\n"), Compass.configuration.serialize.split("\n")
@@ -120,9 +132,13 @@ project_path = "/home/chris/my_compass_project"
 # Set this to the root of your project when deployed:
 http_path = "/"
 css_dir = "css"
+# You can select your preferred output style here (can be overridden via the command line):
+# output_style = :expanded or :nested or :compact or :compressed
 # To enable relative paths to assets via compass helper functions. Uncomment:
 # relative_assets = true
 additional_import_paths = ["../foo", "/path/to/my/framework"]
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+# line_comments = false
 EXPECTED
     assert_equal "/", Compass.configuration.http_path
     assert_equal expected_serialization.split("\n"), Compass.configuration.serialize.split("\n")
@@ -142,9 +158,13 @@ EXPECTED
 # Require any additional compass plugins here.
 # Set this to the root of your project when deployed:
 http_path = "/"
+# You can select your preferred output style here (can be overridden via the command line):
+# output_style = :expanded or :nested or :compact or :compressed
 # To enable relative paths to assets via compass helper functions. Uncomment:
 # relative_assets = true
 sass_options = {:foo=>"bar"}
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+# line_comments = false
 EXPECTED
 
       assert_equal expected_serialization, Compass.configuration.serialize

data/test/fixtures/stylesheets/blueprint/css/ie.css

@@ -24,9 +24,25 @@ img {
 fieldset {
   padding-top: 0; }
 
+legend {
+  margin-top: -0.2em;
+  margin-bottom: 1em;
+  margin-left: -0.5em; }
+
+fieldset, #IE8#HACK {
+  padding-top: 1.4em; }
+
+legend, #IE8#HACK {
+  margin-top: 0;
+  margin-bottom: 0; }
+
 textarea {
   overflow: auto; }
 
+label {
+  position: relative;
+  top: -0.25em; }
+
 input.text {
   margin: 0.5em 0;
   background-color: white;

data/test/fixtures/stylesheets/blueprint/css/screen.css

@@ -84,12 +84,12 @@ h6 {
 
 p {
   margin: 0 0 1.5em; }
-  p img.left {
+  p .left {
     display: inline;
     float: left;
     margin: 1.5em 1.5em 1.5em 0;
     padding: 0; }
-  p img.right {
+  p .right {
     display: inline;
     float: right;
     margin: 1.5em 0 1.5em 1.5em;
@@ -97,31 +97,27 @@ p {
 
 a {
   text-decoration: underline;
-  color: #000099; }
+  color: #0066cc; }
   a:visited {
-    color: #000066; }
+    color: #004c99; }
   a:focus {
-    color: black; }
+    color: #0099ff; }
   a:hover {
-    color: black; }
+    color: #0099ff; }
   a:active {
-    color: #cc0099; }
+    color: #bf00ff; }
 
 blockquote {
   margin: 1.5em;
   color: #666666;
   font-style: italic; }
 
-strong {
+strong, dfn {
   font-weight: bold; }
 
-em {
+em, dfn {
   font-style: italic; }
 
-dfn {
-  font-style: italic;
-  font-weight: bold; }
-
 sup, sub {
   line-height: 0; }
 
@@ -148,7 +144,7 @@ li ul, li ol {
 
 ul, ol {
   margin: 0 1.5em 1.5em 0;
-  padding-left: 3.333em; }
+  padding-left: 1.5em; }
 
 ul {
   list-style-type: disc; }
@@ -177,7 +173,8 @@ thead th {
 th, td, caption {
   padding: 4px 10px 4px 5px; }
 
-tr.even td {
+table.striped tr:nth-child(even) td,
+table tr.even td {
   background: #e5ecf9; }
 
 tfoot {
@@ -234,14 +231,14 @@ caption {
   overflow: hidden;
   *zoom: 1; }
 
-.column, div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23, div.span-24 {
+.column, .span-1, .span-2, .span-3, .span-4, .span-5, .span-6, .span-7, .span-8, .span-9, .span-10, .span-11, .span-12, .span-13, .span-14, .span-15, .span-16, .span-17, .span-18, .span-19, .span-20, .span-21, .span-22, .span-23, .span-24 {
   display: inline;
   float: left;
   margin-right: 10px; }
-  * html .column, * html div.span-1, * html div.span-2, * html div.span-3, * html div.span-4, * html div.span-5, * html div.span-6, * html div.span-7, * html div.span-8, * html div.span-9, * html div.span-10, * html div.span-11, * html div.span-12, * html div.span-13, * html div.span-14, * html div.span-15, * html div.span-16, * html div.span-17, * html div.span-18, * html div.span-19, * html div.span-20, * html div.span-21, * html div.span-22, * html div.span-23, * html div.span-24 {
+  * html .column, * html .span-1, * html .span-2, * html .span-3, * html .span-4, * html .span-5, * html .span-6, * html .span-7, * html .span-8, * html .span-9, * html .span-10, * html .span-11, * html .span-12, * html .span-13, * html .span-14, * html .span-15, * html .span-16, * html .span-17, * html .span-18, * html .span-19, * html .span-20, * html .span-21, * html .span-22, * html .span-23, * html .span-24 {
     overflow-x: hidden; }
 
-.last, div.last {
+.last {
   margin-right: 0; }
 
 .span-1 {
@@ -313,7 +310,7 @@ caption {
 .span-23 {
   width: 910px; }
 
-.span-24, div.span-24 {
+.span-24 {
   width: 950px;
   margin: 0; }
 
@@ -583,7 +580,7 @@ input.span-24, textarea.span-24, select.span-24 {
 
 .push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {
   display: inline;
-  float: right;
+  float: left;
   position: relative; }
 
 .push-1 {
@@ -667,20 +664,19 @@ input.span-24, textarea.span-24, select.span-24 {
 .showgrid {
   background: url('/images/grid.png?busted=true'); }
 
-.error {
+.feedback, .error, .alert, .notice, .success, .info {
   padding: 0.8em;
   margin-bottom: 1em;
-  border: 2px solid #dddddd;
+  border: 2px solid #dddddd; }
+
+.error, .alert {
   background: #fbe3e4;
   color: #8a1f11;
   border-color: #fbc2c4; }
-  .error a {
+  .error a, .alert a {
     color: #8a1f11; }
 
 .notice {
-  padding: 0.8em;
-  margin-bottom: 1em;
-  border: 2px solid #dddddd;
   background: #fff6bf;
   color: #514721;
   border-color: #ffd324; }
@@ -688,15 +684,19 @@ input.span-24, textarea.span-24, select.span-24 {
     color: #514721; }
 
 .success {
-  padding: 0.8em;
-  margin-bottom: 1em;
-  border: 2px solid #dddddd;
   background: #e6efc2;
   color: #264409;
   border-color: #c6d880; }
   .success a {
     color: #264409; }
 
+.info {
+  background: #d5edf8;
+  color: #205791;
+  border-color: #92cae4; }
+  .info a {
+    color: #205791; }
+
 .hide {
   display: none; }
 
@@ -728,9 +728,6 @@ input.text, input.title, input[type=email], input[type=text], input[type=passwor
   padding: 5px; }
 input.title {
   font-size: 1.5em; }
-input[type=checkbox], input.checkbox, input[type=radio], input.radio {
-  position: relative;
-  top: 0.25em; }
 
 textarea {
   margin: 0.5em 0;
@@ -743,12 +740,18 @@ fieldset {
   border: 1px solid #cccccc; }
 
 input.text, input.title, input[type=email], input[type=text], input[type=password],
-textarea, select {
+textarea {
+  background-color: #fff;
   border: 1px solid #bbbbbb; }
   input.text:focus, input.title:focus, input[type=email]:focus, input[type=text]:focus, input[type=password]:focus,
-  textarea:focus, select:focus {
+  textarea:focus {
     border: 1px solid #666666; }
 
+select {
+  background-color: #fff;
+  border-width: 1px;
+  border-style: solid; }
+
 input.text, input.title, input[type=email], input[type=text], input[type=password] {
   width: 300px; }
 

data/test/fixtures/stylesheets/blueprint/css/single-imports/colors.css

@@ -14,19 +14,19 @@
   color: #666666; }
 
 .link-color {
-  color: #000099; }
+  color: #0066cc; }
 
 .link-hover-color {
-  color: black; }
+  color: #0099ff; }
 
 .link-focus-color {
-  color: black; }
+  color: #0099ff; }
 
 .link-active-color {
-  color: #cc0099; }
+  color: #bf00ff; }
 
 .link-visited-color {
-  color: #000066; }
+  color: #004c99; }
 
 .feedback-border-color {
   color: #dddddd; }

data/test/fixtures/stylesheets/blueprint/css/single-imports/form.css

@@ -17,9 +17,6 @@ form.bp input.text, form.bp input.title, form.bp input[type=email], form.bp inpu
   padding: 5px; }
 form.bp input.title {
   font-size: 1.5em; }
-form.bp input[type=checkbox], form.bp input.checkbox, form.bp input[type=radio], form.bp input.radio {
-  position: relative;
-  top: 0.25em; }
 form.bp textarea {
   margin: 0.5em 0;
   padding: 5px; }
@@ -28,11 +25,16 @@ form.bp select {
 form.bp fieldset {
   border: 1px solid #cccccc; }
 form.bp input.text, form.bp input.title, form.bp input[type=email], form.bp input[type=text], form.bp input[type=password],
-form.bp textarea, form.bp select {
+form.bp textarea {
+  background-color: #fff;
   border: 1px solid #bbbbbb; }
   form.bp input.text:focus, form.bp input.title:focus, form.bp input[type=email]:focus, form.bp input[type=text]:focus, form.bp input[type=password]:focus,
-  form.bp textarea:focus, form.bp select:focus {
+  form.bp textarea:focus {
     border: 1px solid #666666; }
+form.bp select {
+  background-color: #fff;
+  border-width: 1px;
+  border-style: solid; }
 form.bp input.text, form.bp input.title, form.bp input[type=email], form.bp input[type=text], form.bp input[type=password] {
   width: 300px; }
 form.bp textarea {