compass 0.10.0.pre1 → 0.10.0.pre2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELOG.markdown +9 -0
- data/VERSION.yml +1 -1
- data/lib/compass/app_integration/rails/installer.rb +1 -1
- data/lib/compass/compiler.rb +7 -3
- data/lib/compass/configuration.rb +1 -0
- data/lib/compass/configuration/adapters.rb +2 -2
- data/lib/compass/configuration/data.rb +2 -3
- data/lib/compass/configuration/serialization.rb +3 -3
- data/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass +1 -1
- data/test/fixtures/stylesheets/compass/css/reset.css +1 -1
- metadata +3 -3
data/CHANGELOG.markdown
CHANGED
@@ -1,6 +1,15 @@
|
|
1
1
|
COMPASS CHANGELOG
|
2
2
|
=================
|
3
3
|
|
4
|
+
0.10.0.pre2 (November 30, 2009)
|
5
|
+
--------------------------------
|
6
|
+
Bug fixes:
|
7
|
+
|
8
|
+
* The line-height in the compass reset should have been 1 and not 1em.
|
9
|
+
* Fixed the reference in the rails initializer to the compass configuration file.
|
10
|
+
* Use the correct error formatting function based on what sass version is installed.
|
11
|
+
* Boolean properties like line_comments can now be set to false in configuration files
|
12
|
+
|
4
13
|
0.10.0.pre1 (November 29, 2009)
|
5
14
|
--------------------------------
|
6
15
|
|
data/VERSION.yml
CHANGED
@@ -91,7 +91,7 @@ module Compass
|
|
91
91
|
def initializer_contents
|
92
92
|
%Q{require 'compass'
|
93
93
|
# If you have any compass plugins, require them here.
|
94
|
-
Compass.configuration.parse(File.join(RAILS_ROOT, "config", "compass.
|
94
|
+
Compass.configuration.parse(File.join(RAILS_ROOT, "config", "compass.rb"))
|
95
95
|
Compass.configuration.environment = RAILS_ENV.to_sym
|
96
96
|
Compass.configure_sass_plugin!
|
97
97
|
}
|
data/lib/compass/compiler.rb
CHANGED
@@ -53,9 +53,13 @@ module Compass
|
|
53
53
|
rescue Sass::SyntaxError => e
|
54
54
|
full_exception = Compass.configuration.environment == :development
|
55
55
|
logger.record :error, basename(sass_filename), "(Line #{e.sass_line}: #{e.message})"
|
56
|
-
|
57
|
-
|
58
|
-
|
56
|
+
contents = if Sass::SyntaxError.respond_to?(:exception_to_css)
|
57
|
+
Sass::SyntaxError.exception_to_css(e, :full_exception => full_exception)
|
58
|
+
else
|
59
|
+
Sass::Plugin.options[:full_exception] ||= Compass.configuration.environment == :development
|
60
|
+
Sass::Plugin.send(:exception_string, e)
|
61
|
+
end
|
62
|
+
write_file css_filename, contents, options.merge(:force => true)
|
59
63
|
end
|
60
64
|
end
|
61
65
|
end
|
@@ -18,7 +18,7 @@ module Compass
|
|
18
18
|
end
|
19
19
|
plugin_opts = {:template_location => locations}
|
20
20
|
plugin_opts[:style] = output_style if output_style
|
21
|
-
plugin_opts[:line_comments] = line_comments
|
21
|
+
plugin_opts[:line_comments] = line_comments
|
22
22
|
plugin_opts.merge!(sass_options || {})
|
23
23
|
plugin_opts
|
24
24
|
end
|
@@ -41,7 +41,7 @@ module Compass
|
|
41
41
|
def to_sass_engine_options
|
42
42
|
engine_opts = {:load_paths => sass_load_paths}
|
43
43
|
engine_opts[:style] = output_style if output_style
|
44
|
-
engine_opts[:line_comments] = line_comments
|
44
|
+
engine_opts[:line_comments] = line_comments
|
45
45
|
engine_opts.merge!(sass_options || {})
|
46
46
|
end
|
47
47
|
|
@@ -17,7 +17,6 @@ module Compass
|
|
17
17
|
# required.
|
18
18
|
class Data
|
19
19
|
|
20
|
-
attr_accessor :required_libraries
|
21
20
|
attr_reader :name
|
22
21
|
|
23
22
|
include Compass::Configuration::Inheritance
|
@@ -25,11 +24,11 @@ module Compass
|
|
25
24
|
include Compass::Configuration::Adapters
|
26
25
|
|
27
26
|
inherited_accessor *ATTRIBUTES
|
27
|
+
inherited_accessor :required_libraries #XXX we should make this array add up cumulatively.
|
28
28
|
|
29
29
|
def initialize(name, attr_hash = nil)
|
30
30
|
raise "I need a name!" unless name
|
31
31
|
@name = name
|
32
|
-
self.required_libraries = []
|
33
32
|
set_all(attr_hash) if attr_hash
|
34
33
|
self.top_level = self
|
35
34
|
end
|
@@ -81,7 +80,7 @@ module Compass
|
|
81
80
|
|
82
81
|
# Require a compass plugin and capture that it occured so that the configuration serialization works next time.
|
83
82
|
def require(lib)
|
84
|
-
required_libraries << lib
|
83
|
+
(self.required_libraries ||= []) << lib
|
85
84
|
super
|
86
85
|
end
|
87
86
|
|
@@ -37,7 +37,7 @@ module Compass
|
|
37
37
|
eval(contents, bind, filename)
|
38
38
|
ATTRIBUTES.each do |prop|
|
39
39
|
value = eval(prop.to_s, bind) rescue nil
|
40
|
-
self.send("#{prop}=", value)
|
40
|
+
self.send("#{prop}=", value) unless value.nil?
|
41
41
|
end
|
42
42
|
if @added_import_paths
|
43
43
|
self.additional_import_paths ||= []
|
@@ -48,11 +48,11 @@ module Compass
|
|
48
48
|
|
49
49
|
def serialize
|
50
50
|
contents = ""
|
51
|
-
required_libraries.each do |lib|
|
51
|
+
(required_libraries || []).each do |lib|
|
52
52
|
contents << %Q{require '#{lib}'\n}
|
53
53
|
end
|
54
54
|
contents << "# Require any additional compass plugins here.\n"
|
55
|
-
contents << "\n" if required_libraries.any?
|
55
|
+
contents << "\n" if (required_libraries || []).any?
|
56
56
|
ATTRIBUTES.each do |prop|
|
57
57
|
value = send("#{prop}_without_default")
|
58
58
|
if value.is_a?(Proc)
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: compass
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.10.0.
|
4
|
+
version: 0.10.0.pre2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Chris Eppstein
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2009-
|
12
|
+
date: 2009-12-01 00:00:00 -08:00
|
13
13
|
default_executable: compass
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
@@ -445,7 +445,7 @@ files:
|
|
445
445
|
- test/test_case_helper.rb
|
446
446
|
- test/test_helper.rb
|
447
447
|
- test/test_rails_helper.rb
|
448
|
-
has_rdoc:
|
448
|
+
has_rdoc: false
|
449
449
|
homepage: http://compass-style.org
|
450
450
|
licenses: []
|
451
451
|
|