staticmatic 0.10.8 → 0.11.0.alpha.0

data/Rakefile

@@ -20,6 +20,7 @@ begin
     gem.add_dependency("haml", ">=2.0.0")
     gem.add_dependency("rack", ">=1.0")
     gem.add_dependency("mongrel", ">=1.1.5")
+    gem.add_dependency("compass")
   end
 rescue LoadError
   puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gemgem.github.com"

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
 :major: 0
-:minor: 10
-:patch: 8
+:minor: 11
+:patch: 0
+:build: alpha.0

data/bin/staticmatic

@@ -5,6 +5,8 @@ require File.dirname(__FILE__) + '/../lib/staticmatic'
 command = ARGV[0]
 directory = ARGV[1]
 
+$:.push File.join(directory, "lib")
+
 if !command || !directory
   puts "Usage: #{$0} <build|setup|preview> <directory>"
   exit
@@ -12,7 +14,15 @@ end
 
 configuration = StaticMatic::Configuration.new
 
-config_file = "#{directory}/src/configuration.rb"
+config_file = File.join(directory, "config", "site.rb")
+
+if !File.exists?(config_file)
+  config_file = File.join(directory, "src", "configuration.rb")
+  
+  if File.exists?(config_file)
+    puts "DEPRECATION: #{directory}/src/configuration.rb will be moved to #{directory}/config/site.rb in 0.12.0"
+  end
+end
 
 if File.exists?(config_file)
   config = File.read(config_file)

data/lib/staticmatic/base.rb

@@ -1,24 +1,4 @@
-module StaticMatic
-  # Directories generated for a new site setup
-  BASE_DIRS = %w{
-    site/
-    site/stylesheets
-    site/images
-    site/javascripts
-    src/
-    src/pages/
-    src/layouts
-    src/stylesheets
-    src/helpers
-  }
-
-  # Templates for setup and their location
-  TEMPLATES = {
-    'application.haml' => 'layouts',
-    'application.sass' => 'stylesheets',
-    'index.haml' => 'pages'
-  }
-  
+module StaticMatic  
   class Base
     
     include StaticMatic::RenderMixin
@@ -39,15 +19,21 @@ module StaticMatic
       @configuration = configuration
       @current_page = nil
       @current_file_stack = []
-      @base_dir = File.expand_path(base_dir)
-      @src_dir = "#{@base_dir}/src"
-      @site_dir = "#{@base_dir}/site"
-      @templates_dir = File.dirname(__FILE__) + '/templates/default/'
+      @base_dir = base_dir
+      @src_dir = File.join(@base_dir, "src")
+      @site_dir = File.join(@base_dir, "site")
+      
+      if File.exists?(File.join(@src_dir, "layouts", "application.haml"))
+        puts "DEPRECATION: layouts/application.haml will be renamed to layouts/default.haml in the 0.12.0"
+        @layout = "application"
+      else
+        @layout = "default"
+      end
       
-      @layout = "application"
       @scope = Object.new
       @scope.instance_variable_set("@staticmatic", self)
       
+      configure_compass
       load_helpers
     end
     
@@ -56,6 +42,8 @@ module StaticMatic
     end
   
     def run(command)
+      puts "Site root is: #{@base_dir}"
+      
       if %w(build setup preview).include?(command)
         send(command)
       else
@@ -77,13 +65,21 @@ module StaticMatic
     end
     
     def full_layout_path(name)
-      "#{@src_dir}/layouts/#{name}.haml"
+      File.join(@src_dir, "layouts", "#{name}.haml")
     end
     
-    class << self
-      def base_dirs
-        StaticMatic::BASE_DIRS
+    def configure_compass
+      Compass.configuration do |config|
+        config.output_style = :expanded
+        config.project_path = @base_dir 
+        config.sass_dir = File.join(@base_dir, "src", "stylesheets")
+        config.css_dir = File.join(@base_dir, "site", "stylesheets")
+        config.images_dir = File.join(@base_dir, "site", "images")
+        config.http_path = "/"
+        config.http_images_path = "/images"
       end
+      
+      configuration.sass_options.merge!(Compass.sass_engine_options)
     end
   end
 end

data/lib/staticmatic/mixins/render.rb

@@ -16,7 +16,7 @@ module StaticMatic::RenderMixin
     begin
       # clear all scope variables except @staticmatic
       @scope.instance_variables.each do |var|
-        @scope.instance_variable_set(var, nil) unless var == '@staticmatic' || :@staticmatic
+        @scope.instance_variable_set(var, nil) unless var == '@staticmatic' || var == :@staticmatic
       end
       html = generate_html_from_template_source(File.read(full_file_path))
   
