compass-edge 0.9.3 → 0.9.4

data/lib/compass/commands/project_base.rb

@@ -11,7 +11,7 @@ module Compass
       def initialize(working_path, options = {})
         super(working_path, options)
         self.project_name = determine_project_name(working_path, options)
-        Compass.configuration.project_path = determine_project_directory(working_path, options)
+        Compass.add_configuration({:project_path => determine_project_directory(working_path, options)}, "implied")
         configure!
       end
 
@@ -89,4 +89,4 @@ module Compass
 
     end
   end
-end
+end

data/lib/compass/commands/project_stats.rb

@@ -136,6 +136,8 @@ module Compass
           "Report statistics about your stylesheets"
         end
 
+        def primary; false; end
+
         def parse!(arguments)
           parser = option_parser(arguments)
           parser.parse!

data/lib/compass/commands/update_project.rb

@@ -62,6 +62,8 @@ module Compass
           option_parser([]).to_s
         end
 
+        def primary; true; end
+
         def description(command)
           "Compile Sass stylesheets to CSS"
         end

data/lib/compass/commands/write_configuration.rb

@@ -41,6 +41,14 @@ module Compass
 
       def perform
         if options[:debug]
+          puts "Configuration sources:"
+          c = Compass.configuration
+          while c
+            print c.name
+            c = c.inherited_data
+            print ", " if c
+          end
+          print "\n"
           Compass.configuration.debug.each do |prop, values|
             if options[:debug].is_a?(Symbol)
               next unless prop == options[:debug]
@@ -51,7 +59,7 @@ module Compass
             end
           end
         else
-          directory projectize(File.dirname(options[:configuration_file]))
+          directory File.dirname(options[:configuration_file])
           installer.write_configuration_files(options[:configuration_file])
         end
       end

data/lib/compass/configuration/data.rb

@@ -18,6 +18,7 @@ module Compass
     class Data
 
       attr_accessor :required_libraries
+      attr_reader :name
 
       include Compass::Configuration::Inheritance
       include Compass::Configuration::Serialization
@@ -25,7 +26,9 @@ module Compass
 
       inherited_accessor *ATTRIBUTES
 
-      def initialize(attr_hash = nil)
+      def initialize(name, attr_hash = nil)
+        raise "I need a name!" unless name
+        @name = name
         self.required_libraries = []
         set_all(attr_hash) if attr_hash
         self.top_level = self
@@ -100,4 +103,4 @@ module Compass
 
     end
   end
-end
+end

data/lib/compass/configuration/defaults.rb

@@ -85,6 +85,7 @@ module Compass
 
       def http_join(*segments)
         segments.map do |segment|
+          next unless segment
           segment = http_pathify(segment)
           segment[-1..-1] == "/" ? segment[0..-2] : segment
         end.join("/")
@@ -104,4 +105,4 @@ module Compass
 
     end
   end
-end
+end

data/lib/compass/configuration/helpers.rb

@@ -11,25 +11,36 @@ module Compass
       end
 
       def default_configuration
-        Data.new.extend(Defaults).extend(Comments)
+        Data.new('defaults').extend(Defaults).extend(Comments)
       end
 
       def add_configuration(config, filename = nil)
         return if config.nil?
-        data = if config.is_a?(Compass::Configuration::Data)
+
+
+        data = configuration_for(config, filename)
+
+        # puts "New configuration: #{data.name}"
+        # puts caller.join("\n")
+        data.inherit_from!(configuration)
+        data.on_top!
+        @configuration = data
+      end
+
+      def configuration_for(config, filename = nil)
+        if config.is_a?(Compass::Configuration::Data)
           config
         elsif config.respond_to?(:read)
           Compass::Configuration::Data.new_from_string(config.read, filename)
         elsif config.is_a?(Hash)
-          Compass::Configuration::Data.new(config)
+          Compass::Configuration::Data.new(filename, config)
         elsif config.is_a?(String)
           Compass::Configuration::Data.new_from_file(config)
+        elsif config.is_a?(Symbol)
+          Compass::AppIntegration.lookup(config).configuration
         else
           raise "I don't know what to do with: #{config.inspect}"
         end
-        data.inherit_from!(configuration)
-        data.on_top!
-        @configuration = data
       end
 
       # Support for testing.
