webby 0.9.3 → 0.9.4

data/spec/webby/filters/maruku_spec.rb

@@ -0,0 +1,31 @@
+
+require ::File.expand_path(
+    ::File.join(::File.dirname(__FILE__), %w[.. .. spec_helper]))
+
+# ---------------------------------------------------------------------------
+describe 'Webby::Filters::Maruku' do
+
+  it 'should regsiter the maruku filter handler' do
+    Webby::Filters._handlers['maruku'].should_not be_nil
+  end
+
+  if try_require('maruku')
+
+    it 'processes maruku markup into HTML' do
+      input = "## Heading Two\n\nAnd some text about this heading."
+      output = Webby::Filters._handlers['maruku'].call(input)
+
+      output.should == %Q{<h2 id='heading_two'>Heading Two</h2>\n\n<p>And some text about this heading.</p>}
+    end
+
+  else
+
+    it 'raises an error when maruku is used but not installed' do
+      input = "## Heading Two\n\nAnd some text about this heading."
+      lambda {Webby::Filters._handlers['maruku'].call(input)}.should raise_error(Webby::Error, "'maruku' must be installed to use the maruku filter")
+    end
+
+  end
+end
+
+# EOF

data/spec/webby/filters/textile_spec.rb

@@ -9,11 +9,22 @@ describe 'Webby::Filters::Textile' do
     Webby::Filters._handlers['textile'].should_not be_nil
   end
 
-  it 'processes textile markup into HTML' do
-    input = "p(foo). this is a paragraph of text"
-    output = Webby::Filters._handlers['textile'].call(input)
+  if try_require('redcloth')
+
+    it 'processes textile markup into HTML' do
+      input = "p(foo). this is a paragraph of text"
+      output = Webby::Filters._handlers['textile'].call(input)
+
+      output.should == %q{<p class="foo">this is a paragraph of text</p>}
+    end
+
+  else
+
+    it 'raises an error when RedCloth is used but not installed' do
+      input = "p(foo). this is a paragraph of text"
+      lambda {Webby::Filters._handlers['textile'].call(input)}.should raise_error(Webby::Error, "'RedCloth' must be installed to use the textile filter")
+    end
 
-    output.should == %q{<p class="foo">this is a paragraph of text</p>}
   end
 end
 

data/spec/webby/helpers/capture_helper_spec.rb

@@ -30,7 +30,7 @@ describe Webby::Helpers::CaptureHelper do
     ::FileUtils.rm_f(CFN)
   end
 
-  it 'should not "leak" any content to containing page' do
+  it 'should not "leak" any content to the containing page' do
     @page_content.should_not be_nil
     @page_content.should eql("Hello world!\n")
   end

data/spec/webby/link_validator_spec.rb

