massimo 0.7.0 → 0.7.1

data/README.md

@@ -20,6 +20,8 @@ Massimo is a static website builder that allows you to use dynamic technologies
     massimo generate my-site
     cd my-site
     massimo build
+    
+For more information, visit http://petebrowne.github.com/massimo/.
 
 ## Copyright
 

data/bin/massimo

@@ -17,4 +17,4 @@ when 'w', 'watch'
   Massimo::Commands::Watch
 else
   Massimo::Commands::Help
-end.run
+end.run

data/lib/massimo/commands/base.rb

@@ -84,4 +84,4 @@ module Massimo
       end
     end
   end
-end
+end

data/lib/massimo/commands/build.rb

@@ -16,4 +16,4 @@ Builds the site from the source files.
       end
     end
   end
-end
+end

data/lib/massimo/commands/generate.rb

@@ -58,6 +58,5 @@ Within a massimo project, you can generate a new resource file:
         end
       end
     end
-    
   end
-end
+end

data/lib/massimo/commands/help.rb

@@ -30,6 +30,5 @@ Commands:
         end
       end
     end
-    
   end
-end
+end

data/lib/massimo/commands/server.rb

@@ -21,4 +21,4 @@ Runs a local Rack based web server on the given port.
       end
     end
   end
-end
+end

data/lib/massimo/commands/version.rb

@@ -6,4 +6,4 @@ module Massimo
       end
     end
   end
-end
+end

data/lib/massimo/commands/watch.rb

@@ -13,4 +13,4 @@ Watches your files for changes and automatically builds the site.
       end
     end
   end
-end
+end

data/lib/massimo/config.rb

@@ -70,4 +70,4 @@ module Massimo
       send(lib_name) || {}
     end
   end
-end
+end

data/lib/massimo/helpers.rb

@@ -20,4 +20,4 @@ module Massimo
       view && view.render(locals)
     end
   end
-end
+end

data/lib/massimo/javascript.rb

@@ -10,35 +10,35 @@ module Massimo
     
     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)
-          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
+    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)
+        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
-    
-      def compress(javascript)
-        case Massimo.config.javascripts_compressor.to_s
-        when 'min', 'jsmin'
-          require 'jsmin' unless defined?(JSMin)
-          JSMin.minify(javascript).strip
-        when 'pack', 'packr'
-          require 'packr' unless defined?(Packr)
-          options = { :shrink_vars => true }.merge Massimo.config.options_for(:packr)
-          Packr.pack(javascript, options)
-        else
-          javascript
-        end
+    end
+  
+    def compress(javascript)
+      case Massimo.config.javascripts_compressor.to_s
+      when 'min', 'jsmin'
+        require 'jsmin' unless defined?(JSMin)
+        JSMin.minify(javascript).strip
+      when 'pack', 'packr'
+        require 'packr' unless defined?(Packr)
+        options = { :shrink_vars => true }.merge Massimo.config.options_for(:packr)
+        Packr.pack(javascript, options)
+      else
+        javascript
       end
+    end
   end
-end
+end

data/lib/massimo/page.rb

@@ -50,47 +50,47 @@ module Massimo
     
     protected
     
-      def read_source
-        case source_path.extname
-        when '.yml', '.yaml'
-          @meta_data = (YAML.load(source_path.read) || {}).symbolize_keys
-          @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
+    def read_source
+      case source_path.extname
+      when '.yml', '.yaml'
+        @meta_data = (YAML.load(source_path.read) || {}).symbolize_keys
+        @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
-                if front_matter
-                  meta_data << line
-                else
-                  @line ||= file.lineno
-                  @content << line
-                end
+                @line ||= file.lineno
+                @content << line
               end
             end
           end
-          
-          @meta_data = (YAML.load(meta_data) || {}).symbolize_keys
         end
+        
+        @meta_data = (YAML.load(meta_data) || {}).symbolize_keys
       end
-      
-      def method_missing(method, *args, &block)
-        if args.length == 0
-          method_name = method.to_s
-          if method_name.chomp! '?'
-            !!@meta_data[method_name.to_sym]
-          else
-            @meta_data[method_name.to_sym]
-          end
+    end
+    
+    def method_missing(method, *args, &block)
+      if args.length == 0
+        method_name = method.to_s
+        if method_name.chomp! '?'
+          !!@meta_data[method_name.to_sym]
         else
-          super
+          @meta_data[method_name.to_sym]
         end
+      else
+        super
       end
+    end
   end
-end
+end

data/lib/massimo/resource.rb

@@ -41,10 +41,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
@@ -98,8 +98,8 @@ module Massimo
     
     protected
     
-      def read_source
-        @content = source_path.read
-      end
+    def read_source
+      @content = source_path.read
+    end
   end
-end
+end

data/lib/massimo/server.rb

@@ -31,4 +31,4 @@ module Massimo
       @file_server.call(env)
     end
   end
-end
+end

data/lib/massimo/site.rb

@@ -67,43 +67,43 @@ module Massimo
     
     protected
     
-      def add_template_scope_blocks(scope)
-        @template_scope_blocks.each do |block|
-          scope.instance_eval(&block)
-        end
+    def add_template_scope_blocks(scope)
+      @template_scope_blocks.each do |block|
+        scope.instance_eval(&block)
       end
-      
-      def add_template_scope_extensions(scope)
-        @template_scope_extensions.each do |extension|
-          scope.extend(extension)
-        end
+    end
+    
+    def add_template_scope_extensions(scope)
+      @template_scope_extensions.each do |extension|
+        scope.extend(extension)
       end
-      
-      def add_template_scope_helpers(scope)
-        config.files_in(:helpers, :rb).each do |file|
-          load(file)
-          if helper = (class_name_of_file(file).constantize rescue nil)
-            scope.extend(helper)
-          end
+    end
+    
+    def add_template_scope_helpers(scope)
+      config.files_in(:helpers, :rb).each do |file|
+        load(file)
+        if helper = (class_name_of_file(file).constantize rescue nil)
+          scope.extend(helper)
         end
       end
-    
-      def reload_libs
-        if defined? @previous_libs
-          @previous_libs.each do |lib|
-            class_name = class_name_of_file(lib)
-            Object.class_eval do
-              remove_const(class_name) if const_defined?(class_name)
-            end
+    end
+  
+    def reload_libs
+      if defined? @previous_libs
+        @previous_libs.each do |lib|
+          class_name = class_name_of_file(lib)
+          Object.class_eval do
+            remove_const(class_name) if const_defined?(class_name)
           end
         end
-        @previous_libs = config.files_in(:lib, :rb).each do |file|
-          load(file)
-        end
       end
-      
-      def class_name_of_file(file)
-        File.basename(file).sub(/\.[^\.]+$/, '').classify
+      @previous_libs = config.files_in(:lib, :rb).each do |file|
+        load(file)
       end
+    end
+    
+    def class_name_of_file(file)
+      File.basename(file).sub(/\.[^\.]+$/, '').classify
+    end
   end
-end
+end

data/lib/massimo/stylesheet.rb

@@ -18,4 +18,4 @@ module Massimo
       @extension ||= '.css'
     end
   end
-end
+end

data/lib/massimo/ui.rb

@@ -54,17 +54,16 @@ module Massimo
     
     protected
     
-      def growl(message, title = 'massimo')
-        Growl.notify(message, :title => title) if defined?(Growl)
-      end
+    def growl(message, title = 'massimo')
+      Growl.notify(message, :title => title) if defined?(Growl)
+    end
+  
+    def padding
+      @padding ||= 0
+    end
     
-      def padding
-        @padding ||= 0
-      end
-      
-      def padding=(value)
-        @padding = [ 0, value.to_i ].max
-      end
-      
+    def padding=(value)
+      @padding = [ 0, value.to_i ].max
+    end
   end
-end
+end

data/lib/massimo/version.rb

@@ -0,0 +1,3 @@
+module Massimo
+  VERSION = '0.7.1'
+end

data/lib/massimo/view.rb

@@ -10,4 +10,4 @@ module Massimo
       template.render(Massimo.site.template_scope, locals, &block)
     end
   end
-end
+end

data/lib/massimo/watcher.rb

@@ -42,16 +42,16 @@ module Massimo
     
     protected
     
-      def files
-        @files = Dir[*glob].map { |file| File.mtime(file) }
-      end
-      
-      def glob
-        glob  = @site.resources.map(&:path)
-        glob << @site.config.path_for(:lib)
-        glob << @site.config.path_for(:helpers)
-        glob.map! { |path| File.join(path, '**/*.*') }
-        glob
-      end
+    def files
+      @files = Dir[*glob].map { |file| File.mtime(file) }
+    end
+    
+    def glob
+      glob  = @site.resources.map(&:path)
+      glob << @site.config.path_for(:lib)
+      glob << @site.config.path_for(:helpers)
+      glob.map! { |path| File.join(path, '**/*.*') }
+      glob
+    end
   end
-end
+end

data/lib/massimo.rb

@@ -8,6 +8,7 @@ module Massimo
   autoload :Site,       'massimo/site'
   autoload :Stylesheet, 'massimo/stylesheet'
   autoload :UI,         'massimo/ui'
