tdreyno-staticmatic 2.9.0 → 2.9.1

data/bin/sm-build

@@ -1,4 +1,21 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'staticmatic')
-StaticMatic::Builder.run_cli(Dir.pwd, 'sm-build', 1,  %w(build --force).concat(ARGV))
+require 'rubygems'
+require 'merb-core'
+
+# Setup Default Options
+ARGV.push *['--pid', "/var/tmp/staticmatic.%s.pid"]
+ARGV.push *['--init-file', File.join(File.dirname(__FILE__), '..', 'lib', 'merb', 'init.rb')]
+
+# Start Merb
+Merb.start
+
+class MerbProxy
+  include Merb::Test::RequestHelper
+end
+
+Sass::Plugin.options = Merb::Config[:sass] if Merb::Config[:sass]
+Sass::Plugin.update_stylesheets
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'builder')
+Generators.run_cli(Dir.pwd, 'sm-build', 1,  %w(build --force).concat(ARGV))

data/bin/sm-init

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'staticmatic')
-StaticMatic::Generator.run_cli(Dir.pwd, 'sm-init', 1, %w(setup).concat(ARGV))
+require File.join(File.dirname(__FILE__), '..', 'lib', 'generator')
+Generators.run_cli(Dir.pwd, 'sm-init', 1, %w(setup).concat(ARGV))

data/bin/sm-server

@@ -1,4 +1,14 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'staticmatic')
-StaticMatic::Previewer.start(Dir.pwd)
+# Require Merb
+require 'rubygems'
+require 'merb-core'
+
+# Setup Default Options
+ARGV.push *['--adapter', "mongrel"]
+ARGV.push *['--pid', "/var/tmp/staticmatic.%s.pid"]
+ARGV.push *['--init-file', File.join(File.dirname(__FILE__), '..', 'lib', 'merb', 'init.rb')]
+
+# Start Merb
+puts "Welcome to StaticMatic"
+Merb.start

data/lib/builder.rb

@@ -0,0 +1,46 @@
+require 'rubygems'
+require 'templater'
+
+module Generators
+  extend Templater::Manifold
+  desc "Build a staticmatic site"
+  
+  class Builder < Templater::Generator
+    # Define source and desintation
+    def self.source_root; Dir.pwd; end
+    def destination_root; File.join(Dir.pwd, 'build'); end
+
+    # Override template to ask staticmatic for the correct extension to output
+    def self.template(name, *args, &block)
+      return if args.first.include?('/layout/')
+      return if File.basename(args.first)[0,1] == '_'
+      
+      if (args[0] === args[1])
+        args[1] = args[0].gsub(File.extname(args.first), '').gsub('pages/', '')
+      end
+      
+      super(name, *args, &block)
+    end
+    
+    def self.file(name, *args, &block)
+      return if args.first.include?('/sass/')
+      args[1] = args[0].gsub('pages/', '') if (args[0] === args[1])
+      super(name, *args, &block)
+    end
+    
+    glob! "images",      [] # No templates
+    glob! "javascripts", [] # No templates
+    glob! "stylesheets", [] # No templates (Sass is pregenerated)
+    glob! "pages",       %w(haml erb)
+  end
+  
+  add :build, Builder
+end
+
+# Monkey-patch to use a dynamic renderer, not just ERb
+class Templater::Actions::Template
+  def render
+    request_path = destination.gsub(File.join(Dir.pwd, 'build'), "")
+    ::MerbProxy.new.get(request_path).body
+  end
+end

data/lib/generator.rb

@@ -0,0 +1,27 @@
+require 'rubygems'
+require 'templater'
+
+module Generators
+extend Templater::Manifold
+  desc "Generator for streamlining staticmatic"
+
+  class NewSite < Templater::Generator
+    desc "Creates a new staticmatic scaffold."
+    first_argument :location, :required => true, :desc => "Project location"
+    
+    def destination_root
+      File.expand_path(location)
+    end
+    
+    def self.source_root
+      File.join(File.dirname(__FILE__), 'template')
+    end
+
+    glob!
+    empty_directory :build,       "build"
+    empty_directory :javascripts, "javascripts"
+    empty_directory :images,      "images"
+  end
+
+  add :setup, NewSite
+end

data/lib/merb/init.rb

