massimo 0.10.0 → 0.10.1

data/README.md

@@ -12,7 +12,7 @@ Features
 * 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 compresses them using whichever library you want.
+  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
 

data/lib/massimo/config.rb

@@ -30,7 +30,8 @@ module Massimo
     CSS_COMPRESSORS = {
       :cssmin    => Crush::CSSMin,
       :rainpress => Crush::Rainpress,
-      :yui       => Crush::YUI::CssCompressor
+      :yui       => Crush::YUI::CssCompressor,
+      :sass      => Crush::Sass::Engine
     }
     
     # Creates a new configuration. Takes either a hash of options
@@ -94,7 +95,7 @@ module Massimo
     #
     # @param [Hash] options The hash of options to use.
     def js_compressor_options=(options)
-      self.js = options
+      self.js_options = options
     end
     
     # Sets up Massimo to compress CSS files. By default,
@@ -122,7 +123,7 @@ module Massimo
     #
     # @param [Hash] options The hash of options to use.
     def css_compressor_options=(options)
-      self.css = options
+      self.css_options = options
     end
     
     # Get a full, expanded path for the given resource name. This is either set
@@ -150,7 +151,7 @@ module Massimo
     # 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) || {}
+      send("#{lib_name}_options") || send(lib_name) || {}
     end
   end
 end

data/lib/massimo/page.rb

@@ -6,6 +6,16 @@ require 'yaml'
 
 module Massimo
   class Page < Resource
+    FRONT_MATTER_PARSER = /
+      (
+        \A\s*       # Beginning of file
+        ^---\s*$\n* # Start YAML Block
+        (.*?)\n*    # YAML data
+        ^---\s*$\n* # End YAML Block
+      )
+      (.*)          # Rest of File
+    /mx
+
     def render
       output = super
         
@@ -54,32 +64,28 @@ module Massimo
       end
     
       def read_source
+        super
+        
         case source_path.extname
         when '.yml', '.yaml'
-          @meta_data = (YAML.load(source_path.read) || {}).symbolize_keys
+          @meta_data = load_yaml_data @content
           @content   = @meta_data[:content] || ''
         else
-          @line        = nil
-          @content     = ''
-          front_matter = false
-          meta_data    = ''
-        
-          source_path.open do |file|
-            file.each do |line|
-              if line =~ /\A---\s*\Z/
-                front_matter = !front_matter
-              else
-                if front_matter
-                  meta_data << line
-                else
-                  @line ||= file.lineno
-                  @content << line
-                end
-              end
-            end
+          if FRONT_MATTER_PARSER.match @content
+            @line      = $1.lines.count + 1
+            @meta_data = load_yaml_data $2
+            @content   = $3
           end
+        end
         
-          @meta_data = (YAML.load(meta_data) || {}).symbolize_keys
+        @meta_data ||= {}
+      end
+      
+      def load_yaml_data(data)
+        begin
+          (YAML.load(data) || {}).symbolize_keys
+        rescue => e
+          raise "Error loading front matter from #{source_path}: #{e.message}"
         end
       end
     

data/lib/massimo/version.rb

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

data/spec/massimo/config_spec.rb

@@ -79,6 +79,11 @@ describe Massimo::Config do
   
   describe '#options_for' do
     it 'returns the options set for the given name' do
+      config = Massimo::Config.new(:sass_options => { :style => :compressed })
+      config.options_for(:sass).should == { :style => :compressed }
+    end
+    
+    it 'returns the options set with the alternate syntax' do
       config = Massimo::Config.new(:sass => { :style => :compressed })
       config.options_for(:sass).should == { :style => :compressed }
     end

data/spec/massimo/stylesheet_spec.rb

@@ -159,5 +159,28 @@ describe Massimo::Stylesheet do
         end
       end
     end
+    
+    context 'using :sass' do
+      it 'compresses using Sass::Engine' do
+        Massimo.config.css_compressor = :sass
+        with_file 'stylesheets/main.css', code do
+          compressor = mock!.render { '' }
+          mock_module('Sass::Engine').new(code, :style  => :compressed, :syntax => :scss) { compressor }
+          stylesheet.render
+        end
+      end
+      
+      context 'with configuration' do
+        it 'passes configuration to Sass::Engine' do
+          Massimo.config.css_compressor = :sass
+          Massimo.config.css_compressor_options = { :cache => false }
+          with_file 'stylesheets/main.css', code do
+            compressor = mock!.render { '' }
+            mock_module('Sass::Engine').new(code, :style  => :compressed, :syntax => :scss, :cache => false) { compressor }
+            stylesheet.render
+          end
+        end
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: massimo
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Pete Browne