@@ -99,7 +99,7 @@ module StaticMatic::RenderMixin
   end
 
   def determine_layout(dir = '')
-    layout_name = "application"
+    layout_name = @layout
   
     if @scope.instance_variable_get("@layout")
       layout_name = @scope.instance_variable_get("@layout")

data/lib/staticmatic/mixins/setup.rb

@@ -2,19 +2,15 @@ module StaticMatic::SetupMixin
   
   def setup
     Dir.mkdir(@base_dir) unless File.exists?(@base_dir)
-  
-    StaticMatic::BASE_DIRS.each do |directory|
-      directory = "#{@base_dir}/#{directory}"
-      if !File.exists?(directory)
-        Dir.mkdir(directory)
-        puts "created #{directory}"
+    
+    Dir[File.join(File.dirname(__FILE__), "..", "templates", "project", "*")].each do |template|
+      begin
+        FileUtils.cp_r(template, @base_dir)
+      rescue Errno::EEXIST
+        # ignore - template exists
       end
     end
 
-    StaticMatic::TEMPLATES.each do |template, destination|
-      copy_file("#{@templates_dir}/#{template}", "#{@src_dir}/#{destination}")
-    end
-
     puts "Done"
   end
 end

data/lib/staticmatic/templates/project/config/site.rb

@@ -0,0 +1,16 @@
+# Default is 3000
+# configuration.preview_server_port = 3000
+ 
+# Default is localhost
+# configuration.preview_server_host = "localhost"
+ 
+# Default is true
+# When false .html & index.html get stripped off generated urls
+# configuration.use_extensions_for_page_links = true
+ 
+# Default is an empty hash
+# configuration.sass_options = {}
+ 
+# Default is an empty hash
+# http://haml-lang.com/docs/yardoc/file.HAML_REFERENCE.html#options
+# configuration.haml_options = {}

data/lib/staticmatic.rb

@@ -5,9 +5,10 @@ require 'sass/plugin'
 require 'rack'
 require 'rack/handler/mongrel'
 require 'fileutils'
+require 'compass'
 
 module StaticMatic
-  VERSION = '0.10.2'
+  VERSION = "0.11.0"
 end
 
 ["render", "build", "setup", "server", "helpers", "rescue"].each do |mixin|

data/spec/compass_integration_spec.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe "Compass integration" do
+  before do
+    setup_staticmatic
+  end
+  
+  it "should configure compass" do
+    Compass.configuration.project_path.should == TEST_SITE_PATH
+    Compass.configuration.sass_dir.should == File.join(TEST_SITE_PATH, "src", "stylesheets")
+    Compass.configuration.css_dir.should == File.join(TEST_SITE_PATH, "site", "stylesheets")
+    Compass.configuration.images_dir.should == File.join(TEST_SITE_PATH, "site", "images")
+    Compass.configuration.http_path.should == "/"
+    Compass.configuration.http_images_path.should == "/images"
+  end
+end

data/spec/sandbox/test_site/src/configuration.rb

@@ -0,0 +1 @@
+# stub for testing

data/spec/sandbox/tmp/Rakefile

@@ -0,0 +1,2 @@
+require "staticmatic"
+require "staticmatic/tasks/staticmatic"

data/spec/sandbox/tmp/config/compass.rb

@@ -0,0 +1,11 @@
+
+output_style = :expanded
+project_path = File.join(File.dirname(__FILE__), "..", "/")     # must be set for Compass to work 
+sass_dir     = "src/stylesheets"  # dir containing Sass / Compass source files
+http_path    = "/"                # root when deployed
+css_dir      = "site/stylesheets" # final CSS
+images_dir   = "site/images"      # final images
+http_images_path = "/images"
+
+# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true

data/spec/sandbox/tmp/config/site.rb

@@ -0,0 +1,16 @@
+# Default is 3000
+# configuration.preview_server_port = 3000
+ 
+# Default is localhost
+# configuration.preview_server_host = "localhost"
+ 
+# Default is true
+# When false .html & index.html get stripped off generated urls
+# configuration.use_extensions_for_page_links = true
+ 
+# Default is an empty hash
+# configuration.sass_options = {}
+ 
+# Default is an empty hash
+# http://haml-lang.com/docs/yardoc/file.HAML_REFERENCE.html#options
+# configuration.haml_options = {}

data/spec/sandbox/tmp/src/layouts/default.haml

@@ -0,0 +1,7 @@
+!!!
+%html
+  %head
+    %title StaticMatic
+    = stylesheets
+  %body
+    = yield

data/spec/sandbox/tmp/src/layouts/site.haml

