compass 0.13.alpha.2 → 0.13.alpha.3

data/test/test_helper.rb

@@ -5,19 +5,6 @@ $:.unshift(lib_dir) unless $:.include?(lib_dir)
 test_dir = File.dirname(__FILE__)
 $:.unshift(test_dir) unless $:.include?(test_dir)
 
-# allows testing with edge Haml by creating a test/haml symlink
-linked_haml = File.dirname(__FILE__) + '/haml'
-
-if File.exists?(linked_haml) && !$:.include?(linked_haml + '/lib')
-  puts "[ using linked Haml ]"
-  $:.unshift linked_haml + '/lib'
-  require 'sass'
-else
-  need_gems = true
-end
-
-require 'rubygems' if need_gems
-
 require 'compass'
 
 require 'test/unit'

data/test/units/configuration_test.rb

@@ -53,6 +53,18 @@ class ConfigurationTest < Test::Unit::TestCase
     assert_correct expected_lines, actual_lines
   end
 
+  def test_custom_watch
+    contents = StringIO.new(<<-CONFIG)
+      watch 'img/**/*' do
+        puts 'foobar'
+      end
+    CONFIG
+    Compass.add_configuration(contents, 'test_watch_config')
+    watch = Compass.configuration.watches.first
+    assert_equal 'img/**/*', watch.glob
+    assert watch.is_a?(Compass::Watcher::Watch)
+  end
+
   def test_serialization_warns_with_asset_host_set
     contents = StringIO.new(<<-CONFIG)
       asset_host do |path|

data/test/units/regressions_test.rb

@@ -4,12 +4,16 @@ require 'compass/exec'
 require 'stringio'
 
 class RegressionsTest < Test::Unit::TestCase
+  include SpriteHelper
   include Compass::CommandLineHelper
-  setup do
+
+  def setup
+    create_sprite_temp
     Compass.reset_configuration!
   end
   
-  after do
+  def teardown
+    clean_up_sprites
     Compass.reset_configuration!
   end
 
@@ -18,12 +22,8 @@ class RegressionsTest < Test::Unit::TestCase
       compass "create --bare issue911"
       FileUtils.mkdir_p "issue911/images/sprites/a"
       FileUtils.mkdir_p "issue911/images/sprites/b"
-      open "issue911/images/sprites/a/foo.png", "wb" do |f|
-        f.write(Compass::PNG.new(5,10, [255,0,255]).to_blob)
-      end
-      open "issue911/images/sprites/b/bar.png", "wb" do |f|
-        f.write(Compass::PNG.new(5,10, [255,255,0]).to_blob)
-      end
+      FileUtils.cp File.join(@images_tmp_path, 'nested/squares/ten-by-ten.png'), "issue911/images/sprites/a/foo.png"
+      FileUtils.cp File.join(@images_tmp_path, 'nested/squares/ten-by-ten.png'), "issue911/images/sprites/a/bar.png"
       Dir.chdir "issue911" do
         result = compile_for_project(<<-SCSS)
           @import "sprites/**/*.png";

data/test/units/sass_extenstions/gradients_test.rb

@@ -0,0 +1,33 @@
+class GradientTestClass
+  extend Compass::SassExtensions::Functions::Constants
+  extend Compass::SassExtensions::Functions::GradientSupport::Functions
+end
+
+require 'test_helper'
+require 'compass'
+
+class GradientsTest < Test::Unit::TestCase
+  
+  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']))
+  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)]))
+    end
+  end
+
+end

data/test/units/sprites/layout_test.rb

@@ -44,11 +44,11 @@ class LayoutTest < Test::Unit::TestCase
     sprite_map_test(opts)
   end
 
-  def horizontal(options= {})
+  def horizontal(options= {}, uri=URI)
     opts = @options.merge("layout" => Sass::Script::String.new('horizontal'))
     opts.merge!(options)
 
-    sprite_map_test(opts)
+    sprite_map_test(opts, uri)
   end
 
   # REPEAT_X
@@ -155,10 +155,19 @@ class LayoutTest < Test::Unit::TestCase
     assert_equal [0, 0, 0, 0], base.images.map(&:top)
     assert_equal 80, base.width
   end
+
+  it "should layout horizontaly with spacing and and position" do
+    base = horizontal({"spacing" => Sass::Script::Number.new(10, ['px']), "position" => Sass::Script::Number.new(50, ['%'])}, 'squares/*.png')
+    assert_equal [0, 20], base.images.map(&:left)
+    assert_equal [5, 0], base.images.map(&:top)
+    assert_equal 50, base.width
+  end
   
   it "should layout horizontaly with position" do
     base = horizontal("selectors_ten_by_ten_active_position" => Sass::Script::Number.new(10, ['px']))
     assert_equal [0, 10, 0, 0], base.images.map(&:top)
+    assert_equal 40, base.width
+    assert_equal 20, base.height
   end
   
   it "should generate a horrizontal sprite" do

data/test/units/watcher/project_watcher_test.rb

@@ -15,6 +15,14 @@ class ProjectWatcherTest < Test::Unit::TestCase
 
   test "should initalize correctly" do
     assert @project_watcher.listener.is_a?(Listen::Listener)
+    assert_equal 2, @project_watcher.sass_watchers.size
+  end
+
+  test "should have 3 watchers" do
+    Dir.chdir File.join(@working_path, 'sass') do
+      @project_watcher = Compass::Watcher::ProjectWatcher.new(Dir.pwd)
+      assert_equal 3, @project_watcher.sass_watchers.size
+    end
   end
 
   test "compiler" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass
 version: !ruby/object:Gem::Version
-  version: 0.13.alpha.2
+  version: 0.13.alpha.3
   prerelease: 5
 platform: ruby
 authors:
@@ -14,22 +14,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70305747639000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0.alpha.93
+        version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70305747639000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: chunky_png
-  requirement: &70305747638360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,18 +42,28 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70305747638360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: listen
-  requirement: &70305747637900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - <=
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.9.9
   type: :runtime
   prerelease: false
-  version_requirements: *70305747637900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 0.9.9
 description: Compass is a Sass-based Stylesheet Framework that streamlines the creation
   and maintenance of CSS.
 email: chris@eppsteins.net
@@ -553,7 +568,6 @@ files:
 - lib/compass/commands/create_project.rb
 - lib/compass/commands/default.rb
 - lib/compass/commands/extension_command.rb
-- lib/compass/commands/generate_grid_background.rb
 - lib/compass/commands/help.rb
 - lib/compass/commands/imports.rb
 - lib/compass/commands/installer_command.rb
@@ -593,7 +607,6 @@ files:
 - lib/compass/exec/switch_ui.rb
 - lib/compass/exec.rb
 - lib/compass/frameworks.rb
-- lib/compass/grid_builder.rb
 - lib/compass/installers/bare_installer.rb
 - lib/compass/installers/base.rb
 - lib/compass/installers/manifest.rb
@@ -618,6 +631,7 @@ files:
 - lib/compass/sass_extensions/functions/selectors.rb
 - lib/compass/sass_extensions/functions/sprites.rb
 - lib/compass/sass_extensions/functions/urls.rb
+- lib/compass/sass_extensions/functions/utility.rb
 - lib/compass/sass_extensions/functions.rb
 - lib/compass/sass_extensions/monkey_patches/browser_support.rb
 - lib/compass/sass_extensions/monkey_patches/traversal.rb
@@ -1066,11 +1080,11 @@ files:
 - test/units/actions_test.rb
 - test/units/command_line_test.rb
 - test/units/compass_module_test.rb
-- test/units/compass_png_test.rb
 - test/units/compiler_test.rb
 - test/units/configuration_test.rb
 - test/units/regressions_test.rb
 - test/units/sass_extensions_test.rb
