compass-edge 0.9.5.0 → 0.10.0.pre

data/lib/compass/frameworks/blueprint/templates/buttons/manifest.rb

@@ -1,17 +1,5 @@
-description "Button Plugin"
 stylesheet 'buttons.sass', :media => 'screen, projection'
 
 image 'buttons/cross.png'
 image 'buttons/key.png'
 image 'buttons/tick.png'
-
-help %Q{
-To install the button plugin:
-  compass init --using blueprint/buttons
-
-The buttons.sass file is just a recommendation to show you how to use the button mixins.  
-}
-
-welcome_message %Q{
-The buttons.sass file is just a recommendation to show you how to use the button mixins.  
-}

data/lib/compass/frameworks/blueprint/templates/link_icons/link_icons.sass

@@ -1,4 +1,4 @@
-@import blueprint/link_icons.sass
+@import blueprint/modules/link_icons.sass
 
 // This turns link icons on for all links. You can change the scoping selector from
 // body to something more specific if you prefer.

data/lib/compass/frameworks/blueprint/templates/link_icons/manifest.rb

@@ -1,5 +1,3 @@
-description "Icons for common types of links"
-
 stylesheet "link_icons.sass", :media => 'screen, projection'
 
 image 'link_icons/doc.png'
@@ -10,14 +8,3 @@ image 'link_icons/im.png'
 image 'link_icons/pdf.png'
 image 'link_icons/visited.png'
 image 'link_icons/xls.png'
-
-help %Q{
-To install the link_icons plugin:
-  compass init --using blueprint/link_icons
-
-The link_icons.sass file is just a recommendation to show you how to use the link mixins.  
-}
-
-welcome_message %Q{
-The link_icons.sass file is just a recommendation to show you how to use the link mixins.  
-}

data/lib/compass/frameworks/blueprint/templates/project/manifest.rb

@@ -1,5 +1,3 @@
-description "The blueprint framework."
-
 stylesheet 'screen.sass', :media => 'screen, projection'
 stylesheet 'partials/_base.sass'
 stylesheet 'print.sass',  :media => 'print'
@@ -8,25 +6,3 @@ stylesheet 'ie.sass',     :media => 'screen, projection', :condition => "lt IE 8
 image 'grid.png'
 
 html 'welcome.html.haml', :erb => true
-
-help %Q{
-Please see the blueprint website for documentation on how blueprint works:
-
-    http://blueprintcss.org/
-
-Docs on the compass port of blueprint can be found on the wiki:
-
-    http://wiki.github.com/chriseppstein/compass/blueprint-documentation
-}
-
-welcome_message %Q{
-Please see the blueprint website for documentation on how blueprint works:
-
-    http://blueprintcss.org/
-
-Docs on the compass port of blueprint can be found on the wiki:
-
-    http://wiki.github.com/chriseppstein/compass/blueprint-documentation
-
-To get started, edit the screen.sass file and read the comments and code there.
-}

data/lib/compass/frameworks/blueprint/templates/project/screen.sass

@@ -5,7 +5,7 @@
 // Import all the default blueprint modules so that we can access their mixins.
 @import blueprint
 // Import the non-default scaffolding module.
-@import blueprint/scaffolding.sass
+@import blueprint/modules/scaffolding.sass
 
 // To generate css equivalent to the blueprint css but with your configuration applied, uncomment:
 // +blueprint
@@ -39,3 +39,9 @@ body.three-col
     // true means it's the last column in the row
     +column(!content_columns, true)
 
+// This is just here to style the welcome page, please delete it.
+body#welcome
+  #container
+    +container
+  h1
+    +column(24)

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

@@ -7,15 +7,7 @@
     %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
-        body#welcome
-          #container
-            +container
-          h1
-            +column(24)
   %body#welcome.bp
     #container
       %h1 Welcome to Compass!
-      %p This is <%= "ERB" %>
+      %p This is <%= "ERB" %>

data/lib/compass/frameworks/compass/stylesheets/_compass.sass

@@ -1,2 +1 @@
-@import compass/utilities.sass
-@import compass/css3.sass
+@import compass/utilities.sass

data/lib/compass/frameworks/compass/stylesheets/compass/_utilities.sass

@@ -1,3 +1,4 @@
+@import utilities/css3.sass
 @import utilities/general.sass
 @import utilities/links.sass
 @import utilities/lists.sass

data/lib/compass/frameworks/compass/stylesheets/compass/utilities/_css3.sass

@@ -0,0 +1,6 @@
+@import css3/border_radius.sass
+@import css3/inline_block.sass
+@import css3/opacity.sass
+@import css3/box_shadow.sass
+@import css3/columns.sass
+@import css3/box_sizing.sass

data/lib/compass/frameworks/compass/stylesheets/compass/utilities/css3/_box_shadow.sass

