chriseppstein-compass 0.6.15 → 0.7.0

data/test/rails_integration_test.rb

@@ -0,0 +1,83 @@
+require  File.join(File.dirname(__FILE__),'test_helper')
+require 'fileutils'
+require 'compass'
+require 'compass/exec'
+require 'timeout'
+
+class RailsIntegrationTest < Test::Unit::TestCase
+  include Compass::TestCaseHelper
+  include Compass::CommandLineHelper
+
+  def setup
+    Compass.configuration.reset!
+  end
+
+  def test_rails_install
+    within_tmp_directory do
+      generate_rails_app_directories("compass_rails")
+      Dir.chdir "compass_rails" do
+        compass("--rails", '--trace', ".") do |responder|
+          responder.respond_to "Is this OK? (Y/n) ", :with => "Y", :required => true
+          responder.respond_to "Emit compiled stylesheets to public/stylesheets/compiled/? (Y/n) ", :with => "Y", :required => true
+        end
+        # puts ">>>#{@last_result}<<<"
+        assert_action_performed :create, "./app/stylesheets/screen.sass"
+        assert_action_performed :create, "./config/initializers/compass.rb"
+      end
+    end
+  rescue LoadError
+    puts "Skipping rails test. Couldn't Load rails"
+  end
+
+  def test_rails_install_with_no_dialog
+    within_tmp_directory do
+      generate_rails_app_directories("compass_rails")
+      Dir.chdir "compass_rails" do
+        compass(*%w(--rails --trace --sass-dir app/stylesheets --css-dir public/stylesheets/compiled .))
+        assert_action_performed :create, "./app/stylesheets/screen.sass"
+        assert_action_performed :create, "./config/initializers/compass.rb"
+      end
+    end
+  rescue LoadError
+    puts "Skipping rails test. Couldn't Load rails"
+  end
+
+
+  def generate_rails_app_directories(name)
+    Dir.mkdir name
+    Dir.mkdir File.join(name, "config")
+    Dir.mkdir File.join(name, "config", "initializers")
+  end
+
+  # Generate a rails application without polluting our current set of requires
+  # with the rails libraries. This will allow testing against multiple versions of rails
+  # by manipulating the load path.
+  def generate_rails_app(name)
+    if pid = fork
+      Process.wait(pid)
+      if $?.exitstatus == 2
+        raise LoadError, "Couldn't load rails"
+      elsif $?.exitstatus != 0
+        raise "Failed to generate rails application."
+      end
+    else
+      begin
+        require 'rails/version'
+        require 'rails_generator'
+        require 'rails_generator/scripts/generate'
+        Rails::Generator::Base.use_application_sources!
+        capture_output do
+          Rails::Generator::Base.logger = Rails::Generator::SimpleLogger.new $stdout
+          Rails::Generator::Scripts::Generate.new.run([name], :generator => 'app')
+        end
+      rescue LoadError
+        Kernel.exit(2)
+      rescue => e
+        $stderr.puts e
+        Kernel.exit!(1)
+      end
+      Kernel.exit!(0)
+    end
+  end
+
+end

data/test/sass_extensions_test.rb

@@ -1,5 +1,4 @@
 require  File.dirname(__FILE__)+'/test_helper'
-require 'compass'
 
 class SassExtensionsTest < Test::Unit::TestCase
   def test_simple

data/test/test_case_helper.rb

@@ -0,0 +1,13 @@
+module Compass
+  module TestCaseHelper
+    def absolutize(path)
+      if path.blank?
+        File.dirname(__FILE__)
+      elsif path[0] == ?/
+        "#{File.dirname(__FILE__)}#{path}"
+      else
+        "#{File.dirname(__FILE__)}/#{path}"
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,15 +1,4 @@
-# allows testing with edge Rails by creating a test/rails symlink
-RAILS_ROOT = linked_rails = File.dirname(__FILE__) + '/rails'
-RAILS_ENV = 'test'
-
 need_gems = false
-if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib')
-  puts "[ using linked Rails ]"
-  $:.unshift linked_rails + '/activesupport/lib'
-  $:.unshift linked_rails + '/actionpack/lib'
-else
-  need_gems = true
-end
 
 # allows testing with edge Haml by creating a test/haml symlink
 linked_haml = File.dirname(__FILE__) + '/haml'
@@ -24,22 +13,9 @@ end
 
 require 'rubygems' if need_gems
 
-require 'action_controller'
-require 'action_view'
-
+require 'compass'
 
 require 'test/unit'
 
