massimo 0.7.5 → 0.8.0

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.gitignore

@@ -0,0 +1,6 @@
+.bundle
+.rvmrc
+.sass-cache
+.yardoc
+doc
+pkg

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/Gemfile.lock

@@ -0,0 +1,88 @@
+PATH
+  remote: .
+  specs:
+    massimo (0.7.5)
+      activesupport (~> 3.0.0)
+      i18n (~> 0.4.0)
+      rack (~> 1.2.0)
+      sinatra_more (~> 0.3.0)
+      thor (~> 0.14.0)
+      tilt (~> 1.2.0)
+      tzinfo (~> 0.3.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.3)
+    closure-compiler (0.3.3)
+    coffee-script (0.3.2)
+    diff-lcs (1.1.2)
+    growl (1.0.3)
+    haml (3.0.25)
+    i18n (0.4.2)
+    jsmin (1.0.1)
+    less (1.2.21)
+      mutter (>= 0.4.2)
+      treetop (>= 1.4.2)
+    mutter (0.5.3)
+    oyster (0.9.4)
+    packr (3.1.0)
+      oyster
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rr (1.0.2)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    sinatra (1.1.2)
+      rack (~> 1.1)
+      tilt (~> 1.2)
+    sinatra_more (0.3.40)
+      activesupport (>= 2.2.2)
+      bundler (>= 0.9.2)
+      sinatra (>= 0.9.2)
+      thor (>= 0.11.8)
+      tilt (>= 0.2)
+    sprockets (1.0.2)
+    test-construct (1.2.0)
+    thor (0.14.6)
+    tilt (1.2.2)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.24)
+    unindent (0.9)
+    yui-compressor (0.9.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 3.0.0)
+  closure-compiler (~> 0.3.0)
+  coffee-script (~> 0.3.0)
+  growl (~> 1.0.0)
+  haml (~> 3.0.0)
+  i18n (~> 0.4.0)
+  jsmin (~> 1.0.0)
+  less (~> 1.2.0)
+  massimo!
+  packr (~> 3.1.0)
+  rack (~> 1.2.0)
+  rack-test (~> 0.5.0)
+  rr (~> 1.0.0)
+  rspec (~> 2.4.0)
+  sinatra_more (~> 0.3.0)
+  sprockets (~> 1.0.0)
+  test-construct (~> 1.2.0)
+  thor (~> 0.14.0)
+  tilt (~> 1.2.0)
+  tzinfo (~> 0.3.0)
+  unindent (~> 0.9.0)
+  yui-compressor (~> 0.9.0)

data/README.md

@@ -21,7 +21,9 @@ Massimo is a static website builder that allows you to use dynamic technologies
     cd my-site
     massimo build
     
-For more information, visit http://petebrowne.github.com/massimo/.
+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
 

data/Rakefile

@@ -0,0 +1,8 @@
+task :default => :spec
+
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new

data/bin/massimo

@@ -1,20 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'massimo'
-
-case ARGV.shift
-when 'b', 'build'
-  Massimo::Commands::Build
-when 'g', 'generate'
-  Massimo::Commands::Generate
-when nil, '-h', '--help', 'help'
-  Massimo::Commands::Help
-when 's', 'server'
-  Massimo::Commands::Server
-when '-v', '--version', 'version'
-  Massimo::Commands::Version
-when 'w', 'watch'
-  Massimo::Commands::Watch
-else
-  Massimo::Commands::Help
-end.run
+Massimo::CLI.start

data/lib/massimo/cli.rb

@@ -0,0 +1,63 @@
+require 'active_support/core_ext/hash/keys'
+require 'thor'
+
+module Massimo
+  class CLI < Thor
+    include Thor::Actions
+    
+    source_root  File.expand_path('../templates', __FILE__)
+    
+    default_task :help
+    
+    class_option 'config_path', :desc => 'Path to the config file',              :aliases => '-c'
+    class_option 'source_path', :desc => 'Path to the source dir',               :aliases => '-s'
+    class_option 'output_path', :desc => 'Path to the output dir',               :aliases => '-o'
+    class_option 'environment', :desc => 'Sets the environment',                 :aliases => '-e'
+    class_option 'production',  :desc => "Sets the environment to 'production'", :aliases => '-p', :type => :boolean
+    
+    desc 'build', 'Builds the site from the source files'
+    def build
+      Kernel.exit Massimo::UI.report_errors {
+        site.process
+        Massimo::UI.say 'massimo has built your site', :growl => true
+      }
+    end
+    map 'b' => :build
+    
+    desc 'generate SITE_NAME', 'Generates a new site with the give name'
+    def generate(site_name)
+      directory 'site', site_name
+    end
+    map 'g' => :generate
+    
+    desc 'server [PORT]', 'Runs a local Rack based web server on the given port'
+    def server(port = 3000)
+      Massimo::Server.start(site, port.to_i)
+    end
+    map 's' => :server
+    
+    desc 'watch', 'Watches your files for changes and automatically builds the site'
+    def watch
+      Massimo::Watcher.start(site)
+    end
+    map 'w' => :watch
+    
+    desc 'version', 'Prints out the version'
+    def version
+      puts Massimo::VERSION
+    end
+    map %w(v -v --version) => :version
+    
+    protected
+      
+      def site
+        @site ||= Massimo::Site.new(site_options)
+      end
+      
+      def site_options
+        config = {}.merge(options).symbolize_keys
+        config[:environment] = 'production' if config.delete(:production) == true
+        config
+      end
+  end
+end