@@ -55,9 +66,26 @@ module Compass
       end
 
       # Read the configuration file for this project
-      def add_project_configuration(configuration_file_path = nil)
-        configuration_file_path ||= detect_configuration_file
-        Compass.add_configuration(configuration_file_path) if configuration_file_path
+      def add_project_configuration(*args)
+        options = args.last.is_a?(Hash) ? args.pop : {}
+        configuration_file_path = args.shift || detect_configuration_file
+        raise ArgumentError, "Too many arguments" if args.any?
+        if configuration_file_path
+
+          data = configuration_for(configuration_file_path)
+
+          if data.raw_project_type
+            add_configuration(data.raw_project_type.to_sym)
+          elsif options[:project_type]
+            add_configuration(options[:project_type])
+          else
+            add_configuration(:stand_alone)
+          end
+
+          add_configuration(data)
+        else
+          add_configuration(options[:project_type] || configuration.project_type || :stand_alone)
+        end
       end
 
       # Returns a full path to the relative path to the project directory
@@ -76,7 +104,7 @@ module Compass
       end
 
       # TODO: Deprecate the src/config.rb location.
-      KNOWN_CONFIG_LOCATIONS = [".compass/config.rb", "config/compass.config", "config.rb", "src/config.rb"]
+      KNOWN_CONFIG_LOCATIONS = ['config/compass.rb', ".compass/config.rb", "config/compass.config", "config.rb", "src/config.rb"]
 
       # Finds the configuration file, if it exists in a known location.
       def detect_configuration_file(project_path = nil)

data/lib/compass/configuration/serialization.rb

@@ -9,13 +9,13 @@ module Compass
 
       module ClassMethods
         def new_from_file(config_file)
-          data = Data.new
+          data = Data.new(config_file)
           data.parse(config_file)
           data
         end
 
         def new_from_string(contents, filename)
-          data = Data.new
+          data = Data.new(filename)
           data.parse_string(contents, filename)
           data
         end

data/lib/compass/exec/project_options_parser.rb

@@ -8,6 +8,10 @@ module Compass::Exec::ProjectOptionsParser
       self.options[:configuration_file] = configuration_file
     end
 
+    opts.on('--app APP', 'Tell compass what kind of application it is integrating with. E.g. rails') do |project_type|
+      self.options[:project_type] = project_type.to_sym
+    end
+
     opts.on('--sass-dir SRC_DIR', "The source directory where you keep your sass stylesheets.") do |sass_dir|
       self.options[:sass_dir] = sass_dir
     end

data/lib/compass/frameworks.rb

@@ -28,7 +28,11 @@ module Compass
     end
 
     def register(name, *arguments)
-      ALL << Framework.new(name, *arguments)
+      if idx = ALL.index{|f| f.name.to_s == name.to_s}
+        ALL[idx] = Framework.new(name, *arguments)
+      else
+        ALL << Framework.new(name, *arguments)
+      end
     end
 
     def [](name)

data/lib/compass/frameworks/blueprint/templates/project/welcome.html.haml

@@ -7,7 +7,12 @@
     %link(href="<%= http_stylesheets_path %>/print.css" media="print" rel="stylesheet" type="text/css")
     /[if lt IE 8]
       %link(href="<%= http_stylesheets_path %>/ie.css" media="screen, projection" rel="stylesheet" type="text/css")    
+    %style(type="text/css")
+      :sass
+        @import blueprint.sass
+        .foo
+          +column(8)
   %body#welcome.bp
     #container
       %h1 Welcome to Compass!
-      %p This is <%= "ERB" %>
+      %p This is <%= "ERB" %>

data/lib/compass/installers/bare_installer.rb

@@ -2,10 +2,6 @@ module Compass
   module Installers
 
     class BareInstaller < Base
-      def default_configuration
-        Compass::Configuration::Data.new.extend(Compass::AppIntegration::StandAlone::ConfigurationDefaults)
-      end
-
       def completed_configuration
         nil
       end

data/lib/compass/installers/base.rb

@@ -112,6 +112,7 @@ module Compass
             ctx = TemplateContext.ctx(:to => to, :options => options)
             contents = process_erb(contents, ctx)
           end
