massimo 0.4.1 → 0.4.2

data/Gemfile

@@ -0,0 +1,13 @@
+source "http://gemcutter.org"
+source "http://gems.github.com"
+
+gem "activesupport",     ">= 3.0.0.beta"
+gem "sinatra_more",      ">= 0.3.39"
+gem "directory_watcher", ">= 1.3.1"
+gem "sprockets",         ">= 1.0.2"
+gem "jsmin",             ">= 1.0.1"
+
+group :test do
+  gem "shoulda", ">= 2.10.3"
+  gem "rr", ">= 0.10.9"
+end

data/Rakefile

@@ -10,10 +10,10 @@ begin
     gem.email       = "me@petebrowne.com"
     gem.homepage    = "http://github.com/peterbrowne/massimo"
     gem.authors     = [ "Peter Browne" ]
-    gem.add_development_dependency "shoulda",           ">= 2.10.2"
-    gem.add_development_dependency "yard",              ">= 0.5.2"
-    gem.add_dependency             "activesupport",     ">= 2.3.5"
-    gem.add_dependency             "sinatra_more",      ">= 0.3.29"
+    gem.add_development_dependency "shoulda",           ">= 2.10.3"
+    gem.add_development_dependency "rr",                ">= 0.10.9"
+    gem.add_dependency             "activesupport",     ">= 3.0.0.beta"
+    gem.add_dependency             "sinatra_more",      ">= 0.3.39"
     gem.add_dependency             "directory_watcher", ">= 1.3.1"
     gem.add_dependency             "sprockets",         ">= 1.0.2"
     gem.add_dependency             "jsmin",             ">= 1.0.1"

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/bin/massimo

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), *%w{.. lib massimo}))
-require File.expand_path(File.join(File.dirname(__FILE__), *%w{.. lib massimo command}))
+require File.expand_path("../../lib/massimo", __FILE__)
+require File.expand_path("../../lib/massimo/command", __FILE__)
 
-exit Massimo::Command.new(ARGV).run!
+exit Massimo::Command.new(ARGV).run!

data/lib/massimo/command.rb

@@ -1,6 +1,7 @@
 require "optparse"
-require "active_support"
 require "yaml"
+require "active_support/backtrace_cleaner"
+require "active_support/core_ext/hash/keys"
 begin require "growl"; rescue LoadError; end
 
 module Massimo
@@ -79,7 +80,7 @@ module Massimo
         watcher = DirectoryWatcher.new(
           ".",
           :interval => 1,
-          :glob     => site.all_source_dirs.collect { |dir| File.join(dir, *%w{** *}) }
+          :glob     => site.all_source_dirs.collect { |dir| File.join(dir, "**/*") }
         )
       
         watcher.add_observer do |*args|

data/lib/massimo/resource/base.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), "processing")
-require File.join(File.dirname(__FILE__), "collection")
+require "massimo/resource/processing"
+require "massimo/resource/collection"
 
 module Massimo
   module Resource

data/lib/massimo/resource/collection.rb

@@ -17,7 +17,7 @@ module Massimo
             files = files.dup
             add_full_path!(files)
           else
-            files = Dir.glob(File.join(dir, "**", "*"))
+            files = Dir.glob(File.join(dir, "**/*"))
             reject_partials_and_directories!(files)
             reject_skipped_files!(files)
           end

data/lib/massimo/site.rb

@@ -93,7 +93,7 @@ module Massimo
       
       # Reload all the files in the source lib dir.
       def reload_libs
-        reload_files Dir.glob(dir_for(:lib, "**", "*.rb"))
+        reload_files Dir.glob(dir_for(:lib, "**/*.rb"))
       end
     
       # Load methods for listing all available files for each Resource type.

data/lib/massimo.rb

@@ -5,20 +5,20 @@ require "rubygems"
 require "pathname"
 require "fileutils"
 require "singleton"
-require "active_support"
+require "active_support/inflector"
+require "active_support/core_ext/hash/keys"
 require "sinatra_more"
 require "sprockets"
 require "jsmin"
 require "tilt"
 
 # Internal
-lib_dir = File.dirname(__FILE__)
-require File.join(lib_dir, "massimo", "helpers")
-require File.join(lib_dir, "massimo", "templates")
-require File.join(lib_dir, "massimo", "site")
+require "massimo/helpers"
+require "massimo/templates"
+require "massimo/site"
 
 module Massimo
-  VERSION = File.read(File.join(File.dirname(__FILE__), "..", "VERSION")) # :nodoc:
+  VERSION = File.read(File.expand_path("../../VERSION", __FILE__)) # :nodoc:
   
   MissingResource = Class.new(StandardError) # :nodoc:
   InvalidResource = Class.new(StandardError) # :nodoc:
@@ -42,8 +42,8 @@ module Massimo
   end
 end
 
-require File.join(lib_dir, "massimo", "resource", "base")
-require File.join(lib_dir, "massimo", "view")
-require File.join(lib_dir, "massimo", "page")
-require File.join(lib_dir, "massimo", "stylesheet")
-require File.join(lib_dir, "massimo", "javascript")
+require "massimo/resource/base"
+require "massimo/view"
+require "massimo/page"
+require "massimo/stylesheet"
+require "massimo/javascript"

