webby 0.9.0 → 0.9.1

data/spec/webby/resources/static_spec.rb

@@ -0,0 +1,49 @@
+
+require File.expand_path(
+    File.join(File.dirname(__FILE__), %w[.. .. spec_helper]))
+
+# -------------------------------------------------------------------------
+describe Webby::Resources::Static do
+  before :all do
+    @filename = File.join %w[content css coderay.css]
+    @static   = Webby::Resources::Static.new(@filename)
+  end
+
+  it 'contains no meta-data' do
+    @static._meta_data.should be_empty
+  end
+
+  it 'uses the path remounted to the output directory as the destination' do
+    @static.destination.should == 'output/css/coderay.css'
+  end
+
+  it 'returns destination without the output directory as the url' do
+    @static.url.should == '/css/coderay.css'
+  end
+
+  it 'reads the contents of the file' do
+    str = @static._read
+    str.split($/).first.should == '.CodeRay {'
+  end
+
+  it 'uses the file extension as the extension' do
+    @static.extension.should equal(@static.ext)
+  end
+
+  # -----------------------------------------------------------------------
+  describe '.dirty?' do
+    it 'returns true if the output file is missing' do
+      @static.dirty?.should == true
+    end
+
+    it 'returns false if the output file is present' do
+      dest = @static.destination
+      FileUtils.mkdir_p File.dirname(dest)
+      FileUtils.touch dest
+      @static.dirty?.should == false
+    end
+  end
+
+end  # describe Webby::Resources::Static
+
+# EOF

data/spec/webby/resources_spec.rb

@@ -1,9 +1,14 @@
 
 
-require ::File.join(::File.dirname(__FILE__), %w[.. spec_helper])
+require File.expand_path(
+    File.join(File.dirname(__FILE__), %w[.. spec_helper]))
 
-# ---------------------------------------------------------------------------
+# --------------------------------------------------------------------------
 describe Webby::Resources do
+  before :each do
+    Webby::Resources.clear
+  end
+
   it "should raise a useful error if there are no layouts" do
     layouts = mock("Layouts")
     Webby::Resources.stub!(:layouts).and_return(layouts)
@@ -12,6 +17,53 @@ describe Webby::Resources do
     lambda do
       Webby::Resources.find_layout("default")
     end.should raise_error(Webby::Error, 'could not find layout "default"')
-    
   end
+
+  it "should return the directory name for a file" do
+    Webby::Resources.dirname('content').should == './'
+    Webby::Resources.dirname('layouts').should == './'
+
+    Webby::Resources.dirname('content/index.txt').should == ''
+    Webby::Resources.dirname('layouts/default.txt').should == ''
+
+    Webby::Resources.dirname('content/tumblog/index.txt').should == 'tumblog'
+    Webby::Resources.dirname('layouts/tumblog/post.txt').should == 'tumblog'
+
+    Webby::Resources.dirname('output/tumblog/index.html').should == 'output/tumblog'
+    Webby::Resources.dirname('templates/tumblog/post.erb').should == 'templates/tumblog'
+  end
+
+  it "should normalize the path for a filename" do
+    Webby::Resources.path('content').should == 'content'
+    Webby::Resources.path('/content').should == 'content'
+    Webby::Resources.path('./content').should == 'content'
+
+    Webby::Resources.path('./').should == ''
+    Webby::Resources.path('/').should == ''
+    Webby::Resources.path('').should == ''
+  end
+
+  # ------------------------------------------------------------------------
+  describe "#new" do
+    before :each do
+      layout = Webby::Resources::Layout.
+               new(Webby.datapath %w[layouts default.txt])
+      Webby::Resources.stub!(:find_layout).and_return(layout)
+    end
+
+    it "creates multiple pages for files with multiple YAML sections" do
+      pages = Webby::Resources.pages
+
+      fn = File.join %w[content photos.txt]
+      Webby::Resources.new(fn)
+
+      ary = pages.find(:all, :in_directory => 'photos')
+      ary.map {|page| page.title}.should == [
+        'First Photo', 'Second Photo', 'Third Photo'
+      ]
+    end
+  end
+
 end