@@ -0,0 +1,154 @@
+require File.expand_path(
+    File.join(File.dirname(__FILE__), %w[.. spec_helper]))
+
+# ---------------------------------------------------------------------------
+describe Webby::LinkValidator do
+  before do
+    @validator = Webby::LinkValidator.new
+    @@old = Webby.site.output_dir
+    Webby.site.output_dir = Webby.datapath('html')
+  end
+
+  after do
+    Webby.site.output_dir = @@old
+  end
+
+  describe ".validate" do
+    it "passes options to a new validator" do
+      new_validator = stub('validator', :validate => true)
+      Webby::LinkValidator.should_receive(:new).with(:options).and_return(new_validator)
+      Webby::LinkValidator.validate(:options)
+    end
+
+    it "checks each file" do
+      #TODO: test fake site
+      files = ["a file", "another file"]
+      Dir.stub!(:glob).and_return(files)
+
+      validator = Webby::LinkValidator.new
+      files.each do |file|
+        validator.should_receive(:check_file).with(file)
+      end
+      validator.validate
+    end
+  end
+
+  describe "checking a file" do
+    describe "with an anchor" do
+      before do
+        @filename = Webby.datapath('html', 'anchor.html')
+      end
+
+      it "validates the anchor" do
+        @validator.should_receive(:validate_anchor)
+        @validator.check_file(@filename)
+      end
+
+      it "does not add the file to the valid uri list" do
+        lambda { @validator.check_file(@filename) }.should_not change(@validator.instance_variable_get('@valid_uris'), :size)
+      end
+
+      it "***CURRENTLY*** returns nil" do
+        @validator.check_file(@filename).should be_nil
+      end
+    end
+
+    describe "with a valid relative href" do
+      before do
+        @filename = Webby.datapath('html', 'relative.html')
+      end
+
+      it "adds the file to the valid uri list" do
+        lambda { @validator.check_file(@filename) }.should change(@validator.instance_variable_get('@valid_uris'), :size).by(1)
+      end
+
+      it "***CURRENTLY*** returns nil" do
+        @validator.check_file(@filename).should be_nil
+      end
+    end
+
+    describe "with an invalid relative href" do
+      before do
+        @filename = Webby.datapath('html', 'invalid-relative.html')
+      end
+
+      it "does not add the file to the invalid uri list" do
+        lambda { @validator.check_file(@filename) }.should_not change(@validator.instance_variable_get('@valid_uris'), :size)
+      end
+
+      it "***CURRENTLY*** returns nil" do
+        @validator.check_file(@filename).should be_nil
+      end
+    end
+
+    describe "with a valid relative href that contains an anchor" do
+      before do
+        @filename = Webby.datapath('html', 'relative-anchor.html')
+      end
+
+      it "adds the file to the valid uri list" do
+        lambda { @validator.check_file(@filename) }.should change(@validator.instance_variable_get('@valid_uris'), :size).by(1)
+      end
+
+      it "***CURRENTLY*** returns nil" do
+        @validator.check_file(@filename).should be_nil
+      end
+    end
+
+    describe "with a valid relative href that contains an invalid anchor" do
+      before do
+        @filename = Webby.datapath('html', 'relative-invalid-anchor.html')
+      end
+
+      it "does not the file to the valid uri list" do
+        lambda { @validator.check_file(@filename) }.should_not change(@validator.instance_variable_get('@valid_uris'), :size)
+      end
+
+      it "***CURRENTLY*** returns nil" do
+        @validator.check_file(@filename).should be_nil
+      end
+    end
+
+    if $test_externals
+      describe "with a valid external href" do
+        before do
+          FakeWeb.register_uri('http://www.google.com/', :string => 'google')
+          @filename = Webby.datapath('html', 'external.html')
+          @validator.validate_externals = true
+        end
+
+        it "adds the file to the valid uri list" do
+          lambda { @validator.check_file(@filename) }.should change(@validator.instance_variable_get('@valid_uris'), :size).by(1)
+        end
+
+        it "does not add the file to the invalid uri list" do
+          lambda { @validator.check_file(@filename) }.should_not change(@validator.instance_variable_get('@invalid_uris'), :size)
+        end
+
+        it "***CURRENTLY*** returns nil" do
+          @validator.check_file(@filename).should be_nil
+        end
+      end
+
+      describe "with an invalid external href" do
+        before do
+          FakeWeb.register_uri('http://www.google.com/', :string => 'google', :status => [ 404, "Not Found" ])
+          @filename = Webby.datapath('html', 'external.html')
+          @validator.validate_externals = true
+        end
+
+        it "does not add the file to the valid uri list" do
+          lambda { @validator.check_file(@filename) }.should_not change(@validator.instance_variable_get('@valid_uris'), :size)
+        end
+
+        it "adds the file to the invalid uri list" do
+          lambda { @validator.check_file(@filename) }.should change(@validator.instance_variable_get('@invalid_uris'), :size).by(1)
+        end
+
+        it "***CURRENTLY*** returns nil" do
+          @validator.check_file(@filename).should be_nil
+        end
+      end
+    end
+  end
+end

data/spec/webby/resources/db_spec.rb

@@ -7,7 +7,7 @@ describe Webby::Resources::DB do
 
   before :each do
     layout = Webby::Resources::Layout.
-             new(Webby.datapath %w[site layouts tumblog default.txt])
+             new(Webby.datapath(%w[site layouts tumblog default.txt]))
     Webby::Resources.stub!(:find_layout).and_return(layout)
 
     @db = Webby::Resources::DB.new
@@ -53,13 +53,13 @@ describe Webby::Resources::DB do
     ary = []
     @db.each {|page| ary << page.url}
     ary.should == %w[
-      /tumblog
+      /tumblog/
       /tumblog/rss.xml
-      /tumblog/200806/the-noble-chicken
-      /tumblog/200807/historical-perspectives-on-the-classic-chicken-joke
-      /tumblog/200807/mad-city-chickens
-      /tumblog/200807/the-wisdom-of-the-dutch
-      /tumblog/200807/up-a-tree
+      /tumblog/200806/the-noble-chicken/
+      /tumblog/200807/historical-perspectives-on-the-classic-chicken-joke/
+      /tumblog/200807/mad-city-chickens/
+      /tumblog/200807/the-wisdom-of-the-dutch/
+      /tumblog/200807/up-a-tree/
     ]
   end
 
@@ -70,11 +70,11 @@ describe Webby::Resources::DB do
 
     page = Webby::Resources::Page.new('content/tumblog/rss.txt')
     parent = @db.parent_of(page)
-    parent.url.should == '/tumblog'
+    parent.url.should == '/tumblog/'
 
     page = Webby::Resources::Page.new('content/tumblog/200807/up-a-tree/index.txt')
     parent = @db.parent_of(page)
-    parent.url.should == '/tumblog'
+    parent.url.should == '/tumblog/'
   end
 
   it 'returns the siblings of a resource' do
@@ -97,11 +97,11 @@ describe Webby::Resources::DB do
 
       children.length.should == 5
       children.map {|page| page.url}.sort.should == %w[
-        /tumblog/200806/the-noble-chicken
-        /tumblog/200807/historical-perspectives-on-the-classic-chicken-joke
-        /tumblog/200807/mad-city-chickens
-        /tumblog/200807/the-wisdom-of-the-dutch
-        /tumblog/200807/up-a-tree
+        /tumblog/200806/the-noble-chicken/
+        /tumblog/200807/historical-perspectives-on-the-classic-chicken-joke/
+        /tumblog/200807/mad-city-chickens/
+        /tumblog/200807/the-wisdom-of-the-dutch/
+        /tumblog/200807/up-a-tree/
       ]
     end
 
@@ -111,11 +111,11 @@ describe Webby::Resources::DB do
 
       children.length.should == 5
       children.map {|page| page.url}.should == %w[
-        /tumblog/200806/the-noble-chicken
-        /tumblog/200807/historical-perspectives-on-the-classic-chicken-joke
-        /tumblog/200807/mad-city-chickens
-        /tumblog/200807/the-wisdom-of-the-dutch
-        /tumblog/200807/up-a-tree
+        /tumblog/200806/the-noble-chicken/
+        /tumblog/200807/historical-perspectives-on-the-classic-chicken-joke/
+        /tumblog/200807/mad-city-chickens/
+        /tumblog/200807/the-wisdom-of-the-dutch/
+        /tumblog/200807/up-a-tree/
       ]
     end
 
@@ -125,11 +125,11 @@ describe Webby::Resources::DB do
 
       children.length.should == 5
       children.map {|page| page.url}.should == %w[
-        /tumblog/200806/the-noble-chicken
-        /tumblog/200807/historical-perspectives-on-the-classic-chicken-joke
-        /tumblog/200807/mad-city-chickens
-        /tumblog/200807/the-wisdom-of-the-dutch
-        /tumblog/200807/up-a-tree
+        /tumblog/200806/the-noble-chicken/
+        /tumblog/200807/historical-perspectives-on-the-classic-chicken-joke/
+        /tumblog/200807/mad-city-chickens/
+        /tumblog/200807/the-wisdom-of-the-dutch/
+        /tumblog/200807/up-a-tree/
       ].reverse
     end
   end

data/spec/webby/resources/layout_spec.rb

