compass 0.12.alpha.4 → 0.12.rc.0

data/lib/compass/configuration/serialization.rb

@@ -16,13 +16,19 @@ module Compass
         end
       end
 
+      def get_binding
+        binding
+      end
       def parse_string(contents, filename)
-        bind = binding
+        bind = get_binding
         eval(contents, bind, filename)
-        ATTRIBUTES.each do |prop|
-          value = eval(prop.to_s, bind) rescue nil
-          value = value.to_s if value.is_a?(Pathname)
-          self.send("#{prop}=", value) unless value.nil?
+        local_vars_set = eval("local_variables", bind)
+        local_vars_set.each do |local_var|
+          if (ATTRIBUTES+ARRAY_ATTRIBUTES).include?(local_var.to_sym)
+            value = eval(local_var.to_s, bind)
+            value = value.to_s if value.is_a?(Pathname)
+            self.send("#{local_var}=", value)
+          end
         end
         if @added_import_paths
           self.additional_import_paths ||= []
@@ -45,7 +51,7 @@ module Compass
         end
         contents << "# Require any additional compass plugins here.\n"
         contents << "\n" if (required_libraries || []).any?
-        ATTRIBUTES.each do |prop|
+        (ATTRIBUTES + ARRAY_ATTRIBUTES).each do |prop|
           value = send("#{prop}_without_default")
           if value.is_a?(Proc)
             $stderr.puts "WARNING: #{prop} is code and cannot be written to a file. You'll need to copy it yourself."
@@ -64,7 +70,11 @@ module Compass
       end
 
       def serialize_property(prop, value)