+          Compass.configure_sass_plugin!
           html = Haml::Engine.new(contents, :filename => templatize(from)).render
           write_file(targetize(to), html, options)
         else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: compass-edge
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 00:00:00 -07:00
+date: 2009-11-19 00:00:00 -08:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,26 +119,10 @@ files:
 - examples/logo/src/screen.sass
 - examples/ninesixty/bootstrap.rb
 - examples/ninesixty/config.rb
-- examples/ninesixty/extensions/ninesixty/README.mkdn
-- examples/ninesixty/extensions/ninesixty/compass-960-plugin.gemspec
-- examples/ninesixty/extensions/ninesixty/lib/ninesixty.rb
-- examples/ninesixty/extensions/ninesixty/lib/ninesixty/compass_plugin.rb
-- examples/ninesixty/extensions/ninesixty/sass/960/_grid.sass
-- examples/ninesixty/extensions/ninesixty/sass/960/_text.sass
-- examples/ninesixty/extensions/ninesixty/templates/project/grid.sass
-- examples/ninesixty/extensions/ninesixty/templates/project/manifest.rb
-- examples/ninesixty/extensions/ninesixty/templates/project/text.sass
 - examples/ninesixty/src/grid.sass
 - examples/ninesixty/src/text.sass
 - examples/yui/bootstrap.rb
 - examples/yui/divisions.html.haml
-- examples/yui/extensions/yui/stylesheets/_yui.sass
-- examples/yui/extensions/yui/stylesheets/yui/modules/_base.sass
-- examples/yui/extensions/yui/stylesheets/yui/modules/_fonts.sass
-- examples/yui/extensions/yui/stylesheets/yui/modules/_grids.sass
-- examples/yui/extensions/yui/stylesheets/yui/modules/_reset.sass
-- examples/yui/extensions/yui/templates/project/manifest.rb
-- examples/yui/extensions/yui/templates/project/screen.sass
 - examples/yui/index.html.haml
 - examples/yui/src/screen.sass
 - examples/yui/sub_divisions.html.haml
@@ -167,6 +151,7 @@ files:
 - lib/compass/commands/generate_grid_background.rb
 - lib/compass/commands/help.rb
 - lib/compass/commands/installer_command.rb
+- lib/compass/commands/interactive.rb
 - lib/compass/commands/list_frameworks.rb
 - lib/compass/commands/print_version.rb
 - lib/compass/commands/project_base.rb
@@ -411,4 +396,6 @@ test_files:
 - test/test_helper.rb
 - test/test_rails_helper.rb
 - features/command_line.feature
+- features/extensions.feature
 - features/step_definitions/command_line_steps.rb
+- features/step_definitions/extension_steps.rb

data/examples/ninesixty/extensions/ninesixty/README.mkdn

@@ -1,56 +0,0 @@
-960 Grid System - Compass Plugin
-================================
-
-* Port of Version 1.0
-* 2008-03-24
-
-Created by Nathan Smith. See the official site for more info: <http://960.gs/>
-
----------
-
-This plugin adds the 960 Grid System framework to [Compass](http://compass-style.org/).
-
-Install
-=======
-
-    sudo gem install chriseppstein-compass
-    sudo gem install chriseppstein-compass-960-plugin
-
-Create a 960-based Compass Project
-==================================
-
-    compass -r ninesixty -f 960 <project name>
-
-Then edit your `grid.sass` and `text.sass` files accordingly. A reset is added into grid.sass automatically.
-
-Customizing your Grid System
-============================
-
-To create a grid system with other number of columns use the `+grid-system` mixin to generate
-the corresponding classes.
-
-Example:
-
-    #wrap
-      +grid-system(24)
-
-Making Semantic Grids
-=====================
-
-* Use the `+grid-container` mixin to declare your container element.
-* Use the `+grid` mixin to declare a grid element.
-* Use the `+alpha` and `+omega` mixins to declare the first and last grid elements for a row.
-* User the `+grid-prefix` and `+grid-suffix` mixins to add grid columns before or after a grid element.
-
-Example:
-
-    #wrap
-      +grid-container
-      #left-nav
-        +alpha
-        +grid(5,16)
-      #main-content
-        +grid-prefix(1,16)
-        +grid(10, 16)
-        +omega
-

data/examples/ninesixty/extensions/ninesixty/compass-960-plugin.gemspec

@@ -1,36 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{compass-960-plugin}
-  s.version = "0.9.10"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Chris Eppstein"]
-  s.date = %q{2009-09-27}
-  s.description = %q{The 960 Grid System is an effort to streamline web development workflow by providing commonly used dimensions, based on a width of 960 pixels. http://960.gs/}
-  s.email = %q{chris@eppsteins.net}
-  s.extra_rdoc_files = ["lib/ninesixty/compass_plugin.rb", "lib/ninesixty.rb", "README.mkdn"]
-  s.files = ["compass-960-plugin.gemspec", "lib/ninesixty/compass_plugin.rb", "lib/ninesixty.rb", "Manifest", "Rakefile", "README.mkdn", "sass/960/_grid.sass", "sass/960/_text.sass", "templates/project/grid.sass", "templates/project/manifest.rb", "templates/project/text.sass", "VERSION"]
-  s.homepage = %q{http://github.com/chriseppstein/compass-960-plugin}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Compass-960-plugin", "--main", "README.mkdn"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{compass-960-plugin}
-  s.rubygems_version = %q{1.3.3}
-  s.summary = %q{Compass compatible Sass port of 960.gs.}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<chriseppstein-compass>, [">= 0"])
-      s.add_development_dependency(%q<echoe>, [">= 0"])
-    else
-      s.add_dependency(%q<chriseppstein-compass>, [">= 0"])
-      s.add_dependency(%q<echoe>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<chriseppstein-compass>, [">= 0"])
-    s.add_dependency(%q<echoe>, [">= 0"])
-  end
-end

data/examples/ninesixty/extensions/ninesixty/lib/ninesixty.rb

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), 'ninesixty', 'compass_plugin')