-module Compass
-  module TestCaseHelper
-    def absolutize(path)
-      if path.blank?
-        File.dirname(__FILE__)
-      elsif path[0] == ?/
-        "#{File.dirname(__FILE__)}#{path}"
-      else
-        "#{File.dirname(__FILE__)}/#{path}"
-      end
-    end
-  end
-end
+require File.join(File.dirname(__FILE__), 'test_case_helper')
+require File.join(File.dirname(__FILE__), 'command_line_helper')

data/test/test_rails_helper.rb

@@ -0,0 +1,20 @@
+# XXX This file isn't in use at the moment, but will be used to help test
+# XXX deep rails integration of compass features.
+need_gems = false
+
+# allows testing with edge Rails by creating a test/rails symlink
+RAILS_ROOT = linked_rails = File.dirname(__FILE__) + '/rails'
+RAILS_ENV = 'test'
+
+if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib')
+  puts "[ using linked Rails ]"
+  $:.unshift linked_rails + '/activesupport/lib'
+  $:.unshift linked_rails + '/actionpack/lib'
+else
+  need_gems = true
+end
+
+require 'rubygems' if need_gems
+
+require 'action_controller'
+require 'action_view'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chriseppstein-compass
 version: !ruby/object:Gem::Version 
-  version: 0.6.15
+  version: 0.7.0
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-05 00:00:00 -07:00
+date: 2009-06-28 00:00:00 -07:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,13 +29,17 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE.markdown
 - README.markdown
 files: 
 - CHANGELOG.markdown
+- LICENSE.markdown
 - README.markdown
 - REVISION
+- Rakefile
 - VERSION.yml
 - bin/compass
+- deps.rip
 - examples/blueprint_default/config.rb
 - examples/blueprint_default/images/grid.png
 - examples/blueprint_default/index.html.haml
@@ -46,6 +50,7 @@ files:
 - examples/blueprint_default/parts/test.jpg
 - examples/blueprint_default/parts/valid.png
 - examples/blueprint_default/src/ie.sass
+- examples/blueprint_default/src/images/grid.png
 - examples/blueprint_default/src/print.sass
 - examples/blueprint_default/src/screen.sass
 - examples/blueprint_plugins/config.rb
@@ -71,13 +76,16 @@ files:
 - examples/blueprint_plugins/plugins/rtl.html.haml
 - examples/blueprint_plugins/src/buttons.sass
 - examples/blueprint_plugins/src/ie.sass
+- examples/blueprint_plugins/src/images/grid.png
 - examples/blueprint_plugins/src/link_icons.sass
 - examples/blueprint_plugins/src/print.sass
 - examples/blueprint_plugins/src/rtl_screen.sass
 - examples/blueprint_plugins/src/screen.sass
+- examples/blueprint_scoped/images/grid.png
 - examples/blueprint_scoped/src/ie.sass
 - examples/blueprint_scoped/src/print.sass
 - examples/blueprint_scoped/src/screen.sass
+- examples/blueprint_scoped_form/images/grid.png
 - examples/blueprint_scoped_form/src/ie.sass
 - examples/blueprint_scoped_form/src/print.sass
 - examples/blueprint_scoped_form/src/screen.sass
@@ -90,6 +98,7 @@ files:
 - examples/blueprint_semantic/parts/test.jpg
 - examples/blueprint_semantic/parts/valid.png
 - examples/blueprint_semantic/src/ie.sass
+- examples/blueprint_semantic/src/images/grid.png
 - examples/blueprint_semantic/src/liquid.sass
 - examples/blueprint_semantic/src/print.sass
 - examples/blueprint_semantic/src/screen.sass
@@ -97,6 +106,7 @@ files:
 - examples/compass/config.rb
 - examples/compass/images/blue_arrow.gif
 - examples/compass/src/compass.sass
+- examples/compass/src/images/blue_arrow.gif
 - examples/compass/src/sticky_footer.sass
 - examples/compass/src/utilities.sass
 - examples/compass/sticky_footer.html.haml
@@ -116,6 +126,7 @@ files:
 - frameworks/blueprint/stylesheets/_blueprint.sass
 - frameworks/blueprint/stylesheets/blueprint/_ie.sass
 - frameworks/blueprint/stylesheets/blueprint/_print.sass
+- frameworks/blueprint/stylesheets/blueprint/_reset.sass
 - frameworks/blueprint/stylesheets/blueprint/_screen.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass
