RubyGems - compass - Versions diffs - 0.11.7 → 0.12.alpha.0 - Mend

compass 0.11.7 → 0.12.alpha.0

Files changed (207) hide show

data/Rakefile +10 -0
data/VERSION.yml +4 -3
data/bin/compass +1 -5
data/features/command_line.feature +17 -17
data/features/extensions.feature +0 -6
data/features/step_definitions/command_line_steps.rb +1 -2
data/frameworks/compass/stylesheets/compass/css3/_font-face.scss +35 -5
data/frameworks/compass/stylesheets/compass/css3/_images.scss +6 -6
data/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss +3 -12
data/frameworks/compass/stylesheets/compass/typography/lists/_bullets.scss +1 -1
data/frameworks/compass/stylesheets/compass/typography/lists/_inline-block-list.scss +11 -14
data/frameworks/compass/stylesheets/compass/utilities/sprites/_base.scss +5 -5
data/frameworks/compass/templates/pie/PIE.htc +64 -83
data/lib/compass.rbc +36 -42
data/lib/compass/actions.rb +1 -0
data/lib/compass/actions.rbc +85 -244
data/lib/compass/app_integration.rbc +20 -28
data/lib/compass/app_integration/merb.rbc +4 -8
data/lib/compass/app_integration/rails.rb +22 -5
data/lib/compass/app_integration/rails.rbc +142 -658
data/lib/compass/app_integration/rails/actionpack2x.rb +10 -0
data/lib/compass/app_integration/rails/{actionpack2 → actionpack2x}/action_controller.rb +0 -0
data/lib/compass/app_integration/rails/{actionpack2 → actionpack2x}/sass_plugin.rb +0 -0
data/lib/compass/app_integration/rails/{actionpack2 → actionpack2x}/urls.rb +0 -0
data/lib/compass/app_integration/rails/actionpack30.rb +11 -0
data/lib/compass/app_integration/rails/{actionpack3 → actionpack30}/railtie.rb +0 -0
data/lib/compass/app_integration/rails/actionpack31.rb +5 -0
data/lib/compass/app_integration/rails/actionpack31/helpers.rb +5 -0
data/lib/compass/app_integration/rails/actionpack31/railtie.rb +89 -0
data/lib/compass/app_integration/rails/configuration_defaults.rb +54 -14
data/lib/compass/app_integration/rails/configuration_defaults.rbc +324 -1081
data/lib/compass/app_integration/rails/installer.rbc +61 -145
data/lib/compass/app_integration/rails/runtime.rb +6 -16
data/lib/compass/app_integration/stand_alone.rbc +15 -15
data/lib/compass/app_integration/stand_alone/configuration_defaults.rbc +23 -23
data/lib/compass/app_integration/stand_alone/installer.rbc +32 -52
data/lib/compass/browser_support.rbc +23 -35
data/lib/compass/commands/clean_project.rb +1 -1
data/lib/compass/commands/project_stats.rb +7 -7
data/lib/compass/commands/sprite.rb +4 -3
data/lib/compass/compiler.rb +2 -2
data/lib/compass/compiler.rbc +398 -591
data/lib/compass/configuration.rb +2 -0
data/lib/compass/configuration.rbc +78 -134
data/lib/compass/configuration/adapters.rbc +40 -98
data/lib/compass/configuration/comments.rb +5 -1
data/lib/compass/configuration/comments.rbc +51 -132
data/lib/compass/configuration/data.rb +26 -10
data/lib/compass/configuration/data.rbc +536 -526
data/lib/compass/configuration/defaults.rb +24 -1
data/lib/compass/configuration/defaults.rbc +187 -762
data/lib/compass/configuration/file_data.rb +0 -22
data/lib/compass/configuration/file_data.rbc +125 -37
data/lib/compass/configuration/helpers.rb +9 -8
data/lib/compass/configuration/helpers.rbc +153 -433
data/lib/compass/configuration/inheritance.rb +13 -0
data/lib/compass/configuration/inheritance.rbc +165 -412
data/lib/compass/configuration/paths.rbc +9 -9
data/lib/compass/configuration/serialization.rb +1 -0
data/lib/compass/configuration/serialization.rbc +84 -151
data/lib/compass/dependencies.rbc +4 -16
data/lib/compass/errors.rbc +5 -5
data/lib/compass/frameworks.rb +4 -10
data/lib/compass/frameworks.rbc +66 -118
data/lib/compass/quick_cache.rbc +8 -12
data/lib/compass/sass_extensions.rbc +4 -8
data/lib/compass/sass_extensions/functions.rbc +57 -90
data/lib/compass/sass_extensions/functions/colors.rbc +18 -22
data/lib/compass/sass_extensions/functions/constants.rbc +25 -45
data/lib/compass/sass_extensions/functions/cross_browser_support.rbc +36 -48
data/lib/compass/sass_extensions/functions/display.rbc +107 -341
data/lib/compass/sass_extensions/functions/enumerate.rbc +9 -9
data/lib/compass/sass_extensions/functions/font_files.rbc +125 -542
data/lib/compass/sass_extensions/functions/gradient_support.rbc +167 -379
data/lib/compass/sass_extensions/functions/image_size.rb +10 -2
data/lib/compass/sass_extensions/functions/image_size.rbc +400 -715
data/lib/compass/sass_extensions/functions/inline_image.rbc +98 -152
data/lib/compass/sass_extensions/functions/lists.rb +0 -5
data/lib/compass/sass_extensions/functions/lists.rbc +39 -75
data/lib/compass/sass_extensions/functions/selectors.rbc +28 -36
data/lib/compass/sass_extensions/functions/sprites.rb +5 -7
data/lib/compass/sass_extensions/functions/sprites.rbc +233 -255
data/lib/compass/sass_extensions/functions/trig.rb +2 -1
data/lib/compass/sass_extensions/functions/trig.rbc +51 -53
data/lib/compass/sass_extensions/functions/urls.rb +171 -80
data/lib/compass/sass_extensions/functions/urls.rbc +1051 -3158
data/lib/compass/sass_extensions/monkey_patches.rbc +5 -5
data/lib/compass/sass_extensions/monkey_patches/browser_support.rbc +47 -63
data/lib/compass/sass_extensions/monkey_patches/traversal.rbc +16 -36
data/lib/compass/sass_extensions/sprites.rb +3 -1
data/lib/compass/sass_extensions/sprites.rbc +13 -93
data/lib/compass/sass_extensions/sprites/engines.rbc +6 -615
data/lib/compass/sass_extensions/sprites/engines/chunky_png_engine.rbc +94 -260
data/lib/compass/sass_extensions/sprites/image.rb +23 -11
data/lib/compass/sass_extensions/sprites/image.rbc +313 -691
data/lib/compass/sass_extensions/sprites/image_row.rb +47 -0
data/lib/compass/sass_extensions/sprites/layout_methods.rb +117 -0
data/lib/compass/sass_extensions/sprites/row_fitter.rb +86 -0
data/lib/compass/sass_extensions/sprites/sprite_map.rb +18 -4
data/lib/compass/sass_extensions/sprites/sprite_map.rbc +3635 -708
data/lib/compass/sass_extensions/sprites/sprite_methods.rb +5 -17
data/lib/compass/sprite_importer.rb +38 -62
data/lib/compass/sprite_importer.rbc +1495 -1125
data/lib/compass/util.rbc +11 -19
data/lib/compass/version.rbc +25 -53
data/test/fixtures/sprites/public/images/image_row/large.png +0 -0
data/test/fixtures/sprites/public/images/image_row/large_square.png +0 -0
data/test/fixtures/sprites/public/images/image_row/medium.png +0 -0
data/test/fixtures/sprites/public/images/image_row/small.png +0 -0
data/test/fixtures/sprites/public/images/image_row/tall.png +0 -0
data/test/fixtures/stylesheets/compass/css/lists.css +7 -7
data/test/fixtures/stylesheets/compass/css/reset.css +1 -0
data/test/fixtures/stylesheets/compass/css/sprites.css +248 -248
data/test/fixtures/stylesheets/compass/images/flag-s8c3c755a68.png +0 -0
data/test/integrations/sprites_test.rb +115 -3
data/test/test_helper.rb +29 -1
data/test/tmp/compass_rails/public/images/selectors-sef52c5c63a.png +0 -0
data/test/units/configuration_test.rb +2 -5
data/test/units/rails_configuration_test.rb +50 -0
data/test/units/sass_extensions_test.rb +17 -5
data/test/units/sprites/image_row_test.rb +57 -0
data/test/units/sprites/image_test.rb +53 -45
data/test/units/sprites/importer_test.rb +31 -12
data/test/units/sprites/row_fitter_test.rb +66 -0
data/test/units/sprites/sprite_command_test.rb +1 -11
data/test/units/sprites/sprite_map_test.rb +122 -16
metadata +38 -149
data/bin/compass.compiled.rbc +0 -707
data/examples/compass/compass_app_log.txt +0 -6
data/frameworks/compass/stylesheets/compass/css3/_user-interface.scss +0 -19
data/lib/compass/commands.rbc +0 -307
data/lib/compass/commands/base.rbc +0 -1044
data/lib/compass/commands/clean_project.rbc +0 -1856
data/lib/compass/commands/create_project.rbc +0 -2691
data/lib/compass/commands/default.rbc +0 -1677
data/lib/compass/commands/generate_grid_background.rbc +0 -1939
data/lib/compass/commands/help.rbc +0 -1921
data/lib/compass/commands/imports.rbc +0 -969
data/lib/compass/commands/installer_command.rbc +0 -807
data/lib/compass/commands/interactive.rbc +0 -1341
data/lib/compass/commands/list_frameworks.rbc +0 -1111
data/lib/compass/commands/print_version.rbc +0 -2478
data/lib/compass/commands/project_base.rbc +0 -2085
data/lib/compass/commands/project_stats.rbc +0 -4202
data/lib/compass/commands/registry.rbc +0 -1350
data/lib/compass/commands/sprite.rbc +0 -2212
data/lib/compass/commands/stamp_pattern.rbc +0 -2011
data/lib/compass/commands/unpack_extension.rbc +0 -2348
data/lib/compass/commands/update_project.rbc +0 -3002
data/lib/compass/commands/validate_project.rbc +0 -1686
data/lib/compass/commands/watch_project.rbc +0 -4155
data/lib/compass/commands/write_configuration.rbc +0 -2896
data/lib/compass/exec.rbc +0 -500
data/lib/compass/exec/command_option_parser.rbc +0 -676
data/lib/compass/exec/global_options_parser.rbc +0 -1306
data/lib/compass/exec/helpers.rbc +0 -758
data/lib/compass/exec/project_options_parser.rbc +0 -1515
data/lib/compass/exec/sub_command_ui.rbc +0 -1191
data/lib/compass/grid_builder.rbc +0 -0
data/lib/compass/installers.rbc +0 -152
data/lib/compass/installers/bare_installer.rbc +0 -939
data/lib/compass/installers/base.rbc +0 -4427
data/lib/compass/installers/manifest.rbc +0 -3335
data/lib/compass/installers/manifest_installer.rbc +0 -1591
data/lib/compass/installers/template_context.rbc +0 -1030
data/lib/compass/logger.rbc +0 -2317
data/lib/compass/sass_extensions/functions/env.rbc +0 -299
data/lib/compass/sass_extensions/sprites/image_methods.rbc +0 -900
data/lib/compass/sass_extensions/sprites/image_row.rbc +0 -1168
data/lib/compass/sass_extensions/sprites/layout_methods.rbc +0 -3236
data/lib/compass/sass_extensions/sprites/row_fitter.rbc +0 -2067
data/lib/compass/sass_extensions/sprites/sprite_methods.rbc +0 -3190
data/test/fixtures/extensions/only_stylesheets/compass_init.rb +0 -1
data/test/fixtures/extensions/only_stylesheets/scss/only_stylesheets/foo.scss +0 -3
data/test/fixtures/stylesheets/compass/css/user-interface.css +0 -5
data/test/fixtures/stylesheets/compass/images/flag-s03c3b29b35.png +0 -0
data/test/fixtures/stylesheets/compass/sass/user-interface.scss +0 -5
data/test/fixtures/stylesheets/envtest/tmp/env.css +0 -2
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/config.rb +0 -25
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/ie.scss +0 -5
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/print.scss +0 -3
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/screen.scss +0 -6
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/ie.css +0 -5
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/print.css +0 -3
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/screen.css +0 -68
data/test/helpers/command_line.rbc +0 -2820
data/test/helpers/diff.rbc +0 -1104
data/test/helpers/io.rbc +0 -962
data/test/helpers/rails.rbc +0 -1116
data/test/helpers/test_case.rbc +0 -1255
data/test/integrations/compass_test.rbc +0 -6589
data/test/integrations/rails_integration_test.rbc +0 -1342
data/test/integrations/sprites_test.rbc +0 -6192
data/test/test_helper.rbc +0 -1694
data/test/units/actions_test.rbc +0 -644
data/test/units/command_line_test.rbc +0 -1532
data/test/units/compass_png_test.rbc +0 -0
data/test/units/configuration_test.rbc +0 -3833
data/test/units/rails_configuration_test.rbc +0 -1032
data/test/units/sass_extensions_test.rbc +0 -3586
data/test/units/sprites/engine_test.rbc +0 -962
data/test/units/sprites/image_row_test.rbc +0 -1578
data/test/units/sprites/image_test.rbc +0 -2836
data/test/units/sprites/importer_test.rbc +0 -2620
data/test/units/sprites/row_fitter_test.rbc +0 -1479
data/test/units/sprites/sprite_command_test.rbc +0 -1147
data/test/units/sprites/sprite_map_test.rbc +0 -6515

data/lib/compass/configuration/paths.rbc CHANGED

@@ -1,5 +1,5 @@
 !RBIX
-9595534255132031488
+333337424968067900
 x
 M
 1
@@ -341,8 +341,8 @@ I
 I
 30
 x
-66
-/Users/crispee/Projects/compass/lib/compass/configuration/paths.rb
+64
+/Users/chris/Projects/compass/lib/compass/configuration/paths.rb
 p
 1
 x
@@ -364,8 +364,8 @@ I
 I
 8
 x
-66
-/Users/crispee/Projects/compass/lib/compass/configuration/paths.rb
+64
+/Users/chris/Projects/compass/lib/compass/configuration/paths.rb
 p
 1
 x
@@ -390,8 +390,8 @@ I
 I
 32
 x
-66
-/Users/crispee/Projects/compass/lib/compass/configuration/paths.rb
+64
+/Users/chris/Projects/compass/lib/compass/configuration/paths.rb
 p
 0
 x
@@ -406,7 +406,7 @@ I
 I
 20
 x
-66
-/Users/crispee/Projects/compass/lib/compass/configuration/paths.rb
+64
+/Users/chris/Projects/compass/lib/compass/configuration/paths.rb
 p
 0

data/lib/compass/configuration/serialization.rb CHANGED

@@ -27,6 +27,7 @@ module Compass
         if @added_import_paths
           self.additional_import_paths ||= []
           self.additional_import_paths += @added_import_paths
+          self.additional_import_paths.uniq!
         end
         issue_deprecation_warnings
       end

data/lib/compass/configuration/serialization.rbc CHANGED

@@ -1,5 +1,5 @@
 !RBIX
-9595534255132031488
+333337424968067900
 x
 M
 1
@@ -341,8 +341,8 @@ I
 I
 e
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 1
 x
@@ -510,8 +510,8 @@ f
 I
 12
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 1
 x
@@ -521,7 +521,7 @@ x
 4
 open
 p
-11
+9
 I
 -1
 I
@@ -535,18 +535,14 @@ d
 I
 c
 I
-22
-I
-0
-I
 23
 I
 e
 I
 2d
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 1
 x
@@ -563,7 +559,7 @@ x
 12
 parse_string
 i
-87
+79
 5
 48
 0
@@ -594,7 +590,7 @@ i
 39
 6
 9
-81
+73
 5
 13
 49
@@ -635,21 +631,13 @@ i
 8
 1
 15
-15
-5
-49
-7
-0
-49
-10
-0
 8
-82
+74
 1
 15
 5
 48
-11
+10
 11
 I
 7
@@ -661,7 +649,7 @@ I
 2
 n
 p
-12
+11
 x
 7
 binding
@@ -834,7 +822,7 @@ x
 4
 send
 p
-21
+9
 I
 0
 I
@@ -844,42 +832,18 @@ I
 I
 17
 I
-1b
-I
-0
-I
-20
-I
-17
-I
-36
-I
-0
-I
-39
-I
-17
-I
 3c
 I
 18
 I
-50
-I
-0
-I
 51
 I
 19
 I
-6a
-I
-0
-I
 6b
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 2
 x
@@ -904,13 +868,10 @@ x
 1
 +
 x
-5
-uniq!
-x
 26
 issue_deprecation_warnings
 p
-23
+19
 I
 -1
 I
@@ -940,26 +901,18 @@ I
 I
 1d
 I
-48
-I
-1e
-I
-51
+49
 I
 1b
 I
-52
-I
-0
-I
-53
+4b
 I
-20
+1f
 I
-57
+4f
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 3
 x
@@ -1163,16 +1116,16 @@ p
 I
 0
 I
-25
+24
 I
 4
 I
-26
+25
 I
 16
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 1
 x
@@ -1249,16 +1202,16 @@ p
 I
 0
 I
-28
+27
 I
 4
 I
-29
+28
 I
 16
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 1
 x