@@ -0,0 +1,31 @@
+dependency 'merb-assets',  ">=1.0.0"
+dependency 'merb-helpers', ">=1.0.0"
+dependency 'merb-haml',    ">=1.0.0"
+
+Merb::Config.use do |c|
+  c[:name]                    = 'sm-server'
+  c[:exception_details]       = true
+  
+  # Append random numbers to assets in dev mode, but not build mode
+  c[:reload_templates]        = (Merb::Config[:adapter] == 'mongrel')
+  
+  c[:reload_classes]          = true
+  c[:reload_time]             = 0.5
+  c[:ignore_tampered_cookies] = true
+  c[:log_auto_flush ]         = true
+  c[:log_level]               = :error
+  c[:log_stream]              = STDOUT
+  c[:log_file]                = nil
+end
+
+Merb.push_path(:controller,   File.dirname(__FILE__))
+Merb.push_path(:router,       File.dirname(__FILE__), "router.rb")
+Merb.push_path(:public,       Merb.root, nil)
+Merb.push_path(:stylesheet,   Merb.root / "stylesheets", nil)
+Merb.push_path(:javascript,   Merb.root / "javascripts", nil)
+Merb.push_path(:image,        Merb.root / "images", nil)
+Merb.push_path(:view,         Merb.root)
+Merb.push_path(:helper,       Merb.root / "helpers")
+
+Merb::Plugins.config[:sass][:css_location]      = Merb.dir_for(:stylesheet)
+Merb::Plugins.config[:sass][:template_location] = Merb.dir_for(:stylesheet) / "sass"

data/lib/merb/router.rb

@@ -0,0 +1,3 @@
+Merb::Router.prepare do
+  match(/(.*)/).to(:controller => 'site', :action => 'index')
+end

data/lib/merb/site.rb