@@ -0,0 +1,7 @@
+!!!
+%html
+  %head
+    %title StaticMatic
+    = stylesheets
+  %body
+    = yield

data/spec/sandbox/tmp/src/pages/index.haml

@@ -0,0 +1 @@
+%h1 StaticMatic!

data/spec/sandbox/tmp/src/stylesheets/screen.sass

@@ -0,0 +1,4 @@
+body
+  font:
+    family: Verdana
+    size: 10pt

data/spec/server_spec.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + "/spec_helper"
 
-
 describe "StaticMatic::Server" do
   before do
     @base_dir = File.dirname(__FILE__) + '/sandbox/tmp'

data/spec/setup_spec.rb

@@ -3,23 +3,20 @@ require File.dirname(__FILE__) + "/spec_helper"
 describe "StaticMatic::Setup" do
   before do
     setup_staticmatic
+    @tmp_dir = File.dirname(__FILE__) + '/sandbox/tmp'
+    staticmatic = StaticMatic::Base.new(@tmp_dir)
+    staticmatic.run('setup')
   end
   
-  it "setup directories" do
-    tmp_dir = File.dirname(__FILE__) + '/sandbox/tmp'
-    staticmatic = StaticMatic::Base.new(tmp_dir)
-    staticmatic.run('setup')
-    
-    StaticMatic::Base.base_dirs.each do |dir|
-      File.exists?("#{tmp_dir}/#{dir}").should_not be_nil, "Should create #{dir}"
-    end
-    
-    StaticMatic::Base.base_dirs.reverse.each do |dir|
-      Dir.entries("#{tmp_dir}/#{dir}").each do |file|
-        next if file.match(/^\./)
-        File.delete("#{tmp_dir}/#{dir}/#{file}")
-      end
-      Dir.delete("#{tmp_dir}/#{dir}") if File.exists?("#{tmp_dir}/#{dir}")
-    end
+  it "should set up project directory in given path" do
+    %w(
+    site/images
+    site/javascripts
+    site/stylesheets
+    src/layouts/site.haml
+    src/pages/index.haml
+    src/stylesheets/screen.sass
+    config/site.rb
+    ).each {|path| File.exists?(File.join(@tmp_dir, path)).should(be_true, "#{path} expected to exist in #{@tmp_dir}") }
   end
 end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'spec'
 
 require File.dirname(__FILE__) + '/../lib/staticmatic'
 
-TEST_SITE_PATH = File.join(File.dirname(__FILE__), "sandbox", "test_site")
+TEST_SITE_PATH = File.expand_path(File.join(File.dirname(__FILE__), "sandbox", "test_site"))
 
 Spec::Runner.configure do |config|
 end

metadata

@@ -1,7 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: staticmatic
 version: !ruby/object:Gem::Version 
-  version: 0.10.8
+  prerelease: true
+  segments: 
+  - 0
+  - 11
+  - 0
+  - alpha
+  - 0
+  version: 0.11.0.alpha.0
 platform: ruby
 authors: 
 - Stephen Bartholomew
@@ -9,39 +16,62 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-20 00:00:00 +00:00
+date: 2010-04-20 00:00:00 +01:00
 default_executable: staticmatic
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mongrel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 5
         version: 1.1.5
-    version: 
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: compass
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: Lightweight Static Site Framework
 email: steve@curve21.com
 executables: 
@@ -70,25 +100,28 @@ files:
 - lib/staticmatic/mixins/setup.rb
 - lib/staticmatic/server.rb
 - lib/staticmatic/template_error.rb
-- lib/staticmatic/templates/default/application.haml
-- lib/staticmatic/templates/default/application.sass
-- lib/staticmatic/templates/default/index.haml
+- 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_spec.rb
 - spec/render_spec.rb
 - spec/rescue_spec.rb
-- spec/sandbox/test_site/configuration.rb
+- spec/sandbox/test_site/config/site.rb
 - spec/sandbox/test_site/site/index
 - spec/sandbox/test_site/site/layout_test
 - spec/sandbox/test_site/site/stylesheets/application.css
 - 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/configuration.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/application.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
@@ -101,6 +134,13 @@ files:
 - 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/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
@@ -118,28 +158,36 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: staticmatic
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Lightweight Static Site Framework
 test_files: 
 - spec/base_spec.rb
+- spec/compass_integration_spec.rb
 - spec/helpers_spec.rb
 - spec/render_spec.rb
 - spec/rescue_spec.rb
-- spec/sandbox/test_site/configuration.rb
+- spec/sandbox/test_site/config/site.rb
+- spec/sandbox/test_site/src/configuration.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