massimo 0.8.4 → 0.8.5

data/lib/massimo/helpers.rb

@@ -2,7 +2,6 @@ require 'padrino-helpers'
 
 module Massimo
   module Helpers
-    include Padrino::Helpers::DomHelpers
     include Padrino::Helpers::OutputHelpers
     include Padrino::Helpers::TagHelpers
     include Padrino::Helpers::AssetTagHelpers

data/lib/massimo/javascript.rb

@@ -1,22 +1,9 @@
+require 'sprockets'
+
 module Massimo
   class Javascript < Massimo::Resource
     def render
-      compress(compile)
-    end
-    
-    def extension
-      @extension ||= '.js'
-    end
-    
-    protected
-    
-      def compile
-        case source_path.extname
-        when '.coffee'
-          require 'coffee-script' unless defined?(CoffeeScript)
-          CoffeeScript.compile(content, Massimo.config.options_for(:coffee_script))
-        else
-          require 'sprockets' unless defined?(Sprockets)
+      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 ]
@@ -24,8 +11,17 @@ module Massimo
           secretary = Sprockets::Secretary.new(options)
           secretary.install_assets
           secretary.concatenation.to_s
+        else
+          super
         end
-      end
+      compress(output)
+    end
+    
+    def extension
+      @extension ||= '.js'
+    end
+    
+    protected 
   
       def compress(javascript)
         case Massimo.config.javascripts_compressor.to_s

data/lib/massimo/page.rb

@@ -7,13 +7,11 @@ require 'yaml'
 module Massimo
   class Page < Resource
     def render
-      output = content
-      
-      if template_type = Tilt[filename]
-        options   = Massimo.config.options_for(source_path.extname[1..-1])
-        template  = template_type.new(source_path.to_s, @line, options) { output }
+      output = if template?
         meta_data = @meta_data.merge self.class.resource_name.singularize.to_sym => self
-        output    = template.render Massimo.site.template_scope, meta_data
+        template.render Massimo.site.template_scope, meta_data
+      else
+        content
       end
         
       if found_layout = Massimo::View.find("layouts/#{layout}")

data/lib/massimo/resource.rb

@@ -2,6 +2,7 @@ require 'active_support/core_ext/string/starts_ends_with'
 require 'active_support/inflector'
 require 'fileutils'
 require 'pathname'
+require 'tilt'
 
 module Massimo
   class Resource
@@ -85,7 +86,11 @@ module Massimo
     
     # Runs the content through any necessary filters, templates, etc.
     def render
-      content
+      if template?
+        template.render
+      else
+        content
+      end
     end
     
     # Writes the rendered content to the output file.
@@ -101,5 +106,18 @@ module Massimo
       def read_source
         @content = source_path.read
       end
+      
+      def template
+        @template ||= begin
+          if template_type = Tilt[filename]
+            options = Massimo.config.options_for(source_path.extname[1..-1])
+            template_type.new(source_path.to_s, @line, options) { content }
+          end
+        end
+      end
+      
+      def template?
+        !!Tilt[filename]
+      end
   end
 end

data/lib/massimo/stylesheet.rb

@@ -1,19 +1,5 @@
 module Massimo
   class Stylesheet < Massimo::Resource
-    def render
-      case source_path.extname
-      when '.sass', '.scss'
-        require 'sass' unless defined?(Sass)
-        options = Massimo.config.options_for(:sass).merge(:css_filename => output_path)
-        Sass::Files.tree_for(source_path.to_s, options).render
-      when '.less'
-        require 'less' unless defined?(Less)
-        Less::Engine.new(content, Massimo.config.options_for(:less)).to_css
-      else
-        super
-      end
-    end
-    
     def extension
       @extension ||= '.css'
     end

data/lib/massimo/version.rb

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

data/massimo.gemspec

@@ -17,17 +17,18 @@ Gem::Specification.new do |s|
   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.2.0'
+  s.add_dependency             'tilt',             '~> 1.3.1'
   s.add_dependency             'tzinfo',           '~> 0.3.0'