+- test/units/sass_extenstions/gradients_test.rb
 - test/units/sprites/engine_test.rb
 - test/units/sprites/image_row_test.rb
 - test/units/sprites/image_test.rb
@@ -1107,7 +1121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A Real Stylesheet Framework
@@ -1526,11 +1540,11 @@ test_files:
 - test/units/actions_test.rb
 - test/units/command_line_test.rb
 - test/units/compass_module_test.rb
-- test/units/compass_png_test.rb
 - test/units/compiler_test.rb
 - test/units/configuration_test.rb
 - test/units/regressions_test.rb
 - test/units/sass_extensions_test.rb
+- test/units/sass_extenstions/gradients_test.rb
 - test/units/sprites/engine_test.rb
 - test/units/sprites/image_row_test.rb
 - test/units/sprites/image_test.rb

data/lib/compass/commands/generate_grid_background.rb

@@ -1,96 +0,0 @@
-require 'compass/commands/project_base'
-require 'compass/commands/update_project'
-require 'compass/grid_builder'
-
-module Compass
-  module Commands
-    module GridBackgroundOptionsParser
-      def set_options(opts)
-        banner = %Q{Usage: compass grid-img W+GxH [path/to/grid.png]
-
-Description:
-  Generates a background image that can be used to check grid alignment.
-
-  Height is optional and defaults to 20px
-
-  By default, the image generated will be named "grid.png"
-  and be found in the images directory.
-
-  Unless you need to check layouts in legacy browsers, it's preferable
-  to use the pure CSS3-based grid background mixin:
-
-  http://compass-style.org/reference/compass/layout/grid_background/
-
-Examples:
-
-  compass grid-img 40+10 # 40px column, 10px gutter, 20px height
-  compass grid-img 40+20x28 # 40px column, 20px gutter, 28px height
-  compass grid-img 60+20x28 images/wide_grid.png
-
-Options:
-}
-        opts.banner = banner
-
-        super
-      end
-    end
-    class GenerateGridBackground < ProjectBase
-
-      include Actions
-
-      register :"grid-img"
-
-      class << self
-        def option_parser(arguments)
-          parser = Compass::Exec::CommandOptionParser.new(arguments)
-          parser.extend(Compass::Exec::GlobalOptionsParser)
-          parser.extend(GridBackgroundOptionsParser)
-        end
-
-        def usage
-          option_parser([]).to_s
-        end
-
-        def description(command)
-          "Generates a grid background image."
-        end
-
-        def parse!(arguments)
-          parser = option_parser(arguments)
-          parser.parse!
-          if arguments.size == 0
-            raise OptionParser::ParseError, "Please specify the grid dimensions."
-          end
-          parser.options[:grid_dimensions] = arguments.shift
-          parser.options[:grid_filename] = arguments.shift
-          parser.options
-        end
-      end
-      def initialize(working_path, options)
-        super
-        assert_project_directory_exists!
-        Compass.add_configuration(options, 'command_line')
-      end
-
-      def perform
-        unless options[:grid_dimensions] =~ /^(\d+)\+(\d+)(?:x(\d+))?$/
-          puts "ERROR: '#{options[:grid_dimensions]}' is not valid."
-          puts "Dimensions should be specified like: 30+10x20"
-          puts "where 30 is the column width, 10 is the gutter width, and 20 is the (optional) height."
-          return
-        end
-        logger.yellow do
-          $stderr.puts "Unless you need to check layouts in legacy browsers, it's preferable"
-          $stderr.puts "to use the pure CSS3-based grid background mixin:"
-          $stderr.puts
-          $stderr.puts "http://compass-style.org/reference/compass/layout/grid_background/"
-        end
-        column_width = $1.to_i
-        gutter_width = $2.to_i
-        height = $3.to_i if $3
-        filename = options[:grid_filename] || projectize("#{project_images_subdirectory}/grid.png")
-        GridBuilder.new(options.merge(:column_width => column_width, :gutter_width => gutter_width, :height => height, :filename => filename, :working_path => self.working_path)).generate!
-      end
-    end
-  end
-end

