compass 1.0.0.alpha.15 → 1.0.0.alpha.16

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

@@ -0,0 +1,52 @@
+/* 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;
+
+.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);
+}

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

@@ -0,0 +1,50 @@
+/* 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();
+}
+
+.fig-quote {
+	> blockquote {
+		@include trailer(.5);
+	}
+	.source {
+		@include adjust-font-size-to(.85rem, auto);
+		@include trailer(.5);
+	}
+}
+
+.panel {
+	@include rhythm-borders;
+}

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

@@ -0,0 +1,50 @@
+/* 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;
+}

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

@@ -2,10 +2,10 @@
   env: production; }
 
 .time {
-  time: 2013-12-04; }
+  time: 2013-12-10; }
 
 .date {
-  date: 2013-12-04; }
+  date: 2013-12-10; }
 
 .filename {
   file: env.scss; }

data/test/helpers/command_line.rb

@@ -92,7 +92,7 @@ module Compass::CommandLineHelper
     end
     message = "Action #{action.inspect} was not performed on: #{path}."
     message += "The following actions were performed: #{actions_found.map{|a|a.inspect}.join(", ")}" if actions_found.any?
-    # puts @last_result
+    puts @last_result
     fail message
   end
 

data/test/units/configuration_test.rb

@@ -22,6 +22,7 @@ class ConfigurationTest < Test::Unit::TestCase
   def test_parse_and_serialize
     contents = StringIO.new(<<-CONFIG)
       require 'compass'
+      require 'compass/import-once/activate'
       # Require any additional compass plugins here.
 
       project_type = :stand_alone
@@ -353,6 +354,7 @@ CONFIG
     assert_equal "/home/chris/my_compass_project/css/foo", plugin_opts[:template_location].find{|s,c| s == "/home/chris/my_compass_project/../foo"}[1]
 
     expected_serialization = <<EXPECTED
+require 'compass/import-once/activate'
 # Require any additional compass plugins here.
 project_path = "/home/chris/my_compass_project"
 
@@ -415,6 +417,7 @@ EXPECTED
     assert_equal "/home/chris/my_compass_project/css/foo", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/home/chris/my_compass_project/../foo"}[1]
 
     expected_serialization = <<EXPECTED
+require 'compass/import-once/activate'
 # Require any additional compass plugins here.
 project_path = "/home/chris/my_compass_project"
 
@@ -453,6 +456,7 @@ EXPECTED
       assert_equal 'bar', Compass.configuration.to_sass_plugin_options[:foo]
 
       expected_serialization = <<EXPECTED
+require 'compass/import-once/activate'
 # Require any additional compass plugins here.
 
 # Set this to the root of your project when deployed:
@@ -488,6 +492,7 @@ EXPECTED
       assert_equal ["/Users/chris/Projects/my_compass_project/images/sprites"], Compass.configuration.sprite_load_path.to_a
 
       expected_serialization = <<EXPECTED
+require 'compass/import-once/activate'
 # Require any additional compass plugins here.
 
 # Set this to the root of your project when deployed:
@@ -558,6 +563,7 @@ EXPECTED
 
     assert_equal "baz", Compass.configuration.foobar
     expected_serialization = <<EXPECTED
+require 'compass/import-once/activate'
 # Require any additional compass plugins here.
 
 # Set this to the root of your project when deployed:

data/test/units/sass_extensions_test.rb

@@ -109,8 +109,8 @@ class SassExtensionsTest < Test::Unit::TestCase
     assert_equal "25px", evaluate("pow(5px, 2)")
     assert_equal "25px", evaluate("pow($number: 5px, $exponent: 2)")
     assert_equal "79.43236px", evaluate("pow(5px, e())")
-    assert (0..2).include?(evaluate("random(2)").to_i)
-    assert (4..16).include?(evaluate("random(4, 16)").to_i)
+    assert((0..2).include?(evaluate("random(2)").to_i))
+    assert((4..16).include?(evaluate("random(4, 16)").to_i))
   end
 
   def test_blank
@@ -210,6 +210,12 @@ class SassExtensionsTest < Test::Unit::TestCase
 
 protected
   def evaluate(value)
-    Sass::Script::Parser.parse(value, 0, 0).perform(Sass::Environment.new).to_s
+    result = Sass::Script::Parser.parse(value, 0, 0).perform(Sass::Environment.new)
+    begin
+      result.to_s
+    rescue Sass::SyntaxError => e
+      raise e unless e.message =~ /isn't a valid CSS value/
+      result.inspect
+    end
   end
 end

data/test/units/sass_extenstions/gradients_test.rb

@@ -1,32 +1,29 @@
 class GradientTestClass
   extend Compass::Core::SassExtensions::Functions::Constants
   extend Compass::Core::SassExtensions::Functions::GradientSupport::Functions
+  def self.options
+    {}
+  end
 end
 
 require 'test_helper'
 require 'compass'
 
 class GradientsTest < Test::Unit::TestCase
-  
+  include Sass::Script::Value::Helpers
+
   def klass
     GradientTestClass
   end
 
-  def sass_string(s)
-    Sass::Script::String.new(s)
-  end
-
-  def sass_list(array)
-    Sass::Script::List.new(array, :space)
-  end
-
   test "should return correct angle" do
-    assert_equal Sass::Script::Number.new(330, ['deg']), klass.convert_angle_from_offical(Sass::Script::Number.new(120, ['deg']))
+    assert_equal number(330, 'deg'), klass.convert_angle_from_offical(number(120, 'deg'))
   end
 
   test "Should convert old to new" do
     [:top => ['to', 'bottom'], :bottom => ['to', 'top'], :left => ['to', 'right'], :right => ['to', 'left']].each do |test_value|
-      assert_equal sass_string(test_value.keys.first.to_s), klass.convert_angle_from_offical(sass_list([sass_string(test_value.values[0].first), sass_string(test_value.values[0].last)]))
+      assert_equal list(identifier(test_value.keys.first.to_s), :space), klass.convert_angle_from_offical(
+        list(identifier(test_value.values[0].first), identifier(test_value.values[0].last), :space))
     end
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: compass
 version: !ruby/object:Gem::Version 
-  hash: -1583178212
+  hash: 915323291
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - alpha
-  - 15
-  version: 1.0.0.alpha.15
+  - 16
+  version: 1.0.0.alpha.16
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -21,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-05 00:00:00 Z
+date: 2013-12-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -29,7 +29,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -723937636
+        hash: -2745595092
         segments: 
         - 3
         - 3
@@ -47,20 +47,36 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1583178212
+        hash: 915323291
         segments: 
         - 1
         - 0
         - 0
         - alpha
-        - 15
-        version: 1.0.0.alpha.15
+        - 16
+        version: 1.0.0.alpha.16
   name: compass-core
   prerelease: false
   type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  name: compass-import-once
+  prerelease: false
+  type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -73,9 +89,9 @@ dependencies:
   name: chunky_png
   prerelease: false
   type: :runtime
-  requirement: *id003
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,9 +105,9 @@ dependencies:
   name: listen
   prerelease: false
   type: :runtime
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,7 +119,7 @@ dependencies:
   name: json
   prerelease: false
   type: :runtime
-  requirement: *id005
+  requirement: *id006
 description: Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintenance of CSS.
 email: chris@eppsteins.net
 executables: 
@@ -298,6 +314,9 @@ files:
 - test/fixtures/stylesheets/compass/css/user-interface.css
 - test/fixtures/stylesheets/compass/css/utilities.css
 - test/fixtures/stylesheets/compass/css/vertical_rhythm.css
+- test/fixtures/stylesheets/compass/css/vertical_rhythm_with_ems.css
+- test/fixtures/stylesheets/compass/css/vertical_rhythm_with_px.css
+- test/fixtures/stylesheets/compass/css/vertical_rhythm_with_rems.css
 - test/fixtures/stylesheets/compass/images/100x150.gif
 - test/fixtures/stylesheets/compass/images/100x150.jpeg
 - test/fixtures/stylesheets/compass/images/100x150.jpg
@@ -601,6 +620,9 @@ files:
 - test/fixtures/stylesheets/compass/sass/user-interface.scss
 - test/fixtures/stylesheets/compass/sass/utilities.scss
 - test/fixtures/stylesheets/compass/sass/vertical_rhythm.scss
+- test/fixtures/stylesheets/compass/sass/vertical_rhythm_with_ems.scss
+- test/fixtures/stylesheets/compass/sass/vertical_rhythm_with_px.scss
+- test/fixtures/stylesheets/compass/sass/vertical_rhythm_with_rems.scss
 - test/fixtures/stylesheets/envtest/config.rb
 - test/fixtures/stylesheets/envtest/css/env.css
 - test/fixtures/stylesheets/envtest/sass/env.scss
@@ -797,6 +819,9 @@ test_files:
 - test/fixtures/stylesheets/compass/css/user-interface.css
 - test/fixtures/stylesheets/compass/css/utilities.css
 - test/fixtures/stylesheets/compass/css/vertical_rhythm.css
+- test/fixtures/stylesheets/compass/css/vertical_rhythm_with_ems.css
+- test/fixtures/stylesheets/compass/css/vertical_rhythm_with_px.css
+- test/fixtures/stylesheets/compass/css/vertical_rhythm_with_rems.css
 - test/fixtures/stylesheets/compass/images/100x150.gif
 - test/fixtures/stylesheets/compass/images/100x150.jpeg
 - test/fixtures/stylesheets/compass/images/100x150.jpg
@@ -1100,6 +1125,9 @@ test_files:
 - test/fixtures/stylesheets/compass/sass/user-interface.scss
 - test/fixtures/stylesheets/compass/sass/utilities.scss
 - test/fixtures/stylesheets/compass/sass/vertical_rhythm.scss
+- test/fixtures/stylesheets/compass/sass/vertical_rhythm_with_ems.scss
+- test/fixtures/stylesheets/compass/sass/vertical_rhythm_with_px.scss
+- test/fixtures/stylesheets/compass/sass/vertical_rhythm_with_rems.scss
 - test/fixtures/stylesheets/envtest/config.rb
 - test/fixtures/stylesheets/envtest/css/env.css
 - test/fixtures/stylesheets/envtest/sass/env.scss