-  s.add_development_dependency 'rspec',            '~> 2.4.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.0.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',    '~> 0.3.0'
-  s.add_development_dependency 'sprockets',        '~> 1.0.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'

data/spec/massimo/helpers_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Massimo::Helpers do
-  it { should include(Padrino::Helpers::DomHelpers) }
   it { should include(Padrino::Helpers::OutputHelpers) }
   it { should include(Padrino::Helpers::TagHelpers) }
   it { should include(Padrino::Helpers::AssetTagHelpers) }

data/spec/massimo/javascript_spec.rb

@@ -24,7 +24,7 @@ describe Massimo::Javascript do
     
     it 'renders using CoffeeScript' do
       with_file 'javascripts/main.coffee', 'number: 42' do
-        mock(CoffeeScript).compile('number: 42', {}) { '' }
+        mock(CoffeeScript).compile('number: 42', { :bare => false }) { '' }
         javascript.render
       end
     end

data/spec/massimo/stylesheet_spec.rb

@@ -24,7 +24,7 @@ describe Massimo::Stylesheet do
     
     it 'should import other .sass files' do
       within_construct do |c|
-        c.file 'stylesheets/main.sass', "@import _base.sass"
+        c.file 'stylesheets/main.sass', '@import "base"'
         c.file 'stylesheets/_base.sass', "#header\n  font-size: 36px"
         stylesheet.render.should == "#header {\n  font-size: 36px; }\n"
       end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: massimo
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 4
-  version: 0.8.4
+  prerelease: 
+  version: 0.8.5
 platform: ruby
 authors: 
 - Pete Browne
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-09 00:00:00 -05:00
-default_executable: 
+date: 2011-05-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -25,10 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -40,10 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 0
         version: 0.4.0
   type: :runtime
   version_requirements: *id002
@@ -55,10 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
         version: 1.2.0
   type: :runtime
   version_requirements: *id003
@@ -70,10 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 0
         version: 0.9.0
   type: :runtime
   version_requirements: *id004
@@ -85,10 +64,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 14
-        - 0
         version: 0.14.0
   type: :runtime
   version_requirements: *id005
@@ -100,11 +75,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
+        version: 1.3.1
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -115,223 +86,174 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
         version: 0.3.0
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: sprockets
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 0
-        version: 2.4.0
-  type: :development
+        version: 1.0.0
+  type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rr
+  name: rspec
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 2.5.0
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: test-construct
+  name: rr
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
+        version: 1.0.0
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: test-construct
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
+        version: 1.2.0
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: unindent
+  name: rack-test
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 0
-        version: 0.9.0
+        version: 0.5.0
   type: :development
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: unindent
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+        version: 0.9.0
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: less
+  name: haml
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
+        version: 3.1.0
   type: :development
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: coffee-script
+  name: sass
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
+        version: 3.1.0
   type: :development
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: sprockets
+  name: less
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 1.2.0
   type: :development
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: jsmin
+  name: coffee-script
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 2.2.0
   type: :development
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: packr
+  name: jsmin
   prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 1
-        - 0
-        version: 3.1.0
+        version: 1.0.0
   type: :development
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: yui-compressor
+  name: packr
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 0
-        version: 0.9.0
+        version: 3.1.0
   type: :development
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  name: closure-compiler
+  name: yui-compressor
   prerelease: false
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
+        version: 0.9.0
   type: :development
   version_requirements: *id020
 - !ruby/object:Gem::Dependency 
-  name: growl
+  name: closure-compiler
   prerelease: false
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 0.3.0
   type: :development
   version_requirements: *id021
+- !ruby/object:Gem::Dependency 
+  name: growl
+  prerelease: false
+  requirement: &id022 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  version_requirements: *id022
 description: Massimo builds HTML, Javascript, and CSS Files from your source.
 email: me@petebrowne.com
 executables: 
@@ -388,7 +310,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/matchers/be_a_directory_matcher.rb
 - spec/support/matchers/be_a_file_matcher.rb
-has_rdoc: true
 homepage: http://massimo.petebrowne.com/
 licenses: []
 
@@ -402,21 +323,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: massimo
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Massimo is a static website builder.