TwP-webby 0.9.4 → 0.9.4.1

data/lib/webby/resources.rb

@@ -86,7 +86,8 @@ module Webby::Resources
     # +nil+ if no layout exists under that filename.
     #
     def find_layout( filename )
-      return if filename.nil?
+      return unless filename
+      filename = filename.to_s
 
       fn  = self.basename(filename)
       dir = ::File.dirname(filename)

data/lib/webby/resources/page.rb

@@ -49,7 +49,10 @@ class Page < Resource
     return @url unless @url.nil?
 
     @url = super
-    @url = File.dirname(@url) if filename == 'index'
+    if filename == 'index'
+      @url = File.dirname(@url)
+      @url << '/' unless %r/\/$/ =~ @url
+    end
     @url
   end
 

data/lib/webby/tasks/create.rake

@@ -13,10 +13,7 @@ namespace :create do
       page, title, dir = Webby::Builder.new_page_info
       page = Webby::Builder.create(page, :from => template,
                  :locals => {:title => title, :directory => dir})
-      unless ::Webby.editor.nil?
-        args = [::Webby.editor.split, page].flatten
-        exec(*args)
-      end
+      Webby.exec_editor(page)
     end
   end  # each
 

data/spec/data/site/tasks/tumblog.rake

@@ -1,3 +1,7 @@
+Loquacious.configuration_for(:webby) {
+  desc "The default directory where new tumblog posts will be created."
+  tumblog_dir 'blog'
+}
 
 namespace :tumblog do
 
@@ -21,7 +25,7 @@ namespace :tumblog do
       page = File.join(dir, File.basename(page))
       page = Webby::Builder.create(page, :from => template,
                  :locals => {:title => title, :directory => dir})
-      exec(::Webby.editor, page) unless ::Webby.editor.nil?
+      Webby.exec_editor(page)
     end
   end  # each
 

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@
 unless defined? WEBBY_SPEC_HELPER
 WEBBY_SPEC_HELPER = true
 
-require 'rubygems'
 require 'fileutils'
 require 'stringio'
 
@@ -11,6 +10,7 @@ begin
   require 'fake_web'
   $test_externals = true
 rescue LoadError
+  retry if require 'rubygems'
   $test_externals = false
 end
 

data/spec/webby/apps/generator_spec.rb

@@ -36,13 +36,14 @@ describe Webby::Apps::Generator do
         "content",
         "content/css",
         "content/css/blueprint",
-        "content/css/blueprint/compressed",
-        "content/css/blueprint/lib",
         "content/css/blueprint/plugins",
         "content/css/blueprint/plugins/buttons",
         "content/css/blueprint/plugins/buttons/icons",
-        "content/css/blueprint/plugins/css-classes",
         "content/css/blueprint/plugins/fancy-type",
+        "content/css/blueprint/plugins/link-icons",
+        "content/css/blueprint/plugins/link-icons/icons",
+        "content/css/blueprint/plugins/rtl",
+        "content/css/blueprint/src",
         "layouts",
         "lib",
         "templates"
@@ -51,6 +52,38 @@ describe Webby::Apps::Generator do
     h["layouts"].should == %w[layouts/default.txt]
   end
 
+  it "should return a list of all the blog files from the template" do
+    @generator.parse %w[blog foo]
+
+    h = @generator.site_files
+    h.keys.sort.should == [
+      "",
+      "content",
+      "content/css",
+      "content/css/blueprint",
+      "content/css/blueprint/plugins",
+      "content/css/blueprint/plugins/buttons",
+      "content/css/blueprint/plugins/buttons/icons",
+      "content/css/blueprint/plugins/fancy-type",
+      "content/css/blueprint/plugins/link-icons",
+      "content/css/blueprint/plugins/link-icons/icons",
+      "content/css/blueprint/plugins/rtl",
+      "content/css/blueprint/src",
+      "layouts",
+      "tasks",
+      "templates",
+      "templates/blog"
+    ]
+    h["layouts"].should == %w[layouts/default.txt]
+    h["tasks"].should == %w[tasks/blog.rake]
+    h["templates"].should == %w[templates/atom_feed.erb]
+    h["templates/blog"].should == [
+      "templates/blog/year.erb",
+      "templates/blog/post.erb",
+      "templates/blog/month.erb"
+    ]
+  end
+
   describe "when parsing command line arguments" do
 
     before :each do

data/spec/webby/apps/main_spec.rb

@@ -78,7 +78,8 @@ describe Webby::Apps::Main do
 
   describe ".parse" do
     it "should pass environment variables to the rake application" do
