compass-core 1.0.0.rc.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bdf3ed83a110afaf4b21a9a95d35ab21f30005d
-  data.tar.gz: 16db580b6ea1afe477b6d77dd5704f60999cb121
+  metadata.gz: 30ed5fb87775781f177185dd819939e2baee183f
+  data.tar.gz: 90f6787c7e0e5155e690185078b7260cb6f73b49
 SHA512:
-  metadata.gz: 2d731a439ad9191b6ccfbe09316aabdd1076116797d3abd8ae81198f42c82899cea0465bdfda82d4dfcbbf77bbd82c46474293bd1a6d84b6cb61e9b5133743d9
-  data.tar.gz: da17ecf2006a0349ee5830914fc6d38693f8eddcd1358cab1938e267718304ecd454eacde0eaeb940493fb1994daf91713c973cf2d4d1a239cb196df2121cb73
+  metadata.gz: 93621889290a4d5ae72cf0bac8ee20b1bb4abce8c148aa0a31caa7a8620aaf3d4ff1d0a4662666488877e171f58403e530be1a507bb890aaed1dc592df1b9965
+  data.tar.gz: afca4711b754be1d06a17ece479feb817305019985a60e4ec3d6092890c81676ffab620b246c580bdaef57be03ca4e6c6096397174fa01287463d46d52cd66ae

data/lib/compass/configuration.rb

@@ -99,6 +99,7 @@ module Compass
       :color_output,
       attributes_for_directory(:css, :stylesheets),
       :environment,
+      attributes_for_directory(:extensions, nil),
       :framework_path,
       attributes_for_directory(:javascripts),
       :line_comments,
@@ -110,6 +111,7 @@ module Compass
       :required_libraries,
       attributes_for_directory(:sass, nil),
       :sass_options,
+      :sourcemap,
       :sprite_engine,
     ].flatten
 

data/lib/compass/configuration/adapters.rb

@@ -35,7 +35,11 @@ module Compass
         plugin_opts.merge!(sass_options || {})
         plugin_opts[:load_paths] ||= []
         plugin_opts[:load_paths] += resolve_additional_import_paths
-        plugin_opts[:load_paths] << Compass::SpriteImporter.new
+        # TODO: When sprites are extracted to their own plugin, this
+        # TODO: will need to be extracted to there.
+        if defined?(Compass::SpriteImporter.new)
+          plugin_opts[:load_paths] << Compass::SpriteImporter.new
+        end
         plugin_opts[:full_exception] = (environment == :development)
         plugin_opts
       end
@@ -86,7 +90,11 @@ module Compass
           next p if p.respond_to?(:find_relative)
           importer.new(p.to_s)
         end
-        load_paths << Compass::SpriteImporter.new
+        # TODO: When sprites are extracted to their own plugin, this
+        # TODO: will need to be extracted to there.
+        if defined?(Compass::SpriteImporter.new)
+          load_paths << Compass::SpriteImporter.new
+        end
         load_paths
       end
 

data/lib/compass/core/generated_version.rb

@@ -1,5 +1,5 @@
 module Compass
   module Core
-    VERSION = "1.0.0.rc.1"
+    VERSION = "1.0.0"
   end
 end

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

@@ -11,6 +11,7 @@ end
   inline_image image_size constants gradient_support
   font_files   lists      colors    math
   env          cross_browser_support configuration
+  files
 ).each do |func|
   require "compass/core/sass_extensions/functions/#{func}"
 end
@@ -25,6 +26,7 @@ module Sass::Script::Functions
   include Compass::Core::SassExtensions::Functions::ImageSize
   include Compass::Core::SassExtensions::Functions::GradientSupport::Functions
   include Compass::Core::SassExtensions::Functions::FontFiles
+  include Compass::Core::SassExtensions::Functions::Files
   include Compass::Core::SassExtensions::Functions::Constants
   include Compass::Core::SassExtensions::Functions::Lists
   include Compass::Core::SassExtensions::Functions::Colors

data/lib/compass/core/sass_extensions/functions/configuration.rb

@@ -85,9 +85,10 @@ module Compass::Core::SassExtensions::Functions::Configuration
 
   OPTION_TRANSFORMER = Hash.new() {|h, k| proc {|v, ctx| v.value } }
   OPTION_TRANSFORMER[:asset_cache_buster] = proc do |v, ctx|
-    proc do |file|
+    proc do |url, file|
       if ctx.environment.function(v.value) || Sass::Script::Functions.callable?(v.value.tr('-', '_'))
-        result = ctx.call(v, ctx.quoted_string(file))
+        result = ctx.call(v, ctx.quoted_string(url),
+                             file.nil? ? ctx.null() : ctx.quoted_string(file.path))
         case result
         when Sass::Script::Value::String, Sass::Script::Value::Null
           result.value

data/lib/compass/core/sass_extensions/functions/cross_browser_support.rb

