massimo 0.4.3 → 0.4.4

data/Gemfile

@@ -1,7 +1,7 @@
-source "http://gemcutter.org"
-source "http://gems.github.com"
+source "http://rubygems.org"
 
 gem "activesupport",     ">= 3.0.0.beta"
+gem "warden",            ">= 0.10.1" # needed for sinatra_more
 gem "sinatra_more",      ">= 0.3.39"
 gem "directory_watcher", ">= 1.3.1"
 gem "sprockets",         ">= 1.0.2"

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/massimo/command.rb

@@ -1,8 +1,8 @@
-require "optparse"
-require "yaml"
 require "active_support/backtrace_cleaner"
 require "active_support/core_ext/hash/keys"
 begin require "growl"; rescue LoadError; end
+require "optparse"
+require "yaml"
 
 module Massimo
   class Command

data/lib/massimo/helpers.rb

@@ -1,3 +1,5 @@
+begin require "sinatra_more"; rescue LoadError; end
+
 module Massimo
   class Helpers
     if defined? SinatraMore

data/lib/massimo/javascript.rb

@@ -1,3 +1,7 @@
+require "jsmin"
+require "sprockets"
+require "massimo/resource/base"
+
 module Massimo
   class Javascript < Massimo::Resource::Base
     processable!

data/lib/massimo/page.rb

@@ -1,3 +1,8 @@
+require "active_support/inflector"
+require "pathname"
+require "yaml"
+require "massimo/view"
+
 module Massimo
   class Page < Massimo::View
     META_SEP = %r/\A---\s*(?:\r\n|\n)?\z/ # :nodoc:

data/lib/massimo/resource/base.rb

@@ -1,11 +1,13 @@
+require "active_support/inflector"
+require "pathname"
 require "massimo/resource/processing"
 require "massimo/resource/collection"
 
 module Massimo
   module Resource
     class Base
-      include Massimo::Resource::Processing
-      extend  Massimo::Resource::Collection
+      include Processing
+      extend  Collection
     
       attr_reader :source_path, :body
     

data/lib/massimo/resource/processing.rb

@@ -1,3 +1,6 @@
+require "fileutils"
+require "pathname"
+
 module Massimo
   module Resource
     module Processing

data/lib/massimo/site.rb

@@ -1,3 +1,9 @@
+require "active_support/inflector"
+require "active_support/core_ext/hash/keys"
+require "singleton"
+# require "massimo/helpers"
+# require "massimo/view"
+
 module Massimo
   class Site
     include Singleton
@@ -116,8 +122,10 @@ module Massimo
       # Reload the given files and an Array of the reloaded Constants.
       def reload_files(files)
         files.collect do |file|
+          class_name = File.basename(file).gsub(File.extname(file), "").classify
+          Object.class_eval { remove_const(class_name) if const_defined?(class_name) }
           load(file)
-          File.basename(file).gsub(File.extname(file), "").classify.constantize rescue nil
+          class_name.constantize rescue nil
         end
       end
   end

data/lib/massimo/stylesheet.rb

@@ -1,3 +1,6 @@
+require "pathname"
+require "massimo/resource/base"
+
 module Massimo
   class Stylesheet < Massimo::Resource::Base
     processable!

data/lib/massimo/templates.rb

@@ -1,3 +1,5 @@
+require "tilt"
+
 module Tilt
   register :html, Tilt::ERBTemplate
   register :php,  Tilt::ERBTemplate

data/lib/massimo/view.rb

@@ -1,3 +1,6 @@
+require "tilt"
+require "massimo/resource/base"
+
 module Massimo
   class View < Massimo::Resource::Base
     attr_reader :meta_data
@@ -18,9 +21,15 @@ module Massimo
       
       # All undefined methods are sent to the `@meta_data` hash.
       def method_missing(method, *args, &block)
