tdreyno-staticmatic 2.9.4 → 2.9.6

data/bin/sm-build

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 
+# Require Merb
 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')]
+ARGV.push *['--environment', 'build']
 
 # Start Merb
 Merb.start
@@ -14,8 +15,5 @@ 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-server

@@ -5,9 +5,8 @@ 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')]
+ARGV.push *['--adapter', "mongrel"]
 
 # Start Merb
 puts "Welcome to StaticMatic"

data/lib/builder.rb

@@ -4,7 +4,7 @@ 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
@@ -14,26 +14,30 @@ module Generators
     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)
+
+    public_files_glob = File.join(source_root, "public", "{images,javascripts,stylesheets}", '**/*')
+    Dir[public_files_glob].each do |action|
+      next if File.directory?(action)
+      action = action.sub("#{source_root}/", '')
+      file(action.downcase.gsub(/[^a-z0-9]+/, '_').to_sym, action, action.gsub('public/', ''))
+    end
+
+    glob! "pages", %w(haml erb)
   end
-  
+
   add :build, Builder
 end
 

data/lib/generator.rb

@@ -2,25 +2,36 @@ require 'rubygems'
 require 'templater'
 
 module Generators
-extend Templater::Manifold
+  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"
-    
+    option :rack, :as => :boolean, :default => false, :desc => 'Should generate rackup (ru) file for Passenger'
+
     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"
+    glob! :config
+    glob! :helpers
+    glob! :pages
+    glob! :public
+    glob! :stylesheets
+
+    file :config_ru, :rack => true do |file|
+      file.source = File.join(source_root, 'config.ru')
+      file.destination = 'config.ru'
+    end
+
+    empty_directory :stylesheets, "public/stylesheets"
+    empty_directory :javascripts, "public/javascripts"
+    empty_directory :images,      "public/images"
   end
 
   add :setup, NewSite

data/lib/merb/init.rb

@@ -1,14 +1,12 @@
-dependency 'merb-assets',  ">=1.0.0"
-dependency 'merb-helpers', ">=1.0.0"
-dependency 'merb-haml',    ">=1.0.0"
+require File.join(File.dirname(__FILE__), 'dependencies')
 
 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_templates]        = (Merb::Config[:environment] != 'build')
+
   c[:reload_classes]          = true
   c[:reload_time]             = 0.5
   c[:ignore_tampered_cookies] = true
@@ -16,16 +14,18 @@ Merb::Config.use do |c|
   c[:log_level]               = :error
   c[:log_stream]              = STDOUT
   c[:log_file]                = nil
+
+  c[:sass] = {
+    :template_location  =>  Merb.root / 'stylesheets',
+    :css_location       =>  Merb.root / 'public' / 'stylesheets',
+  }
 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"
+Merb.push_path(:public,       Merb.root / "public", nil)
+Merb.push_path(:stylesheet,   Merb.dir_for(:public) / "stylesheets", nil)
+Merb.push_path(:javascript,   Merb.dir_for(:public) / "javascripts", nil)
+Merb.push_path(:image,        Merb.dir_for(:public) / "images", nil)
+Merb.push_path(:view,         Merb.root / "pages")
+Merb.push_path(:helper,       Merb.root / "helpers")

data/lib/merb/site.rb

@@ -1,12 +1,12 @@
 # Intercept all requests
 class Site < ::Merb::Controller
   def index
-    render :template => File.join("pages", current_page)
+    render :template => current_page
   end
   
   override! :partial
   def partial(template, opts={})
-    super(File.join("pages", template.to_s), opts)
+    super(template.to_s, opts)
   end
   
   override! :asset_path

data/lib/template/config/init.rb

@@ -0,0 +1,7 @@
+# Include default staticmatic init
+require '<%= ::File.join(::File.expand_path(::File.join(source_root, '..')), 'merb', 'init') %>'
+
+# Enable Compass
+dependency "chriseppstein-compass", :require_as => 'compass'
+Merb::Plugins.config[:compass][:stylesheets]          = Merb.dir_for(:stylesheet)
+Merb::Plugins.config[:compass][:compiled_stylesheets] = Merb.dir_for(:stylesheet) / "sass"

data/spec/fixtures/sample/pages/layout/site.html.erb

@@ -1,9 +1,9 @@
 <html>
 <head>
-	<%= stylesheet_link_tag "site" %>
+	<%= css_include_tag "site" %>
 	<h1>My Sample Site</h1>
 </head>
 <body>
-	<%= yield %>
+	<%= catch_content :for_layout %>
 </body>
 </html>

data/spec/generator_spec.rb

@@ -11,7 +11,7 @@ describe "Generator" do
   
   before :each do
     init_cmd = project_file("bin", "sm-init")
-    `cd #{File.dirname(@root_dir)} && #{init_cmd} #{File.basename(@root_dir)}`
+    `cd #{File.dirname(@root_dir)} && #{init_cmd} #{File.basename(@root_dir)} --rack`
   end
   
   after :each do
@@ -21,12 +21,13 @@ describe "Generator" do
   it "should copy template files" do
     template_dir = project_file("lib", "template", "**/*")
     Dir[template_dir].each do |f|
+      next if File.directory?(f)
       File.exists?("#{@root_dir}/#{f.split('template/')[1]}").should be_true
     end
   end
   
   it "should create empty directories" do
-    %w(build javascripts images).each do |d|
+    %w(stylesheets public/stylesheets public/javascripts public/images).each do |d|
       File.exists?("#{@root_dir}/#{d}").should be_true
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tdreyno-staticmatic
 version: !ruby/object:Gem::Version 
-  version: 2.9.4
+  version: 2.9.6
 platform: ruby
 authors: 
 - Stephen Bartholomew
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-06 00:00:00 -07:00
+date: 2009-04-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.5
     version: 
+- !ruby/object:Gem::Dependency 
+  name: haml
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: merb-haml
   type: :runtime
@@ -84,10 +94,11 @@ files:
 - lib/merb/init.rb
 - lib/merb/router.rb
 - lib/merb/site.rb
+- lib/template/config/init.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
+- lib/template/pages/layout/site.html.haml
+- lib/template/stylesheets/site.sass
 - README.textile
 has_rdoc: true
 homepage: http://github.com/tdreyno/staticmatic
@@ -113,7 +124,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Static sites, the Merb Way
 test_files: 
 - spec/generator_spec.rb
@@ -130,5 +141,5 @@ test_files:
 - spec/fixtures/sample/pages/static.html
 - spec/fixtures/sample/pages/services/index.html.erb
 - spec/fixtures/sample/pages/services/web_development.html.erb
-- spec/fixtures/sample/stylesheets/static.css
-- spec/fixtures/sample/stylesheets/sass/site.sass
+- spec/fixtures/sample/public/stylesheets/static.css
+- spec/fixtures/sample/stylesheets/site.sass