+
+# EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webby
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-25 00:00:00 -06:00
+date: 2008-09-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.1
+        version: 0.9.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.8.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -90,6 +90,21 @@ extra_rdoc_files:
 - lib/webby/tasks/growl.rake
 - lib/webby/tasks/heel.rake
 - lib/webby/tasks/validate.rake
+- spec/data/content/_partial.txt
+- spec/data/content/index.txt
+- spec/data/content/photos.txt
+- spec/data/content/tumblog/200806/the-noble-chicken/index.txt
+- spec/data/content/tumblog/200807/historical-perspectives-on-the-classic-chicken-joke/index.txt
+- spec/data/content/tumblog/200807/mad-city-chickens/index.txt
+- spec/data/content/tumblog/200807/the-wisdom-of-the-dutch/index.txt
+- spec/data/content/tumblog/200807/up-a-tree/index.txt
+- spec/data/content/tumblog/index.txt
+- spec/data/content/tumblog/rss.txt
+- spec/data/hooligans/bad_meta_data_1.txt
+- spec/data/hooligans/bad_meta_data_2.txt
+- spec/data/layouts/default.txt
+- spec/data/layouts/tumblog/default.txt
+- spec/data/layouts/tumblog/post.txt
 files: 
 - History.txt
 - Manifest.txt
@@ -153,7 +168,9 @@ files:
 - examples/webby/content/index.txt
 - examples/webby/content/learn/index.txt
 - examples/webby/content/reference/index.txt
+- examples/webby/content/release-notes/index.txt
 - examples/webby/content/release-notes/rel-0-9-0/index.txt
+- examples/webby/content/release-notes/rel-0-9-1/index.txt
 - examples/webby/content/robots.txt
 - examples/webby/content/script/jquery.corner.js
 - examples/webby/content/script/jquery.js
@@ -227,8 +244,8 @@ files:
 - lib/webby/renderer.rb
 - lib/webby/resources.rb
 - lib/webby/resources/db.rb
-- lib/webby/resources/file.rb
 - lib/webby/resources/layout.rb
+- lib/webby/resources/meta_file.rb
 - lib/webby/resources/page.rb
 - lib/webby/resources/partial.rb
 - lib/webby/resources/resource.rb
@@ -245,12 +262,53 @@ files:
 - spec/core_ext/hash_spec.rb
 - spec/core_ext/string_spec.rb
 - spec/core_ext/time_spec.rb
+- spec/data/Sitefile
+- spec/data/content/_partial.txt
+- spec/data/content/css/coderay.css
+- spec/data/content/css/site.css
+- spec/data/content/css/tumblog.css
+- spec/data/content/images/tumblog/permalink.gif
+- spec/data/content/images/tumblog/rss.gif
+- spec/data/content/index.txt
+- spec/data/content/photos.txt
+- spec/data/content/tumblog/200806/the-noble-chicken/index.txt
+- spec/data/content/tumblog/200807/historical-perspectives-on-the-classic-chicken-joke/index.txt
+- spec/data/content/tumblog/200807/mad-city-chickens/index.txt
+- spec/data/content/tumblog/200807/the-wisdom-of-the-dutch/index.txt
+- spec/data/content/tumblog/200807/up-a-tree/index.txt
+- spec/data/content/tumblog/index.txt
+- spec/data/content/tumblog/rss.txt
+- spec/data/hooligans/bad_meta_data_1.txt
+- spec/data/hooligans/bad_meta_data_2.txt
+- spec/data/layouts/default.txt
+- spec/data/layouts/tumblog/default.txt
+- spec/data/layouts/tumblog/post.txt
+- spec/data/lib/breadcrumbs.rb
+- spec/data/lib/tumblog_helper.rb
+- spec/data/tasks/tumblog.rake
+- spec/data/templates/_partial.erb
+- spec/data/templates/atom_feed.erb
+- spec/data/templates/page.erb
+- spec/data/templates/presentation.erb
+- spec/data/templates/tumblog/conversation.erb
+- spec/data/templates/tumblog/link.erb
+- spec/data/templates/tumblog/photo.erb
+- spec/data/templates/tumblog/post.erb
+- spec/data/templates/tumblog/quote.erb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/webby/apps/generator_spec.rb
 - spec/webby/apps/main_spec.rb
+- spec/webby/filters/textile_spec.rb
 - spec/webby/helpers/capture_helper_spec.rb
-- spec/webby/resources/file_spec.rb
+- spec/webby/renderer_spec.rb
+- spec/webby/resources/db_spec.rb
+- spec/webby/resources/layout_spec.rb
+- spec/webby/resources/meta_file_spec.rb
+- spec/webby/resources/page_spec.rb
+- spec/webby/resources/partial_spec.rb
+- spec/webby/resources/resource_spec.rb
+- spec/webby/resources/static_spec.rb
 - spec/webby/resources_spec.rb
 - tasks/ann.rake
 - tasks/bones.rake

data/lib/webby/resources/file.rb

@@ -1,221 +0,0 @@
-require 'yaml'
-
-module Webby::Resources
-
-# The Webby::Resources::File class is identical to the core Ruby file class
-# except for YAML meta-data stored at the top of the file. This meta-data
-# is made available through the <code>meta_data</code> and
-# <code>meta_data=</code> functions.
-#
-# The meta-data data must be found between two YAML block separators "---",
-# each on their own line.
-#
-# Example:
-#
-#     ---
-#     layout: blog
-#     filter: markdown
-#     tags:
-#       - ruby
-#       - web development
-#     ---
-#     This is a blog entry formatted using MarkDown and tagged as "ruby" and
-#     "web development". The layout being used is the "blog" format.
-#
-class File < ::File
-
-  META_SEP = %r/\A---\s*\r?\n\z/o   # :nodoc:
-
-  class << self
-    # call-seq:
-    #    File.read( name [, length [, offset]])    => string
-    #
-    # Opens the file, optionally seeks to the given _offset_, then returns
-    # _length_ bytes (defaulting to the rest of the file). +read+ ensures
-    # the file is closed before returning.
-    #
-    def read( name, *args )
-      fd = new name, 'r'
-      fd.read(*args)
-    ensure
-      fd.close unless fd.nil?
-    end
-
-    # call-seq:
-    #    File.readlines( name, sep_string = $/ )    => array
-    #
-    # Reads the entire file specified by _name_ as individual lines, and
-    # returns those lines in an array. Lines are separated by _sep_string_.
-    # +readlines+ ensures the file is closed before returning.
-    #
-    def readlines( name, sep = $/ )
-      fd = new name, 'r'
-      fd.readlines sep
-    ensure
-      fd.close unless fd.nil?
-    end
-
-    # call-seq:
-    #    File.meta_data( name )    => object or nil
-    #
-    # Reads the meta-data from the file specified by _name_. +meta_data+
-    # ensures the files is closed before returning.
-    #
-    def meta_data( name )
-      fd = new name, 'r'
-      fd.meta_data
-    ensure
-      fd.close unless fd.nil?
-    end
-
-    # call-seq:
-    #    File.dirname( filename )    => dir_name
-    #
-    # Returns all components of the _filename_ except the last one. The
-    # filename must be formed using forward slashes ("/") regardless of the
-    # separator used on the local file system.
-    #
-    def dirname( fn )
-      ::File.dirname(fn).sub(%r/\A[^\/]+\/?/o, '')
-    end
-
-    # call-seq:
-    #    File.basename( filename )    => base_name
-    #
-    # Returns the last component of the _filename_, which must be formed
-    # using forward slashes ("/"regardless of the separator used on the
-    # local file system. The suffix is removed from the filename.
-    #
-    def basename( fn )
-      ::File.basename(fn, '.*')
-    end
-
-    # call-seq:
-    #    File.extname( filename )    => ext_name
-    #
-    # Returns the extension (the portion of file name in path after the
-    # period). This method excludes the period from the extension name.
-    #
-    def extname( fn )
-      ::File.extname(fn).tr('.', '')
-    end
-  end
-
-  # call-seq:
-  #    File.new( filename, mode = "r" )          => file
-  #    File.new( filename [, mode [, perm]] )    => file
-  #
-  # Opens the file named by _filename_ according to _mode_ (default is 'r')
-  # and returns a new +Webby::Resources::File+ object. See the description
-  # of class +IO+ for a description of _mode_. The file _mode_ may
-  # optionally be specified as a +Fixnum+ by or-ing together the flags
-  # (+O_RDONLY+ etc, again described under +IO+). Optional permission bits
-  # may be given in _perm_. These _mode_ and permission bits are platform
-  # dependent; on Unix systems, see +open(2)+ for details. 
-  #
-  #    f = File.new("testfile", "r")
-  #    f = File.new("newfile",  "w+")
-  #    f = File.new("newfile", File::CREAT|File::TRUNC|File::RDWR, 0644)
-  #
-  def initialize( *args )
-    super
-    @meta_end = end_of_meta_data
-  end
-
-  # call-seq:
-  #    meta_data
-  #
-  # Returns the meta-data defined at the top of the file. Returns +nil+ if
-  # no meta-data is defined. The meta-data is returned as Ruby objects
-  #
-  # Meta-data is stored in YAML format between two YAML separators "---" on
-  # their own lines.
-  #
-  def meta_data
-    return if @meta_end.nil?
-
-    cur, meta_end, @meta_end = tell, @meta_end, nil
-    seek 0
-    return YAML.load(self)
-
-  ensure
-    @meta_end = meta_end if defined? meta_end and meta_end
-    seek cur if defined? cur and cur
-  end
-
-  # call-seq
-  #    meta_data = object
-  #
-  # Stores the given _object_ as meta-data in YAML format at the top of the
-  # file. If the _objectc_ is +nil+, then the meta-data section will be
-  # removed from the file.
-  #
-  # Meta-data is stored in YAML format between two YAML separators "---" on
-  # their own lines.
-  #
-  def meta_data=( data )
-    return if data.nil? and @meta_end.nil?
-
-    seek 0
-    lines = readlines
-
-    truncate 0
-    unless data.nil?
-      write YAML.dump(data)
-      write "--- #$/"
-    end
-    lines.each {|line| write line}
-  ensure
-    @meta_end = end_of_meta_data
-    seek 0, IO::SEEK_END
-  end
-
-  alias :_gets :gets
-  private :_gets
-
-  %w(getc gets read read_nonblock readbytes readchar readline readlines readpartial scanf).each do |m|
-    self.class_eval <<-CODE
-      def #{m}(*a)
-        skip_meta_data
-        super
-      end
-    CODE
-  end
-
-
-  private
-
-  # Moves the file pointer to the end of the meta-data section. Does nothing
-  # if there is no meta-data section or if the file pointer is already past
-  # the meta-data section.
-  #
-  def skip_meta_data
-    return if @meta_end.nil? 
-    return if tell >= @meta_end
-    seek @meta_end
-  end
-
-  # Returns the position in this file where the meta-data ends and the file
-  # data begins. If there is no meta-data in the file, returns +nil+.
-  #
-  def end_of_meta_data
-    cur = tell
-
-    seek 0
-    line = _gets
-    return unless META_SEP =~ line
-
-    while line = _gets
-      break if META_SEP =~ line
-    end
-    return if line.nil?
-    tell
-
-  ensure
-    seek cur
-  end
-
-end  # class File
-end  # module Webby::Resources
-
-# EOF