data/examples/ninesixty/extensions/ninesixty/lib/ninesixty/compass_plugin.rb

@@ -1,5 +0,0 @@
-options = Hash.new
-options[:stylesheets_directory] = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'sass'))
-options[:templates_directory] = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'templates'))
-
-Compass::Frameworks.register('960', options)

data/examples/ninesixty/extensions/ninesixty/sass/960/_grid.sass

@@ -1,64 +0,0 @@
-!ninesixty_gutter_width ||= 20px
-!ninesixty_grid_width ||= 960px
-!ninesixty_columns ||= 12
-
-=grid-container
-  :margin-left auto
-  :margin-right auto
-  :width= !ninesixty_grid_width
-
-=grid-width(!n, !cols = !ninesixty_columns, !gutter_width = !ninesixty_gutter_width)
-  :width= (!ninesixty_grid_width / !cols) * !n - !gutter_width
-
-=grid-unit-base(!gutter_width = !ninesixty_gutter_width)
-  :display inline
-  :float left
-  :margin
-    :left= !gutter_width / 2
-    :right= !gutter_width / 2
-
-=grid(!n, !cols = !ninesixty_columns, !gutter_width = !ninesixty_gutter_width)
-  +grid-unit-base(!gutter_width)
-  +grid-width(!n, !cols, !gutter_width)
-
-=alpha
-  :margin-left 0
-
-=omega
-  :margin-right 0
-
-=grids(!cols = !ninesixty_columns, !gutter_width = !ninesixty_gutter_width)
-  #{enumerate(".grid",1,!cols,"_")}
-    +grid-unit-base
-  @for !n from 1 through !cols
-    .grid_#{!n}
-      +grid-width(!n, !cols, !gutter_width)
-
-=grid-prefix(!n, !cols = !ninesixty_columns)
-  :padding-left= (!ninesixty_grid_width / !cols) * !n
-
-=grid-prefixes(!cols = !ninesixty_columns)
-  @for !n from 1 through !cols - 1
-    .prefix_#{!n}
-      +grid-prefix(!n, !cols)
-
-=grid-suffix(!n, !cols = !ninesixty_columns)
-  :padding-right= (!ninesixty_grid_width / !cols) * !n
-
-=grid-suffixes(!cols = !ninesixty_columns)
-  @for !n from 1 through !cols - 1
-    .suffix_#{!n}
-      +grid-suffix(!n, !cols)
-
-=grid-children
-  .alpha
-    +alpha
-  .omega
-    +omega
-
-=grid-system(!cols = !ninesixty_columns)
-  +grid-container
-  +grids(!cols)
-  +grid-prefixes(!cols)
-  +grid-suffixes(!cols)
-  +grid-children