* commit 'merbjedi/master':
Adding Pathname support to compass configs
Adding PathName support for add_project_configuration
Separating out Rails2 actionpack integration logic
and should be accessible to the webserver. By default the fonts directory
is the "fonts" subdirectory of the css directory but another location
can be set via the fonts_dir and http_fonts_dir configuration options.
* edge: (118 commits)
Make the tests pass in ruby 1.9
Fix a bug in FSSM for ruby 1.9. Closes GH-48.
Version bump to 0.9.4
Update the TODO.
If a template provides a haml file, it can have compass-enabled sass filters within it.
Allow vendored frameworks to override built-in frameworks to enable
[Rails] Allow compass extensions to be stored in the vendor/plugins/compass/extensions directory.
Fix some issues regarding how the project type configuration gets applied.
Don't leave directories around after testing.
Name all configuration sources for debugging purposes.
[Command Line] Primary commands get special status in the initial help output.
[Command Line] Access the Sass Repl (sass -i) with the compass environment loaded.
Separate the project type default configuration from the installer.
Add config/compass.rb as a known config location. Default to config/compass.rb as the configuration file for rails projects.
Fix a bug when the welcome message was not provided by an extension template.
Version bump to 0.9.3
Starting work on the changelog for 0.10
Stuff that needs to be done before the next release.
Help for each template that ships with compass.
Allow the welcome message to replace the default one instead of just augment it.
...
Conflicts:
CHANGELOG.markdown
VERSION.yml
compass.gemspec
lib/compass/configuration.rb
lib/vendor/fssm.rb
lib/vendor/fssm/state.rb
configuration. Configuration is now a singly linked list of configuration objects
that inherit values and defaults from the next configuration instance.
All instances hold a reference to the top of the configuration chain.
There is now a consistent API for reading configuration property values:
<attr>: Reads the fully-resolved attribute after taking
configuration inheritance and defaults into account.
raw_<attr>: reads attribute from a configuration object without
inheritance or defaults.
default_for(<attr>): reads the default value for an attribute
default_for_<attr>: specifies the default value for an attribute.
<attr>_without_default: reads the inherited attribute without applying defaults.
comment_for_<attr>: Specifies a comment that will be emitted above the
property when serializing the configuration to a file.
Additionally, method_missing and respond_to both work down the
configuration chain, so any method that is added to a configuration
instance, can be accessed from the top level.
The distinction between default and explicitly set values allows compass
to more correctly manage the serialization of attributes when creating
configuration files for projects.
The compass configuration can still be accessed via
Compass.configuration, however, the configuration object is no longer a
singleton. This means that you can build several configuration chains
to track several projects at once. This should ease the use of compass
in other frameworks and plugins that want to use compass internally.
