tdreyno-staticmatic 2.0.3 → 2.1.0

data/app_generators/staticmatic/staticmatic_generator.rb

@@ -0,0 +1,74 @@
+class StaticmaticGenerator < RubiGen::Base
+  
+  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
+                              Config::CONFIG['ruby_install_name'])
+
+  default_options :template => nil
+
+  attr_reader :name
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if args.empty?
+    @destination_root = File.expand_path(args.shift)
+    @name = base_name
+    extract_options
+  end
+
+  def manifest
+    record do |m|
+      # Ensure appropriate folder(s) exists
+      m.directory ''
+      
+      # Create stubs
+      m.file_copy_each ["Rakefile"]
+      BASEDIRS.each do |path|
+        m.directory path
+        m.folder path, path
+      end
+
+      # m.template "template.rb",  "some_file_after_erb.rb"
+      # m.template_copy_each ["Rakefile"]
+      # m.file     "file",         "some_file_copied"
+
+      # Rubigen script/generate
+      # m.dependency "install_rubigen_scripts", [destination_root, 'staticmatic'],
+      #  :shebang => options[:shebang], :collision => :force
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+Creates a scaffold for building a staticmatic website 
+USAGE: #{spec.name} name
+
+EOS
+    end
+
+    def add_options!(opts)
+      opts.separator ''
+      opts.separator 'Options:'
+      # For each option below, place the default
+      # at the top of the file next to "default_options"
+      opts.on("-t", "--template=\"Your Template Directory\"", String,
+              "Use a custom template for this project") { |options[:template]| }
+      opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+    end
+
+    def extract_options
+      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
+      # Templates can access these value via the attr_reader-generated methods, but not the
+      # raw instance variable value.
+      @source_root = File.expand_path(options[:template]) if options[:template]
+    end
+
+    # Installation skeleton.  Intermediate directories are automatically
+    # created so don't sweat their absence here.
+    BASEDIRS = %w(
+      src/helpers
+      src/layouts
+      src/pages
+      src/stylesheets
+    )
+end

data/bin/staticmatic

@@ -1,12 +1,17 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/staticmatic'
+require 'rubygems'
+require 'rubigen'
 
-directory = ARGV[0]
-
-if !directory
-  puts "Usage: #{$0} <directory>"
-  exit
+if %w(-v --version).include? ARGV.first
+  require 'staticmatic/version'
+  puts "#{File.basename($0)} #{Staticmatic::VERSION::STRING}"
+  exit(0)
 end
 
-StaticMatic::Creator.setup(directory)
+require 'rubigen/scripts/generate'
+source = RubiGen::PathSource.new(:application, 
+  File.join(File.dirname(__FILE__), "../app_generators"))
+RubiGen::Base.reset_sources
+RubiGen::Base.append_sources source
+RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'staticmatic')

data/lib/staticmatic/autoload.rb

@@ -1,6 +1,5 @@
 module StaticMatic
   autoload :Builder,     'staticmatic/builder'
-  autoload :Creator,     'staticmatic/creator'
   autoload :Config,      'staticmatic/config'
   autoload :Deprecation, 'staticmatic/deprecation'
   autoload :Previewer,   'staticmatic/previewer'
@@ -15,4 +14,5 @@ module StaticMatic
 end
 
 require 'staticmatic/actionpack_support/mime'
-require 'staticmatic/actionpack_support/remove_partial_benchmark'
+require 'staticmatic/actionpack_support/remove_partial_benchmark'
+require 'staticmatic/actionpack_support/remove_controller_caching'

data/lib/staticmatic/base.rb

@@ -65,7 +65,7 @@ module StaticMatic
       # Clean @layout variable for next request
       @template.instance_variable_set("@layout", nil)
       
-      layout ||= determine_default_layout
+      layout ||= "site"
       
       render("layouts/#{layout}")
     end
@@ -117,17 +117,6 @@ module StaticMatic
       end
       
       extension
-    end 
-    
-    # Default layout is 'site' but we'll also accept 'application'
-    def determine_default_layout
-      layout = "site"
-      
-      Dir["#{@src_dir}/layouts/**"].each do |layout_file|
-        layout = "application" if layout_file.match /application/
-      end
-      
-      layout 
     end
     
     # Remove the extension from a given template path

data/lib/staticmatic/helpers/asset_tag_helper.rb

@@ -1,37 +1,11 @@
 module StaticMatic
   module Helpers
     module AssetTagHelper