@@ -0,0 +1,12 @@
+//**
+  Provides cross-browser css box shadows 
+    for Webkit and the future
+  arguments are horizontal offset, vertical offset, blur and color
+
+=box-shadow(!ho, !vo, !b, !c )
+  /* Webkit (Safari, Chrome)
+  -webkit-box-shadow= !ho !vo !b !c
+  /* Mozilla (Firefox, Camino)
+  -moz-box-shadow= !ho !vo !b !c
+  /* CSS3
+  box-shadow= !ho !vo !b !c

data/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass

@@ -33,7 +33,7 @@
   q, blockquote
     +reset-quotation
     
-  a img
+  img a
     +reset-image-anchor-border
  
  
@@ -57,7 +57,7 @@
   q, blockquote
     +reset-quotation
   
-  a img
+  img a
     +reset-image-anchor-border
  
 //Mixins partials

data/lib/compass/frameworks/compass/templates/ellipsis/manifest.rb

@@ -1,27 +1,2 @@
-description "Plugin for cross-browser ellipsis truncated text."
-
 file 'xml/ellipsis.xml', :like => :css
-stylesheet 'ellipsis.sass'
-
-help %Q{
-First, install the plugin to get the xml file that makes this work in firfox:
-
-  compass init --using blueprint/link_icons
-
-Then mix +ellipsis into your selectors to enable ellipsis
-there when text gets too long.
-
-The ellipsis.sass file is just an example for how to use this plugin,
-feel free to delete it.
-
-For more information see:
-  http://mattsnider.com/css/css-string-truncation-with-ellipsis/
-}
-
-welcome_message %Q{
-The ellipsis.sass file is just an example for how to use this plugin,
-feel free to delete it.
-
-For more information see:
-  http://mattsnider.com/css/css-string-truncation-with-ellipsis/  
-}
+stylesheet 'ellipsis.sass'

data/lib/compass/frameworks/compass/templates/extension/manifest.rb

@@ -1,20 +1,6 @@
-description "Generate a compass extension."
-
-file 'stylesheets/main.sass', :to => "stylesheets/_#{File.basename(options[:pattern_name]||options[:project_name]||'main')}.sass"
+file 'stylesheets/main.sass', :to => "stylesheets/_#{File.basename(options[:pattern_name])}.sass"
 file 'templates/project/manifest.rb'
 file 'templates/project/screen.sass'
 
-help %Q{
-  To generate a compass extension:
-  compass create my_extension --using compass/extension
-}
-
-welcome_message %Q{
-For a full tutorial on how to build your own extension see:
-
-http://github.com/chriseppstein/compass/blob/edge/docs/EXTENSIONS.markdown
-
-}, :replace => true
-
 no_configuration_file!
-skip_compilation!
+skip_compilation!

data/lib/compass/frameworks/compass/templates/project/manifest.rb

@@ -1,4 +1,3 @@
-description "The default project layout."
 stylesheet 'screen.sass', :media => 'screen, projection'
 stylesheet 'print.sass',  :media => 'print'
 stylesheet 'ie.sass',     :media => 'screen, projection', :condition => "IE"

data/lib/compass/grid_builder.rb

@@ -48,7 +48,7 @@ module Compass
         canvas.background_fill = 'white'
 
         canvas.g do |column|
-          column.rect(self.column_width - 1, @height).styles(:fill => "#e8effb")
+          column.rect(self.column_width, @height).styles(:fill => "#e8effb")
         end
 
         canvas.g do |baseline|

data/lib/compass/installers.rb

@@ -1,3 +1,3 @@
-%w(manifest template_context base manifest_installer bare_installer).each do |f|
+%w(manifest template_context base).each do |f|
   require "compass/installers/#{f}"
 end

data/lib/compass/installers/base.rb

@@ -7,16 +7,22 @@ module Compass
 
       attr_accessor :template_path, :target_path, :working_path
       attr_accessor :options
+      attr_accessor :manifest
 
       def initialize(template_path, target_path, options = {})
         @template_path = template_path
         @target_path = target_path
         @working_path = Dir.getwd
         @options = options
+        @manifest = Manifest.new(manifest_file, options) if template_path
         self.logger = options[:logger]
       end
 
-      [:css_dir, :sass_dir, :images_dir, :javascripts_dir, :http_stylesheets_path, :fonts_dir].each do |dir|
+      def manifest_file
+        @manifest_file ||= File.join(template_path, "manifest.rb")
+      end
+
+      [:css_dir, :sass_dir, :images_dir, :javascripts_dir, :http_stylesheets_path].each do |dir|
         define_method dir do
           Compass.configuration.send(dir)
         end
@@ -25,6 +31,23 @@ module Compass
         end
       end
 
+      # Initializes the project to work with compass
+      def init
+        dirs = manifest.map do |entry|
+          loc = send("install_location_for_#{entry.type}", entry.to, entry.options)
+          File.dirname(loc)
+        end
+
+        if manifest.has_stylesheet?
+          dirs << sass_dir
+          dirs << css_dir
+        end
+
+        dirs.uniq.sort.each do |dir|
+          directory targetize(dir)
+        end
+      end
+
       # Runs the installer.
       # Every installer must conform to the installation strategy of prepare, install, and then finalize.
       # A default implementation is provided for each step.
@@ -39,14 +62,25 @@ module Compass
       def prepare
       end
 
-      # The install method override this to install
+      def configure_option_with_default(opt)
+        value = options[opt]
+        value ||= begin
+          default_method = "default_#{opt}".to_sym
+          send(default_method) if respond_to?(default_method)
+        end
+        send("#{opt}=", value)
+      end
+
+      # The default install method. Calls install_<type> methods in the order specified by the manifest.
       def install
-        raise "Not Yet Implemented"
+        manifest.each do |entry|
+          send("install_#{entry.type}", entry.from, entry.to, entry.options)
+        end
       end
 
       # The default finalize method -- it is a no-op.
       # This could print out a message or something.
-      def finalize(options = {})
+      def finalize
       end
 
       def compilation_required?
@@ -91,10 +125,6 @@ module Compass
         "#{javascripts_dir}/#{to}"
       end
 
-      installer :font do |to|
-        "#{fonts_dir}/#{to}"
-      end
-
       installer :file do |to|
         "#{pattern_name_as_dir}#{to}"
       end
@@ -116,7 +146,6 @@ 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
@@ -136,12 +165,22 @@ module Compass
         strip_trailing_separator File.join(template_path, separate(path))
       end
 
-      # Emits an HTML fragment that can be used to link to the compiled css files
       def stylesheet_links
-        ""
+        html = "<head>\n"
+        manifest.each_stylesheet do |stylesheet|
+          # Skip partials.
+          next if File.basename(stylesheet.from)[0..0] == "_"
+          media = if stylesheet.options[:media]
+            %Q{ media="#{stylesheet.options[:media]}"}
+          end
+          ss_line = %Q{  <link href="#{http_stylesheets_path}/#{stylesheet.to.sub(/\.sass$/,'.css')}"#{media} rel="stylesheet" type="text/css" />}
+          if stylesheet.options[:condition]
+            ss_line = "  <!--[if #{stylesheet.options[:condition]}]>\n    #{ss_line}\n  <![endif]-->"
+          end
+          html << ss_line + "\n"
+        end
+        html << "</head>"
       end
     end
   end
 end
-require 'compass/installers/bare_installer'
-require 'compass/installers/manifest_installer'

data/lib/compass/installers/manifest.rb

@@ -37,41 +37,9 @@ module Compass
       type :stylesheet
       type :image
       type :javascript
-      type :font
       type :file
       type :html
 
-      def help(value = nil)
-        if value
-          @help = value
-        else
-          @help
-        end
-      end
-
-      attr_reader :welcome_message_options
-
-      def welcome_message(value = nil, options = {})
-        if value
-          @welcome_message = value
-          @welcome_message_options = options
-        else
-          @welcome_message
-        end
-      end
-
-      def welcome_message_options
-        @welcome_message_options || {}
-      end
-
-      def description(value = nil)
-        if value
-          @description = value
-        else
-          @description
-        end
-      end
-
       # Enumerates over the manifest files
       def each
         @entries.each {|e| yield e}
@@ -108,4 +76,4 @@ module Compass
     end
 
   end
-end
+end

data/lib/compass/logger.rb

@@ -1,20 +1,7 @@
 module Compass
   class Logger
 
-    DEFAULT_ACTIONS = [:directory, :exists, :remove, :create, :overwrite, :compile, :error, :identical]
-
-    ACTION_COLORS = {
-      :error => :red,
-      :compile => :green,
-      :overwrite => :yellow,
-      :create => :green,
-      :remove => :yellow,
-      :exists => :green,
-      :directory => :green,
-      :identical => :green
-    }
-
-    COLORS = { :clear => 0, :red => 31, :green => 32, :yellow => 33 }
+    DEFAULT_ACTIONS = [:directory, :exists, :remove, :create, :overwrite, :compile]
 
     attr_accessor :actions, :options
 
@@ -26,22 +13,9 @@ module Compass
 
     # Record an action that has occurred
     def record(action, *arguments)
-      emit color(ACTION_COLORS[action]) if Compass.configuration.color_output
       log "#{action_padding(action)}#{action} #{arguments.join(' ')}"
-      emit color(:clear) if Compass.configuration.color_output
     end
 
-    def color(c)
-      if c && COLORS.has_key?(c.to_sym)
-        "\e[#{COLORS[c.to_sym]}m"
-      else
-        ""
-      end
-    end
-
-    def emit(msg)
-      print msg
-    end
     # Emit a log message
     def log(msg)
       puts msg
@@ -65,4 +39,4 @@ module Compass
     def log(msg)
     end
   end
-end
+end