@@ -35,7 +35,7 @@ module Compass::Core::SassExtensions::Functions::CrossBrowserSupport
     bool(needed)
   end
 
-  %w(webkit moz o ms svg css2).each do |prefix|
+  %w(webkit moz o ms svg css2 owg).each do |prefix|
     class_eval <<-RUBY, __FILE__, __LINE__ + 1
       # Syntactic sugar to apply the given prefix
       # -moz($arg) is the same as calling prefix(-moz, $arg)

data/lib/compass/core/sass_extensions/functions/files.rb

@@ -0,0 +1,33 @@
+require 'digest/md5'
+
+module Compass::Core::SassExtensions::Functions::Files
+  extend Compass::Core::SassExtensions::Functions::SassDeclarationHelper
+  extend Sass::Script::Value::Helpers
+
+  def md5sum(file, format = nil)
+    assert_type file, :String
+    filename = nil
+    if options[:css_filename] && File.exists?(options[:css_filename])
+      filename = File.expand_path(file.value, File.dirname(options[:css_filename]))
+    elsif Pathname.new(file.value).absolute?
+      filename = file.value
+    end
+    if filename && File.exist?(filename)
+      assert_type file, :String if format
+      digest = Digest::MD5.new()
+      digest << File.read(filename)
+      if !format || format.value == "hex"
+        unquoted_string(digest.hexdigest)
+      elsif format && format.value == "integer"
+        number(digest.hexdigest.hex)
+      elsif format
+        raise Sass::SyntaxError, "Unknown format '#{format}' for md5sum"
+      end
+    else
+      raise Sass::SyntaxError, "File not found: #{file}"
+    end
+  end
+  declare :md5sum, [:file]
+  declare :md5sum, [:file, :format]
+end
+

data/lib/compass/core/sass_extensions/functions/gradient_support.rb

@@ -296,7 +296,16 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     def to_s_prefixed(options = self.options)
       to_s(options)
     end
-    
+
+    def supports?(aspect)
+      # I don't know how to support radial old webkit gradients (owg)
+      if %w(owg).include?(aspect)
+        false
+      else
+        super
+      end
+    end
+
     standardized_prefix :webkit
     standardized_prefix :moz
 
@@ -418,14 +427,27 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
       # I don't know how to support degree-based gradients in old webkit gradients (owg) or svg so we just disable them.
       if %w(owg).include?(aspect) && position_or_angle.is_a?(Sass::Script::Value::Number) && position_or_angle.numerator_units.include?("deg")
         false
-      elsif aspect == "svg" && color_stops.value.any?{|cs| cs.stop.is_a?(Sass::Script::Value::String) }
-        # calc expressions cannot be represented in svg
+      elsif %w(owg svg).include?(aspect) && color_stops.value.any?{|cs| cs.stop.is_a?(Sass::Script::Value::String) }
+        # calc expressions cannot be represented in svg or owg
         false
       else
         super
       end
     end
 
+    # Output the original webkit gradient syntax
+    def to_owg(options = self.options)
+      position_list = reverse_side_or_corner(position_or_angle)
+
+      start_point = grad_point(position_list)
+      args = []
+      args << start_point
+      args << linear_end_position(position_list, start_point, color_stops.value.last.stop)
+      args << grad_color_stops(color_stops)
+      args.each{|a| a.options = options}
+      Sass::Script::String.new("-webkit-gradient(linear, #{args.join(', ')})")
+    end
+
     def to_svg(options = self.options)
       linear_svg_gradient(color_stops, position_or_angle || identifier("top"))
     end
@@ -438,6 +460,24 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
   module Functions
     include Sass::Script::Value::Helpers
 
+    def reverse_side_or_corner(position)
+      position_array = position.nil? ? [identifier('top')] : position.value.dup
+      if position_array.first == identifier('to')
+        # Remove the 'to' element from the array
+        position_array.shift
+
+        # Reverse all the positions
+        reversed_position = position_array.map do |pos|
+          opposite_position(pos)
+        end
+      else
+        # When the position does not have the 'to' element we don't need to
+        # reverse the direction of the gradient
+        reversed_position = position_array
+      end
+      opts(list(reversed_position, :space))
+    end
+
     def convert_angle_from_offical(deg)
       if deg.is_a?(Sass::Script::Value::Number)
         return number((deg.value.to_f - 450).abs % 360, 'deg')
@@ -582,7 +622,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     # returns color-stop() calls for use in webkit.
     def grad_color_stops(color_list)
       stops = color_stops_in_percentages(color_list).map do |stop, color|
-        "color-stop(#{stop.inspect}, #{ColorStop.color_to_s(color)})"
+        Sass::Script::String.new("color-stop(#{stop.to_s}, #{ColorStop.color_to_s(color)})")
       end
       opts(list(stops, :comma))
     end
@@ -607,19 +647,23 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     end
 
     # only used for webkit