+  autoload :Version,    'massimo/version'
   autoload :View,       'massimo/view'
   autoload :Watcher,    'massimo/watcher'
   
@@ -21,8 +22,6 @@ module Massimo
     autoload :Watch,    'massimo/commands/watch'
   end
   
-  VERSION = '0.7.0'
-  
   class << self
     def site
       @site ||= Site.new
@@ -36,4 +35,4 @@ module Massimo
       site.config
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: massimo
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Pete Browne
@@ -15,27 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 -05:00
+date: 2010-09-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31098225
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
-        - beta
-        version: 3.0.0.beta
+        version: 3.0.0
   type: :runtime
-  prerelease: false
-  name: activesupport
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,10 +49,10 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
-  prerelease: false
-  name: rack
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: sinatra_more
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,10 +65,10 @@ dependencies:
         - 0
         version: 0.3.0
   type: :runtime
-  prerelease: false
-  name: sinatra_more
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,10 +81,10 @@ dependencies:
         - 0
         version: 0.13.0
   type: :runtime
-  prerelease: false
-  name: thor
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: tilt
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -96,10 +97,10 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  prerelease: false
-  name: tilt
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: tzinfo
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -112,42 +113,44 @@ dependencies:
         - 0
         version: 0.3.0
   type: :runtime
-  prerelease: false
-  name: tzinfo
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 62196427
         segments: 
-        - 1
-        - 3
+        - 2
         - 0
-        version: 1.3.0
+        - 0
+        - beta
+        - 20
+        version: 2.0.0.beta.20
   type: :development
-  prerelease: false
-  name: rspec
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 10
         - 0
-        version: 0.10.0
+        version: 1.0.0
   type: :development
-  prerelease: false
-  name: rr
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
+  name: test-construct
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -160,10 +163,10 @@ dependencies:
         - 0
         version: 1.2.0
   type: :development
-  prerelease: false
-  name: test-construct
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -176,10 +179,10 @@ dependencies:
         - 0
         version: 0.5.0
   type: :development
-  prerelease: false
-  name: rack-test
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
+  name: unindent
+  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -192,10 +195,10 @@ dependencies:
         - 0
         version: 0.9.0
   type: :development
-  prerelease: false
-  name: unindent
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -208,10 +211,10 @@ dependencies:
         - 0
         version: 3.0.0
   type: :development
-  prerelease: false
-  name: haml
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
+  name: less
+  prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -224,10 +227,10 @@ dependencies:
         - 0
         version: 1.2.0
   type: :development
-  prerelease: false
-  name: less
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
+  name: coffee-script
+  prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -240,10 +243,10 @@ dependencies:
         - 0
         version: 0.3.0
   type: :development
-  prerelease: false
-  name: coffee-script
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
+  name: sprockets
+  prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -256,10 +259,10 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  prerelease: false
-  name: sprockets
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
+  name: jsmin
+  prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -272,40 +275,38 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  prerelease: false
-  name: growl
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
+  name: packr
+  prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
+        - 3
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: 3.1.0
   type: :development
-  prerelease: false
-  name: jsmin
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
+  name: growl
+  prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
-        - 3
         - 1
         - 0
-        version: 3.1.0
+        - 0
+        version: 1.0.0
   type: :development
-  prerelease: false
-  name: packr
   version_requirements: *id018
 description: Massimo builds HTML, Javascript, and CSS Files from your source.
 email: me@petebrowne.com
@@ -317,24 +318,25 @@ extra_rdoc_files: []
 
 files: 
 - bin/massimo
-- lib/massimo/stylesheet.rb
-- lib/massimo/server.rb
-- lib/massimo/view.rb
-- lib/massimo/page.rb
+- lib/massimo/commands/base.rb
 - lib/massimo/commands/build.rb
-- lib/massimo/commands/server.rb
 - lib/massimo/commands/generate.rb
 - lib/massimo/commands/help.rb
-- lib/massimo/commands/watch.rb
+- lib/massimo/commands/server.rb
 - lib/massimo/commands/version.rb
-- lib/massimo/commands/base.rb
-- lib/massimo/resource.rb
+- lib/massimo/commands/watch.rb
 - lib/massimo/config.rb
+- lib/massimo/helpers.rb
+- lib/massimo/javascript.rb
+- lib/massimo/page.rb
+- lib/massimo/resource.rb
+- lib/massimo/server.rb
+- lib/massimo/site.rb
+- lib/massimo/stylesheet.rb
 - lib/massimo/ui.rb
+- lib/massimo/version.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