webby 0.8.4 → 0.9.0

data/lib/webby/helpers/tex_img_helper.rb

@@ -97,10 +97,9 @@ module TexImgHelper
       %x[pdflatex -interaction=batchmode out.tex &> #{dev_null}]
 
       convert =  "\\( -density #{res} out.pdf -trim +repage \\) "
-      convert << "\\( +clone -fuzz 100% -fill #{fg} -opaque black \\) "
-      convert << "+swap -compose copy-opacity -composite "
-      convert << "\\( +clone -fuzz 100% -fill #{bg} -opaque white +matte \\) "
-      convert << "+swap -compose over -composite #{out_file}"
+      convert << "\\( -clone 0 -negate -background #{fg} -channel A -combine \\) "
+      convert << "\\( -clone 0 -background #{bg} -channel A -combine \\) "
+      convert << "-delete 0 -compose dst-over -composite #{out_file}"
       %x[convert #{convert} &> #{dev_null}]
     ensure
       Dir.chdir(pwd)
@@ -124,12 +123,9 @@ module TexImgHelper
   end
 end  # module TexImgHelper
 
-%x[pdflatex --version 2>&1]
-if 0 == $?.exitstatus
-  %x[convert --version 2>&1]
-  if 0 == $?.exitstatus
-    register(TexImgHelper)
-  end
+if  cmd_available?(%w[pdflatex --version]) \
+and cmd_available?(%w[convert --help])
+  register(TexImgHelper)
 end
 
 end  # module Webby::Helpers

data/lib/webby/renderer.rb

@@ -37,9 +37,9 @@ class Renderer
 
     loop {
       ::File.open(page.destination, 'w') do |fd|
-        fd.write(renderer.__send__(:_layout_page))
+        fd.write(renderer._layout_page)
       end
-      break unless renderer.__send__(:_next_page)
+      break unless renderer._next_page
     }
   end
 
@@ -244,7 +244,7 @@ class Renderer
   #
   def _render_layout_for( res )
     return unless res.layout
-    lyt = Resources.layouts.find :filename => res.layout
+    lyt = Resources.find_layout(res.layout)
     return if lyt.nil?
 
     _track_rendering(lyt.path) {
@@ -267,6 +267,8 @@ class Renderer
     # go to the next page; break out if there is no next page
     if @pager.next?
       @pager = @pager.next
+      @_content_for.clear
+      @_bindings.clear
     else
       @page.number = nil
       return false

data/lib/webby/resources/layout.rb

@@ -43,7 +43,7 @@ class Layout < Resource
     return @mdata['extension'] if @mdata.has_key? 'extension'
 
     if @mdata.has_key? 'layout'
-      lyt = ::Webby::Resources.layouts.find :filename => @mdata['layout']
+      lyt = ::Webby::Resources.find_layout(@mdata['layout'])
       ext = lyt ? lyt.extension : nil
     end
   end

data/lib/webby/resources/page.rb

@@ -105,7 +105,7 @@ class Page < Resource
     return @mdata['extension'] if @mdata.has_key? 'extension'
 
     if @mdata.has_key? 'layout'
-      lyt = ::Webby::Resources.layouts.find :filename => @mdata['layout']
+      lyt = ::Webby::Resources.find_layout(@mdata['layout'])
       ext = lyt ? lyt.extension : nil
       return ext if ext
     end

data/lib/webby/resources/resource.rb

@@ -72,10 +72,20 @@ class Resource
   #    resource[key]    => value or nil
   #
   # Returns the value associated with the given meta-data key. Key is
-  # usually a string.
+  # converted into a string.
   #
   def []( key )
-    @mdata[key]
+    @mdata[key.to_s]
+  end
+
+  # call-seq:
+  #    resource[key] = value
+  #
+  # Sets the given meta-data key to the value. Key is converted into a
+  # string.
+  #
+  def []=( key, value )
+    @mdata[key.to_s] = value
   end
 
   # call-seq:
@@ -111,7 +121,7 @@ class Resource
     # check to see if the layout is dirty, and if it is then we
     # are dirty, too
     if @mdata.has_key? 'layout'
-      lyt = ::Webby::Resources.layouts.find :filename => @mdata['layout']
+      lyt = ::Webby::Resources.find_layout(@mdata['layout'])
       unless lyt.nil?
         return true if lyt.dirty?
       end

data/lib/webby/resources.rb

@@ -71,6 +71,22 @@ module Webby::Resources
       filename.sub(%r/\A(?:\.\/|\/)/o, '').freeze
     end
 
+    # Returns the layout resource corresponding to the given _filename_ or
+    # +nil+ if no layout exists under that filename.
+    #
+    def find_layout( filename )
+      return if filename.nil?
+
+      fn  = ::Webby::Resources::File.basename(filename)
+      dir = ::File.dirname(filename)
+      dir = '.' == dir ? '' : dir
+
+      layouts.find(:filename => fn, :in_directory => dir)
+
+    rescue RuntimeError
+      raise Webby::Error, "could not find layout #{filename.inspect}"
+    end
+
   end  # class << self
 
 end  # module Webby::Resources

data/{examples/presentation → lib/webby}/tasks/create.rake

@@ -10,7 +10,7 @@ namespace :create do
 
     desc "Create a new #{name}"
     task name do |t|
-      page, title, dir = Webby::Builder.new_page_info(t)
+      page, title, dir = Webby::Builder.new_page_info
       page = Webby::Builder.create(page, :from => template,
                  :locals => {:title => title, :directory => dir})
       exec(::Webby.editor, page) unless ::Webby.editor.nil?

data/{examples → lib}/webby/tasks/growl.rake

@@ -1,5 +1,6 @@
 
-desc 'Send log events to Growl (Mac OS X only)'
+unless WINDOWS
+
 task :growl do
   Logging::Logger['Webby'].add_appenders(Logging::Appenders::Growl.new(
     "Webby",
@@ -9,4 +10,6 @@ task :growl do
   ))
 end
 
+end  # unless WINDOWS
+
 # EOF

data/lib/webby.rb

@@ -18,7 +18,7 @@ Logging::Appender.stdout.layout = Logging::Layouts::Pattern.new(
 module Webby
 
   # :stopdoc:
-  VERSION = '0.8.4'   # :nodoc:
+  VERSION = '0.9.0'   # :nodoc:
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -47,6 +47,7 @@ module Webby
       :base          => nil,
       :create_mode   => 'page',
       :blog_dir      => 'blog',
+      :tumblog_dir   => 'tumblog',
 
       # Items for running the heel webserver
       :heel_port => 4331,
@@ -159,7 +160,7 @@ module Webby
   # <tt>File.join</tt>.
   #
   def self.libpath( *args )
-    args.empty? ? LIBPATH : ::File.join(LIBPATH, *args)
+    args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
   end
 
   # Returns the path for Webby. If any arguments are given,
@@ -167,7 +168,7 @@ module Webby
   # <tt>File.join</tt>.
   #
   def self.path( *args )
-    args.empty? ? PATH : ::File.join(PATH, *args)
+    args.empty? ? PATH : ::File.join(PATH, args.flatten)
   end
 
   # call-seq:
@@ -201,19 +202,24 @@ end  # module Webby
 
 
 # call-seq:
-#    try_require( library )    => true or false
+#    try_require( library, gemname = nil )    => true or false
 #
 # Try to laod the given _library_ using the built-in require, but do not
 # raise a LoadError if unsuccessful. Returns +true+ if the _library_ was
 # successfully loaded; returns +false+ otherwise.
 #
-def try_require( lib )
+# If a _gemname_ is given, then the "gem gemname" command will be called
+# before the library is loaded.
+#
+def try_require( lib, gemname = nil )
+  gem gemname unless gemname.nil?
   require lib
   true
 rescue LoadError
   false
 end
 
+Webby.require_all_libs_relative_to(__FILE__, ::File.join(%w[webby core_ext]))
 Webby.require_all_libs_relative_to(__FILE__)
 
 end  # unless defined?

data/spec/core_ext/hash_spec.rb

@@ -0,0 +1,47 @@
+
+require ::File.expand_path(
+    ::File.join(::File.dirname(__FILE__), %w[.. spec_helper]))
+
+describe Hash do
+
+  it "should stringify keys" do
+    h = {
+      :one  => 1,
+      :two  => 2,
+      3     => 'three',
+      [3,4] => :thirty_four
+    }.stringify_keys
+    h.keys.sort.should == %w[3 34 one two]
+  end
+
+  it "should symbolize keys" do
+    h = {
+      'foo' => 42,
+      'bar' => 'baz'
+    }.symbolize_keys
+
+    h.has_key?('foo').should == false
+    h.has_key?('bar').should == false
+
+    h.has_key?(:foo).should == true
+    h.has_key?(:bar).should == true
+  end
+
+  describe "when sanitizing values" do
+    [
+     ['none', nil], ['nil', nil],
+     ['true', true], ['yes', true],
+     ['false', false], ['no', false]
+    ].each do |from, to|
+
+      it "should convert #{from.inspect} to #{to.inspect}" do
+        h = {:key => from}
+        h.sanitize!
+        h[:key].should == to
+      end
+    end
+  end
+
+end
+
+# EOF

data/spec/core_ext/string_spec.rb

@@ -0,0 +1,110 @@
+
+require ::File.expand_path(
+    ::File.join(::File.dirname(__FILE__), %w[.. spec_helper]))
+
+describe String do
+
+  describe "#/" do
+    it "should join other strings to form a file path" do
+      path = 'foo' / 'bar' / 'baz'
+      path.should == ::File.join(%w[foo bar baz])
+    end
+  end
+
+  describe "#titlecase" do
+    it "should not capitalize small words" do
+      'and on the other hand of fate we have a ring'.titlecase.
+          should == 'And on the Other Hand of Fate We Have a Ring'
+    end
+
+    it "should not modify words that contain capital letters other than the first character" do
+      'the iTunes store is down'.titlecase.
+          should == 'The iTunes Store Is Down'
+      "what's up with the MacUpdate site".titlecase.
+          should == "What's Up With the MacUpdate Site"
+    end
+
+    it "should skip words with line dots (example.com or del.icio.us)" do
+      'the website example.com is used in documentation'.titlecase.
+          should == 'The Website example.com Is Used in Documentation'
+    end
+
+    it "should always capitlize the first and last words of the title" do
+      'a little bit of'.titlecase.should == 'A Little Bit Of'
+      'iTunes is being released'.titlecase.should == 'iTunes Is Being Released'
+      %q("a quoted title if").titlecase.should == %q("A Quoted Title If")
+      %q(and if you do via?).titlecase.should == %q(And if You Do Via?)
+    end
+
+    it "should caplitalize a small word after a colon" do
+      %q(starting sub-phrase with a small word: a trick, perhaps?).titlecase.
+          should == %q(Starting Sub-Phrase With a Small Word: A Trick, Perhaps?)
+
+      %q(sub-phrase with a small word in quotes: 'a trick, perhaps?').titlecase.
+          should == %q(Sub-Phrase With a Small Word in Quotes: 'A Trick, Perhaps?')
+
+      %q(sub-phrase with a small word in quotes: "a trick, perhaps?").titlecase.
+          should == %q(Sub-Phrase With a Small Word in Quotes: "A Trick, Perhaps?")
+    end
+
+    it "should properly handle contractions" do
+      %q(this isn't going to work).titlecase.
+          should == %q(This Isn't Going to Work)
+
+      %q(MicroSoft won't go down that route).titlecase.
+          should == %q(MicroSoft Won't Go Down That Route)
+    end
+
+    it "should capitalize phrases inside quotations" do
+      %q(Q&A with steve jobs: 'that's what happens in technology').titlecase.
+          should == %q(Q&A With Steve Jobs: 'That's What Happens in Technology')
+    end
+
+  end
+
+  describe "#to_url" do
+    it "should convert characters to words" do
+      given    = "10% Inspiration & 90% Perspiration"
+      expected = "10-percent-inspiration-and-90-percent-perspiration"
+
+      given.to_url.should == expected
+    end
+
+    it "should convert entities to words" do
+      given    = "Tea   & crumpets & crêpes for me!"
+      expected = "tea-and-crumpets-and-crepes-for-me"
+
+      given.to_url.should == expected
+    end
+
+    it "should remove html tags" do
+      given    = "I Am <strong>Awesome</strong>"
+      expected = "i-am-awesome"
+
+      given.to_url.should == expected
+    end
+
+    it "should convert ellipses" do
+      given    = "The Suspense... Is... Killing Me"
+      expected = "the-suspense-dot-dot-dot-is-dot-dot-dot-killing-me"
+
+      given.to_url.should == expected
+    end
+
+    it "should convert underscores to dashes" do
+      given    = "How to use attr_accessible and attr_protected"
+      expected = "how-to-use-attr-accessible-and-attr-protected"
+
+      given.to_url.should == expected
+    end
+
+    it "should remove punctuation" do
+      given    = "I'm just making sure there's nothing wrong with things!"
+      expected = "im-just-making-sure-theres-nothing-wrong-with-things"
+
+      given.to_url.should == expected
+    end
+  end
+end
+
+# EOF

data/spec/core_ext/time_spec.rb

@@ -0,0 +1,19 @@
+
+require ::File.expand_path(
+    ::File.join(::File.dirname(__FILE__), %w[.. spec_helper]))
+
+describe Time do
+
+  it "should serialize to a YAML string" do
+    now = Time.now
+
+    utc_offset = now.utc_offset / 3600
+    sign, utc_offset = utc_offset < 0 ? ['-', -utc_offset] : ['', utc_offset]
+    str = "%s.%06d %s%02d:00" %
+          [now.strftime('%Y-%m-%d %H:%M:%S'), now.usec, sign, utc_offset]
+
+    now.to_y.should == str
+  end
+end
+
+# EOF

data/spec/webby/apps/generator_spec.rb

@@ -0,0 +1,111 @@
+
+require ::File.expand_path(
+    ::File.join(::File.dirname(__FILE__), %w[.. .. spec_helper]))
+require 'stringio'
+
+describe Webby::Apps::Generator do
+
+  before :each do
+    @generator = Webby::Apps::Generator.new
+  end
+
+  it "should return a list of available templates" do
+    ary = %w[blog presentation tumblog webby website].map {|t| Webby.path('examples', t)}
+    @generator.templates.should == ary
+  end
+
+  it "should pretend to create a site" do
+    @generator.parse %w[-p website foo]
+    @generator.pretend?.should == true
+
+    @generator = Webby::Apps::Generator.new
+    @generator.parse %w[website foo]
+    @generator.pretend?.should == false
+
+    @generator = Webby::Apps::Generator.new
+    @generator.parse %w[--pretend website foo]
+    @generator.pretend?.should == true
+  end
+
+  it "should return a list of all the site files from the template" do
+    @generator.parse %w[website foo]
+
+    h = @generator.site_files
+    h.keys.sort.should == [
+        "",
+        "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",
+        "layouts",
+        "lib",
+        "templates"
+    ]
+    h["content"].should == %w[content/index.txt]
+    h["layouts"].should == %w[layouts/default.txt]
+  end
+
+  describe "when parsing command line arguments" do
+
+    before :each do
+      @strio = StringIO.new
+      @generator = Webby::Apps::Generator.new
+      @generator.instance_variable_set(:@stdout, @strio)
+
+      class << @strio
+        def to_s
+          seek 0
+          str = read
+          truncate 0
+          return str
+        end
+      end
+    end
+
+    it "should force the overwriting of files on collision" do
+      @generator.options[:collision].should be_nil
+      @generator.parse %w[-f website foo]
+      @generator.options[:collision].should == :force
+    end
+
+    it "should skip files on collision" do
+      @generator.options[:collision].should be_nil
+      @generator.parse %w[-s website foo]
+      @generator.options[:collision].should == :skip
+    end
+
+    it "should update only the rake files in the tasks folder" do
+      @generator.options[:update].should be_nil
+      @generator.parse %w[-u website foo]
+      @generator.options[:update].should == true
+    end
+
+    it "should pretend to generate / alter files" do
+      @generator.options[:pretend].should be_nil
+      @generator.parse %w[-p website foo]
+      @generator.options[:pretend].should == true
+    end
+
+    it "should exit if a site is not specified" do
+      lambda{@generator.parse %w[website]}.
+          should raise_error(SystemExit, 'exit')
+      @strio.to_s.split("\n").first.
+          should == 'Usage: webby-gen [options] template site'
+    end
+
+    it "should exit if an unknown template is given" do
+      lambda{@generator.parse %w[foo bar]}.
+          should raise_error(SystemExit, 'exit')
+      @strio.to_s.split("\n").last.
+          should == "    Could not find template 'foo'"
+    end
+  end
+end
+
+# EOF

data/spec/webby/apps/main_spec.rb

@@ -0,0 +1,75 @@
+
+require ::File.expand_path(
+    ::File.join(::File.dirname(__FILE__), %w[.. .. spec_helper]))
+
+# ---------------------------------------------------------------------------
+describe Webby::Apps::Main do
+  before do
+    @main = Webby::Apps::Main.new
+  end
+
+  describe ".capture_command_line_args" do
+    it "should set the raw arguments" do
+      raw = ["The Raw Arguments"]
+      args = @main.capture_command_line_args(raw)
+      args.raw.should == raw
+    end
+
+    it "should set the page with one argument by downcasing" do
+      page = "This-is-a-page"
+      args = @main.capture_command_line_args([page])
+      args.page.should == page.downcase
+    end
+
+    it "should set the page with two or more arguments by joining" do
+      page = %w(this is a page)
+      args = @main.capture_command_line_args(page)
+      args.page.should == page.join('-')
+    end
+
+    it "should set the dir from the page's dirname" do
+      page = "foo/bar/this-is-a-page.txt"
+      args = @main.capture_command_line_args([page])
+      args.dir.should == "foo/bar"
+    end
+
+    it "should set the slug from the page's basename" do
+      page = "foo/bar/this-is-a-page.txt"
+      args = @main.capture_command_line_args([page])
+      args.slug.should == "this-is-a-page"
+    end
+
+    it "should turn the slug into a url" do
+      page = "10% Inspiration & 90% Perspiration"
+      args = @main.capture_command_line_args([page])
+      args.slug.should == "10-percent-inspiration-and-90-percent-perspiration"
+    end
+
+    it "should set the page by combining the dir and slug" do
+      page = "10% Inspiration & 90% Perspiration"
+      args = @main.capture_command_line_args([page])
+      args.page.should == "10-percent-inspiration-and-90-percent-perspiration"
+
+      page = "foo/bar/10% Inspiration & 90% Perspiration"
+      args = @main.capture_command_line_args([page])
+      args.page.should == "foo/bar/10-percent-inspiration-and-90-percent-perspiration"
+    end
+
+    # TODO: Is this desired behavior?
+    it "should set the title by joining the raw args, getting the basename, and titlecasing"  do
+      page = "foo/bar/this-is-a-page.txt"
+      args = @main.capture_command_line_args([page])
+      args.title.should == "This-Is-a-Page"
+    end
+  end
+
+  describe ".parse" do
+    it "should pass environment variables to the rake application" do
+      ARGV = ary = []
+      args = %w[rebuild foo BASE=http://www.example.com bar]
+      @main.parse args
+      ary.should == %w[rebuild BASE=http://www.example.com]
+      args.should == %w[foo bar]
+    end
+  end
+end

data/spec/webby/helpers/capture_helper_spec.rb

@@ -23,7 +23,7 @@ describe Webby::Helpers::CaptureHelper do
   before :each do
     @renderman = Webby::Renderer.new(
                  Webby::Resources::Page.new(CFN))
-    @page_content = @renderman.render_page
+    @page_content = @renderman._render_page
   end
 
   after :all do

data/spec/webby/resources_spec.rb

@@ -0,0 +1,17 @@
+
+
+require ::File.join(::File.dirname(__FILE__), %w[.. spec_helper])
+
+# ---------------------------------------------------------------------------
+describe Webby::Resources do
+  it "should raise a useful error if there are no layouts" do
+    layouts = mock("Layouts")
+    Webby::Resources.stub!(:layouts).and_return(layouts)
+    layouts.should_receive(:find).and_raise RuntimeError
+
+    lambda do
+      Webby::Resources.find_layout("default")
+    end.should raise_error(Webby::Error, 'could not find layout "default"')
+    
+  end
+end

data/tasks/gem.rake

@@ -91,8 +91,11 @@ namespace :gem do
   end
 
   desc 'Install the gem'
-  task :install => [:clobber, :package] do
-    sh "#{SUDO} #{GEM} install --no-update-sources pkg/#{PROJ.gem._spec.full_name}"
+  task :install => [:clobber, 'gem:package'] do
+    sh "#{SUDO} #{GEM} install --local pkg/#{PROJ.gem._spec.full_name}"
+
+    # use this version of the command for rubygems > 1.0.0
+    #sh "#{SUDO} #{GEM} install --no-update-sources pkg/#{PROJ.gem._spec.full_name}"
   end
 
   desc 'Uninstall the gem'
@@ -106,6 +109,11 @@ namespace :gem do
   desc 'Reinstall the gem'
   task :reinstall => [:uninstall, :install]
 
+  desc 'Cleanup the gem'
+  task :cleanup do
+    sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}"
+  end
+
 end  # namespace :gem
 
 desc 'Alias to gem:package'