compass 0.12.7 → 0.13.alpha.4

data/test/fixtures/stylesheets/compass/sass/vertical_rhythm.scss

@@ -1,16 +1,217 @@
-@import "compass/typography/vertical_rhythm";
+// Test all functions and mixins, at least indirectly.
+// functions:
+// * rhythm
+// * lines-for-font-size
+//
+// mixins:
+// * establish-baseline
+// * output-rhythm
+// * debug-vertical-alignment
+// * adjust-font-size-to
+// * adjust-leading-to
+// * leader
+// * margin-leader
+// * padding-leader
+// * trailer
+// * margin-trailer
+// * padding-trailer
+// * rhythm
+// * rhythm-margins
+// * rhythm-padding
+// * apply-side-rhythm-border
+// * leading-border
+// * trailing-border
+// * rhythm-borders
+// * horizontal-borders (h-borders)
+//
+// deprecated mixins:
+// * reset-baseline
 
 $base-font-size: 14px;
 $base-line-height: 16px;
+@import "compass/typography/vertical_rhythm";
+
+@include establish-baseline;
+
+.small {
+	@include adjust-font-size-to(12px, 1);
+}
+
+.padded {
+	@include rhythm(1, 1, 1, 1);
+}
+
+.small-padded {
+	@include adjust-font-size-to(12px, 1);
+	@include rhythm(1, 1, 1, 1, 12px);
+}
+
+.borders {
+	@include h-borders(1px, 1);
+}
+
+.large-borders {
+	@include adjust-font-size-to(24px, 3);
+	@include h-borders(6px, 1, 24px);
+}
+
+.reset {
+	@include reset-baseline;
+}
+
+
+/* New test using em output */
+$base-font-size: 18px;
+$base-line-height: $base-font-size * 1.4;
+$rhythm-unit: em;
+$default-rhythm-border-style: solid #aaa;
+
+@import "compass/typography/vertical_rhythm";
 
 @include establish-baseline;
 
-.small { @include adjust-font-size-to(12px,1); }
+.container {
+	@include debug-vertical-alignment;
+}
+
+p {
+	@include margin-leader;
+	@include margin-trailer;
+}
+
+th,
+td {
+	@include rhythm-padding(.25);
+}
+
+// Incremental leading made easy!
+.caption {
+	@include adjust-font-size-to(13px, 4/5);
+}
+
+.spaced-out {
+	@include adjust-leading-to(1.5);
+}
+
+blockquote {
+	@include rhythm-margins;
+	padding: 0 rhythm();
+}
+
+.fig-quote {
+	> blockquote {
+		@include trailer(.5);
+	}
+	.source {
+		@include adjust-font-size-to(13px, auto);
+		@include trailer(.5, 13px);
+	}
+}
+
+.panel {
+	@include adjust-font-size-to(16px);
+	@include rhythm-borders($font-size: 16px);
+}
+
+/* New using rem output with pixel fallbacks */
+$base-font-size: 18px;
+$base-line-height: $base-font-size * 1.4;
+$rhythm-unit: rem;
+$default-rhythm-border-style: solid #aaa;
+@import "compass/typography/vertical_rhythm";
+
+@include establish-baseline;
+
+.container {
+	@include debug-vertical-alignment;
+}
+
+p {
+	@include margin-leader;
+	@include margin-trailer;
+}
+
+th,
+td {
+	@include rhythm-padding(.25);
+}
+
+/* Incremental leading made easy! */
+.caption {
+	@include adjust-font-size-to(.85rem, 4/5);
+}
+
+.spaced-out {
+	@include adjust-leading-to(1.5);
+}
+
+blockquote {
+	@include rhythm-margins;
+	padding: 0 rhythm();
+}
+
+.fig-quote {
+	> blockquote {
+		@include trailer(.5);
+	}
+	.source {
+		@include adjust-font-size-to(.85rem, auto);
+		@include trailer(.5);
+	}
+}
+
+.panel {
+	@include rhythm-borders;
+}
+
+/* New using px output */
+$base-font-size: 18px;
+$base-line-height: $base-font-size * 1.4;
+$rhythm-unit: px;
+$default-rhythm-border-style: solid #aaa;
+@import "compass/typography/vertical_rhythm";
+
+@include establish-baseline;
+
+.container {
+	@include debug-vertical-alignment;
+}
+
+p {
+	@include margin-leader;
+	@include margin-trailer;
+}
+
+th,
+td {
+	@include rhythm-padding(.25);
+}
+
+/* Incremental leading made easy! */
+.caption {
+	@include adjust-font-size-to(.85rem, 4/5);
+}
+
+.spaced-out {
+	@include adjust-leading-to(1.5);
+}
+
+blockquote {
+	@include rhythm-margins;
+	padding: 0 rhythm();
+}
 
-.padded { @include rhythm(1,1,1,1); }
-.small-padded { @include adjust-font-size-to(12px,1); @include rhythm(1,1,1,1,12px); }
+.fig-quote {
+	> blockquote {
+		@include trailer(.5);
+	}
+	.source {
+		@include adjust-font-size-to(.85rem, auto);
+		@include trailer(.5);
+	}
+}
 
-.borders { @include h-borders(1px,1); }
-.large-borders { @include adjust-font-size-to(24px,3); @include h-borders(6px,1,24px); }
+.panel {
+	@include rhythm-borders;
+}
 
-.reset { @include reset-baseline; }

data/test/fixtures/stylesheets/envtest/css/env.css

@@ -1,2 +1,10 @@
 .env {
   env: <%= options[:environment] %>; }
+.time {
+  time: "<%= Time.now.strftime("%F") %>"; }
+.date {
+  date: "<%= Time.now.strftime("%F") %>"; }
+.filename {
+  file: <%= filename.gsub(%r{/scss/}, '/sass/') %>; }
+.output {
+  output: <%= output_file %>; }

data/test/fixtures/stylesheets/envtest/sass/env.scss

@@ -1,3 +1,19 @@
 .env {
   env: compass-env();  
 }
+
+.time {
+  time: current-time("%F");
+}
+
+.date {
+  date: current-date("%F");
+}
+
+.filename {
+  file: current-source-file();
+}
+
+.output {
+  output: current-output-file();
+}

data/test/fixtures/stylesheets/envtest/tmp/env.css

@@ -0,0 +1,14 @@
+.env {
+  env: production; }
+
+.time {
+  time: "2013-04-03"; }
+
+.date {
+  date: "2013-04-03"; }
+
+.filename {
+  file: /Volumes/SSD/Work/compass/test/fixtures/stylesheets/envtest/sass/env.scss; }
+
+.output {
+  output: /Volumes/SSD/Work/compass/test/fixtures/stylesheets/envtest/tmp/env.css; }

data/test/fixtures/stylesheets/valid/css/simple.css

@@ -0,0 +1,4 @@
+/* line 1, ../sass/simple.sass */
+div {
+  color: red;
+}

data/test/helpers/diff.rb

@@ -3,7 +3,7 @@ require 'diff/lcs/hunk'
 module Compass
   module Diff
     #stole this from rspec who stole this from the gem
-    def diff_as_string(data_new, data_old)
+    def diff_as_string(data_old, data_new)
       data_old = data_old.split(/\n/).map! { |e| e.chomp }
       data_new = data_new.split(/\n/).map! { |e| e.chomp }
       output = ""

data/test/integrations/compass_test.rb

@@ -11,7 +11,7 @@ class CompassTest < Test::Unit::TestCase
   end
 
   def teardown
-    [:blueprint, :empty, :compass, :image_urls, :relative].each do |project_name|
+    [:empty, :compass, :image_urls, :relative].each do |project_name|
       ::FileUtils.rm_rf tempfile_path(project_name)
     end
   end
@@ -23,7 +23,7 @@ class CompassTest < Test::Unit::TestCase
     before_compile = Proc.new do |config|
       config.on_stylesheet_saved {|filepath| path = filepath; saved = true }
     end
-    within_project(:blueprint, before_compile)
+    within_project(:compass, before_compile)
     assert saved, "Stylesheet callback didn't get called"
     assert path.is_a?(String), "Path is not a string. Got: #{path.class.name}"
   end
@@ -51,17 +51,6 @@ class CompassTest < Test::Unit::TestCase
     end
   end
 
-  def test_blueprint
-    within_project(:blueprint) do |proj|
-      each_css_file(proj.css_path) do |css_file|
-        assert_no_errors css_file, :blueprint
-      end
-      each_sass_file do |sass_file|
-        assert_renders_correctly sass_file, :ignore_charset => true
-      end
-    end
-  end
-
   def test_compass
     within_project('compass') do |proj|
       each_css_file(proj.css_path) do |css_file|
@@ -95,6 +84,17 @@ class CompassTest < Test::Unit::TestCase
     end
   end
 
+  def test_busted_font_urls
+    within_project('busted_font_urls') do |proj|
+      each_css_file(proj.css_path) do |css_file|
+        assert_no_errors css_file, 'busted_font_urls'
+      end
+      each_sass_file do |sass_file|
+        assert_renders_correctly sass_file
+      end
+    end
+  end
+
   def test_busted_image_urls
     within_project('busted_image_urls') do |proj|
       each_css_file(proj.css_path) do |css_file|
@@ -138,8 +138,9 @@ private
   def assert_renders_correctly(*arguments)
     options = arguments.last.is_a?(Hash) ? arguments.pop : {}
     for name in arguments
-      actual_result_file = "#{tempfile_path(@current_project)}/#{name}.css"
+      @output_file = actual_result_file = "#{tempfile_path(@current_project)}/#{name}.css"
       expected_result_file = "#{result_path(@current_project)}/#{name}.css"
+      @filename = expected_result_file.gsub('css', 'scss')
       actual_lines = File.read(actual_result_file)
       actual_lines.gsub!(/^@charset[^;]+;/,'') if options[:ignore_charset]
       actual_lines = actual_lines.split("\n").reject{|l| l=~/\A\Z/}
@@ -221,4 +222,12 @@ private
     File.join(project_path(project_name), "saved")
   end
 
+  def filename
+    @filename
+  end
+
+  def output_file
+    @output_file
+  end
+
 end