massimo 0.8.3 → 0.8.4

data/lib/massimo/helpers.rb

@@ -1,4 +1,3 @@
-require 'rack/utils' # needed for sinatra_more...
 require 'padrino-helpers'
 
 module Massimo

data/lib/massimo/server.rb

@@ -5,21 +5,19 @@ module Massimo
   class Server
     class << self
       def start(site, port = 3000)
-        Massimo::UI.say "massimo is serving your site at http://localhost:#{port}", :growl => true
-        trap('INT') do
-          Massimo::UI.say 'massimo is shutting down your server', :growl => true
-          Rack::Handler::WEBrick.shutdown
+        handler = Rack::Handler.default
+        trap(:INT) do
+          if handler.respond_to?(:shutdown)
+            handler.shutdown
+          else
+            exit
+          end
         end
-        
-        app = Rack::Builder.new do
-          use Rack::ShowExceptions
-          run Massimo::Server.new(site)
-        end
-        Rack::Handler::WEBrick.run(app, :Port => port)
+        handler.run(self.new(site), :Port => port)
       end
     end
     
-    def initialize(site)
+    def initialize(site = Massimo.site)
       @site        = site
       @file_server = Rack::File.new(site.config.output_path)
       @watcher     = Massimo::Watcher.new(site)

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

@@ -3,7 +3,7 @@ require 'sprockets'
 
 # This is an example configuration File
 # Look here for all the available options:
-# http://petebrowne.github.com/massimo/configuration/
+# http://massimo.petebrowne.com/configuration/
 
 if config.environment.production?
   # Use JSMin for javascript compression

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

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

data/lib/massimo/version.rb

@@ -1,3 +1,3 @@
 module Massimo
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end

data/lib/massimo/watcher.rb

@@ -17,7 +17,7 @@ module Massimo
     def run
       begin
         loop do
-          process
+          Massimo::UI.report_errors { process }
           sleep 0.5
         end
       rescue Interrupt
@@ -27,17 +27,15 @@ module Massimo
     
     # Processes the Site if any of the files have changed.
     def process
-      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
-        end
+      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
       end
     end
     

data/spec/massimo/cli_spec.rb

@@ -161,7 +161,7 @@ describe Massimo::CLI do
 
           # This is an example configuration File
           # Look here for all the available options:
-          # http://petebrowne.github.com/massimo/configuration/
+          # http://massimo.petebrowne.com/configuration/
 
           if config.environment.production?
             # Use JSMin for javascript compression
@@ -179,6 +179,17 @@ describe Massimo::CLI do
       end
     end
     
+    it 'creates a default rackup file' do
+      within_construct do |c|
+        massimo 'generate my_site'
+        content = <<-EOS.unindent
+          require 'massimo'
+          run Massimo::Server.new
+        EOS
+        'my_site/config.ru'.should be_a_file.with_content(content)
+      end
+    end
+    
     context "with mapping 'g'" do
       it 'creates a massimo site directory' do
         within_construct do |c|

data/spec/massimo/server_spec.rb

@@ -3,14 +3,14 @@ require 'spec_helper'
 describe Massimo::Server do
   let(:app) { Massimo::Server.new(Massimo.site) }
   
-  it 'should serve up static files' do
+  it 'serves up static files' do
     with_file 'public/stylesheets/main.css', 'body { font-size: 12px; }' do
       get '/stylesheets/main.css'
       last_response.body.should == 'body { font-size: 12px; }'
     end
   end
   
-  it 'should serve up directory index files' do
+  it 'serves up directory index files' do
     with_file 'public/about-us/index.html', 'About Us' do
       get '/about-us/'
       last_response.body.should == 'About Us'
@@ -18,7 +18,7 @@ describe Massimo::Server do
   end
   
   context 'when files have changed' do
-    it 'should process the site on request' do
+    it 'processes the site on request' do
       with_file 'pages/index.haml' do
         mock(Massimo.site).process
         get '/'
@@ -27,9 +27,13 @@ describe Massimo::Server do
   end
   
   context 'when files have not changed' do
-    it 'should not process the site on request' do
-      dont_allow(Massimo.site).process
-      get '/'
+    it 'does not process the site on request' do
+      with_file 'pages/index.haml' do
+        mock(Massimo.site).process
+        get '/'
+        dont_allow(Massimo.site).process
+        get '/'
+      end
     end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: massimo
 version: !ruby/object:Gem::Version 
-  hash: 57
   prerelease: false
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Pete Browne
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -05:00
+date: 2011-04-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 4
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 2
@@ -74,7 +70,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
         segments: 
         - 0
         - 9
@@ -90,7 +85,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 39
         segments: 
         - 0
         - 14
@@ -106,7 +100,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 2
@@ -122,7 +115,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 3
@@ -138,7 +130,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 2
         - 4
@@ -154,7 +145,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -170,7 +160,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 2
@@ -186,7 +175,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 0
         - 5
@@ -202,7 +190,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
         segments: 
         - 0
         - 9
@@ -218,7 +205,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
@@ -234,7 +220,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 2
@@ -250,7 +235,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 3
@@ -266,7 +250,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -282,7 +265,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -298,7 +280,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 3
         - 1
@@ -314,7 +295,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
         segments: 
         - 0
         - 9
@@ -330,7 +310,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 3
@@ -346,7 +325,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -382,6 +360,7 @@ files:
 - lib/massimo/site.rb
 - lib/massimo/stylesheet.rb
 - lib/massimo/templates/site/config.rb
+- lib/massimo/templates/site/config.ru
 - lib/massimo/templates/site/javascripts/main.js
 - lib/massimo/templates/site/pages/index.erb
 - lib/massimo/templates/site/public/.empty_directory
@@ -423,7 +402,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -432,7 +410,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"