massimo 0.3.9 → 0.4.0

data/test/test_site.rb

@@ -2,39 +2,33 @@ require File.join(File.dirname(__FILE__), "helper")
 
 class TestSite < Test::Unit::TestCase
   
-  def source_page_paths
-    @source_page_paths ||= Pathname.glob(source_dir("pages", "**", "*")).
-      reject  { |p| p.basename.to_s =~ /^_/ || File.directory?(p) }.
-      collect { |p| p.basename }
-  end
-  
   should "store configuration options" do
     @site = Massimo::Site(
-      :source  => "./source",
-      :output  => "./output"
+      :source => source_dir,
+      :output => output_dir
     )
-    assert_equal "./source", @site.options[:source]
-    assert_equal "./output", @site.options[:output]
+    assert_equal source_dir, @site.options[:source]
+    assert_equal output_dir, @site.options[:output]
   end
   
   should "use default options unless specified" do
-    @site = Massimo::Site(:output => "./output")
-    assert_equal Massimo::Site::DEFAULT_OPTIONS[:source], @site.options[:source]
-    assert_equal "./output", @site.options[:output]
+    @site = Massimo::Site(:source => source_dir)
+    assert_equal source_dir, @site.options[:source]
+    assert_equal Massimo::Site::DEFAULT_OPTIONS[:output], @site.options[:output]
   end
   
   should "have refresh the configuration if new options are set" do
-    Massimo::Site(:souce => "/some/strange/dir", :output => "/the/wrong/dir")
-    @site = Massimo::Site(:output => "/the/wrong/dir")
-    assert_equal Massimo::Site::DEFAULT_OPTIONS[:source], @site.options[:source]
+    Massimo::Site(:source => source_dir, :output => "/the/wrong/dir")
+    @site = Massimo::Site(:source => source_dir)
+    assert_equal Massimo::Site::DEFAULT_OPTIONS[:output], @site.options[:output]
   end
   
   should "have methods for determining the environment" do
-    @site = Massimo::Site()
+    @site = Massimo::Site(:source => source_dir)
     assert @site.development?
-    @site = Massimo::Site(:environment => :development)
+    @site = Massimo::Site(:source => source_dir, :environment => :development)
     assert @site.development?
-    @site = Massimo::Site(:environment => :production)
+    @site = Massimo::Site(:source => source_dir, :environment => :production)
     assert @site.production?
   end
   
@@ -45,12 +39,12 @@ class TestSite < Test::Unit::TestCase
       assert_equal source_dir("some", "path"), @site.source_dir("some", "path")
     end
   
-    should "have a directory shortcut methods" do
-      assert_equal source_dir("pages", "some", "file.txt"),       @site.pages_dir("some", "file.txt")
-      assert_equal source_dir("views", "some", "file.txt"),       @site.views_dir("some", "file.txt")
-      assert_equal source_dir("stylesheets", "some", "file.txt"), @site.stylesheets_dir("some", "file.txt")
-      assert_equal source_dir("javascripts", "some", "file.txt"), @site.javascripts_dir("some", "file.txt")
-    end
+    # should "have a directory shortcut methods" do
+    #   assert_equal source_dir("pages", "some", "file.txt"),       @site.pages_dir("some", "file.txt")
+    #   assert_equal source_dir("views", "some", "file.txt"),       @site.views_dir("some", "file.txt")
+    #   assert_equal source_dir("stylesheets", "some", "file.txt"), @site.stylesheets_dir("some", "file.txt")
+    #   assert_equal source_dir("javascripts", "some", "file.txt"), @site.javascripts_dir("some", "file.txt")
+    # end
   
     should "have a output_dir method" do
       assert_equal output_dir("some", "path"), @site.output_dir("some", "path")
@@ -95,32 +89,5 @@ class TestSite < Test::Unit::TestCase
       teardown { clear_output }
     end
   end