@@ -126,6 +137,7 @@ files:
 - frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_link_icons.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass
+- frameworks/blueprint/stylesheets/blueprint/modules/_reset.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass
@@ -148,6 +160,7 @@ files:
 - frameworks/blueprint/templates/project/grid.png
 - frameworks/blueprint/templates/project/ie.sass
 - frameworks/blueprint/templates/project/manifest.rb
+- frameworks/blueprint/templates/project/partials/_base.sass
 - frameworks/blueprint/templates/project/print.sass
 - frameworks/blueprint/templates/project/screen.sass
 - frameworks/compass.rb
@@ -161,6 +174,7 @@ files:
 - frameworks/compass/stylesheets/compass/utilities/_links.sass
 - frameworks/compass/stylesheets/compass/utilities/_lists.sass
 - frameworks/compass/stylesheets/compass/utilities/_print.sass
+- frameworks/compass/stylesheets/compass/utilities/_sprites.sass
 - frameworks/compass/stylesheets/compass/utilities/_tables.sass
 - frameworks/compass/stylesheets/compass/utilities/_text.sass
 - frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass
@@ -176,6 +190,7 @@ files:
 - frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass
 - frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass
 - frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass
+- frameworks/compass/stylesheets/compass/utilities/sprites/_sprite_img.sass
 - frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass
 - frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass
 - frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass
@@ -195,6 +210,13 @@ files:
 - frameworks/yui/templates/project/screen.sass
 - lib/compass.rb
 - lib/compass/actions.rb
+- lib/compass/app_integration.rb
+- lib/compass/app_integration/merb.rb
+- lib/compass/app_integration/rails.rb
+- lib/compass/app_integration/rails/action_controller.rb
+- lib/compass/app_integration/rails/image_url.rb
+- lib/compass/app_integration/rails/sass_plugin.rb
+- lib/compass/app_integration/rails/templates/compass-install-rails.rb
 - lib/compass/commands/base.rb
 - lib/compass/commands/create_project.rb
 - lib/compass/commands/generate_grid_background.rb
@@ -221,16 +243,25 @@ files:
 - lib/compass/installers/rails.rb
 - lib/compass/installers/stand_alone.rb
 - lib/compass/logger.rb
-- lib/compass/merb.rb
+- lib/compass/sass_extensions.rb
+- lib/compass/sass_extensions/functions.rb
+- lib/compass/sass_extensions/functions/display.rb
+- lib/compass/sass_extensions/functions/enumerate.rb
+- lib/compass/sass_extensions/functions/image_url.rb
+- lib/compass/sass_extensions/functions/inline_image.rb
+- lib/compass/sass_extensions/functions/selectors.rb
+- lib/compass/sass_extensions/monkey_patches.rb
+- lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb
 - lib/compass/test_case.rb
 - lib/compass/validator.rb
 - lib/compass/version.rb
-- lib/sass_extensions.rb
+- test/command_line_helper.rb
 - test/command_line_test.rb
 - test/compass_test.rb
 - test/configuration_test.rb
 - test/fixtures/stylesheets/blueprint/config.rb
 - test/fixtures/stylesheets/blueprint/css/typography.css
+- test/fixtures/stylesheets/blueprint/images/grid.png
 - test/fixtures/stylesheets/blueprint/sass/ie.sass
 - test/fixtures/stylesheets/blueprint/sass/print.sass
 - test/fixtures/stylesheets/blueprint/sass/screen.sass
@@ -244,14 +275,21 @@ files:
 - test/fixtures/stylesheets/compass/sass/print.sass
 - test/fixtures/stylesheets/compass/sass/reset.sass
 - test/fixtures/stylesheets/compass/sass/utilities.sass
+- test/fixtures/stylesheets/image_urls/config.rb
+- test/fixtures/stylesheets/image_urls/css/screen.css
+- test/fixtures/stylesheets/image_urls/images/grid.png
+- test/fixtures/stylesheets/image_urls/sass/screen.sass
 - test/fixtures/stylesheets/yui/config.rb
 - test/fixtures/stylesheets/yui/css/mixins.css
 - test/fixtures/stylesheets/yui/sass/base.sass
 - test/fixtures/stylesheets/yui/sass/fonts.sass
 - test/fixtures/stylesheets/yui/sass/grids.sass
 - test/fixtures/stylesheets/yui/sass/mixins.sass
+- test/rails_integration_test.rb
 - test/sass_extensions_test.rb