-      ARGV = ary = []
+      ary = ARGV
+      ARGV.replace []
       args = %w[rebuild foo BASE=http://www.example.com bar]
       @main.parse args
       ary.should == %w[rebuild BASE=http://www.example.com]

data/spec/webby/filters/basepath_spec.rb

@@ -108,13 +108,13 @@ describe Webby::Filters::BasePath do
 
   it 'is restrictive to the configured xpaths' do
     Webby.site.base = 'not a real site'
-    input = @input % ['<img src="/foo/picture.jpg" />', '<a href="/page.html">Page Title</a>']
+    input = @input % ['<foo src="/foo/picture.jpg" />', '<a href="/page.html">Page Title</a>']
 
     bp = Webby::Filters::BasePath.new(input, 'html')
     bp.filter.should == <<-HTML
 <html>
 <head>
-<img src="/foo/picture.jpg" />
+<foo src="/foo/picture.jpg" />
 </head>
 <body>
 <a href="not a real site/page.html">Page Title</a>

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: TwP-webby
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.4.1
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,29 +9,32 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-01 00:00:00 -08:00
+date: 2009-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: directory_watcher
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.1
+        version: 1.1.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.6.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: launchy
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,39 +44,53 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: logging
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.7
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: loquacious
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.3
+        version: 0.8.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.4
+        version: 1.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: bones
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.5.0
     version: 
 description: "*Webby* is a fantastic little website management system. It would be called a *content management system* if it were a bigger kid. But, it's just a runt with a special knack for transforming text. And that's really all it does - manages the legwork of turning text into something else, an *ASCII Alchemist* if you will.  Webby works by combining the contents of a *page* with a *layout* to produce HTML. The layout contains everything common to all the pages - HTML headers, navigation menu, footer, etc. - and the page contains just the information for that page. You can use your favorite markup language to write your pages; Webby supports quite a few.  Install Webby and try it out!"
 email: tim.pease@gmail.com
@@ -110,12 +127,43 @@ extra_rdoc_files:
 - spec/data/site/layouts/tumblog/post.txt
 files: 
 - History.txt
-- Manifest.txt
 - README.rdoc
 - Rakefile
 - bin/webby
 - bin/webby-gen
 - examples/blog/Sitefile
+- examples/blog/content/css/blueprint/ie.css
+- examples/blog/content/css/blueprint/plugins/buttons/icons/cross.png
+- examples/blog/content/css/blueprint/plugins/buttons/icons/key.png
+- examples/blog/content/css/blueprint/plugins/buttons/icons/tick.png
+- examples/blog/content/css/blueprint/plugins/buttons/readme.txt
+- examples/blog/content/css/blueprint/plugins/buttons/screen.css
+- examples/blog/content/css/blueprint/plugins/fancy-type/readme.txt
+- examples/blog/content/css/blueprint/plugins/fancy-type/screen.css
+- examples/blog/content/css/blueprint/plugins/link-icons/icons/doc.png
+- examples/blog/content/css/blueprint/plugins/link-icons/icons/email.png
+- examples/blog/content/css/blueprint/plugins/link-icons/icons/external.png
+- examples/blog/content/css/blueprint/plugins/link-icons/icons/feed.png
+- examples/blog/content/css/blueprint/plugins/link-icons/icons/im.png
+- examples/blog/content/css/blueprint/plugins/link-icons/icons/pdf.png
+- examples/blog/content/css/blueprint/plugins/link-icons/icons/visited.png
+- examples/blog/content/css/blueprint/plugins/link-icons/icons/xls.png
+- examples/blog/content/css/blueprint/plugins/link-icons/readme.txt
+- examples/blog/content/css/blueprint/plugins/link-icons/screen.css
+- examples/blog/content/css/blueprint/plugins/rtl/readme.txt
+- examples/blog/content/css/blueprint/plugins/rtl/screen.css
+- examples/blog/content/css/blueprint/print.css
+- examples/blog/content/css/blueprint/screen.css
+- examples/blog/content/css/blueprint/src/forms.css
+- examples/blog/content/css/blueprint/src/grid.css
+- examples/blog/content/css/blueprint/src/grid.png
+- examples/blog/content/css/blueprint/src/ie.css
+- examples/blog/content/css/blueprint/src/print.css
+- examples/blog/content/css/blueprint/src/reset.css
+- examples/blog/content/css/blueprint/src/typography.css
+- examples/blog/content/css/coderay.css
+- examples/blog/content/css/site.css
+- examples/blog/layouts/default.txt
 - examples/blog/tasks/blog.rake
 - examples/blog/templates/atom_feed.erb
 - examples/blog/templates/blog/month.erb
@@ -176,6 +224,7 @@ files:
 - examples/webby/content/release-notes/rel-0-9-1/index.txt
 - examples/webby/content/release-notes/rel-0-9-2/index.txt
 - examples/webby/content/release-notes/rel-0-9-3/index.txt
+- examples/webby/content/release-notes/rel-0-9-4/index.txt
 - examples/webby/content/robots.txt
 - examples/webby/content/script/jquery.corner.js
 - examples/webby/content/script/jquery.js
@@ -228,6 +277,7 @@ files:
 - lib/webby/apps/main.rb
 - lib/webby/auto_builder.rb
 - lib/webby/builder.rb
+- lib/webby/config.rb
 - lib/webby/core_ext/enumerable.rb
 - lib/webby/core_ext/hash.rb
 - lib/webby/core_ext/kernel.rb
@@ -340,20 +390,7 @@ files:
 - spec/webby/resources/resource_spec.rb
 - spec/webby/resources/static_spec.rb
 - spec/webby/resources_spec.rb
-- tasks/ann.rake
-- tasks/bones.rake
-- tasks/gem.rake
-- tasks/git.rake
-- tasks/manifest.rake
 - tasks/mswin32.rake
-- tasks/notes.rake
-- tasks/post_load.rake
-- tasks/rdoc.rake
-- tasks/rubyforge.rake
-- tasks/setup.rb
-- tasks/spec.rake
-- tasks/svn.rake
-- tasks/test.rake
 - tasks/website.rake
 has_rdoc: true
 homepage: http://webby.rubyforge.org/
@@ -381,6 +418,6 @@ rubyforge_project: webby
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: static website creation and management
+summary: Awesome static website creation and management!
 test_files: []