-      def stylesheet_link_tag(*sources)
-        options = sources.extract_options!.stringify_keys
-        expand_stylesheet_sources(sources).collect do |source| 
-          stylesheet_tag(source, options) 
-        end.join("\n")
-      end
-  
-      def javascript_include_tag(*sources)
-        options = sources.extract_options!.stringify_keys
-        expand_javascript_sources(sources).collect do |source|  
-          javascript_src_tag(source, options)
-        end.join("\n")
-      end
-      
-      def javascript_src_tag(source, options)
-        content_tag("script", "", { "type" => Mime::JS, "src" => compute_public_path(source, "javascripts", "js") }.merge(options))
-      end
-
-      def stylesheet_tag(source, options)
-        tag("link", { "rel" => "stylesheet", "type" => Mime::CSS, "media" => "screen", "href" => compute_public_path(source, "stylesheets", "css") }.merge(options), false, false)
-      end
-      
       def compute_public_path(source, dir, ext = nil, include_host = true)
-        path = "#{relative_path_to_root}#{dir}/#{source}"
+        path = "#{@relative_path_to_root}#{dir}/#{source}"
         path << ".#{ext}" if ext
         path
       end
-  
-      def relative_path_to_root
-        @relative_path_to_root
-      end
     end
   end
 end

data/lib/staticmatic/previewer.rb

@@ -10,38 +10,29 @@ module StaticMatic
     end
   
     def process(request, response)
-      @staticmatic.load_helpers
-      path_info = request.params[Mongrel::Const::PATH_INFO]
+      path_info = request.params[Mongrel::Const::PATH_INFO].chomp("/")
       get_or_head = @@file_only_methods.include? request.params[Mongrel::Const::REQUEST_METHOD]
       