@@ -0,0 +1,41 @@
+# Intercept all requests
+class Site < ::Merb::Controller
+  def index
+    render :template => File.join("pages", current_page)
+  end
+  
+  override! :partial
+  def partial(template, opts={})
+    super(File.join("pages", template.to_s), opts)
+  end
+  
+  override! :asset_path
+  def asset_path(*args)
+    relative_path(super)
+  end
+  
+  override! :image_tag
+  def image_tag(img, opts={})
+    super(img, opts.merge(:path => relative_path('/images/')))
+  end
+  
+  override! :link_to
+  def link_to(name, url='', opts={})
+    absolute_path = (opts[:href] || url)
+    absolute_path = "/" + absolute_path if absolute_path.length > 0
+    super(name, url, opts.merge(:href => relative_path(absolute_path)))
+  end
+  
+protected
+  def current_page
+    path = request.uri
+    path << "index.html" if path[path.length-1,1] == '/'
+    path[1..request.uri.length]
+  end
+
+private
+  def relative_path(absolute_path)
+    depth = current_page.split('/').length - 1
+    absolute_path.gsub(/^\//, "../" * depth)
+  end
+end

data/lib/{templates → template}/helpers/site_helper.rb

@@ -1,5 +1,7 @@
 # Add helpers to use in your templates here
 #
 # For best results, create seperate helpers for different reponsibilities
-module SiteHelper
+module Merb
+  module SiteHelper
+  end
 end

data/lib/{templates/layouts → template/layout}/site.html.haml

@@ -3,4 +3,4 @@
     %title StaticMatic!
     
   %body 
-    = yield
+    = catch_content :for_layout

data/spec/builder_spec.rb

@@ -1,29 +1,44 @@
-require File.join(File.dirname(__FILE__), "..", "lib", "staticmatic")
+require 'fileutils'
 
-describe StaticMatic::Builder do
-  before :each do
-    @root_dir  = File.expand_path(File.join(File.dirname(__FILE__), "fixtures", "builder-test"))
-    @init_cmd  = File.expand_path(File.join(File.dirname(__FILE__), "..", "bin", "sm-init"))
-    @build_cmd = File.expand_path(File.join(File.dirname(__FILE__), "..", "bin", "sm-build"))
-    
-    `cd #{File.dirname(@root_dir)} && #{@init_cmd} #{File.basename(@root_dir)}`
+describe "Builder" do
+  def project_file(*parts)
+    File.expand_path(File.join(File.dirname(__FILE__), "..", *parts))
+  end
+
+  before :all do
+    @root_dir = project_file("spec", "fixtures", "sample")
+  end
+
+  before :each do    
+    build_cmd = project_file("bin", "sm-build")
+    `cd #{@root_dir} && #{build_cmd}`
   end
   
   after :each do
-    FileUtils.rm_rf(@root_dir)
+    FileUtils.rm_rf(File.join(@root_dir, "build"))
   end
   
   it "should build normal files" do
-    `cd #{@root_dir} && #{@build_cmd}`
-    File.exists?("#{@root_dir}/build/index.html").should_not be_false
+    File.exists?("#{@root_dir}/build/index.html").should be_true
+  end
+
+  it "should build static files" do
+    File.exists?("#{@root_dir}/build/static.html").should be_true
+  end
+
+  it "should build subdirectory files" do
+    File.exists?("#{@root_dir}/build/services/index.html").should be_true
+  end
+
+  it "should build sass files" do
+    File.exists?("#{@root_dir}/build/stylesheets/site.css").should be_true
+  end
+
+  it "should build static css files" do
+    File.exists?("#{@root_dir}/build/stylesheets/static.css").should be_true
   end
   
   it "should not build partial files" do
-    File.open("#{@root_dir}/pages/_partial.html.erb", "w") do |f|
-      f.puts "Test"
-    end
-    
-    `cd #{@root_dir} && #{@build_cmd}`
     File.exists?("#{@root_dir}/build/_partial.html").should be_false
   end
 end

data/spec/fixtures/sample/helpers/speech_helper.rb

@@ -1,5 +1,7 @@
-module SpeechHelper
-  def say(text)
-    "You said: #{text}"
+module Merb
+  module SpeechHelper
+    def say(text)
+      "You said: #{text}"
+    end
   end
 end

data/spec/fixtures/sample/pages/partial_test.html.erb

@@ -1 +1 @@
-<%= render(:partial => "pages/form") %>
+<%= partial "./form" %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tdreyno-staticmatic
 version: !ruby/object:Gem::Version 
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors: 
 - Stephen Bartholomew
@@ -10,62 +10,44 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-05 00:00:00 -08:00
+date: 2008-12-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mongrel
+  name: templater
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rubyzip
+  name: merb-core
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: templater
+  name: merb-haml
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.5
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: merb-assets
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: actionpack
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.1.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.1.2
+        version: 1.0.0
     version: 
 description: 
 email: tdreyno@gmail.com
@@ -82,42 +64,17 @@ files:
 - bin/sm-init
 - bin/sm-build
 - bin/sm-server
-- lib/staticmatic.rb
-- lib/staticmatic/autoload.rb
-- lib/staticmatic/base.rb
-- lib/staticmatic/builder.rb
-- lib/staticmatic/builder/html.rb
-- lib/staticmatic/builder/dotnet.rb
-- lib/staticmatic/config.rb
-- lib/staticmatic/deprecation.rb
-- lib/staticmatic/generator.rb
-- lib/staticmatic/previewer.rb
-- lib/staticmatic/template.rb
-- lib/staticmatic/actionpack_support/mime.rb
-- lib/staticmatic/actionpack_support/remove_partial_benchmark.rb
-- lib/staticmatic/actionpack_support/remove_controller_caching.rb
-- lib/staticmatic/helpers/asset_tag_helper.rb
-- lib/staticmatic/helpers/page_helper.rb
-- lib/staticmatic/helpers/url_helper.rb
-- lib/staticmatic/template_handlers/haml.rb
-- lib/staticmatic/template_handlers/liquid.rb
-- lib/staticmatic/template_handlers/markdown.rb
-- lib/staticmatic/template_handlers/sass.rb
-- lib/staticmatic/template_handlers/textile.rb
-- lib/staticmatic/templates/rescues/default_error.html.erb
-- lib/staticmatic/templates/rescues/template_error.html.erb
-- lib/templates/helpers/site_helper.rb
-- lib/templates/layouts/site.html.haml
-- lib/templates/pages/index.html.haml
-- lib/templates/stylesheets/site.css.sass
-- spec/action_view_helpers_spec.rb
-- spec/asset_helpers_spec.rb
+- lib/builder.rb
+- lib/generator.rb
+- lib/merb/init.rb
+- lib/merb/router.rb
+- lib/merb/site.rb
+- lib/template/helpers/site_helper.rb
+- lib/template/layout/site.html.haml
+- lib/template/pages/index.html.haml
+- lib/template/stylesheets/sass/site.sass
 - spec/base_spec.rb
 - spec/builder_spec.rb
-- spec/config_spec.rb
-- spec/deprecation_spec.rb
-- spec/layouts_spec.rb
-- spec/rendering_spec.rb
 - spec/fixtures/sample/build/haml_test.html
 - spec/fixtures/sample/build/hello_world.html
 - spec/fixtures/sample/build/index.html
@@ -126,8 +83,8 @@ files:
 - spec/fixtures/sample/build/services/web_development.html
 - spec/fixtures/sample/build/stylesheets/site.css
 - spec/fixtures/sample/helpers/speech_helper.rb
-- spec/fixtures/sample/layouts/site.html.erb
-- spec/fixtures/sample/layouts/specified_layout.html.erb
+- spec/fixtures/sample/pages/layout/site.html.erb
+- spec/fixtures/sample/pages/layout/specified_layout.html.erb
 - spec/fixtures/sample/pages/_form.html.erb
 - spec/fixtures/sample/pages/haml_test.html.haml
 - spec/fixtures/sample/pages/hello_world.html.erb
@@ -135,13 +92,13 @@ files:
 - spec/fixtures/sample/pages/partial_test.html.erb
 - spec/fixtures/sample/pages/liquid_test.html.liquid
 - spec/fixtures/sample/pages/markdown_test.html.markdown
-- spec/fixtures/sample/pages/page_with_error.html.haml
+- spec/fixtures/sample/pages/page_with_error.html.nothaml
 - spec/fixtures/sample/pages/specify_layout.html.erb
 - spec/fixtures/sample/pages/static.html
 - spec/fixtures/sample/pages/textile_test.html.textile
 - spec/fixtures/sample/pages/services/index.html.erb
 - spec/fixtures/sample/pages/services/web_development.html.erb
-- spec/fixtures/sample/stylesheets/site.css.sass
+- spec/fixtures/sample/stylesheets/sass/site.sass
 has_rdoc: false
 homepage: http://github.com/tdreyno/staticmatic
 post_install_message: 
@@ -169,14 +126,8 @@ signing_key:
 specification_version: 2
 summary: Static sites, the Rails Way
 test_files: 
-- spec/action_view_helpers_spec.rb
-- spec/asset_helpers_spec.rb
 - spec/base_spec.rb
 - spec/builder_spec.rb
-- spec/config_spec.rb
-- spec/deprecation_spec.rb
-- spec/layouts_spec.rb
-- spec/rendering_spec.rb
 - spec/fixtures/sample/build/haml_test.html
 - spec/fixtures/sample/build/hello_world.html
 - spec/fixtures/sample/build/index.html
@@ -185,8 +136,8 @@ test_files:
 - spec/fixtures/sample/build/services/web_development.html
 - spec/fixtures/sample/build/stylesheets/site.css
 - spec/fixtures/sample/helpers/speech_helper.rb
-- spec/fixtures/sample/layouts/site.html.erb
-- spec/fixtures/sample/layouts/specified_layout.html.erb
+- spec/fixtures/sample/pages/layout/site.html.erb
+- spec/fixtures/sample/pages/layout/specified_layout.html.erb
 - spec/fixtures/sample/pages/_form.html.erb
 - spec/fixtures/sample/pages/haml_test.html.haml
 - spec/fixtures/sample/pages/hello_world.html.erb
@@ -194,10 +145,10 @@ test_files:
 - spec/fixtures/sample/pages/partial_test.html.erb
 - spec/fixtures/sample/pages/liquid_test.html.liquid
 - spec/fixtures/sample/pages/markdown_test.html.markdown
-- spec/fixtures/sample/pages/page_with_error.html.haml
+- spec/fixtures/sample/pages/page_with_error.html.nothaml
 - spec/fixtures/sample/pages/specify_layout.html.erb
 - spec/fixtures/sample/pages/static.html
 - spec/fixtures/sample/pages/textile_test.html.textile
 - spec/fixtures/sample/pages/services/index.html.erb
 - spec/fixtures/sample/pages/services/web_development.html.erb
-- spec/fixtures/sample/stylesheets/site.css.sass
+- spec/fixtures/sample/stylesheets/sass/site.sass

data/lib/staticmatic/actionpack_support/mime.rb

@@ -1,5 +0,0 @@
-module Mime
-  CSS  = "text/css"
-  HTML = "text/html"
-  JS   = "text/javascript"
-end

data/lib/staticmatic/actionpack_support/remove_controller_caching.rb

@@ -1,7 +0,0 @@
-module ActionController
-  class Base
-    def self.perform_caching
-      false
-    end
-  end
-end

data/lib/staticmatic/actionpack_support/remove_partial_benchmark.rb

@@ -1,6 +0,0 @@
-# Remove ActionController::Base.benchmark call
-class ActionView::PartialTemplate
-  def render
-    @handler.render(self)
-  end
-end

data/lib/staticmatic/autoload.rb

@@ -1,18 +0,0 @@
-module StaticMatic
-  autoload :Base,        File.join(File.dirname(__FILE__), 'base')
-  autoload :Template,    File.join(File.dirname(__FILE__), 'template')
-  autoload :Config,      File.join(File.dirname(__FILE__), 'config')
-  autoload :Builder,     File.join(File.dirname(__FILE__), 'builder')
-  autoload :Generator,   File.join(File.dirname(__FILE__), 'generator')
-  autoload :Deprecation, File.join(File.dirname(__FILE__), 'deprecation')
-  autoload :Previewer,   File.join(File.dirname(__FILE__), 'previewer')
-  
-  module Helpers
-    autoload :AssetTagHelper, File.join(File.dirname(__FILE__), 'helpers', 'asset_tag_helper')
-    autoload :PageHelper,     File.join(File.dirname(__FILE__), 'helpers', 'page_helper')
-    autoload :UrlHelper,      File.join(File.dirname(__FILE__), 'helpers', 'url_helper')
-  end
-  
-  module TemplateHandlers
-  end
-end

data/lib/staticmatic/base.rb

@@ -1,77 +0,0 @@
-module StaticMatic
-  class Base
-    include StaticMatic::Deprecation
-  
-    attr_accessor :logger, :root_dir, :build_dir, :extentions, :guard
-  
-    def initialize(root_dir)
-      @root_dir  = root_dir
-      @build_dir = File.join(@root_dir, "build")
-      @guard = Mutex.new
-    
-      # Setup logger
-      @logger = Logger.new(STDERR)
-      @logger.level = Logger::INFO
-    
-      # User config
-      StaticMatic::Config.setup
-      config_file = File.join(@root_dir, "config.rb")
-      require config_file if File.exists? config_file
-      
-      @extentions = ActionView::Template.template_handler_extensions.map { |ext| ext.to_s }
-    end
-    
-    def helpers
-      Dir[File.join(@root_dir, 'helpers', '**', '*_helper.rb')]
-    end
-    
-    def layouts
-      @layouts ||= Dir[File.join(@root_dir, "layouts", "*")].select do |path|
-        !File.directory?(path)
-      end.map do |path|
-        File.basename(path)
-      end
-    end
-    
-    def template(filename)
-      filename = full_template_path(filename)
-      @templates ||= {}
-      @templates[filename] ||= Template.new(filename, self)
-    end
-    
-    def pages
-      @pages ||= Dir[File.join(@root_dir, "pages", "**/*")].select do |path|
-        !File.directory?(path) && File.basename(path) !~ /^_/
-      end.map do |path|
-        path.gsub("#{@root_dir}/", "")
-      end.partition do |relative_path|
-        can_render?(relative_path)
-      end
-    end
-    
-    # Aliases
-    def dynamic_pages; pages.first; end
-    def static_pages;  pages.last; end
-    
-    # Delegate to Template class
-    def render(filename);       template(filename).render; end
-    def rendered_ext(filename); template(filename).rendered_ext; end
-    def can_render?(filename)
-      return false if filename =~ /images\/|javascripts\//
-      template(filename).can_render?
-    end
-  
-  protected  
-    # Full path to a template, relative to src/
-    def full_template_path(template)
-      template  = template.gsub("#{@root_dir}/", '')
-      directory = template.match(/^(\/)?(layouts|stylesheets|pages)/) ? "" : "pages"
-      template  = File.join(directory, template) unless directory.empty?
-    
-      path     = File.join(File.expand_path(@root_dir), template)
-      template = File.join(template, "index") if File.directory? path
-    
-      template
-    end
-  end
-end