data/lib/compass/grid_builder.rb

@@ -1,102 +0,0 @@
-require 'zlib'
-
-module Compass
-
-  # A simple class to represent and create a PNG-File
-  # No drawing features given
-  # Just subclass and write [R,G,B]-Byte-Values into the <tt>@data</tt> matrix
-  # Build for compactness, so not much error checking!
-  #
-  # Code based on seattlerb's png, see http://seattlerb.rubyforge.org/png/
-  class PNG
-    CRC_TABLE = (0..255).map do |n|
-      (0...8).inject(n){|x,i| x = ((x & 1) == 1) ? 0xedb88320 ^ (x >> 1) : x >> 1}
-    end
-
-    class << self
-      def crc(chunkdata='')
-        chunkdata.unpack('C*').inject(0xffffffff){|crc, byte| CRC_TABLE[(crc ^ byte)  & 0xff] ^ (crc >> 8) } ^  0xffffffff
-      end
-
-      def chunk(type, data="")
-        [data.size, type, data, crc(type + data)].pack("Na*a*N")
-      end
-    end
-
-    # Initiates a new PNG-Object
-    # * <tt>width</tt>: Width of the image in pixels
-    # * <tt>height</tt>: Height of the image in pixels
-    # * <tt>background</tt>: Background-color represented as [R,G,B]-Byte-Array
-    def initialize(width, height, background = [255,255,255])
-      @height = height
-      @width = width
-      @data = Array.new(@height) { |x| Array.new(@width, background) }
-    end
-
-    BITS    = 8
-    RGB     = 2 # Color Types ( RGBA = 6)
-    NONE    = 0 # Filter
-
-    # binary representation of the PNG, write to file with binary mode
-    def to_blob
-      blob = []
-      blob <<  [137, 80, 78, 71, 13, 10, 26, 10].pack("C*")
-      blob << PNG.chunk('IHDR', [@width, @height, BITS, RGB, NONE, NONE, NONE].pack("N2C5"))
-      blob << PNG.chunk('IDAT', Zlib::Deflate.deflate(self.png_join))
-      blob << PNG.chunk('IEND', '')
-      blob.join
-    end
-
-    def png_join
-      @data.map { |row| "\0" + row.map { |p| "%c%c%c" % p}.join }.join
-    end
-  end
-
-  class GridBuilder < PNG
-    include Actions
-
-    attr_reader :column_width, :gutter_width, :filename, :able_to_generate, :options
-
-    # ==== Options
-    # * <tt>options</tt>
-    #   * <tt>:column_width</tt> -- Width (in pixels) of current grid column
-    #   * <tt>:gutter_width</tt> -- Width (in pixels) of current grid gutter
-    #   * <tt>:height</tt> -- Height (in pixels) of a row
-    #   * <tt>:filename</tt> -- Output path of grid.png file
-    def initialize(options={})
-      @column_width = options[:column_width] || 0
-      gutter_width = options[:gutter_width] || 0
-
-      height = options[:height] || 20
-      width = @column_width + gutter_width
-      width = 10 if width == 0
-
-      @filename = options[:filename]
-      @options = options
-
-      super(width, height, [0xe9,0xe9,0xe9])
-    end
-
-    def working_path
-      options[:working_path]
-    end
-
-    # generates (overwriting if necessary) grid.png image to be tiled in background
-    def generate!
-      (0...@height-1).each do |line|
-        @data[line] = Array.new(@width){|x| x < @column_width ? [0xe8, 0xef, 0xfb] : [0xff,0xff,0xff] }
-      end
-
-      if File.exists?(filename)
-        if options[:force]
-          overwrite = true
-        else
-          msg = "#{filename} already exists. Overwrite with --force."
-          raise Compass::FilesystemConflict.new(msg)
-        end
-      end
-      directory File.dirname(filename)
-      write_file(filename, self.to_blob, options, true)
-    end
-  end
-end