-      file_ext = File.extname(path_info).gsub(/^\./, '') 
-      file_ext = "html" if file_ext.blank?
-      
-      file_name = path_info.chomp(".#{file_ext}")
-      file_name = CGI::unescape(file_name)
-      file_name.gsub!(/^\//, '')
-
-      if file_ext && file_ext.match(/html|css/)
+      if get_or_head and @files.can_serve(path_info)
+        @files.process(request, response) # try to serve static file from site dir
+      elsif @staticmatic.can_render? path_info
         response.start(200) do |head, out|
+          file_ext = File.extname(path_info).gsub(/^\./, '') 
+          file_ext = "html" if file_ext.blank?
+
+          file_name = path_info.chomp(".#{file_ext}")
+          file_name = CGI::unescape(file_name)
+          file_name.gsub!(/^\//, '')
+        
           head["Content-Type"] = "text/#{file_ext}"
           output = ""
-          
-          if @staticmatic.can_render? path_info
-            output = (file_ext == "css") ?
-              @staticmatic.render(path_info) :
-              @staticmatic.render_with_layout(file_name)
-          else
-            if @files.can_serve(path_info)
-              @files.process(request,response)
-            else
-              output = "File not Found"
-            end
-          end
+        
+          @staticmatic.load_helpers
+          output = (file_ext == "css") ?
+            @staticmatic.render(path_info) :
+            @staticmatic.render_with_layout(file_name)
           out.write output
         end
-      else
-        # try to serve static file from site dir
-        @files.process(request,response) if @files.can_serve(path_info)
       end
     end
     
@@ -51,9 +42,10 @@ module StaticMatic
         staticmatic = StaticMatic::Base.new(staticmatic) if staticmatic.is_a? String
 
         config = Mongrel::Configurator.new :host => StaticMatic::Config[:host] do
-          puts "Running Preview of #{staticmatic.root_dir} on port #{StaticMatic::Config[:post]}"
+          puts "Running Preview of #{staticmatic.root_dir} on port #{StaticMatic::Config[:port]}"
           listener :port => StaticMatic::Config[:port] do
             uri "/", :handler => Previewer.new(staticmatic)
+            uri "/favicon", :handler => Mongrel::Error404Handler.new("")
           end
           trap("INT") { stop }
           run

data/lib/staticmatic.rb

@@ -10,7 +10,7 @@ require 'staticmatic/autoload'
 require 'staticmatic/base'
 
 # Load template handlers
-Dir['lib/staticmatic/template_handlers/*.rb'].each do |handler|
+Dir[File.dirname(__FILE__) + '/staticmatic/template_handlers/*.rb'].each do |handler|
   begin
     require "staticmatic/template_handlers/#{File.basename(handler)}"
   rescue
@@ -20,9 +20,8 @@ end
 
 ActionView::Base.class_eval do
   include StaticMatic::Helpers::AssetTagHelper
-  include StaticMatic::Helpers::DeprecatedHelpers
   include StaticMatic::Helpers::PageHelper
   include StaticMatic::Helpers::UrlHelper
-  include Mime
   include StaticMatic::Deprecation
+  include Mime
 end

data/staticmatic.gemspec

@@ -1,53 +1,52 @@
 Gem::Specification.new do |s|
-  s.name        = "staticmatic"
-  s.version     = "2.0.3"
-  s.date        = "2008-07-31"
-  s.authors     = ["Stephen Bartholomew", "Thomas Reynolds"]
-  s.email       = "steve@curve21.com"
-  s.homepage    = "http://github.com/tdreyno/staticmatic"
-  s.summary     = "Static sites, the Rails Way"
-  s.files       = ["LICENSE",
-                   "Rakefile",
-                   "staticmatic.gemspec",
-                   "bin/staticmatic",
-                   "lib/staticmatic.rb",
-                   "lib/staticmatic/autoload.rb",
-                   "lib/staticmatic/base.rb",
-                   "lib/staticmatic/builder.rb",
-                   "lib/staticmatic/config.rb",
-                   "lib/staticmatic/creator.rb",
-                   "lib/staticmatic/deprecation.rb",
-                   "lib/staticmatic/previewer.rb",
-                   "lib/staticmatic/rescue.rb",
-                   "lib/staticmatic/actionpack_support/mime.rb",
-                   "lib/staticmatic/actionpack_support/remove_partial_benchmark.rb",
-                   "lib/staticmatic/helpers/asset_tag_helper.rb",
-                   "lib/staticmatic/helpers/deprecated_helpers.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/default/Rakefile",
-                   "lib/staticmatic/templates/default/config.rb",
-                   "lib/staticmatic/templates/default/src/helpers/site_helper.rb",
-                   "lib/staticmatic/templates/default/src/layouts/site.html.haml",
-                   "lib/staticmatic/templates/default/src/pages/index.html.haml",
-                   "lib/staticmatic/templates/default/src/stylesheets/site.css.sass",
-                   "lib/staticmatic/templates/rescues/default_error.html.erb",
-                   "lib/staticmatic/templates/rescues/template_error.html.erb",
-                   "lib/tasks/staticmatic.rb",
-                   "vendor/html-scanner/html/document.rb",
-                   "vendor/html-scanner/html/node.rb",
-                   "vendor/html-scanner/html/sanitizer.rb",
-                   "vendor/html-scanner/html/selector.rb",
-                   "vendor/html-scanner/html/tokenizer.rb",
-                   "vendor/html-scanner/html/version.rb"]
+  s.name     = "staticmatic"
+  s.version  = "2.1.0"
+  s.date     = "2008-08-15"
+  s.authors  = ["Stephen Bartholomew", "Thomas Reynolds"]
+  s.email    = "tdreyno@gmail.com"
+  s.homepage = "http://github.com/tdreyno/staticmatic"
+  s.summary  = "Static sites, the Rails Way"
+  s.files    = ["LICENSE",
+                "Rakefile",
+                "staticmatic.gemspec",
+                "app_generators/staticmatic/staticmatic_generator.rb",
+                "app_generators/staticmatic/templates/Rakefile",
+                "app_generators/staticmatic/templates/src/helpers/site_helper.rb",
+                "app_generators/staticmatic/templates/src/layouts/site.html.haml",
+                "app_generators/staticmatic/templates/src/pages/index.html.haml",
+                "app_generators/staticmatic/templates/src/stylesheets/site.css.sass",
+                "bin/staticmatic",
+                "lib/staticmatic.rb",
+                "lib/staticmatic/autoload.rb",
+                "lib/staticmatic/base.rb",
+                "lib/staticmatic/builder.rb",
+                "lib/staticmatic/config.rb",
+                "lib/staticmatic/deprecation.rb",
+                "lib/staticmatic/previewer.rb",
+                "lib/staticmatic/rescue.rb",
+                "lib/staticmatic/actionpack_support/mime.rb",
+                "lib/staticmatic/actionpack_support/remove_partial_benchmark.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/tasks/staticmatic.rb",
+                "vendor/html-scanner/html/document.rb",
+                "vendor/html-scanner/html/node.rb",
+                "vendor/html-scanner/html/sanitizer.rb",
+                "vendor/html-scanner/html/selector.rb",
+                "vendor/html-scanner/html/tokenizer.rb",
+                "vendor/html-scanner/html/version.rb"]
   s.executables = %w(staticmatic)
-  s.add_dependency("haml", ">=2.0.1")
+  s.add_dependency("rubigen")
   s.add_dependency("mongrel")
-  s.add_dependency("actionpack", ">=2.1.0")
+  s.add_dependency("haml",          ">=2.0.1")
+  s.add_dependency("actionpack",    ">=2.1.0")
   s.add_dependency("activesupport", ">=2.1.0")
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tdreyno-staticmatic
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors: 
 - Stephen Bartholomew
@@ -10,17 +10,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-31 00:00:00 -07:00
+date: 2008-08-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: rubigen
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.1
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongrel
@@ -31,6 +31,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: haml
+  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: 
@@ -50,7 +59,7 @@ dependencies:
         version: 2.1.0
     version: 
 description: 
-email: steve@curve21.com
+email: tdreyno@gmail.com
 executables: 
 - staticmatic
 extensions: []
@@ -61,20 +70,24 @@ files:
 - LICENSE
 - Rakefile
 - staticmatic.gemspec
+- app_generators/staticmatic/staticmatic_generator.rb
+- app_generators/staticmatic/templates/Rakefile
+- app_generators/staticmatic/templates/src/helpers/site_helper.rb
+- app_generators/staticmatic/templates/src/layouts/site.html.haml
+- app_generators/staticmatic/templates/src/pages/index.html.haml
+- app_generators/staticmatic/templates/src/stylesheets/site.css.sass
 - bin/staticmatic
 - lib/staticmatic.rb
 - lib/staticmatic/autoload.rb
 - lib/staticmatic/base.rb
 - lib/staticmatic/builder.rb
 - lib/staticmatic/config.rb
-- lib/staticmatic/creator.rb
 - lib/staticmatic/deprecation.rb
 - lib/staticmatic/previewer.rb
 - lib/staticmatic/rescue.rb
 - lib/staticmatic/actionpack_support/mime.rb
 - lib/staticmatic/actionpack_support/remove_partial_benchmark.rb
 - lib/staticmatic/helpers/asset_tag_helper.rb
-- lib/staticmatic/helpers/deprecated_helpers.rb
 - lib/staticmatic/helpers/page_helper.rb
 - lib/staticmatic/helpers/url_helper.rb
 - lib/staticmatic/template_handlers/haml.rb
@@ -82,12 +95,6 @@ files:
 - lib/staticmatic/template_handlers/markdown.rb
 - lib/staticmatic/template_handlers/sass.rb
 - lib/staticmatic/template_handlers/textile.rb
-- lib/staticmatic/templates/default/Rakefile
-- lib/staticmatic/templates/default/config.rb
-- lib/staticmatic/templates/default/src/helpers/site_helper.rb
-- lib/staticmatic/templates/default/src/layouts/site.html.haml
-- lib/staticmatic/templates/default/src/pages/index.html.haml
-- lib/staticmatic/templates/default/src/stylesheets/site.css.sass
 - lib/staticmatic/templates/rescues/default_error.html.erb
 - lib/staticmatic/templates/rescues/template_error.html.erb
 - lib/tasks/staticmatic.rb

data/lib/staticmatic/creator.rb

@@ -1,18 +0,0 @@
-module StaticMatic
-  class Creator
-    class << self
-      def setup(directory)
-        FileUtils.mkdir(directory) unless File.exists?(directory)
-        
-        template_directory = Dir.glob(File.dirname(__FILE__) + "/templates/default/**")
-        
-        FileUtils.cp_r(template_directory, directory)
-        
-        unless File.exists?(directory + "/build")
-          FileUtils.mkdir(directory + "/build")
-          FileUtils.mkdir(directory + "/build/stylesheets")
-        end
-      end
-    end
-  end
-end

data/lib/staticmatic/helpers/deprecated_helpers.rb

@@ -1,48 +0,0 @@
-module StaticMatic
-  module Helpers
-    module DeprecatedHelpers
-      def stylesheets(*params)
-        deprecate :alt => "stylesheet_link_tag"
-
-        if params.blank?
-          glob = File.join(@staticmatic.src_dir, 'stylesheets', '*.sass')
-          stylesheets = Dir[glob].inject([]) do |sum, stylesheet|
-            sum << File.basename(stylesheet).chomp(File.extname(stylesheet))
-          end
-        
-          stylesheets.concat assets_from_build_directory("stylesheets", "css", stylesheets)
-        
-          params = stylesheets
-        end
-      
-        stylesheet_link_tag(params)
-      end
-    
-      def link(title, href = "", options = {})
-        deprecate :alt => "link_to"
-        link_to(title, href, options)
-      end
-    
-      def img(name, options = {})
-        deprecate :alt => "image_tag"
-        image_tag(name, options)
-      end
-    
-      def javascripts(*files)
-        javascript_include_tag(files)
-      end
-    
-      private 
-      # Return an array of asset files from a given build directory
-      #
-      # Optionally pass in an array to exclude files served dynamically
-      def assets_from_build_directory(dir, ext, exclude = [])
-        glob = File.join(@staticmatic.build_dir, dir, "*.#{ext}")
-        Dir[glob].inject([]) do |sum, file|
-          file = File.basename(file).chomp(File.extname(file))
-          sum << file unless exclude && exclude.include?(file)
-        end
-      end
-    end
-  end
-end

data/lib/staticmatic/templates/default/config.rb

@@ -1,3 +0,0 @@
-StaticMatic::Config.setup(
-  :use_build_tracking => true
-)