Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix gemspec, stylesheet helper should generate link for scss templates

  • Loading branch information...
commit 694198c07ee2854302fabf9e4a81f00cb47e14a9 1 parent b0d1ebd
Stephen Bartholomew authored
View
4 Rakefile
@@ -15,8 +15,8 @@ begin
gem.authors = ["Stephen Bartholomew"]
gem.rubyforge_project = "staticmatic"
- gem.files = FileList["[A-Z]*", "{bin,lib,spec}/**/*"]
-
+ gem.files.include "[A-Z]*", "{bin,lib,spec}/**/*"
+ gem.files.exclude "spec/sandbox/tmp", "spec/sandbox/test_site/site/*"
gem.add_dependency("haml", ">=2.0.0")
gem.add_dependency("rack", ">=1.0")
gem.add_dependency("compass", ">=0.10.0")
View
1  lib/staticmatic/helpers/assets_helper.rb
@@ -59,6 +59,7 @@ def stylesheets(*params)
#specific files requested and in a specific order
params.each do |file|
if File.exist?(File.join(@staticmatic.src_dir, 'stylesheets', "#{file}.sass")) ||
+ File.exist?(File.join(@staticmatic.src_dir, 'stylesheets', "#{file}.scss")) ||
File.exist?(File.join(@staticmatic.site_dir, 'stylesheets', "#{file}.css"))
options[:href] = File.join(relative_path, "stylesheets", "#{file}.css")
output << tag(:link, options)
View
4 spec/helpers/asset_helper_spec.rb
@@ -24,6 +24,10 @@
it "should not link to partials" do
@links.should_not match(/\_forms.css/)
end
+
+ it "should setup links for specified stylesheets" do
+ stylesheets(:sassy).should match(/stylesheets\/sassy\.css/)
+ end
end
context "When using the stylesheet helper from a sub page" do
View
202 staticmatic.gemspec
@@ -1,6 +1,6 @@
# Generated by jeweler
# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
# -*- encoding: utf-8 -*-
Gem::Specification.new do |s|
@@ -16,110 +16,124 @@ Gem::Specification.new do |s|
s.executables = ["staticmatic"]
s.extra_rdoc_files = [
"LICENSE",
- "README.markdown"
+ "README.markdown"
]
s.files = [
"LICENSE",
- "README.markdown",
- "Rakefile",
- "VERSION.yml",
- "bin/staticmatic",
- "lib/staticmatic.rb",
- "lib/staticmatic/base.rb",
- "lib/staticmatic/compass.rb",
- "lib/staticmatic/compass/app_integration.rb",
- "lib/staticmatic/compass/configuration_defaults.rb",
- "lib/staticmatic/compass/installer.rb",
- "lib/staticmatic/configuration.rb",
- "lib/staticmatic/error.rb",
- "lib/staticmatic/helpers.rb",
- "lib/staticmatic/helpers/assets_helper.rb",
- "lib/staticmatic/helpers/current_path_helper.rb",
- "lib/staticmatic/helpers/form_helper.rb",
- "lib/staticmatic/helpers/render_helper.rb",
- "lib/staticmatic/helpers/tag_helper.rb",
- "lib/staticmatic/helpers/url_helper.rb",
- "lib/staticmatic/mixins/build.rb",
- "lib/staticmatic/mixins/helpers.rb",
- "lib/staticmatic/mixins/render.rb",
- "lib/staticmatic/mixins/rescue.rb",
- "lib/staticmatic/mixins/server.rb",
- "lib/staticmatic/mixins/setup.rb",
- "lib/staticmatic/server.rb",
- "lib/staticmatic/template_error.rb",
- "lib/staticmatic/templates/project/config/compass.rb",
- "lib/staticmatic/templates/project/config/site.rb",
- "lib/staticmatic/templates/project/src/layouts/default.haml",
- "lib/staticmatic/templates/project/src/pages/index.haml",
- "lib/staticmatic/templates/project/src/stylesheets/screen.sass",
- "lib/staticmatic/templates/rescues/default.haml",
- "lib/staticmatic/templates/rescues/template.haml",
- "spec/base_spec.rb",
- "spec/compass_integration_spec.rb",
- "spec/helpers/asset_helper_spec.rb",
- "spec/helpers/custom_helper_spec.rb",
- "spec/render_spec.rb",
- "spec/rescue_spec.rb",
- "spec/sandbox/test_site/config/compass.rb",
- "spec/sandbox/test_site/config/site.rb",
- "spec/sandbox/test_site/site/images/grid.png",
- "spec/sandbox/test_site/site/index",
- "spec/sandbox/test_site/site/layout_test",
- "spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html",
- "spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html.html",
- "spec/sandbox/test_site/site/sub_folder/index.html",
- "spec/sandbox/test_site/src/helpers/application_helper.rb",
- "spec/sandbox/test_site/src/layouts/alternate_layout.haml",
- "spec/sandbox/test_site/src/layouts/default.haml",
- "spec/sandbox/test_site/src/layouts/projects.haml",
- "spec/sandbox/test_site/src/pages/hello_world.erb",
- "spec/sandbox/test_site/src/pages/index.haml",
- "spec/sandbox/test_site/src/pages/layout_test.haml",
- "spec/sandbox/test_site/src/pages/page_one.haml",
- "spec/sandbox/test_site/src/pages/page_two.haml",
- "spec/sandbox/test_site/src/pages/page_with_error.haml",
- "spec/sandbox/test_site/src/pages/page_with_partial_error.haml",
- "spec/sandbox/test_site/src/partials/menu.haml",
- "spec/sandbox/test_site/src/partials/partial_with_error.haml",
- "spec/sandbox/test_site/src/stylesheets/application.sass",
- "spec/sandbox/test_site/src/stylesheets/css_with_error.sass",
- "spec/sandbox/test_site/src/stylesheets/nested/a_nested_stylesheet.sass",
- "spec/sandbox/test_site/src/stylesheets/partials/_forms.sass",
- "spec/sandbox/test_site/src/stylesheets/sassy.scss",
- "spec/sandbox/tmp/Rakefile",
- "spec/sandbox/tmp/config/compass.rb",
- "spec/sandbox/tmp/config/site.rb",
- "spec/sandbox/tmp/src/layouts/default.haml",
- "spec/sandbox/tmp/src/layouts/site.haml",
- "spec/sandbox/tmp/src/pages/index.haml",
- "spec/sandbox/tmp/src/stylesheets/screen.sass",
- "spec/server_spec.rb",
- "spec/setup_spec.rb",
- "spec/spec_helper.rb",
- "spec/template_error_spec.rb"
+ "README.markdown",
+ "Rakefile",
+ "VERSION.yml",
+ "bin/staticmatic",
+ "lib/staticmatic.rb",
+ "lib/staticmatic/base.rb",
+ "lib/staticmatic/compass.rb",
+ "lib/staticmatic/compass/app_integration.rb",
+ "lib/staticmatic/compass/configuration_defaults.rb",
+ "lib/staticmatic/compass/installer.rb",
+ "lib/staticmatic/configuration.rb",
+ "lib/staticmatic/error.rb",
+ "lib/staticmatic/helpers.rb",
+ "lib/staticmatic/helpers/assets_helper.rb",
+ "lib/staticmatic/helpers/current_path_helper.rb",
+ "lib/staticmatic/helpers/form_helper.rb",
+ "lib/staticmatic/helpers/render_helper.rb",
+ "lib/staticmatic/helpers/tag_helper.rb",
+ "lib/staticmatic/helpers/url_helper.rb",
+ "lib/staticmatic/mixins/build.rb",
+ "lib/staticmatic/mixins/helpers.rb",
+ "lib/staticmatic/mixins/render.rb",
+ "lib/staticmatic/mixins/rescue.rb",
+ "lib/staticmatic/mixins/server.rb",
+ "lib/staticmatic/mixins/setup.rb",
+ "lib/staticmatic/server.rb",
+ "lib/staticmatic/template_error.rb",
+ "lib/staticmatic/templates/project/config/compass.rb",
+ "lib/staticmatic/templates/project/config/site.rb",
+ "lib/staticmatic/templates/project/src/layouts/default.haml",
+ "lib/staticmatic/templates/project/src/pages/index.haml",
+ "lib/staticmatic/templates/project/src/stylesheets/screen.sass",
+ "lib/staticmatic/templates/rescues/default.haml",
+ "lib/staticmatic/templates/rescues/template.haml",
+ "spec/base_spec.rb",
+ "spec/compass_integration_spec.rb",
+ "spec/helpers/asset_helper_spec.rb",
+ "spec/helpers/custom_helper_spec.rb",
+ "spec/render_spec.rb",
+ "spec/rescue_spec.rb",
+ "spec/sandbox/test_site/config/compass.rb",
+ "spec/sandbox/test_site/config/site.rb",
+ "spec/sandbox/test_site/src/helpers/application_helper.rb",
+ "spec/sandbox/test_site/src/layouts/alternate_layout.haml",
+ "spec/sandbox/test_site/src/layouts/default.haml",
+ "spec/sandbox/test_site/src/layouts/projects.haml",
+ "spec/sandbox/test_site/src/pages/hello_world.erb",
+ "spec/sandbox/test_site/src/pages/index.haml",
+ "spec/sandbox/test_site/src/pages/layout_test.haml",
+ "spec/sandbox/test_site/src/pages/page_one.haml",
+ "spec/sandbox/test_site/src/pages/page_two.haml",
+ "spec/sandbox/test_site/src/pages/page_with_error.haml",
+ "spec/sandbox/test_site/src/pages/page_with_partial_error.haml",
+ "spec/sandbox/test_site/src/partials/menu.haml",
+ "spec/sandbox/test_site/src/partials/partial_with_error.haml",
+ "spec/sandbox/test_site/src/stylesheets/application.sass",
+ "spec/sandbox/test_site/src/stylesheets/css_with_error.sass",
+ "spec/sandbox/test_site/src/stylesheets/nested/a_nested_stylesheet.sass",
+ "spec/sandbox/test_site/src/stylesheets/partials/_forms.sass",
+ "spec/sandbox/test_site/src/stylesheets/sassy.scss",
+ "spec/server_spec.rb",
+ "spec/setup_spec.rb",
+ "spec/spec_helper.rb",
+ "spec/template_error_spec.rb",
+ "staticmatic.gemspec",
+ "website/Gemfile",
+ "website/config/site.rb",
+ "website/site/docs/compass_integration.html",
+ "website/site/docs/getting_started.html",
+ "website/site/docs/helpers.html",
+ "website/site/images/bycurve21.gif",
+ "website/site/images/curve21.jpg",
+ "website/site/images/homepage-build.jpg",
+ "website/site/images/homepage-previewing.jpg",
+ "website/site/images/homepage-templating.jpg",
+ "website/site/stylesheets/ie.css",
+ "website/site/stylesheets/print.css",
+ "website/site/stylesheets/screen.css",
+ "website/src/helpers/content_helper.rb",
+ "website/src/layouts/default.haml",
+ "website/src/pages/development.haml",
+ "website/src/pages/docs/_menu.haml",
+ "website/src/pages/docs/_requires_prerelease.haml",
+ "website/src/pages/docs/compass_integration.haml",
+ "website/src/pages/docs/getting_started.haml",
+ "website/src/pages/docs/helpers.haml",
+ "website/src/pages/index.haml",
+ "website/src/stylesheets/_base.scss",
+ "website/src/stylesheets/_defaults.scss",
+ "website/src/stylesheets/ie.scss",
+ "website/src/stylesheets/print.scss",
+ "website/src/stylesheets/screen.scss"
]
s.homepage = %q{http://staticmatic.net}
- s.rdoc_options = ["--charset=UTF-8"]
s.require_paths = ["lib"]
s.rubyforge_project = %q{staticmatic}
s.rubygems_version = %q{1.3.6}
s.summary = %q{Lightweight Static Site Framework}
s.test_files = [
"spec/base_spec.rb",
- "spec/compass_integration_spec.rb",
- "spec/helpers/asset_helper_spec.rb",
- "spec/helpers/custom_helper_spec.rb",
- "spec/render_spec.rb",
- "spec/rescue_spec.rb",
- "spec/sandbox/test_site/config/compass.rb",
- "spec/sandbox/test_site/config/site.rb",
- "spec/sandbox/test_site/src/helpers/application_helper.rb",
- "spec/sandbox/tmp/config/compass.rb",
- "spec/sandbox/tmp/config/site.rb",
- "spec/server_spec.rb",
- "spec/setup_spec.rb",
- "spec/spec_helper.rb",
- "spec/template_error_spec.rb"
+ "spec/compass_integration_spec.rb",
+ "spec/helpers/asset_helper_spec.rb",
+ "spec/helpers/custom_helper_spec.rb",
+ "spec/render_spec.rb",
+ "spec/rescue_spec.rb",
+ "spec/sandbox/test_site/config/compass.rb",
+ "spec/sandbox/test_site/config/site.rb",
+ "spec/sandbox/test_site/src/helpers/application_helper.rb",
+ "spec/sandbox/tmp/config/compass.rb",
+ "spec/sandbox/tmp/config/site.rb",
+ "spec/server_spec.rb",
+ "spec/setup_spec.rb",
+ "spec/spec_helper.rb",
+ "spec/template_error_spec.rb"
]
if s.respond_to? :specification_version then
Please sign in to comment.
Something went wrong with that request. Please try again.