+- test/test_case_helper.rb
 - test/test_helper.rb
+- test/test_rails_helper.rb
 has_rdoc: false
 homepage: http://compass-style.org
 post_install_message: 
@@ -279,11 +317,13 @@ signing_key:
 specification_version: 3
 summary: A Real Stylesheet Framework
 test_files: 
+- test/command_line_helper.rb
 - test/command_line_test.rb
 - test/compass_test.rb
 - test/configuration_test.rb
 - test/fixtures/stylesheets/blueprint/config.rb
 - test/fixtures/stylesheets/blueprint/css/typography.css
+- test/fixtures/stylesheets/blueprint/images/grid.png
 - test/fixtures/stylesheets/blueprint/sass/ie.sass
 - test/fixtures/stylesheets/blueprint/sass/print.sass
 - test/fixtures/stylesheets/blueprint/sass/screen.sass
@@ -297,11 +337,18 @@ test_files:
 - test/fixtures/stylesheets/compass/sass/print.sass
 - test/fixtures/stylesheets/compass/sass/reset.sass
 - test/fixtures/stylesheets/compass/sass/utilities.sass
+- test/fixtures/stylesheets/image_urls/config.rb
+- test/fixtures/stylesheets/image_urls/css/screen.css
+- test/fixtures/stylesheets/image_urls/images/grid.png
+- test/fixtures/stylesheets/image_urls/sass/screen.sass
 - test/fixtures/stylesheets/yui/config.rb
 - test/fixtures/stylesheets/yui/css/mixins.css
 - test/fixtures/stylesheets/yui/sass/base.sass
 - test/fixtures/stylesheets/yui/sass/fonts.sass
 - test/fixtures/stylesheets/yui/sass/grids.sass
 - test/fixtures/stylesheets/yui/sass/mixins.sass
+- test/rails_integration_test.rb
 - test/sass_extensions_test.rb
+- test/test_case_helper.rb
 - test/test_helper.rb
+- test/test_rails_helper.rb

data/lib/sass_extensions.rb

@@ -1,67 +0,0 @@
-require 'sass/plugin'
-
-module Sass::Script::Functions
-  COMMA_SEPARATOR = /\s*,\s*/
-
-  def nest(*arguments)
-    nested = arguments.map{|a| a.value}.inject do |memo,arg|
-      ancestors = memo.split(COMMA_SEPARATOR)
-      descendants = arg.split(COMMA_SEPARATOR)
-      ancestors.map{|a| descendants.map{|d| "#{a} #{d}"}.join(", ")}.join(", ")
-    end
-    Sass::Script::String.new(nested)
-  end
-
-  def enumerate(prefix, from, through)
-    selectors = (from.value..through.value).map{|i| "#{prefix.value}-#{i}"}.join(", ")
-    Sass::Script::String.new(selectors)
-  end
-
-  def image_url(path)
-    if absolute_path?(path.value)
-      return Sass::Script::String.new("url(#{path})")
-    end
-    http_images_path = if Compass.configuration.http_images_path == :relative
-      if (target_css_file = options[:css_filename])
-        images_path = File.join(Compass.configuration.project_path, Compass.configuration.images_dir)
-        Pathname.new(images_path).relative_path_from(Pathname.new(File.dirname(target_css_file))).to_s
-      else
-        nil
-      end
-    else
-      Compass.configuration.http_images_path
-    end
-    if http_images_path
-      http_images_path = "#{http_images_path}/" unless http_images_path[-1..-1] == "/"
-      path = "#{http_images_path}#{path}"
-    end
-    Sass::Script::String.new("url(#{path})")
-  end
-
-  private
-  def absolute_path?(path)
-    path[0..0] == "/" || path[0..3] == "http"
-  end
-end
-
-# XXX: We can remove this check and monkeypatch once Sass 2.2 is released.
-module Sass::Plugin
-  class << self
-    unless method_defined?(:exact_stylesheet_needs_update?)
-      def stylesheet_needs_update?(name, template_path, css_path)
-        css_file = css_filename(name, css_path)
-        template_file = template_filename(name, template_path)
-        exact_stylesheet_needs_update?(css_file, template_file)
-      end
-      def exact_stylesheet_needs_update?(css_file, template_file)
-        if !File.exists?(css_file)
-          return true
-        else
-          css_mtime = File.mtime(css_file)
-          File.mtime(template_file) > css_mtime ||
-            dependencies(template_file).any?(&dependency_updated?(css_mtime))
-        end
-      end
-    end
-  end
-end