-    def linear_end_position(position_or_angle, color_list)
-      start_point = grad_point(position_or_angle || identifier("top"))
-      end_point = grad_point(opposite_position(position_or_angle || identifier("top")))
-      end_target = color_list.value.last.stop
+    def linear_end_position(position_or_angle, start_point, end_target)
+      end_point = grad_point(opposite_position(position_or_angle))
 
-      if color_list.value.last.stop && color_list.value.last.stop.numerator_units == ["px"]
-        new_end = color_list.value.last.stop.value
+      if end_target && end_target.numerator_units == ["px"]
         if start_point.value.first == end_point.value.first && start_point.value.last.value == 0
           # this means top-to-bottom
-          end_point.value[1] = number(end_target.value)
+          new_end_point = end_point.value.dup
+          new_end_point[1] = number(end_target.value)
+
+          end_point = opts(list(new_end_point, end_point.separator))
         elsif start_point.value.last == end_point.value.last && start_point.value.first.value == 0
           # this implies left-to-right
-          end_point.value[0] = number(end_target.value)
+
+          new_end_point = end_point.value.dup
+          new_end_point[0] = number(end_target.value)
+
+          end_point = opts(list(new_end_point, end_point.separator))
         end
       end
       end_point
@@ -750,7 +794,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
         arg.all?{|a| color_stop?(a)} ? arg : nil
       end
     end
-    
+
     def linear_svg(color_stops, x1, y1, x2, y2)
       gradient = %Q{<linearGradient id="grad" gradientUnits="objectBoundingBox" x1="#{x1}" y1="#{y1}" x2="#{x2}" y2="#{y2}">#{color_stops_svg(color_stops)}</linearGradient>}
       svg(gradient)

data/lib/compass/core/sass_extensions/monkey_patches/browser_support.rb

@@ -69,7 +69,7 @@ module Sass::Script
       "#{name}(#{args.map{|a| a.to_s(options)}.join(", ")})"
     end
 
-    %w(webkit moz o ms svg css2).each do |prefix|
+    %w(webkit moz o ms svg css2 owg).each do |prefix|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def to_#{prefix}(options = self.options)
           prefixed_args = args.map do |arg|

data/stylesheets/compass/css3/_images.scss

@@ -4,6 +4,7 @@
 $gradient-support-threshold: $graceful-usage-threshold !default;
 $svg-gradient-shim-threshold: $graceful-usage-threshold !default;
 $border-image-support-threshold: $graceful-usage-threshold !default;
+$owg-threshold: $graceful-usage-threshold !default;
 
 // Compass assumes you will use the official gradient syntax,
 // unless otherwise instructed.
@@ -31,6 +32,9 @@ $use-legacy-gradient-syntax: false !default;
 // so we can shim the gradient with an inline svg file.
 $browsers-supporting-svg-but-not-gradients: (ie: "9", opera: "9.5-9.6");
 
+// These browsers require the old webkit gradient syntax
+$browsers-supporting-old-webkit-gradients: (android: ("2.1", "3"));
+
 @mixin each-gradient-prefix($values) {
   @if prefixed(-svg, $values) {
     @include for-legacy-browsers($browsers-supporting-svg-but-not-gradients,
@@ -41,6 +45,15 @@ $browsers-supporting-svg-but-not-gradients: (ie: "9", opera: "9.5-9.6");
       }
     }
   }
+  @if prefixed(-owg, $values) {
+    @include for-legacy-browsers($browsers-supporting-old-webkit-gradients,
+                                 $owg-threshold)
+    {
+      @include with-prefix(-owg) {
+        @content;
+      }
+    }
+  }
   @include with-each-prefix(css-gradients, $gradient-support-threshold) {
     @if $current-prefix {
       @if prefixed($current-prefix, $values) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Eppstein
@@ -11,68 +11,68 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: The Compass core stylesheet library and minimum required ruby extensions.
@@ -84,6 +84,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.txt
 - data/caniuse.json
 - data/caniuse_extras/css-placeholder.json
 - lib/compass-core.rb
@@ -107,6 +108,7 @@ files:
 - lib/compass/core/sass_extensions/functions/display.rb
 - lib/compass/core/sass_extensions/functions/enumerate.rb
 - lib/compass/core/sass_extensions/functions/env.rb
+- lib/compass/core/sass_extensions/functions/files.rb
 - lib/compass/core/sass_extensions/functions/font_files.rb
 - lib/compass/core/sass_extensions/functions/gradient_support.rb
 - lib/compass/core/sass_extensions/functions/image_size.rb
@@ -226,7 +228,6 @@ files:
 - templates/project/manifest.rb
 - templates/project/print.sass
 - templates/project/screen.sass
-- LICENSE.txt
 homepage: http://compass-style.org/reference/compass/
 licenses:
 - MIT
@@ -237,17 +238,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The Compass core stylesheet library