-        %Q(#{prop} = #{value.inspect}\n)
+        if value.respond_to?(:serialize_to_config)
+          value.serialize_to_config(prop) + "\n"
+        else
+          %Q(#{prop} = #{value.inspect}\n)
+        end
       end
 
       def issue_deprecation_warnings

data/lib/compass/errors.rb

@@ -7,4 +7,5 @@ module Compass
 
   class MissingDependency < Error
   end
+  class SpriteException < Error; end
 end

data/lib/compass/installers/manifest.rb

@@ -141,11 +141,16 @@ module Compass
       # evaluated in a Manifest instance context
       def parse(manifest_file)
         with_manifest(manifest_file) do
-          open(manifest_file) do |f|
-            eval(f.read, instance_binding, manifest_file)
-          end
-        end
-      end
+          if File.exists?(manifest_file)
+            open(manifest_file) do |f| 
+              eval(f.read, instance_binding, manifest_file)
+            end 
+          else
+              eval("discover :all", instance_binding, manifest_file)
+          end 
+        end 
+      end 
+
 
       def instance_binding
         binding

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

@@ -7,6 +7,7 @@ module Compass::SassExtensions::Functions::Display
                   datalist dfn em embed font i img input keygen kbd label mark meter output
                   progress q rp rt ruby s samp select small span strike strong sub
                   sup textarea time tt u var video wbr},
+    :"inline-block" => %w{img},
     :table => %w{table},
     :"list-item" => %w{li},
     :"table-row-group" => %w{tbody},

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

@@ -19,7 +19,7 @@ module Compass::SassExtensions::Functions::Trig
   private
   def trig(operation, number)
     if number.numerator_units == ["deg"] && number.denominator_units == []
-      Sass::Script::Number.new(Math.send(operation, (number.value * Math::PI / 180)))
+      Sass::Script::Number.new(Math.send(operation, Math::PI * number.value / 180))
     else
       Sass::Script::Number.new(Math.send(operation, number.value), number.numerator_units, number.denominator_units)
     end

data/lib/compass/sass_extensions/sprites.rb

@@ -2,7 +2,6 @@ require 'digest/md5'
 require 'compass/sprite_importer'
 
 module Compass
-  class SpriteException < Exception; end
   module SassExtensions
     module Sprites
     end

data/lib/compass/sass_extensions/sprites/image.rb

@@ -26,7 +26,7 @@ module Compass
         end
         
         def find_file
-          Compass.configuration.sprite_load_path.each do |path|
+          Compass.configuration.sprite_load_path.compact.each do |path|
             f = File.join(path, relative_file)
             if File.exists?(f)
               return f

data/lib/compass/sprite_importer.rb

@@ -74,11 +74,14 @@ module Compass
     
     # Returns the Glob of image files for the uri
     def self.files(uri)
-      Compass.configuration.sprite_load_path.each do |folder|
+      Compass.configuration.sprite_load_path.compact.each do |folder|
         files = Dir[File.join(folder, uri)].sort
         next if files.empty?
         return files
       end
+
+      path = Compass.configuration.sprite_load_path.to_a.join(', ')
+      raise Compass::SpriteException, %Q{No files were found in the load path matching "#{uri}". Your current load paths are: #{path}}
     end
 
     # Returns an Array of image names without the file extension

data/test/fixtures/stylesheets/compass/css/background-clip.css

@@ -0,0 +1,10 @@
+.background-clip {
+  -webkit-background-clip: border;
+  -moz-background-clip: border;
+  background-clip: border-box; }
+
+.background-clip-khtml {
+  -webkit-background-clip: border;
+  -moz-background-clip: border;
+  -khtml-background-clip: border-box;
+  background-clip: border-box; }

data/test/fixtures/stylesheets/compass/css/fonts.css

@@ -1,4 +1,4 @@
 @font-face {
   font-family: "font1";
   src: url('/tmp/fonts/font1.eot');
-  src: url('/tmp/fonts/font1.eot?iefix') format('eot'), url('/tmp/fonts/font1.woff') format('woff'); }
+  src: url('/tmp/fonts/font1.eot?#iefix') format('eot'), url('/tmp/fonts/font1.woff') format('woff'); }

data/test/fixtures/stylesheets/compass/sass/background-clip.scss

@@ -0,0 +1,8 @@
+@import "compass/css3/background-clip";
+
+.background-clip { @include background-clip('border-box'); }
+
+.background-clip-khtml { 
+  $experimental-support-for-khtml:true;
+  @include background-clip('border-box');
+}

data/test/test_helper.rb

@@ -46,8 +46,8 @@ module SpriteHelper
   URI = "selectors/*.png"
   
   def init_sprite_helper
-    @images_src_path = File.join(File.dirname(__FILE__), 'fixtures', 'sprites', 'public', 'images')
-    @images_tmp_path = File.join(File.dirname(__FILE__), 'fixtures', 'sprites', 'public', 'images-tmp')
+    @images_src_path = File.join(File.expand_path('../', __FILE__), 'fixtures', 'sprites', 'public', 'images')
+    @images_tmp_path = File.join(File.expand_path('../', __FILE__), 'fixtures', 'sprites', 'public', 'images-tmp')
   end
   
   def sprite_map_test(options, uri = URI)

data/test/units/compiler_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+require 'fileutils'
+
+class CompilerTest < Test::Unit::TestCase
+  
+  it "should strip css from file name and reappend" do
+    compiler = Compass::Compiler.new(Dir.pwd, 'foo', 'bar', {})
+    assert_equal 'screen', compiler.stylesheet_name(File.join(Dir.pwd, 'foo', 'screen.css.scss'))
+  end
+
+end

data/test/units/configuration_test.rb

@@ -68,6 +68,96 @@ class ConfigurationTest < Test::Unit::TestCase
     assert_equal "WARNING: asset_host is code and cannot be written to a file. You'll need to copy it yourself.\n", warning
   end
 
+  class TestData < Compass::Configuration::Data
+    def initialize
+      super(:test)
+    end
+    inherited_array :stuff
+  end
+
+  def test_inherited_array_can_clobber
+    data1 = TestData.new
+    data1.stuff = [:a]
+    data2 = TestData.new
+    data2.stuff = [:b]
+    data2.inherit_from!(data1)
+    assert_equal [:b], data2.stuff.to_a
+  end
+
+  def test_inherited_array_can_append
+    data1 = TestData.new
+    data1.stuff = [:a]
+    data2 = TestData.new
+    data2.stuff << :b
+    data2.inherit_from!(data1)
+    assert_equal [:b, :a], data2.stuff.to_a
+  end
+
+  def test_inherited_array_can_append_2
+    data1 = TestData.new
+    data1.stuff = [:a]
+    data2 = TestData.new
+    data2.stuff << :b
+    data2.inherit_from!(data1)
+    data3 = TestData.new
+    data3.stuff << :c
+    data3.inherit_from!(data2)
+    assert_equal [:c, :b, :a], data3.stuff.to_a
+  end
+
+  def test_inherited_array_can_remove
+    data1 = TestData.new
+    data1.stuff = [:a]
+    data2 = TestData.new
+    data2.stuff >> :a
+    data2.inherit_from!(data1)
+    assert_equal [], data2.stuff.to_a
+  end
+
+  def test_inherited_array_combined_augmentations
+    data1 = TestData.new
+    data1.stuff = [:a]
+    data2 = TestData.new
+    data2.stuff >> :a
+    data2.stuff << :b
+    data2.inherit_from!(data1)
+    assert_equal [:b], data2.stuff.to_a
+  end
+
+  def test_inherited_array_long_methods
+    data1 = TestData.new
+    data1.stuff = [:a]
+    data2 = TestData.new
+    data2.remove_from_stuff(:a)
+    data2.add_to_stuff(:b)
+    data2.inherit_from!(data1)
+    assert_equal [:b], data2.stuff.to_a
+  end
+
+  def test_inherited_array_augmentations_can_be_clobbered
+    data1 = TestData.new
+    data1.stuff = [:a]
+    data2 = TestData.new
+    data2.stuff >> :a
+    data2.stuff << :b
+    data2.stuff = [:c]
+    data2.inherit_from!(data1)
+    assert_equal [:c], data2.stuff.to_a
+  end
+
+  def test_inherited_array_augmentations_after_clobbering
+    data1 = TestData.new
+    data1.stuff = [:a]
+    data2 = TestData.new
+    data2.stuff >> :a
+    data2.stuff << :b
+    data2.stuff = [:c, :d]
+    data2.stuff << :e
+    data2.stuff >> :c
+    data2.inherit_from!(data1)
+    assert_equal [:d, :e], data2.stuff.to_a
+  end
+
   def test_serialization_warns_with_asset_cache_buster_set
     contents = StringIO.new(<<-CONFIG)
       asset_cache_buster do |path|
@@ -77,12 +167,36 @@ class ConfigurationTest < Test::Unit::TestCase
 
     Compass.add_configuration(contents, "test_serialization_warns_with_asset_cache_buster_set")
 
+    assert_kind_of Proc, Compass.configuration.asset_cache_buster_without_default
+    assert_equal "http://example.com", Compass.configuration.asset_cache_buster_without_default.call("whatever")
     warning = capture_warning do
       Compass.configuration.serialize
     end
     assert_equal "WARNING: asset_cache_buster is code and cannot be written to a file. You'll need to copy it yourself.\n", warning
   end
 
+  def test_inherited_arrays_augmentations_serialize
+    inherited = TestData.new
+    inherited.stuff << :a
+    d = TestData.new
+    d.stuff << :b
+    d.stuff >> :c
+    assert_equal <<CONFIG, d.serialize_property(:stuff, d.stuff)
+stuff << :b
+stuff >> :c
+CONFIG
+  end
+  def test_inherited_arrays_clobbering_with_augmentations_serialize
+    inherited = TestData.new
+    inherited.stuff << :a
+    d = TestData.new
+    d.stuff << :b
+    d.stuff = [:c, :d]
+    d.stuff << :e
+    assert_equal <<CONFIG, d.serialize_property(:stuff, d.stuff)
+stuff = [:c, :d, :e]
+CONFIG
+  end
   def test_additional_import_paths
     contents = StringIO.new(<<-CONFIG)
       http_path = "/"
@@ -190,6 +304,36 @@ http_path = \"/\"
 # To disable debugging comments that display the original location of your selectors. Uncomment:
 # line_comments = false
 
+EXPECTED
+
+      assert_correct(expected_serialization, Compass.configuration.serialize)
+    end
+
+    def test_sprite_load_path_clobbers
+      contents = StringIO.new(<<-CONFIG)
+        sprite_load_path = ["/Users/chris/Projects/my_compass_project/images/sprites"]
+      CONFIG
+
+      Compass.add_configuration(contents, "test_sass_options")
+
+      assert_equal ["/Users/chris/Projects/my_compass_project/images/sprites"], Compass.configuration.sprite_load_path.to_a
+
+      expected_serialization = <<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
+
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+# line_comments = false
+
+sprite_load_path = ["/Users/chris/Projects/my_compass_project/images/sprites"]
 EXPECTED
 
       assert_correct(expected_serialization, Compass.configuration.serialize)

data/test/units/sprites/sprite_command_test.rb

@@ -11,14 +11,15 @@ class SpriteCommandTest < Test::Unit::TestCase
     @before_dir = ::Dir.pwd
     create_temp_cli_dir
     create_sprite_temp
-    File.open(File.join(@test_dir, 'config.rb'), 'w') do |f|
+    @config_file = File.join(@test_dir, 'config.rb')
+    File.open(@config_file, 'w') do |f|
       f << config_data
     end
   end
   
   def config_data
     return <<-CONFIG
-      images_path = #{@images_tmp_path.inspect}
+      images_path = "#{@images_tmp_path}"
     CONFIG
   end
 
@@ -47,7 +48,7 @@ class SpriteCommandTest < Test::Unit::TestCase
   end
 
   it "should create sprite file" do
-    assert_equal 0, run_compass_with_options(['sprite', "-f", 'stylesheet.scss', "'#{@images_tmp_path}/*.png'"]).to_i
+    assert_equal 0, run_compass_with_options(['sprite', "-f", 'stylesheet.scss', "squares/*.png"]).to_i
     assert File.exists?(File.join(test_dir, 'stylesheet.scss'))
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: compass
 version: !ruby/object:Gem::Version 
-  hash: -3702664252
+  hash: 15424133
   prerelease: 5
   segments: 
   - 0
   - 12
-  - alpha
-  - 4
-  version: 0.12.alpha.4
+  - rc
+  - 0
+  version: 0.12.rc.0
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 -08:00
+date: 2012-01-31 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -149,7 +149,6 @@ files:
 - examples/compass/bootstrap.rb
 - examples/compass/clean.rb
 - examples/compass/compass.html.haml
-- examples/compass/compass_app_log.txt
 - examples/compass/config.rb
 - examples/compass/headers.txt
 - examples/compass/images/blue_arrow.gif
@@ -621,25 +620,9 @@ files:
 - frameworks/compass/templates/project/USAGE.markdown
 - lib/compass/actions.rb
 - lib/compass/actions.rbc
-- lib/compass/app_integration/merb/runtime.rb
-- lib/compass/app_integration/merb.rb
 - lib/compass/app_integration/merb.rbc
-- lib/compass/app_integration/rails/actionpack2x/action_controller.rb
-- lib/compass/app_integration/rails/actionpack2x/sass_plugin.rb
-- lib/compass/app_integration/rails/actionpack2x/urls.rb
-- lib/compass/app_integration/rails/actionpack2x.rb
-- lib/compass/app_integration/rails/actionpack30/railtie.rb
-- lib/compass/app_integration/rails/actionpack30.rb
-- lib/compass/app_integration/rails/actionpack31/helpers.rb
-- lib/compass/app_integration/rails/actionpack31/railtie.rb
-- lib/compass/app_integration/rails/actionpack31.rb
-- lib/compass/app_integration/rails/configuration_defaults.rb
 - lib/compass/app_integration/rails/configuration_defaults.rbc
-- lib/compass/app_integration/rails/installer.rb
 - lib/compass/app_integration/rails/installer.rbc
-- lib/compass/app_integration/rails/runtime.rb
-- lib/compass/app_integration/rails/templates/compass-install-rails.rb
-- lib/compass/app_integration/rails.rb
 - lib/compass/app_integration/rails.rbc
 - lib/compass/app_integration/stand_alone/configuration_defaults.rb
 - lib/compass/app_integration/stand_alone/configuration_defaults.rbc
@@ -677,6 +660,7 @@ files:
 - lib/compass/commands/project_base.rbc
 - lib/compass/commands/project_stats.rb
 - lib/compass/commands/project_stats.rbc
+- lib/compass/commands/project_structure.rb
 - lib/compass/commands/registry.rb
 - lib/compass/commands/registry.rbc
 - lib/compass/commands/sprite.rb
@@ -920,6 +904,7 @@ files:
 - test/fixtures/stylesheets/busted_image_urls/tmp/screen.css
 - test/fixtures/stylesheets/compass/100x150.jpg
 - test/fixtures/stylesheets/compass/config.rb
+- test/fixtures/stylesheets/compass/css/background-clip.css
 - test/fixtures/stylesheets/compass/css/border_radius.css
 - test/fixtures/stylesheets/compass/css/box-sizeing.css
 - test/fixtures/stylesheets/compass/css/box.css
@@ -1199,6 +1184,7 @@ files:
 - test/fixtures/stylesheets/compass/images/flag/zm.png
 - test/fixtures/stylesheets/compass/images/flag/zw.png
 - test/fixtures/stylesheets/compass/images/flag-s4798b5a210.png
+- test/fixtures/stylesheets/compass/sass/background-clip.scss
 - test/fixtures/stylesheets/compass/sass/border_radius.scss
 - test/fixtures/stylesheets/compass/sass/box-sizeing.scss
 - test/fixtures/stylesheets/compass/sass/box.sass
@@ -1264,11 +1250,9 @@ files:
 - test/helpers/test_case.rbc
 - test/integrations/compass_test.rb
 - test/integrations/compass_test.rbc
-- test/integrations/rails_integration_test.rb
 - test/integrations/rails_integration_test.rbc
 - test/integrations/sprites_test.rb
 - test/integrations/sprites_test.rbc
-- test/integrations/test_rails_helper.rb
 - test/test_helper.rb
 - test/test_helper.rbc
 - test/units/actions_test.rb
@@ -1277,9 +1261,9 @@ files:
 - test/units/command_line_test.rbc
 - test/units/compass_png_test.rb
 - test/units/compass_png_test.rbc
+- test/units/compiler_test.rb
 - test/units/configuration_test.rb
 - test/units/configuration_test.rbc
-- test/units/rails_configuration_test.rb
 - test/units/rails_configuration_test.rbc
 - test/units/sass_extensions_test.rb
 - test/units/sass_extensions_test.rbc
@@ -1300,7 +1284,6 @@ files:
 - test/units/sprites/sprite_map_test.rbc
 - features/command_line.feature
 - features/extensions.feature
-- features/rails_integration.feature
 - features/step_definitions/command_line_steps.rb
 - features/step_definitions/extension_steps.rb
 has_rdoc: true
@@ -1430,6 +1413,7 @@ test_files:
 - test/fixtures/stylesheets/busted_image_urls/tmp/screen.css
 - test/fixtures/stylesheets/compass/100x150.jpg
 - test/fixtures/stylesheets/compass/config.rb
+- test/fixtures/stylesheets/compass/css/background-clip.css
 - test/fixtures/stylesheets/compass/css/border_radius.css
 - test/fixtures/stylesheets/compass/css/box-sizeing.css
 - test/fixtures/stylesheets/compass/css/box.css
@@ -1709,6 +1693,7 @@ test_files:
 - test/fixtures/stylesheets/compass/images/flag/zm.png
 - test/fixtures/stylesheets/compass/images/flag/zw.png
 - test/fixtures/stylesheets/compass/images/flag-s4798b5a210.png
+- test/fixtures/stylesheets/compass/sass/background-clip.scss
 - test/fixtures/stylesheets/compass/sass/border_radius.scss
 - test/fixtures/stylesheets/compass/sass/box-sizeing.scss
 - test/fixtures/stylesheets/compass/sass/box.sass
@@ -1774,11 +1759,9 @@ test_files:
 - test/helpers/test_case.rbc
 - test/integrations/compass_test.rb
 - test/integrations/compass_test.rbc
-- test/integrations/rails_integration_test.rb
 - test/integrations/rails_integration_test.rbc
 - test/integrations/sprites_test.rb
 - test/integrations/sprites_test.rbc
-- test/integrations/test_rails_helper.rb
 - test/test_helper.rb
 - test/test_helper.rbc
 - test/units/actions_test.rb
@@ -1787,9 +1770,9 @@ test_files:
 - test/units/command_line_test.rbc
 - test/units/compass_png_test.rb
 - test/units/compass_png_test.rbc
+- test/units/compiler_test.rb
 - test/units/configuration_test.rb
 - test/units/configuration_test.rbc
-- test/units/rails_configuration_test.rb
 - test/units/rails_configuration_test.rbc
 - test/units/sass_extensions_test.rb
 - test/units/sass_extensions_test.rbc
@@ -1810,6 +1793,5 @@ test_files:
 - test/units/sprites/sprite_map_test.rbc
 - features/command_line.feature
 - features/extensions.feature
-- features/rails_integration.feature
 - features/step_definitions/command_line_steps.rb
 - features/step_definitions/extension_steps.rb