massimo 0.6.0 → 0.6.1

data/bin/massimo

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'massimo'
-
 Massimo::CLI.start

data/lib/massimo/config.rb

@@ -19,45 +19,47 @@ module Massimo
     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)
+      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.
     def source_path
-      File.expand_path(super)
+      File.expand_path super
     end
     
     # The full, expanded path to the output path.
     def output_path
-      File.expand_path(super)
+      File.expand_path super
     end
     
     # Get a full, expanded path for the given resource name. This is either set
     # in the configuration or determined dynamically based on the name.
     def path_for(resource_name)
-      path_method = "#{resource_name}_path"
-      if resource_path = (respond_to?(path_method) and send(path_method))
-        File.expand_path(resource_path)
+      if resource_path = send("#{resource_name}_path")
+        File.expand_path resource_path
       else
-        File.join(source_path, resource_name.to_s)
+        File.join source_path, resource_name.to_s
       end
     end
     
     # Get the configured URL for th given resource name.
     def url_for(resource_name)
-      url_method   = "#{resource_name}_url"
-      resource_url = respond_to?(url_method) && send(url_method)
-      resource_url = resources_url unless resource_url
-      File.join(base_url, resource_url)
+      File.join base_url, send("#{resource_name}_url") || resources_url
     end
     
     # Get an array of all the file paths found in the given resource name's path,
     # restricted to the given extension.
     def files_in(resource_name, extension = '*')
-      Dir.glob(File.join(path_for(resource_name), "**/*.#{extension}"))
+      Dir.glob File.join(path_for(resource_name), "**/*.#{extension}")
+    end
+    
+    # Convience method for getting options for a given library name. For instance,
+    # this is how we get the options set for Haml or Sass during processing.
+    def options_for(lib_name)
+      send(lib_name) || {}
     end
   end
 end

data/lib/massimo/javascript.rb

@@ -4,13 +4,14 @@ module Massimo
       case source_path.extname.to_s
       when '.coffee'
         require 'coffee-script' unless defined?(CoffeeScript)
-        CoffeeScript.compile(content)
+        CoffeeScript.compile(content, Massimo.config.options_for(:coffee_script))
       else
         require 'sprockets' unless defined?(Sprockets)
-        secretary = Sprockets::Secretary.new(
+        options = Massimo.config.options_for(:sprockets).merge(
           :assert_root  => Massimo.config.output_path,
           :source_files => [ source_path.to_s ]
         )
+        secretary = Sprockets::Secretary.new(options)
         secretary.install_assets
         secretary.concatenation.to_s
       end

data/lib/massimo/page.rb

@@ -10,9 +10,10 @@ module Massimo
       output = content
       
       if template_type = Tilt[filename]
-        template  = template_type.new(source_path.to_s, @line || 1) { output }
-        meta_data = @meta_data.merge(self.class.resource_name.singularize.to_sym => self)
-        output    = template.render(Massimo.site.template_scope, meta_data)
+        options   = Massimo.config.options_for(source_path.extname[1..-1])
+        template  = template_type.new(source_path.to_s, @line, options) { output }
+        meta_data = @meta_data.merge self.class.resource_name.singularize.to_sym => self
+        output    = template.render Massimo.site.template_scope, meta_data
       end
         
       if found_layout = Massimo::View.find("layouts/#{layout}")
@@ -23,7 +24,7 @@ module Massimo
     end
     
     def title
-      @meta_data[:title] ||= filename.chomp(source_path.extname.to_s).titleize
+      @meta_data[:title] ||= filename.chomp(source_path.extname).titleize
     end
     
     def extension
@@ -75,7 +76,6 @@ module Massimo
       
       def method_missing(method, *args, &block)
         if args.length == 0
-          read_source
           method_name = method.to_s
           if method_name.chomp! '?'
             !!@meta_data[method_name.to_sym]

data/lib/massimo/stylesheet.rb

@@ -4,10 +4,11 @@ module Massimo
       case source_path.extname.to_s
       when '.sass', '.scss'
         require 'sass' unless defined?(Sass)
-        Sass::Files.tree_for(source_path.to_s, :css_filename => output_path).render
+        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).to_css
+        Less::Engine.new(content, Massimo.config.options_for(:less)).to_css
       else
         super
       end

data/lib/massimo/view.rb

@@ -5,7 +5,8 @@ module Massimo
     unprocessable
     
     def render(locals = {}, &block)
-      template = Tilt.new(source_path.to_s) { content }
+      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)
     end
   end

data/lib/massimo.rb

@@ -12,7 +12,7 @@ module Massimo
   autoload :View,       'massimo/view'
   autoload :Watcher,    'massimo/watcher'
   
-  VERSION = File.read File.expand_path('../../VERSION', __FILE__)
+  VERSION = '0.6.1'
   
   class << self
     def site

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Pete Browne
@@ -88,24 +88,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: version
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 0
-        version: 0.9.0
-  type: :development
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -115,11 +101,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: test-construct
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -129,11 +115,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -143,11 +129,11 @@ dependencies:
         - 0
         version: 0.5.0
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -157,11 +143,11 @@ dependencies:
         - 0
         version: 0.10.0
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -172,11 +158,11 @@ dependencies:
         - beta
         version: 3.0.0.beta
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: less
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -186,11 +172,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :development
-  version_requirements: *id012
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: coffee-script
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -200,11 +186,11 @@ dependencies:
         - 0
         version: 0.3.0
   type: :development
-  version_requirements: *id013
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: sprockets
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -214,11 +200,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id014
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: unindent
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -228,11 +214,11 @@ dependencies:
         - 0
         version: 0.9.0
   type: :development
-  version_requirements: *id015
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: growl
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -242,7 +228,7 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id016
+  version_requirements: *id015
 description: Massimo builds HTML, Javascript, and CSS Files from your source.
 email: me@petebrowne.com
 executables: 
@@ -253,22 +239,21 @@ extra_rdoc_files: []
 
 files: 
 - bin/massimo
-- lib/massimo/cli.rb
-- lib/massimo/config.rb
-- lib/massimo/helpers.rb
-- lib/massimo/javascript.rb
+- lib/massimo/stylesheet.rb
+- lib/massimo/server.rb
+- lib/massimo/view.rb
 - lib/massimo/page.rb
 - lib/massimo/resource.rb
-- lib/massimo/server.rb
-- lib/massimo/site.rb
-- lib/massimo/stylesheet.rb
+- lib/massimo/cli.rb
+- lib/massimo/config.rb
 - lib/massimo/ui.rb
-- lib/massimo/view.rb
 - lib/massimo/watcher.rb
+- lib/massimo/site.rb
+- lib/massimo/javascript.rb
+- lib/massimo/helpers.rb
 - lib/massimo.rb
 - LICENSE
 - README.md
-- VERSION
 has_rdoc: true
 homepage: http://petebrowne.github.com/massimo/
 licenses: []
@@ -294,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: massimo
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3

data/VERSION

@@ -1 +0,0 @@
-0.6.0