@@ -6,7 +6,7 @@ require File.expand_path(
 describe Webby::Resources::Layout do
   before :each do
     layout = Webby::Resources::Layout.
-             new(Webby.datapath %w[site layouts tumblog default.txt])
+             new(Webby.datapath(%w[site layouts tumblog default.txt]))
     Webby::Resources.stub!(:find_layout).and_return(layout)
 
     @default = File.join %w[layouts tumblog default.txt]

data/spec/webby/resources/page_spec.rb

@@ -6,7 +6,7 @@ require File.expand_path(
 describe Webby::Resources::Page do
   before :each do
     layout = Webby::Resources::Layout.
-             new(Webby.datapath %w[site layouts default.txt])
+             new(Webby.datapath(%w[site layouts default.txt]))
     Webby::Resources.stub!(:find_layout).and_return(layout)
 
     @filename = File.join %w[content index.txt]
@@ -55,7 +55,13 @@ describe Webby::Resources::Page do
     it "uses only the directory name for 'index' files" do
       filename = File.join %w[content tumblog index.txt]
       resource = Webby::Resources::Page.new(filename)
-      resource.url.should == '/tumblog'
+      resource.url.should == '/tumblog/'
+    end
+
+    it "avoids adding a double trailing slash on the end" do
+      filename = File.join %w[content index.txt]
+      resource = Webby::Resources::Page.new(filename)
+      resource.url.should == '/'
     end
   end
 

data/spec/webby/resources/resource_spec.rb

@@ -7,7 +7,7 @@ describe Webby::Resources::Resource do
 
   before :each do
     layout = Webby::Resources::Layout.
-             new(Webby.datapath %w[site layouts default.txt])
+             new(Webby.datapath(%w[site layouts default.txt]))
     Webby::Resources.stub!(:find_layout).and_return(layout)
 
     @filename = File.join %w[content index.txt]

data/spec/webby/resources_spec.rb

@@ -47,7 +47,7 @@ describe Webby::Resources do
   describe "#new" do
     before :each do
       layout = Webby::Resources::Layout.
-               new(Webby.datapath %w[site layouts default.txt])
+               new(Webby.datapath(%w[site layouts default.txt]))
       Webby::Resources.stub!(:find_layout).and_return(layout)
     end
 

data/tasks/ann.rake

@@ -1,4 +1,3 @@
-# $Id$
 
 begin
   require 'bones/smtp_tls'
@@ -43,7 +42,7 @@ namespace :ann do
   desc "Send an email announcement"
   task :email => ['ann:prereqs', PROJ.ann.file] do
     ann = PROJ.ann
-    from = ann.email[:from] || PROJ.email
+    from = ann.email[:from] || Array(PROJ.authors).first || PROJ.email
     to   = Array(ann.email[:to])
 
     ### build a mail header for RFC 822

data/tasks/bones.rake

@@ -1,4 +1,3 @@
-# $Id$
 
 if HAVE_BONES
 

data/tasks/gem.rake

@@ -4,13 +4,17 @@ require 'rake/packagetask'
 require 'rubygems/user_interaction'
 require 'rubygems/builder'
 
-class Bones::GemPackageTask < Rake::PackageTask
+module Bones
+class GemPackageTask < Rake::PackageTask
   # Ruby GEM spec containing the metadata for this package.  The
   # name, version and package_files are automatically determined
   # from the GEM spec and don't need to be explicitly provided.
   #
   attr_accessor :gem_spec
 
+  # Tasks from the Bones gem directory
+  attr_reader :bones_files
+
   # Create a GEM Package task library.  Automatically define the gem
   # if a block is given.  If no block is supplied, then +define+
   # needs to be called to define the task.
@@ -28,6 +32,12 @@ class Bones::GemPackageTask < Rake::PackageTask
     super(gem.name, gem.version)
     @gem_spec = gem
     @package_files += gem_spec.files if gem_spec.files
+    @bones_files = []
+
+    local_setup = File.join(Dir.pwd, %w[tasks setup.rb])
+    if !test(?e, local_setup)
+      Dir.glob(::Bones.path(%w[lib bones tasks *])).each {|fn| bones_files << fn}
+    end
   end
 
   # Create the Rake tasks and actions specified by this
@@ -38,7 +48,7 @@ class Bones::GemPackageTask < Rake::PackageTask
     super
     task :prereqs
     task :package => ['gem:prereqs', "#{package_dir_path}/#{gem_file}"]
-    file "#{package_dir_path}/#{gem_file}" => [package_dir_path] + package_files do
+    file "#{package_dir_path}/#{gem_file}" => [package_dir_path] + package_files + bones_files do
       when_writing("Creating GEM") {
         chdir(package_dir_path) do
           Gem::Builder.new(gem_spec).build
@@ -48,6 +58,26 @@ class Bones::GemPackageTask < Rake::PackageTask
         end
       }
     end
+
+    file package_dir_path => bones_files do
+      mkdir_p package_dir rescue nil
+
+      gem_spec.files = (gem_spec.files +
+          bones_files.map {|fn| File.join('tasks', File.basename(fn))}).sort
+
+      bones_files.each do |fn|
+        base_fn = File.join('tasks', File.basename(fn))
+        f = File.join(package_dir_path, base_fn)
+        fdir = File.dirname(f)
+        mkdir_p(fdir) if !File.exist?(fdir)
+        if File.directory?(fn)
+          mkdir_p(f)
+        else
+          raise "file name conflict for '#{base_fn}' (conflicts with '#{fn}')" if test(?e, f)
+          safe_ln(fn, f)
+        end
+      end
+    end
   end
   
   def gem_file
@@ -57,7 +87,8 @@ class Bones::GemPackageTask < Rake::PackageTask
       "#{package_name}-#{@gem_spec.platform}.gem"
     end
   end
-end  # class Bones::GemPackageTask
+end  # class GemPackageTask
+end  # module Bones
 
 namespace :gem do
 
@@ -76,6 +107,10 @@ namespace :gem do
       s.add_dependency(*dep)
     end
 
+    PROJ.gem.development_dependencies.each do |dep|
+      s.add_development_dependency(*dep)
+    end
+
     s.files = PROJ.gem.files
     s.executables = PROJ.gem.executables.map {|fn| File.basename(fn)}
     s.extensions = PROJ.gem.files.grep %r/extconf\.rb$/
@@ -124,6 +159,13 @@ namespace :gem do
     puts PROJ.gem._spec.to_ruby
   end
 
+  desc 'Write the gemspec '
+  task :spec => 'gem:prereqs' do
+    File.open("#{PROJ.name}.gemspec", 'w') do |f|
+      f.write PROJ.gem._spec.to_ruby
+    end
+  end
+
   desc 'Install the gem'
   task :install => [:clobber, 'gem:package'] do
     sh "#{SUDO} #{GEM} install --local pkg/#{PROJ.gem._spec.full_name}"
@@ -147,41 +189,13 @@ namespace :gem do
   task :cleanup do
     sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}"
   end
-
-  namespace :mswin32 do
-    win32_spec = PROJ.gem._spec.dup
-    win32_spec.platform = 'x86-mswin32'
-
-    pkg = Bones::GemPackageTask.new(win32_spec)
-    class << pkg
-      def package_dir_path() "#{package_dir}/#{package_name}-x86-mswin32"; end
-    end
-    pkg.define
-
-    file "#{pkg.package_dir_path}/#{pkg.gem_file}" => :unix2dos
-
-    task :unix2dos do
-      reject = %w[.gif .jpg .jpeg]
-      Find.find(File.join(pkg.package_dir_path, 'examples')) do |fn|
-        next unless test(?f, fn)
-        next if reject.include?(File.extname(fn))
-        sh %{unix2dos #{fn}}
-      end
-    end
-  end  # namespace :mswin32
 end  # namespace :gem
 
 
 desc 'Alias to gem:package'
-task :gem => ['gem:package', 'gem:mswin32:package']
-
-task :clobber => ['gem:clobber_package', 'gem:mswin32:clobber_package']
+task :gem => 'gem:package'
 
-%w[
-  gem:clobber_package
-  gem:mswin32:clobber_package
-  gem:mswin32:package
-  gem:mswin32:repackage
-].each {|name| remove_desc_for_task name}
+task :clobber => 'gem:clobber_package'
+remove_desc_for_task 'gem:clobber_package'
 
 # EOF