-  
-  should "find only the pages set in the :pages option" do
-    only_pages = %w{about_us.erb feed.haml index.erb}
-    page_paths = Massimo::Site(:source => source_dir, :pages => only_pages).pages(true).collect { |page| page.source_path.basename }
-    assert_equal_arrays only_pages, page_paths
-  end
-
-  should "skip pages set in the :skip_pages option (as an Array)" do
-    skip_pages = %w{about_us.erb erb.erb erb_with_layout.erb feed.haml posts/first-post.haml haml.haml html.html index.erb markdown.markdown}
-    page_paths = Massimo::Site(:source => source_dir, :skip_pages => skip_pages).pages(true).collect { |page| page.source_path.basename }
-    assert_equal_arrays [
-      "with_extension.haml",
-      "with_meta_data.haml",
-      "with_title.haml",
-      "with_url.haml",
-      "without_extension.haml",
-      "without_meta_data.haml",
-      "without_title.haml",
-      "without_url.haml"
-    ], page_paths
-  end
-
-  should "skip pages set in the :skip_pages option (as a Proc)" do
-    site_options = { :source => source_dir, :skip_pages => lambda { |file| file.include?("with") } }
-    page_paths = Massimo::Site(site_options).pages(true).collect { |page| page.source_path.basename }
-    assert_equal_arrays %w{about_us.erb erb.erb feed.haml first-post.haml haml.haml html.html index.erb markdown.markdown}, page_paths
-  end
     
 end

data/test/test_view.rb

@@ -42,5 +42,9 @@ class TestView < Test::Unit::TestCase
       @view.new_data = "test"
       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 }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: massimo
 version: !ruby/object:Gem::Version 
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors: 
 - Peter Browne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-24 00:00:00 -06:00
+date: 2010-01-09 00:00:00 -06:00
 default_executable: massimo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.26
+        version: 0.3.29
     version: 
 - !ruby/object:Gem::Dependency 
   name: directory_watcher
@@ -83,7 +83,7 @@ dependencies:
         version: 1.0.1
     version: 
 description: Massimo builds HTML, Javascript, and CSS Files from your source.
-email: peter@peterbrowne.net
+email: me@petebrowne.com
 executables: 
 - massimo
 extensions: []
@@ -104,7 +104,9 @@ files:
 - lib/massimo/helpers.rb
 - lib/massimo/javascript.rb
 - lib/massimo/page.rb
-- lib/massimo/resource.rb
+- lib/massimo/resource/base.rb
+- lib/massimo/resource/collection.rb
+- lib/massimo/resource/processing.rb
 - lib/massimo/site.rb
 - lib/massimo/stylesheet.rb
 - lib/massimo/templates.rb
@@ -144,6 +146,7 @@ files:
 - test/source/views/with_helper.haml
 - test/source/views/with_locals.haml
 - test/source/views/without_locals.haml
+- test/test_helpers.rb
 - test/test_javascript.rb
 - test/test_page.rb
 - test/test_resource.rb
@@ -183,6 +186,7 @@ test_files:
 - test/helper.rb
 - test/source/helpers/test_helper.rb
 - test/source/lib/site.rb
+- test/test_helpers.rb
 - test/test_javascript.rb
 - test/test_page.rb
 - test/test_resource.rb

data/lib/massimo/resource.rb

@@ -1,52 +0,0 @@
-module Massimo
-  class Resource
-    attr_reader :source_path, :body
-    
-    # Creates a new page associated with the given file path.
-    def initialize(source_path)
-      @source_path = ::Pathname.new(source_path)
-      # read and parse the source file
-      self.read_source!
-    end
-    
-    # Renders the page using the registered filters.
-    def render(locals = {})
-      @body
-    end
-    
-    # Gets the resource's file name.
-    def file_name
-      @source_path.basename.to_s
-    end
-    
-    # Gets the resource type, based on the file's extension
-    def resource_type
-      @source_path.extname.to_s[1..-1]
-    end
-    
-    # Gets the site instance
-    def site
-      ::Massimo::Site()
-    end
-    
-    protected
-    
-      # Reads the source page file, and populates the meta_data and
-      # body attributes.
-      def read_source!
-        raise ::Massimo::MissingResource unless @source_path.exist?
-        # try to read it now
-        begin
-          @line = 1
-          @body = @source_path.read
-        rescue
-          raise ::Massimo::InvalidResource
-        end
-      end
-      
-      # Get the options from the Site's config for the current resource type.
-      def options_for_resource_type
-        self.site.options[self.resource_type.to_sym]
-      end
-  end
-end