-        if method.to_s.match(/(.*)\=$/) && args.length == 1
-          @meta_data[$1.to_sym] = args.first
-        elsif args.empty? && @meta_data.key?(method)
+        case args.length
+        when 1
+          method_name = method.to_s
+          if method_name.chomp!('=')
+            @meta_data[method_name.to_sym] = args.first
+          else
+            super
+          end
+        when 0
           @meta_data[method]
         else
           super

data/lib/massimo.rb

@@ -1,18 +1,6 @@
-# Rubygems
-require "rubygems"
+libdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
-# External
-require "pathname"
-require "fileutils"
-require "singleton"
-require "active_support/inflector"
-require "active_support/core_ext/hash/keys"
-require "sinatra_more"
-require "sprockets"
-require "jsmin"
-require "tilt"
-
-# Internal
 require "massimo/helpers"
 require "massimo/templates"
 require "massimo/site"
@@ -28,7 +16,7 @@ module Massimo
   # instance.
   def self.Site(options = {})
     return @site if defined?(@site) && options.empty?
-    @site = Massimo::Site.instance.setup(options)
+    @site = Site.instance.setup(options)
   end
   
   # All the avaiable Resource types

data/massimo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{massimo}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Browne"]
-  s.date = %q{2010-03-29}
+  s.date = %q{2010-03-30}
   s.default_executable = %q{massimo}
   s.description = %q{Massimo builds HTML, Javascript, and CSS Files from your source.}
   s.email = %q{me@petebrowne.com}

data/test/helper.rb

@@ -1,36 +1,40 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+testdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(testdir) unless $LOAD_PATH.include?(testdir)
+
+libdir = File.expand_path("../../lib", __FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require "rubygems"
+require "massimo"
 require "test/unit"
-require "shoulda"
-# begin require "redgreen"; rescue LoadError; end
-begin require "turn"; rescue LoadError; end
 require "assertions"
+require "shoulda"
 require "rr"
 
-# Load Massimo
-require File.expand_path("../../lib/massimo", __FILE__)
+begin
+  require "turn"
+rescue LoadError
+  begin require "redgreen"; rescue LoadError; end
+end
 
 class Test::Unit::TestCase
   include Assertions
   include RR::Adapters::TestUnit
 
-  #
   def source_dir(*subdirs)
     File.join("./test/source", *subdirs)
   end
 
-  #
   def output_dir(*subdirs)
     File.join("./test/output", *subdirs)
   end
 
-  #
+  # Clears all the output files created during tests.
   def clear_output
     FileUtils.rm_rf(output_dir)
   end
   
-  #
+  # Create a new Site instance
   def site(options = {})
     @site = ::Massimo::Site({
       :source => source_dir,
@@ -39,19 +43,19 @@ class Test::Unit::TestCase
     }.merge(options))
   end
   
-  #
+  # Creates a Page instance for the given path
   def page(*path)
     @page ||= ::Massimo::Page.new(source_dir("pages", *path))
   end
   
-  #
+  # Creates a View Instance for the given path
   def view(*path)
     return @view if defined?(@view)
     meta_data = path.extract_options!
     @view = ::Massimo::View.new(source_dir("views", *path), meta_data)
   end
   
-  #
+  # All the Page paths in the source dir
   def source_page_paths
     @source_page_paths ||= Pathname.glob(source_dir("pages/**/*")).
       reject  { |p| p.basename.to_s =~ /^_/ || File.directory?(p) }.

data/test/test_view.rb

@@ -43,8 +43,8 @@ class TestView < Test::Unit::TestCase
       assert_equal "test", @view.new_data
     end
     
-    should "still raise NoMethodError when accessing non-existent meta_data properties" do
-      assert_raise(::NoMethodError) { @view.non_existent_prop }
+    should "still return nil when accessing non-existent meta_data properties" do
+      assert_nil @view.non_existent_prop
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Peter Browne
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 -05:00
+date: 2010-03-30 00:00:00 -05:00
 default_executable: massimo
 dependencies: 
 - !ruby/object:Gem::Dependency