@@ -1332,16 +1285,16 @@ p
 I
 0
 I
-2b
+2a
 I
 4
 I
-2c
+2b
 I
 16
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 1
 x
@@ -1602,72 +1555,60 @@ x
 18
 serialize_property
 p
-31
+25
 I
 0
 I
-30
+2f
 I
 4
 I
-31
+30
 I
 15
 I
-32
+31
 I
 1f
 I
-33
-I
-37
-I
 32
 I
-38
+37
 I
-0
+31
 I
 39
 I
-35
+34
 I
 49
 I
-36
+35
 I
 53
 I
-37
+36
 I
 69
 I
-35
-I
-6a
-I
-0
+34
 I
 6b
 I
-39
+38
 I
 7a
 I
-3a
+39
 I
 84
 I
-3c
-I
-9d
-I
-0
+3b
 I
 9e
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 3
 x
@@ -1680,52 +1621,48 @@ x
 7
 to_emit
 p
-21
+19
 I
 -1
 I
-23
+22
 I
 0
 I
-24
+23
 I
 6
 I
-25
+24
 I
 15
 I
-28
+27
 I
 24
 I
-2b
+2a
 I
 33
 I
-2e
+2d
 I
 3c
 I
-2f
-I
-55
-I
-0
+2e
 I
 56
 I
-30
+2f
 I
 5f
 I
-3f
+3e
 I
 62
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 1
 x
@@ -1792,16 +1729,16 @@ p
 I
 -1
 I
-42
+41
 I
 0
 I
-43
+42
 I
 14
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 2
 x
@@ -1885,32 +1822,28 @@ x
 4
 puts
 p
-11
+9
 I
 -1
 I
-46
+45
 I
 0
 I
-47
+46
 I
 9
 I
-48
-I
-19
-I
 47
 I
-1a
+19
 I
-0
+46
 I
 1b
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 0
 p
@@ -1930,20 +1863,20 @@ I
 I
 2c
 I
-23
+22
 I
 3a
 I
-42
+41
 I
 48
 I
-46
+45
 I
 56
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 0
 x
@@ -1958,8 +1891,8 @@ I
 I
 1c
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 0
 x
@@ -1974,8 +1907,8 @@ I
 I
 1c
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 0
 x
@@ -1990,7 +1923,7 @@ I
 I
 1c
 x
-74
-/Users/crispee/Projects/compass/lib/compass/configuration/serialization.rb
+72
+/Users/chris/Projects/compass/lib/compass/configuration/serialization.rb
 p
 0