data/massimo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{massimo}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Browne"]
-  s.date = %q{2010-01-10}
+  s.date = %q{2010-02-22}
   s.default_executable = %q{massimo}
   s.description = %q{Massimo builds HTML, Javascript, and CSS Files from your source.}
   s.email = %q{me@petebrowne.com}
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "Gemfile",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -105,27 +106,27 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
-      s.add_development_dependency(%q<yard>, [">= 0.5.2"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_runtime_dependency(%q<sinatra_more>, [">= 0.3.29"])
+      s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
+      s.add_development_dependency(%q<rr>, [">= 0.10.9"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta"])
+      s.add_runtime_dependency(%q<sinatra_more>, [">= 0.3.39"])
       s.add_runtime_dependency(%q<directory_watcher>, [">= 1.3.1"])
       s.add_runtime_dependency(%q<sprockets>, [">= 1.0.2"])
       s.add_runtime_dependency(%q<jsmin>, [">= 1.0.1"])
     else
-      s.add_dependency(%q<shoulda>, [">= 2.10.2"])
-      s.add_dependency(%q<yard>, [">= 0.5.2"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_dependency(%q<sinatra_more>, [">= 0.3.29"])
+      s.add_dependency(%q<shoulda>, [">= 2.10.3"])
+      s.add_dependency(%q<rr>, [">= 0.10.9"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
+      s.add_dependency(%q<sinatra_more>, [">= 0.3.39"])
       s.add_dependency(%q<directory_watcher>, [">= 1.3.1"])
       s.add_dependency(%q<sprockets>, [">= 1.0.2"])
       s.add_dependency(%q<jsmin>, [">= 1.0.1"])
     end
   else
-    s.add_dependency(%q<shoulda>, [">= 2.10.2"])
-    s.add_dependency(%q<yard>, [">= 0.5.2"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-    s.add_dependency(%q<sinatra_more>, [">= 0.3.29"])
+    s.add_dependency(%q<shoulda>, [">= 2.10.3"])
+    s.add_dependency(%q<rr>, [">= 0.10.9"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
+    s.add_dependency(%q<sinatra_more>, [">= 0.3.39"])
     s.add_dependency(%q<directory_watcher>, [">= 1.3.1"])
     s.add_dependency(%q<sprockets>, [">= 1.0.2"])
     s.add_dependency(%q<jsmin>, [">= 1.0.1"])

data/test/helper.rb

@@ -9,7 +9,7 @@ require "assertions"
 require "rr"
 
 # Load Massimo
-require File.join(File.dirname(__FILE__), "..", "lib", "massimo")
+require File.expand_path("../../lib/massimo", __FILE__)
 
 class Test::Unit::TestCase
   include Assertions
@@ -17,12 +17,12 @@ class Test::Unit::TestCase
 
   #
   def source_dir(*subdirs)
-    File.join(File.dirname(__FILE__), "source", *subdirs)
+    File.join("./test/source", *subdirs)
   end
 
   #
   def output_dir(*subdirs)
-    File.join(File.dirname(__FILE__), "output", *subdirs)
+    File.join("./test/output", *subdirs)
   end
 
   #
@@ -53,7 +53,7 @@ class Test::Unit::TestCase
   
   #
   def source_page_paths
-    @source_page_paths ||= Pathname.glob(source_dir("pages", "**", "*")).
+    @source_page_paths ||= Pathname.glob(source_dir("pages/**/*")).
       reject  { |p| p.basename.to_s =~ /^_/ || File.directory?(p) }.
       collect { |p| p.basename }
   end

data/test/test_helpers.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.expand_path("../helper", __FILE__)
 
 class TestHelpers < Test::Unit::TestCase
   context "A Site's Helpers" do

data/test/test_javascript.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.expand_path("../helper", __FILE__)
 
 class TestJavascript < Test::Unit::TestCase
   context "A Site" do

data/test/test_page.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.expand_path("../helper", __FILE__)
 
 class TestPage < Test::Unit::TestCase
   context "A Site" do

data/test/test_resource.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.expand_path("../helper", __FILE__)
 
 class TestResource < Test::Unit::TestCase
   context "A site" do

data/test/test_site.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.expand_path("../helper", __FILE__)
 
 class TestSite < Test::Unit::TestCase
   

data/test/test_stylesheet.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.expand_path("../helper", __FILE__)
 
 class TestStylesheet < Test::Unit::TestCase
   context "A Site" do

data/test/test_view.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.expand_path("../helper", __FILE__)
 
 class TestView < Test::Unit::TestCase
   context "A View with options" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: massimo
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Peter Browne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 -06:00
+date: 2010-02-22 00:00:00 -06:00
 default_executable: massimo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,17 +20,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.10.2
+        version: 2.10.3
     version: 
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rr
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.2
+        version: 0.10.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.5
+        version: 3.0.0.beta
     version: 
 - !ruby/object:Gem::Dependency 
   name: sinatra_more
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.29
+        version: 0.3.39
     version: 
 - !ruby/object:Gem::Dependency 
   name: directory_watcher
@@ -94,6 +94,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile