massimo 0.8.5 → 0.9.0

data/lib/massimo/javascript.rb

@@ -2,6 +2,14 @@ require 'sprockets'
 
 module Massimo
   class Javascript < Massimo::Resource
+    def extension
+      if Tilt.registered?(super[1..-1])
+        '.js'
+      else
+        super
+      end
+    end
+    
     def render
       output = if source_path.extname == '.js'
           options = Massimo.config.options_for(:sprockets).merge(
@@ -17,10 +25,6 @@ module Massimo
       compress(output)
     end
     
-    def extension
-      @extension ||= '.js'
-    end
-    
     protected 
   
       def compress(javascript)

data/lib/massimo/page.rb

@@ -7,12 +7,7 @@ require 'yaml'
 module Massimo
   class Page < Resource
     def render
-      output = if template?
-        meta_data = @meta_data.merge self.class.resource_name.singularize.to_sym => self
-        template.render Massimo.site.template_scope, meta_data
-      else
-        content
-      end
+      output = super
         
       if found_layout = Massimo::View.find("layouts/#{layout}")
         output = found_layout.render(:page => self) { output }
@@ -26,7 +21,13 @@ module Massimo
     end
     
     def extension
-      @meta_data[:extension] ||= '.html'
+      if @meta_data[:extension]
+        @meta_data[:extension]
+      elsif Tilt.registered?(super[1..-1])
+        '.html'
+      else
+        super
+      end
     end
     
     def url
@@ -48,6 +49,10 @@ module Massimo
     
     protected
     
+      def template_locals
+        @meta_data.merge self.class.resource_name.singularize.to_sym => self
+      end
+    
       def read_source
         case source_path.extname
         when '.yml', '.yaml'

data/lib/massimo/resource.rb

@@ -1,11 +1,14 @@
 require 'active_support/core_ext/string/starts_ends_with'
 require 'active_support/inflector'
+require 'active_support/memoizable'
 require 'fileutils'
 require 'pathname'
 require 'tilt'
 
 module Massimo
   class Resource
+    extend ActiveSupport::Memoizable
+    
     class << self
       # The underscored, pluralized name of the resource.
       def resource_name
@@ -42,10 +45,10 @@ module Massimo
       
       protected
         
-      def unprocessable
-        def self.processable?; false; end
-        define_method(:process) { false }
-      end
+        def unprocessable
+          def self.processable?; false; end
+          define_method(:process) { false }
+        end
     end
     
     attr_reader :source_path, :content
@@ -53,43 +56,50 @@ module Massimo
     # Creates a new resource for the given source file.
     # The contents of the file will automatically be read.
     def initialize(source)
-      @source_path = source.is_a?(Pathname) ? source.expand_path : Pathname.new(source).expand_path
+      @source_path = Pathname.new(source).expand_path
       read_source
     end
     
     # The basename of the source file.
     def filename
-      @filename ||= source_path.basename.to_s
+      source_path.basename.to_s
     end
     
     # The extension to output with.
     def extension
-      @extension ||= source_path.extname
+      extensions.first
+    end
+    
+    # A list of all the extensions appended to the filename.
+    def extensions
+      filename.scan /\.[^.]+/
     end
     
     # The url to the resource. This is created by swiching the base path
     # of the source file with the base url.
     def url
-      @url ||= begin
-        url = source_path.to_s.sub(/^#{Regexp.escape(self.class.path)}/, '')
-        url = url.sub(/\.[^\.]+$/, extension)
-        url = File.join(self.class.url, url) unless url.starts_with? self.class.url
-        url = url.dasherize
-        url
-      end
+      url = source_path.to_s.sub(/^#{Regexp.escape(self.class.path)}/, '')
+      url = url.sub(/\..+$/, extension)
+      url = File.join(self.class.url, url) unless url.starts_with? self.class.url
+      url = url.dasherize
+      url
     end
     
     # The path to the output file.
     def output_path
-      @output_path ||= Pathname.new File.join(Massimo.config.output_path, url.sub(/^#{Regexp.escape(Massimo.config.base_url)}/, ''))
+      Pathname.new File.join(Massimo.config.output_path, url.sub(/^#{Regexp.escape(Massimo.config.base_url)}/, ''))
     end
     
     # Runs the content through any necessary filters, templates, etc.
     def render
-      if template?
-        template.render
-      else
-        content
+      extensions.reverse.inject(content) do |output, ext|
+        if template_type = Tilt[ext]
+          template_options = Massimo.config.options_for(ext[1..-1])
+          template         = template_type.new(source_path.to_s, @line, template_options) { output }
+          template.render(template_scope, template_locals)
+        else
+          output
+        end
       end
     end
     
@@ -107,17 +117,14 @@ module Massimo
         @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
+      def template_scope
+        Massimo.site.template_scope
       end
       
-      def template?
-        !!Tilt[filename]
+      def template_locals
+        {}
       end
+      
+      memoize :filename, :extension, :extensions, :url, :output_path
   end
 end

data/lib/massimo/stylesheet.rb

@@ -1,7 +1,11 @@
 module Massimo
   class Stylesheet < Massimo::Resource
     def extension
-      @extension ||= '.css'
+      if Tilt.registered?(super[1..-1])
+        '.css'
+      else
+        super
+      end
     end
   end
 end

data/lib/massimo/version.rb

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

data/lib/massimo/view.rb

@@ -5,9 +5,9 @@ module Massimo
     unprocessable
     
     def render(locals = {}, &block)
-      options  = Massimo.config.options_for(source_path.extname[1..-1])
-      template = Tilt.new(source_path.to_s, 1, options) { content }
-      template.render(Massimo.site.template_scope, locals, &block)
+      template_options = Massimo.config.options_for(extension[1..-1])
+      template         = Tilt.new(source_path.to_s, 1, template_options) { content }
+      template.render(template_scope, locals, &block)
     end
   end
 end

data/spec/massimo/javascript_spec.rb

@@ -1,6 +1,32 @@
 require 'spec_helper'
 
 describe Massimo::Javascript do
+  describe '#extension' do
+    context 'with multiple extensions' do
+      it 'should return the first extension' do
+        with_file 'file.js.coffee' do
+          Massimo::Javascript.new('file.js.coffee').extension.should == '.js'
+        end
+      end
+    end
+    
+    context 'with a single Tilt registered extension' do
+      it 'should default to .js' do
+        with_file 'file.coffee' do
+          Massimo::Javascript.new('file.coffee').extension.should == '.js'
+        end
+      end
+    end
+    
+    context 'with a single unregistered extension' do
+      it 'should be that extension' do
+        with_file 'file.json' do
+          Massimo::Javascript.new('file.json').extension.should == '.json'
+        end
+      end
+    end
+  end
+  
   context 'with normal .js files' do
     let(:javascript) { Massimo::Javascript.new 'javascripts/main.js' }
     

data/spec/massimo/page_spec.rb

@@ -84,6 +84,32 @@ describe Massimo::Page do
     end
   end
   
+  describe '#extension' do
+    context 'with multiple extensions' do
+      it 'should return the first extension' do
+        with_file 'file.rss.erb' do
+          Massimo::Page.new('file.rss.erb').extension.should == '.rss'
+        end
+      end
+    end
+    
+    context 'with a single Tilt registered extension' do
+      it 'should default to .html' do
+        with_file 'file.md' do
+          Massimo::Page.new('file.md').extension.should == '.html'
+        end
+      end
+    end
+    
+    context 'with a single unregistered extension' do
+      it 'should be that extension' do
+        with_file 'file.json' do
+          Massimo::Page.new('file.json').extension.should == '.json'
+        end
+      end
+    end
+  end
+  
   describe '#render' do
     let(:page) { Massimo::Page.new 'page.erb' }
     

data/spec/massimo/resource_spec.rb

@@ -48,6 +48,26 @@ describe Massimo::Resource do
         Massimo::Resource.new('url.erb').extension.should == '.erb'
       end
     end
+    
+    it 'should be the first extension of the file' do
+      with_file 'url.html.md.erb' do
+        Massimo::Resource.new('url.html.md.erb').extension.should == '.html'
+      end
+    end
+  end
+  
+  describe '#extensions' do
+    it 'should be the extension of the file' do
+      with_file 'url.erb' do
+        Massimo::Resource.new('url.erb').extensions.should == %w(.erb)
+      end
+    end
+    
+    it 'should be all of the extensions of the file' do
+      with_file 'url.html.md.erb' do
+        Massimo::Resource.new('url.html.md.erb').extensions.should == %w(.html .md .erb)
+      end
+    end
   end
   
   describe '#filename' do
@@ -79,6 +99,14 @@ describe Massimo::Resource do
         end
       end
     end
+    
+    context 'with multiple template extensions' do
+      it 'should only use the first extension' do
+        with_file 'file.html.md.erb' do
+          Massimo::Resource.new('file.html.md.erb').output_path.to_s.should == File.expand_path('public/file.html')
+        end
+      end
+    end
   end
   
   describe '#content' do
@@ -95,6 +123,18 @@ describe Massimo::Resource do
         resource.render.should == 'content'
       end
     end
+    
+    it 'should render the content using Tilt' do
+      with_file 'file.erb', '<%= "hello" %>' do
+        Massimo::Resource.new('file.erb').render.should == 'hello'
+      end
+    end
+    
+    it 'should render the content using multiple Tilt templates' do
+      with_file 'file.css.scss.erb', '$color: <%= "#999" %>; body { color: $color; }' do
+        Massimo::Resource.new('file.css.scss.erb').render.gsub(/\s/, '').should == 'body{color:#999999;}'
+      end
+    end
   end
   
   describe '#process' do

data/spec/massimo/stylesheet_spec.rb

@@ -1,6 +1,32 @@
 require 'spec_helper'
 
 describe Massimo::Stylesheet do
+  describe '#extension' do
+    context 'with multiple extensions' do
+      it 'should return the first extension' do
+        with_file 'file.css.scss' do
+          Massimo::Stylesheet.new('file.css.scss').extension.should == '.css'
+        end
+      end
+    end
+    
+    context 'with a single Tilt registered extension' do
+      it 'should default to .css' do
+        with_file 'file.scss' do
+          Massimo::Stylesheet.new('file.scss').extension.should == '.css'
+        end
+      end
+    end
+    
+    context 'with a single unregistered extension' do
+      it 'should be that extension' do
+        with_file 'file.jpg' do
+          Massimo::Stylesheet.new('file.jpg').extension.should == '.jpg'
+        end
+      end
+    end
+  end
+  
   context 'with normal .css files' do
     let(:stylesheet) { Massimo::Stylesheet.new('stylesheets/main.css') }
     

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: massimo
 version: !ruby/object:Gem::Version 
+  hash: 59
   prerelease: 
-  version: 0.8.5
+  segments: 
+  - 0
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Pete Browne
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 Z
+date: 2011-05-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -20,6 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -31,6 +41,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
   type: :runtime
   version_requirements: *id002
@@ -42,6 +57,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
   type: :runtime
   version_requirements: *id003
@@ -53,6 +73,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
   type: :runtime
   version_requirements: *id004
@@ -64,6 +89,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 0
+        - 14
+        - 0
         version: 0.14.0
   type: :runtime
   version_requirements: *id005
@@ -75,6 +105,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
         version: 1.3.1
   type: :runtime
   version_requirements: *id006
@@ -86,6 +121,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
   type: :runtime
   version_requirements: *id007
@@ -97,6 +137,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :runtime
   version_requirements: *id008
@@ -108,6 +153,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
   type: :development
   version_requirements: *id009
@@ -119,6 +169,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id010
@@ -130,6 +185,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
   type: :development
   version_requirements: *id011
@@ -141,6 +201,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
         version: 0.5.0
   type: :development
   version_requirements: *id012
@@ -152,6 +217,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
   type: :development
   version_requirements: *id013
@@ -163,6 +233,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
   type: :development
   version_requirements: *id014
@@ -174,6 +249,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
   type: :development
   version_requirements: *id015
@@ -185,6 +265,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
   type: :development
   version_requirements: *id016
@@ -196,6 +281,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
   type: :development
   version_requirements: *id017
@@ -207,6 +297,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id018
@@ -218,6 +313,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
   type: :development
   version_requirements: *id019
@@ -229,6 +329,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
   type: :development
   version_requirements: *id020
@@ -240,6 +345,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
   type: :development
   version_requirements: *id021
@@ -251,6 +361,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id022
@@ -323,12 +438,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []