massimo 0.9.0 → 0.10.0

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  

data/README.md

@@ -1,30 +1,42 @@
-# Massimo
+Massimo
+=======
 
 Massimo is a static website builder that allows you to use dynamic technologies such as Haml & Sass for rapid development.
 
 *Massimo's code is inspired by other website generators like [Jekyll](http://github.com/mojombo/jekyll) and [Webby](http://webby.rubyforge.org/).*
 
-## Features
+Features
+--------
 
 * Renders templates and views using [Tilt](http://github.com/rtomayko/tilt)
 * Uses familiar helper methods from [Padrino::Helpers](http://github.com/padrino/padrino-framework)
 * Supports custom helper methods like [Rails](http://rubyonrails.org/) and [Sinatra](http://www.sinatrarb.com/)
 * Concats javascripts using [Sprockets](http://getsprockets.org/)
-  and then minifies them using [JSMin](http://github.com/rgrove/jsmin)
+  and then compresses them using whichever library you want.
 * Renders stylesheets using either [Sass](http://sass-lang.com/) or [Less](http://lesscss.org/)
 * Automatically creates pretty URLs
 
-## Getting Started
+Installation
+-----------
+
+``` bash
+$ gem install massimo
+```
+
+Getting Started
+---------------
     
-    gem install massimo
-    massimo generate my-site
-    cd my-site
-    massimo build
+``` bash
+$ massimo new my-site
+$ cd my-site
+$ massimo build
+```
     
 For more information, visit [http://massimo.petebrowne.com/](http://massimo.petebrowne.com/).
 
 For an example of a site built by massimo, visit [http://github.com/petebrowne/massimo-site](http://github.com/petebrowne/massimo-site).
 
-## Copyright
+Copyright
+---------
 
-Copyright (c) 2009 [Peter Browne](http://petebrowne.com). See LICENSE for details.
+Copyright (c) 2011 [Peter Browne](http://petebrowne.com). See LICENSE for details.

data/Rakefile

@@ -5,4 +5,4 @@ Bundler::GemHelper.install_tasks
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
+RSpec::Core::RakeTask.new

data/bin/massimo

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 
+require 'bundler/setup' if File.exist?('./Gemfile')
 require 'massimo'
 Massimo::CLI.start

data/lib/massimo/cli.rb

@@ -24,11 +24,11 @@ module Massimo
     end
     map 'b' => :build
     
-    desc 'generate SITE_NAME', 'Generates a new site with the give name'
-    def generate(site_name)
+    desc 'new SITE_NAME', 'Generates a new site with the give name'
+    def new(site_name)
       directory 'site', site_name
     end
-    map 'g' => :generate
+    map %w(n generate g) => :new
     
     desc 'server [PORT]', 'Runs a local Rack based web server on the given port'
     def server(port = 3000)

data/lib/massimo/config.rb

@@ -1,6 +1,8 @@
 require 'active_support/core_ext/hash/keys'
 require 'active_support/string_inquirer'
+require 'crush'
 require 'ostruct'
+require 'tilt'
 require 'yaml'
 
 module Massimo
@@ -17,6 +19,20 @@ module Massimo
       :stylesheets_url => '/stylesheets'
     }.freeze
     
+    JS_COMPRESSORS = {
+      :jsmin    => Crush::JSMin,
+      :packr    => Crush::Packr,
+      :yui      => Crush::YUI::JavaScriptCompressor,
+      :closure  => Crush::Closure::Compiler,
+      :uglifier => Crush::Uglifier
+    }
+    
+    CSS_COMPRESSORS = {
+      :cssmin    => Crush::CSSMin,
+      :rainpress => Crush::Rainpress,
+      :yui       => Crush::YUI::CssCompressor
+    }
+    
     # Creates a new configuration. Takes either a hash of options
     # or a file path to a .yaml file.
     def initialize(options = nil)
@@ -46,6 +62,69 @@ module Massimo
       ActiveSupport::StringInquirer.new(super)
     end
     
+    # Sets up Massimo to compress both JavaScript and CSS files.
+    #
+    # @param [Boolean] compress Wether or not to compress.
+    def compress=(compress)
+      Crush.register if compress
+    end
+    
+    # Sets up Massimo to compress JavaScript files. By default,
+    # whichever JavaScript compression library is available, is used.
+    # To set the one you want to use see #js_compressor=.
+    #
+    # @param [Boolean] compress Wether or not to compress.
+    def compress_js=(compress)
+      Crush.register_js if compress
+    end
+    
+    # Sets the JavaScript compressor to use. The compressor can
+    # be either a symbol mapping to the recognized Crush::Engines
+    # (see JS_COMPRESSORS) or any Tilt::Template.
+    #
+    # @param [Tilt::Template, Symbol] compressor The compressor to use.
+    def js_compressor=(compressor)
+      if compressor.respond_to?(:to_sym)
+        compressor = JS_COMPRESSORS[compressor.to_sym]
+      end
+      Tilt.prefer compressor, 'js'
+    end
+    
+    # Sets the options used by the JavaScript compressor.
+    #
+    # @param [Hash] options The hash of options to use.
+    def js_compressor_options=(options)
+      self.js = options
+    end
+    
+    # Sets up Massimo to compress CSS files. By default,
+    # whichever CSS compression library is available, is used.
+    # To set the one you want to use see #css_compressor=.
+    #
+    # @param [Boolean] compress Wether or not to compress.
+    def compress_css=(compress)
+      Crush.register_css if compress
+    end
+    
+    # Sets the CSS compressor to use. The compressor can
+    # be either a symbol mapping to the recognized Crush::Engines
+    # (see CSS_COMPRESSORS) or any Tilt::Template.
+    #
+    # @param [Tilt::Template, Symbol] compressor The compressor to use.
+    def css_compressor=(compressor)
+      if compressor.respond_to?(:to_sym)
+        compressor = CSS_COMPRESSORS[compressor.to_sym]
+      end
+      Tilt.prefer compressor, 'css'
+    end
+    
+    # Sets the options used by the CSS compressor.
+    #
+    # @param [Hash] options The hash of options to use.
+    def css_compressor_options=(options)
+      self.css = options
+    end
+    
     # Get a full, expanded path for the given resource name. This is either set
     # in the configuration or determined dynamically based on the name.
     def path_for(resource_name)
@@ -70,6 +149,7 @@ module Massimo
     # Convience method for getting options for a given library name. For instance,
     # this is how we get the options set for Haml or Sass during processing.
     def options_for(lib_name)
+      return options_for("sass") if lib_name == "scss"
       send(lib_name) || {}
     end
   end

data/lib/massimo/javascript.rb

@@ -1,4 +1,5 @@
 require 'sprockets'
+require 'tilt'
 
 module Massimo
   class Javascript < Massimo::Resource
@@ -11,42 +12,16 @@ module Massimo
     end
     
     def render
-      output = if source_path.extname == '.js'
-          options = Massimo.config.options_for(:sprockets).merge(
-            :assert_root  => Massimo.config.output_path,
-            :source_files => [ source_path.to_s ]
-          )
-          secretary = Sprockets::Secretary.new(options)
-          secretary.install_assets
-          secretary.concatenation.to_s
-        else
-          super
-        end
-      compress(output)
-    end
-    
-    protected 
-  
-      def compress(javascript)
-        case Massimo.config.javascripts_compressor.to_s
-        when 'min', 'jsmin'
-          require 'jsmin' unless defined?(JSMin)
-          JSMin.minify(javascript)
-        when 'pack', 'packr'
-          require 'packr' unless defined?(Packr)
-          options = { :shrink_vars => true }.merge Massimo.config.options_for(:packr)
-          Packr.pack(javascript, options)
-        when 'yui', 'yui-compressor', 'yui/compressor'
-          require 'yui/compressor' unless defined?(YUI)
-          options = { :munge => true }.merge Massimo.config.options_for(:yui)
-          YUI::JavaScriptCompressor.new(options).compress(javascript)
-        when 'closure', 'closure-compiler', 'closure/compiler'
-          require 'closure-compiler' unless defined?(Closure)
-          options = Massimo.config.options_for(:closure)
-          Closure::Compiler.new(options).compile(javascript)
-        else
-          javascript
-        end.strip
+      if source_path.extname == '.js'
+        options = Massimo.config.options_for(:sprockets).merge(
+          :assert_root  => Massimo.config.output_path,
+          :source_files => [ source_path.to_s ]
+        )
+        secretary = Sprockets::Secretary.new(options)
+        secretary.install_assets
+        @content = secretary.concatenation.to_s
       end
+      super
+    end
   end
 end

data/lib/massimo/page.rb

@@ -17,7 +17,7 @@ module Massimo
     end
     
     def title
-      @meta_data[:title] ||= filename.chomp(source_path.extname).titleize
+      @meta_data[:title] ||= filename.gsub(/\.[^.]+/, '').titleize
     end
     
     def extension

data/lib/massimo/site.rb

@@ -17,6 +17,8 @@ module Massimo
       @template_scope_extensions = []
       Massimo.site               = self
       
+      setup_bundle unless bundled?
+      
       Massimo::Reloader.reload(:config) do
         instance_eval File.read(config.config_path) if File.exist?(config.config_path)
         instance_eval(&block) if block_given?
@@ -45,7 +47,7 @@ module Massimo
     # The scope used for templating. It includes helpers from Massimo::Helpers along
     # with any custom helpers.
     def template_scope
-      Object.new.extend(Massimo::Helpers, Tilt::CompileSite).tap do |scope|
+      Object.new.extend(Massimo::Helpers).tap do |scope|
         add_template_scope_blocks(scope)
         add_template_scope_extensions(scope)
         add_template_scope_helpers(scope)
@@ -71,6 +73,15 @@ module Massimo
     
     protected
     
+      def bundled?
+        !!@bundled
+      end
+      
+      def setup_bundle
+        Bundler.require(:default, config.environment.to_sym) if defined?(Bundler)
+        @bundled = true
+      end
+    
       def add_template_scope_blocks(scope)
         @template_scope_blocks.each do |block|
           scope.instance_eval(&block)

data/lib/massimo/stylesheet.rb

@@ -1,3 +1,5 @@
+require 'tilt'
+
 module Massimo
   class Stylesheet < Massimo::Resource
     def extension
@@ -8,4 +10,4 @@ module Massimo
       end
     end
   end
-end
+end

data/lib/massimo/templates/site/Gemfile.tt

@@ -0,0 +1,8 @@
+source :rubygems
+
+gem "massimo", "<%= Massimo::VERSION %>"
+gem "sass", "~> 3.1"
+
+group :production do
+  gem "uglifier", "~> 1.0"
+end

data/lib/massimo/templates/site/config.rb

@@ -1,16 +1,10 @@
-require 'sass'
-require 'sprockets'
-
 # This is an example configuration File
 # Look here for all the available options:
 # http://massimo.petebrowne.com/configuration/
 
 if config.environment.production?
-  # Use JSMin for javascript compression
-  # config.javascripts_compressor = :min
-  
-  # Compress the output of Sass stylesheets
-  # config.sass = { :style => :compressed }
+  # Compress javascripts and stylesheets
+  config.compress = true
 end
 
 helpers do

data/lib/massimo/templates/site/config.ru

@@ -1,2 +1,2 @@
-require 'massimo'
+require "massimo"
 run Massimo::Server.new

data/lib/massimo/templates/site/views/layouts/{main.erb → main.html.erb}

@@ -3,8 +3,8 @@
   <head lang="en">
     <meta charset="utf-8">
     <title><%= page.title %></title>
-    <%= stylesheet_link_tag 'main' %>
-    <%= javascript_include_tag 'main' %>
+    <%= stylesheet_link_tag "main" %>
+    <%= javascript_include_tag "main" %>
   </head>
   <body>
     <%= yield %>

data/lib/massimo/version.rb

@@ -1,3 +1,3 @@
 module Massimo
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/massimo.gemspec

@@ -7,33 +7,29 @@ Gem::Specification.new do |s|
   s.summary     = 'Massimo is a static website builder.'
   s.description = 'Massimo builds HTML, Javascript, and CSS Files from your source.'
   
-  s.authors           = 'Pete Browne'
-  s.email             = 'me@petebrowne.com'
+  s.authors           = ['Pete Browne']
+  s.email             = ['me@petebrowne.com']
   s.homepage          = 'http://massimo.petebrowne.com/'
   s.rubyforge_project = 'massimo'
   
-  s.add_dependency             'activesupport',    '~> 3.0.0'
-  s.add_dependency             'i18n',             '~> 0.4.0'
-  s.add_dependency             'rack',             '~> 1.2.0'
-  s.add_dependency             'padrino-helpers',  '~> 0.9.0'
-  s.add_dependency             'thor',             '~> 0.14.0'
-  s.add_dependency             'tilt',             '~> 1.3.1'
-  s.add_dependency             'tzinfo',           '~> 0.3.0'
-  s.add_dependency             'sprockets',        '~> 1.0.0'
-  s.add_development_dependency 'rspec',            '~> 2.5.0'
-  s.add_development_dependency 'rr',               '~> 1.0.0'
-  s.add_development_dependency 'test-construct',   '~> 1.2.0'
-  s.add_development_dependency 'rack-test',        '~> 0.5.0'
-  s.add_development_dependency 'unindent',         '~> 0.9.0'
-  s.add_development_dependency 'haml',             '~> 3.1.0'
-  s.add_development_dependency 'sass',             '~> 3.1.0'
-  s.add_development_dependency 'less',             '~> 1.2.0'
-  s.add_development_dependency 'coffee-script',    '~> 2.2.0'
-  s.add_development_dependency 'jsmin',            '~> 1.0.0'
-  s.add_development_dependency 'packr',            '~> 3.1.0'
-  s.add_development_dependency 'yui-compressor',   '~> 0.9.0'
-  s.add_development_dependency 'closure-compiler', '~> 0.3.0'
-  s.add_development_dependency 'growl',            '~> 1.0.0'
+  s.add_dependency             'activesupport',    '~> 3.0'
+  s.add_dependency             'i18n',             '~> 0.4'
+  s.add_dependency             'rack',             '~> 1.1'
+  s.add_dependency             'padrino-helpers',  '~> 0.9'
+  s.add_dependency             'thor',             '~> 0.14'
+  s.add_dependency             'tilt',             '~> 1.3'
+  s.add_dependency             'crush',            '~> 0.3'
+  s.add_dependency             'tzinfo',           '~> 0.3'
+  s.add_dependency             'sprockets',        '~> 1.0'
+  s.add_development_dependency 'rake',             '>= 0.8.7'
+  s.add_development_dependency 'rspec',            '~> 2.6'
+  s.add_development_dependency 'rr',               '~> 1.0'
+  s.add_development_dependency 'test-construct',   '~> 1.2'
+  s.add_development_dependency 'rack-test',        '~> 0.5'
+  s.add_development_dependency 'unindent',         '~> 0.9'
+  s.add_development_dependency 'haml',             '~> 3.1'
+  s.add_development_dependency 'sass',             '~> 3.1'
+  s.add_development_dependency 'less',             '~> 1.2'
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{ |f| f =~ /^bin\/(.*)/ ? $1 : nil }.compact

data/spec/massimo/cli_spec.rb

@@ -78,17 +78,17 @@ describe Massimo::CLI do
     end
   end
   
-  describe '#generate' do
+  describe '#new' do
     it 'creates a massimo site directory' do
       within_construct do |c|
-        massimo 'generate my_site'
+        massimo 'new my_site'
         'my_site'.should be_a_directory
       end
     end
     
     it 'creates resource directories' do
       within_construct do |c|
-        massimo 'generate my_site'
+        massimo 'new my_site'
         'my_site/pages'.should be_a_directory
         'my_site/views'.should be_a_directory
         'my_site/javascripts'.should be_a_directory
@@ -98,14 +98,14 @@ describe Massimo::CLI do
     
     it 'creates an output path' do
       within_construct do |c|
-        massimo 'generate my_site'
+        massimo 'new my_site'
         'my_site/public'.should be_a_directory
       end
     end
     
     it 'creates an default index page' do
       within_construct do |c|
-        massimo 'generate my_site'
+        massimo 'new my_site'
         content = <<-EOS.unindent
           ---
           title: Home Page
@@ -113,64 +113,75 @@ describe Massimo::CLI do
           <h1><%= title %></h1>
           <p>Find me in pages/index.erb</p>
         EOS
-        'my_site/pages/index.erb'.should be_a_file.with_content(content)
+        'my_site/pages/index.html.erb'.should be_a_file.with_content(content)
       end
     end
     
     it 'creates a default layout' do
       within_construct do |c|
-        massimo 'generate my_site'
+        massimo 'new my_site'
         content = <<-EOS.unindent
         <!doctype html>
         <html>
           <head lang="en">
             <meta charset="utf-8">
             <title><%= page.title %></title>
-            <%= stylesheet_link_tag 'main' %>
-            <%= javascript_include_tag 'main' %>
+            <%= stylesheet_link_tag "main" %>
+            <%= javascript_include_tag "main" %>
           </head>
           <body>
             <%= yield %>
           </body>
         </html>
         EOS
-        'my_site/views/layouts/main.erb'.should be_a_file.with_content(content)
+        'my_site/views/layouts/main.html.erb'.should be_a_file.with_content(content)
       end
     end
     
     it 'creates a default javascript file' do
       within_construct do |c|
-        massimo 'generate my_site'
+        massimo 'new my_site'
         'my_site/javascripts/main.js'.should be_a_file
       end
     end
     
     it 'creates a default stylesheet file' do
       within_construct do |c|
-        massimo 'generate my_site'
-        'my_site/stylesheets/main.scss'.should be_a_file
+        massimo 'new my_site'
+        'my_site/stylesheets/main.css.scss'.should be_a_file
+      end
+    end
+    
+    it 'creates a default Gemfile' do
+      within_construct do |c|
+        massimo 'new my_site'
+        content = <<-EOS.unindent
+          source :rubygems
+          
+          gem "massimo", "#{Massimo::VERSION}"
+          gem "sass", "~> 3.1"
+          
+          group :production do
+            gem "uglifier", "~> 1.0"
+          end
+        EOS
+        'my_site/Gemfile'.should be_a_file.with_content(content)
       end
     end
     
     it 'creates a default config file' do
       within_construct do |c|
-        massimo 'generate my_site'
+        massimo 'new my_site'
         content = <<-EOS.unindent
-          require 'sass'
-          require 'sprockets'
-
           # This is an example configuration File
           # Look here for all the available options:
           # http://massimo.petebrowne.com/configuration/
-
+          
           if config.environment.production?
-            # Use JSMin for javascript compression
-            # config.javascripts_compressor = :min
-  
-            # Compress the output of Sass stylesheets
-            # config.sass = { :style => :compressed }
+            # Compress javascripts and stylesheets
+            config.compress = true
           end
-
+          
           helpers do
             # Define helper methods here
           end
@@ -181,9 +192,9 @@ describe Massimo::CLI do
     
     it 'creates a default rackup file' do
       within_construct do |c|
-        massimo 'generate my_site'
+        massimo 'new my_site'
         content = <<-EOS.unindent
-          require 'massimo'
+          require "massimo"
           run Massimo::Server.new
         EOS
         'my_site/config.ru'.should be_a_file.with_content(content)
@@ -194,7 +205,7 @@ describe Massimo::CLI do
       it 'creates a massimo site directory' do
         within_construct do |c|
           silence(:stdout) do
-            massimo 'g my_site'
+            massimo 'n my_site'
             'my_site'.should be_a_directory
           end
         end