data/lib/massimo/config.rb

@@ -6,6 +6,7 @@ require 'yaml'
 module Massimo
   class Config < OpenStruct
     DEFAULT_OPTIONS = {
+      :config_path     => 'config.rb',
       :source_path     => '.',
       :output_path     => 'public',
       :environment     => 'development',
@@ -20,19 +21,21 @@ module Massimo
     # or a file path to a .yaml file.
     def initialize(options = nil)
       hash = DEFAULT_OPTIONS.dup
-      
-      options = YAML.load_file(options) if options.is_a? String
       hash.merge!(options.symbolize_keys) if options.is_a? Hash
-      
       super hash
     end
     
-    # The full, expanded path to the source path.
+    # The full, expanded path to the config file
+    def config_path
+      File.expand_path super
+    end
+    
+    # The full, expanded path to the source directory.
     def source_path
       File.expand_path super
     end
     
-    # The full, expanded path to the output path.
+    # The full, expanded path to the output directory.
     def output_path
       File.expand_path super
     end

data/lib/massimo/javascript.rb

@@ -31,14 +31,22 @@ module Massimo
         case Massimo.config.javascripts_compressor.to_s
         when 'min', 'jsmin'
           require 'jsmin' unless defined?(JSMin)
-          JSMin.minify(javascript).strip
+          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
+        end.strip
       end
   end
 end

data/lib/massimo/reloader.rb

@@ -0,0 +1,37 @@
+module Massimo
+  module Reloader
+    extend self
+    
+    def load(name = :default)
+      cache[name] ||= {}
+      
+      previous_constants = Object.constants
+      previous_features  = $LOADED_FEATURES.dup
+      yield if block_given?
+      cache[name][:constants] = (Object.constants - previous_constants).uniq
+      cache[name][:features]  = ($LOADED_FEATURES - previous_features).uniq
+      
+      cache[name]
+    end
+    
+    def unload(name = :default)
+      return unless cache.key?(name)
+      cache[name][:constants].reject! do |const|
+        Object.send(:remove_const, const) if Object.const_defined?(const)
+      end if cache[name].key?(:constants)
+      cache[name][:features].reject! do |feature|
+        $LOADED_FEATURES.delete(feature)
+      end if cache[name].key?(:features)
+      cache[name]
+    end
+    
+    def reload(name = :default, &block)
+      unload(name)
+      load(name, &block)
+    end
+    
+    def cache
+      @cache ||= {}
+    end
+  end
+end

data/lib/massimo/site.rb

@@ -5,21 +5,27 @@ require 'tilt'
 module Massimo
   class Site
     attr_accessor :config
+    attr_reader   :resources
     
     # Creates a new Site, passing the given options to a new configuration.
     # If a block is given, it is evaluated in the scope of the new Site.
     def initialize(options = nil, &block)
+      @original_options        ||= options
       @config                    = Config.new(options)
+      @resources                 = [ Massimo::Page, Massimo::Javascript, Massimo::Stylesheet, Massimo::View ]
       @template_scope_blocks     = []
       @template_scope_extensions = []
       Massimo.site               = self
       
-      instance_eval(&block) if block_given?
+      Massimo::Reloader.reload(:config) do
+        instance_eval File.read(config.config_path) if File.exist?(config.config_path)
+        instance_eval(&block) if block_given?
+      end
     end
     
-    # The resources used in this Site.
-    def resources
-      @resources ||= [ Massimo::Page, Massimo::Javascript, Massimo::Stylesheet, Massimo::View ]
+    # Sets up the Site from scratch again. Also Reloads the config file again.
+    def reload(&block)
+      initialize @original_options, &block
     end
     
     # Adds a new, custom resource to the Site. If a Class constant is given,
@@ -78,30 +84,27 @@ module Massimo
       end
     
       def add_template_scope_helpers(scope)
-        config.files_in(:helpers, :rb).each do |file|
-          load(file)
-          if helper = (class_name_of_file(file).constantize rescue nil)
-            scope.extend(helper)
+        cache = Massimo::Reloader.reload(:helpers) do
+          config.files_in(:helpers, :rb).each do |file|
+            load(file)
+          end
+        end
+        
+        if constants = cache[:constants]
+          constants.each do |const|
+            if (helper = const.to_s.constantize rescue nil)
+              scope.extend(helper)
+            end
           end
         end
       end
   
       def reload_libs
-        if defined? @previous_libs
-          @previous_libs.each do |lib|
-            class_name = class_name_of_file(lib)
-            Object.class_eval do
-              remove_const(class_name) if const_defined?(class_name)
-            end
+        Massimo::Reloader.reload(:libs) do
+          config.files_in(:lib, :rb).each do |file|
+            load(file)
           end
         end
-        @previous_libs = config.files_in(:lib, :rb).each do |file|
-          load(file)
-        end
-      end
-    
-      def class_name_of_file(file)
-        File.basename(file).sub(/\.[^\.]+$/, '').classify
       end
   end
 end

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

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

data/lib/massimo/templates/site/pages/index.erb

@@ -0,0 +1,5 @@
+---
+title: Home Page
+---
+<h1><%= title %></h1>
+<p>Find me in pages/index.erb</p>

data/lib/massimo/templates/site/views/layouts/main.erb

@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+  <head lang="en">
+    <meta charset="utf-8">
+    <title><%= page.title %></title>
+    <%= stylesheet_link_tag 'main' %>
+    <%= javascript_include_tag 'main' %>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/lib/massimo/ui.rb

@@ -35,7 +35,7 @@ module Massimo
     def report_errors
       begin
         yield
-        0
+        true
       rescue Exception => error
         say 'massimo had a problem', :red
         indent do
@@ -43,7 +43,7 @@ module Massimo
           say error.backtrace.first, :magenta
         end
         growl "#{error.message}\n#{error.backtrace.first}", 'massimo problem'
-        1
+        false
       end
     end
     

data/lib/massimo/version.rb

@@ -1,3 +1,3 @@
 module Massimo
-  VERSION = '0.7.5'
+  VERSION = '0.8.0'
 end

data/lib/massimo/watcher.rb

@@ -8,8 +8,9 @@ module Massimo
     end
     
     def initialize(site)
-      @site  = site
-      @files = []
+      @site           = site
+      @previous_files = []
+      check_config
     end
     
     # Runs a loop, processing the Site whenever files have changed.
@@ -26,8 +27,13 @@ module Massimo
     
     # Processes the Site if any of the files have changed.
     def process
-      if changed?
-        Massimo::UI.report_errors do
+      Massimo::UI.report_errors do
+        if config_changed?
+          Massimo::UI.say 'massimo is reloading your site'
+          @site.reload
+          @site.process
+          Massimo::UI.say 'massimo has built your site', :growl => true
+        elsif changed?
           Massimo::UI.say 'massimo has noticed a change'
           @site.process
           Massimo::UI.say 'massimo has built your site', :growl => true
@@ -37,13 +43,22 @@ module Massimo
     
     # Determine if any of the Site's files have changed.
     def changed?
-      @files != files
+      @previous_files != check_files
+    end
+    
+    # Determine if the Site's config file has chanaged.
+    def config_changed?
+      @previous_config != check_config
     end
     
     protected
     
-      def files
-        @files = Dir[*glob].map { |file| File.mtime(file) }
+      def check_config
+        @previous_config = File.exist?(@site.config.config_path) && File.mtime(@site.config.config_path)
+      end
+    
+      def check_files
+        @previous_files = Dir[*glob].map { |file| File.mtime(file) }
       end
     
       def glob

data/lib/massimo.rb

@@ -1,27 +1,19 @@
 module Massimo
   autoload :Config,     'massimo/config'
+  autoload :CLI,        'massimo/cli'
   autoload :Helpers,    'massimo/helpers'
   autoload :Javascript, 'massimo/javascript'
   autoload :Page,       'massimo/page'
+  autoload :Reloader,   'massimo/reloader'
   autoload :Resource,   'massimo/resource'
   autoload :Server,     'massimo/server'
   autoload :Site,       'massimo/site'
   autoload :Stylesheet, 'massimo/stylesheet'
   autoload :UI,         'massimo/ui'
-  autoload :Version,    'massimo/version'
+  autoload :VERSION,    'massimo/version'
   autoload :View,       'massimo/view'
   autoload :Watcher,    'massimo/watcher'
   
-  module Commands
-    autoload :Base,     'massimo/commands/base'
-    autoload :Build,    'massimo/commands/build'
-    autoload :Generate, 'massimo/commands/generate'
-    autoload :Help,     'massimo/commands/help'
-    autoload :Server,   'massimo/commands/server'
-    autoload :Version,  'massimo/commands/version'
-    autoload :Watch,    'massimo/commands/watch'
-  end
-  
   class << self
     def site
       @site ||= Site.new

data/massimo.gemspec

@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/massimo/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = 'massimo'
+  s.version     = Massimo::VERSION
+  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.homepage          = 'http://petebrowne.github.com/massimo/'
+  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             'sinatra_more',     '~> 0.3.0'
+  s.add_dependency             'thor',             '~> 0.14.0'
+  s.add_dependency             'tilt',             '~> 1.2.0'
+  s.add_dependency             'tzinfo',           '~> 0.3.0'
+  s.add_development_dependency 'rspec',            '~> 2.4.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.0.0'
+  s.add_development_dependency 'less',             '~> 1.2.0'
+  s.add_development_dependency 'coffee-script',    '~> 0.3.0'
+  s.add_development_dependency 'sprockets',        '~> 1.0.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.files        = `git ls-files`.split("\n")
+  s.executables  = `git ls-files`.split("\n").map{ |f| f =~ /^bin\/(.*)/ ? $1 : nil }.compact
+  s.require_path = 'lib'
+end