massimo 0.7.3 → 0.7.4

data/lib/massimo/commands/base.rb

@@ -16,7 +16,7 @@ module Massimo
         command.run
       end
       
-      def initialize()
+      def initialize
         @options = {}
         @parser  = OptionParser.new
         
@@ -63,15 +63,13 @@ module Massimo
       end
       
       def site
-        @site ||= begin
-          site = Massimo::Site.new config_file(:yml)
+        @site ||= Massimo::Site.new(config_file(:yml)).tap do |site|
           site.config.environment = options[:environment] if options[:environment]
           site.config.source_path = options[:source_path] if options[:source_path]
           site.config.output_path = options[:output_path] if options[:output_path]
           if config_rb = config_file(:rb)
             site.instance_eval File.read(config_rb)
           end
-          site
         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
+      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
       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
+      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

@@ -43,54 +43,54 @@ module Massimo
     def output_path
       @output_path ||= begin
         output_path = super.to_s
-        output_path << "index.html" if output_path.ends_with? '/'
+        output_path << 'index.html' if output_path.ends_with? '/'
         Pathname.new output_path
       end
     end
     
     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    = ''
+      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
+          source_path.open do |file|
+            file.each do |line|
+              if line =~ /\A---\s*\Z/
+                front_matter = !front_matter
               else
-                @line ||= file.lineno
-                @content << line
+                if front_matter
+                  meta_data << line
+                else
+                  @line ||= file.lineno
+                  @content << line
+                end
               end
             end
           end
-        end
         
-        @meta_data = (YAML.load(meta_data) || {}).symbolize_keys
+          @meta_data = (YAML.load(meta_data) || {}).symbolize_keys
+        end
       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]
+      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
         else
-          @meta_data[method_name.to_sym]
+          super
         end
-      else
-        super
       end
-    end
   end
 end

data/lib/massimo/resource.rb

@@ -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

data/lib/massimo/site.rb

@@ -39,12 +39,10 @@ module Massimo
     # The scope used for templating. It includes helpers from Massimo::Helpers along
     # with any custom helpers.
     def template_scope
-      @template_scope ||= begin
-        scope = Object.new.extend(Massimo::Helpers, Tilt::CompileSite)
+      Object.new.extend(Massimo::Helpers, Tilt::CompileSite).tap do |scope|
         add_template_scope_blocks(scope)
         add_template_scope_extensions(scope)
         add_template_scope_helpers(scope)
-        scope
       end
     end
     
@@ -67,43 +65,43 @@ module Massimo
     
     protected
     
-    def add_template_scope_blocks(scope)
-      @template_scope_blocks.each do |block|
-        scope.instance_eval(&block)
+      def add_template_scope_blocks(scope)
+        @template_scope_blocks.each do |block|
+          scope.instance_eval(&block)
+        end
       end
-    end
     
-    def add_template_scope_extensions(scope)
-      @template_scope_extensions.each do |extension|
-        scope.extend(extension)
+      def add_template_scope_extensions(scope)
+        @template_scope_extensions.each do |extension|
+          scope.extend(extension)
+        end
       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)
+      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
       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)
+      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
         end
+        @previous_libs = config.files_in(:lib, :rb).each do |file|
+          load(file)
+        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
-    end
+      def class_name_of_file(file)
+        File.basename(file).sub(/\.[^\.]+$/, '').classify
+      end
   end
 end

data/lib/massimo/ui.rb

@@ -54,16 +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

data/lib/massimo/version.rb

@@ -1,3 +1,3 @@
 module Massimo
-  VERSION = '0.7.3'
+  VERSION = '0.7.4'
 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 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 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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - Pete Browne
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 -06:00
+date: 2010-11-27 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency