hydeweb 0.1.2 → 0.1.3

data/HISTORY.md

@@ -1,3 +1,17 @@
+v0.1.3
+------
+
+ - .html files are now being treated as .erb.
+ - Implement `page.children.find`.
+ - Implement `page.children.except`.
+ - Fix #children and sorting giving errors.
+ - Fix #siblings.
+ - Revise the 'no config file found' error message.
+ - Allow `.hyderc` as a filename.
+ - Add help for `hyde help start`.
+ - Support `hyde start -D` which is a very hackish solution to have
+   Hyde start as a daemon.
+
 v0.1.2
 ------
 

data/Rakefile

@@ -4,8 +4,8 @@ end
 
 task :default => :test
 
-task :gembuild do
+task :gemrelease do
   require './lib/hyde'
   v = Hyde.version
-  system "joe build && git commit -a -m \"Update to version #{v}.\" && git tag v#{v}"
+  system "joe build && git commit -a -m \"Update to version #{v}.\" && git tag v#{v} && git push && joe release"
 end

data/bin/hyde

@@ -3,5 +3,6 @@ $:.push File.expand_path('../../lib', __FILE__)
 
 require 'hyde'
 
-hydefile = Hyde::CLI.find_in_project('hyde.conf')
+hydefile = Hyde::CONFIG_FILES.inject { |a, fname| a ||= Hyde::CLI.find_in_project(fname) }
+
 Hyde::CLI.run! :file => hydefile

data/bin/hyde01

@@ -3,5 +3,6 @@ $:.push File.expand_path('../../lib', __FILE__)
 
 require 'hyde'
 
-hydefile = Hyde::CLI.find_in_project('hyde.conf')
+hydefile = Hyde::CONFIG_FILES.inject { |a, fname| a ||= Hyde::CLI.find_in_project(fname) }
+
 Hyde::CLI.run! :file => hydefile

data/data/new_site/hyde.conf

@@ -4,7 +4,7 @@ hyde_requirement: 0.1
 
 # The folder where the site's source files are kept.
 site_path:       .
-output_path:     _public
+output_path:     _output
 
 # Other paths:
 layouts_path:    _layouts

data/lib/hyde.rb

@@ -8,8 +8,11 @@ require 'yaml'
 require 'tilt'
 require 'shake'
 
+# HTML files as ERB
+Tilt.mappings['html'] = Tilt.mappings['erb']
+
 class Hyde
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
   PREFIX  = File.expand_path('../', __FILE__)
 
   Error        = Class.new(StandardError)
@@ -17,11 +20,15 @@ class Hyde
   VersionError = Class.new(Error)
   NoGemError   = Class.new(Error)
 
+  # Allowed config filenames
+  CONFIG_FILES = ['hyde.conf', '.hyderc']
+
   autoload :Project, "#{PREFIX}/hyde/project"
   autoload :Page,    "#{PREFIX}/hyde/page"
   autoload :Meta,    "#{PREFIX}/hyde/meta"
   autoload :Config,  "#{PREFIX}/hyde/config"
   autoload :CLI,     "#{PREFIX}/hyde/cli"
+  autoload :Set,     "#{PREFIX}/hyde/set"
   autoload :Layout,  "#{PREFIX}/hyde/layout"
   autoload :Partial, "#{PREFIX}/hyde/partial"
   autoload :Helpers, "#{PREFIX}/hyde/helpers"

data/lib/hyde/cli.rb

@@ -68,16 +68,37 @@ class CLI < Shake
   task(:start) do
     project
 
-    port = (params.extract('-p') || 4833).to_i
-    host = (params.extract('-o') || '0.0.0.0')
+    port   = (params.extract('-p') || 4833).to_i
+    host   = (params.extract('-o') || '0.0.0.0')
+    daemon = (!! params.delete('-D'))
 
     require 'hyde/server'
 
-    Hyde::Server.run! :Host => host, :Port => port
+    if daemon
+      pid = fork { Hyde::Server.run! :Host => host, :Port => port, :quiet => true }
+      sleep 2
+      puts
+      puts "Listening on #{host}:#{port} on pid #{pid}."
+      puts "To stop: kill #{pid}"
+    else
+      Hyde::Server.run! :Host => host, :Port => port
+    end
   end
 
   task.description = "Starts the server"
   task.category = :project
+  task.help = %{
+    Usage:
+
+        #{executable} start [-p PORT] [-o HOST] [-D]
+    
+    Starts an HTTP server so you may rapidly test your project locally.
+
+    If the -p and/or -o is specified, it will listen on the specified HOST:PORT.
+    Otherwise, the default is 0.0.0.0:4833.
+
+    If -D is specified, it goes into daemon mode.
+  }.gsub(/^ {4}/, '').strip.split("\n")
 
   task(:version) do
     puts "Hyde #{Hyde::VERSION}"
@@ -108,9 +129,9 @@ class CLI < Shake
       err
       err "Get started by typing:"
       err "  $ #{executable} create my_project"
-      err
-      err "Type `#{executable} help COMMAND` for additional help on a command."
     end
+    err
+    err "Type `#{executable} help COMMAND` for additional help on a command."
   end
 
   task.description = "Shows help for a given command"

data/lib/hyde/cli/helpers.rb

@@ -1,8 +1,7 @@
 class Hyde
 class CLI
 module Helpers
-  def show_help_for(task)
-    name = params.first
+  def show_help_for(name)
     task = task(name)
     pass "No such command. Try: #{executable} help"  unless task
 
@@ -35,8 +34,9 @@ module Helpers
   end
 
   def no_project
-    "Error: This is not a Hyde project.\n" +
-    "You may convert it into one by creating a config file:\n" +
+    "Error: no Hyde config file found.\n" +
+    "(Looked for #{Hyde::CONFIG_FILES.join(', ')})\n\n" +
+    "You start by creating a config file for this project:\n" +
     "  $ #{executable} create .\n\n" +
     "You may also create an empty project in a new directory:\n" +
     "  $ #{executable} create NAME\n"

data/lib/hyde/meta.rb

@@ -3,5 +3,9 @@ class Meta < OpenStruct
   def merge!(hash)
     @table.merge(hash)
   end
+
+  def [](id)
+    @table[id.to_sym]
+  end
 end
 end

data/lib/hyde/page.rb

@@ -65,6 +65,10 @@ class Page
 
   alias to_s title
 
+  def position
+    meta[:position] || title
+  end
+  
   def <=>(other)
     result   = self.position <=> other.position
     result ||= self.position.to_s <=> other.position.to_s
@@ -226,15 +230,18 @@ class Page
       File.expand_path("../#{base}/*", @file)
     end
 
-    Dir[files].reject { |f| f == @file }.map { |f| self.class[f, project] }.compact.sort
+    Set.new Dir[files].reject { |f| f == @file }.map { |f| self.class[f, project] }.compact.sort
   end
 
   def siblings
-    p = parent and p.children
+    pages = (p = parent and p.children)
+    return Set.new  unless pages
+    return Set.new  unless pages.include?(self)
+    Set.new(pages)
   end
 
   def breadcrumbs
-    parent? ? (parent.breadcrumbs + [self]) : [self]
+    Set.new (parent? ? (parent.breadcrumbs + [self]) : [self])
   end
   
   def index?
@@ -253,6 +260,21 @@ class Page
     breadcrumbs.size
   end
 
+  def next
+    page = self
+    while true do
+      page.siblings.index(self)
+    end
+  end
+
+  def ==(other)
+    self.path == other.path
+  end
+
+  def inspect
+    "<##{self.class.name} #{path.inspect}>"
+  end
+
 protected
   def default_layout
     'default'  if html?

data/lib/hyde/server.rb

@@ -15,6 +15,7 @@ class Hyde
     end
 
     def show_status(page)
+      return if @options[:quiet]
       path = env['PATH_INFO']
       return  if path == '/favicon.ico'
 
@@ -48,6 +49,7 @@ end
 module Hyde::Server
   # :Host, :Port
   def self.run!(options={})
+    @options = options
     handler = rack_handler  or return false
     handler.run self, options
   end

data/lib/hyde/set.rb

@@ -0,0 +1,23 @@
+class Hyde
+class Set < Array
+  # Filters a set by given metadata criteria.
+  #
+  # @example
+  #   Page['/'].children.find(layout: 'default')
+  #
+  def find(by={})
+    self.class.new(select do |page|
+      by.inject(true) { |b, (field, value)| b &&= (page.meta.send(field) == value) }
+    end)
+  end
+
+  # Filters a set by removing items matching the given metadata criteria.
+  # This is the opposite of #find.
+  #
+  def except(by={})
+    self.class.new(reject do |page|
+      by.inject(true) { |b, (field, value)| b &&= (page.meta.send(field) == value) }
+    end)
+  end
+end
+end

data/test/fixture/extensions/control/index.html

@@ -0,0 +1 @@
+<h1>hey</h1>

data/test/fixture/html/control/index.html

@@ -0,0 +1,2 @@
+<h1>Welcome.</h1>
+Hello

data/test/fixture/html/hyde.conf

@@ -0,0 +1,8 @@
+hyde_requirement: 0.1
+site_path: site
+extensions_path: extensions
+output_path: public
+ignore:
+- **/*~
+- **/compass/**/*
+- **/_*.scss

data/test/fixture/html/site/index.html

@@ -0,0 +1,2 @@
+<h1>Welcome.</h1>
+<%= "Hello" %>

data/test/fixture/one/site/hello.haml

@@ -1 +1,3 @@
+hello: world
+--
 %h1 Welcome!

data/test/fixture/one/site/hi.html

@@ -1 +1,3 @@
+layout: false
+--
 Hello.

data/test/fixture/sort/control/about.html

@@ -0,0 +1,6 @@
+<li>
+  <a href='/about/intrepid.html'>One, intrepid</a>
+</li>
+<li>
+  <a href='/about/hardy.html'>Two, hardy</a>
+</li>

data/test/fixture/sort/control/about/hardy.html

@@ -0,0 +1 @@
+...

data/test/fixture/sort/control/about/intrepid.html

@@ -0,0 +1 @@
+...

data/test/helper.rb

@@ -3,11 +3,11 @@ $:.push File.expand_path('../../lib', __FILE__)
 require 'hyde'
 require 'contest'
 
-# Unpack
-Page    = Hyde::Page
-Project = Hyde::Project
-
 class TestCase < Test::Unit::TestCase
+  # Shorthand
+  Page    = Hyde::Page
+  Project = Hyde::Project
+
   def fixture(*a)
     path = File.expand_path('../fixture', __FILE__)
     File.join path, *a

data/test/unit/hyde_test.rb

@@ -7,10 +7,6 @@ class HydeTest < TestCase
     Dir.chdir @path
   end
 
-  test "hi" do
-    #y @project.pages.map { |page| y html: page.to_html, path: page.path, file: page.file }
-  end
-
   test "build" do
     @project.pages.each { |page| page.write }
   end
@@ -22,6 +18,7 @@ class HydeTest < TestCase
     assert_equal Page['/cheers.html'].file,   site['cheers.html.haml']
     assert_equal Page['/hi.html'].file,       site['hi.html']
     assert_equal Page['/hi.yo'].file,         site['hi.html']
+    assert_equal Page['/hi'].file,            site['hi.html']
     assert_equal Page['/css/style.css'].file, site['css/style.scss']
     assert_equal Page['/css/style.css'].file, site['css/style.scss']
     assert_equal Page['/about'].file,         site['about/index.scss']

data/test/unit/page_test.rb

@@ -24,4 +24,35 @@ class PageTest < TestCase
     assert Page['/'].parent.nil?
     assert Page['/css/style.css'].parent.path == '/index.html'
   end
+
+  test "siblings" do
+    # Because it has no parent, technically
+    page = Page['/about/index.css']
+    assert page.siblings.empty?
+
+    page = Page['/hello.html']
+    assert_equal %w(/cheers.html /hello.html /hi.html), page.siblings.map(&:path)
+  end
+
+  test "mimes" do
+    assert !Page['/css/style.css'].html?
+    assert Page['/'].html?
+    assert_equal 'text/css',  Page['/css/style.css'].mime_type
+    assert_equal 'text/html', Page['/about/us.html'].mime_type
+    assert_equal 'html', Page['/about/us.html'].default_ext
+    assert_equal 'css',  Page['/css/style.css'].default_ext
+  end
+  
+  test "no layout" do
+    page = Page['/hi.html']
+    assert_equal false, page.meta.layout
+    assert_equal nil, page.layout
+    assert_equal false, page.layout?
+    assert_equal page.to_html, page.content
+  end
+
+  test "html pages should be intact" do
+    page = Page['/hi']
+    assert_equal page.markup, page.content
+  end
 end

data/test/unit/set_test.rb

@@ -0,0 +1,26 @@
+require File.expand_path('../../helper', __FILE__)
+
+class SetTest < TestCase
+  setup do
+    @path = fixture('one')
+    @project = Project.new(@path)
+    Dir.chdir @path
+  end
+
+  test "breadcrumbs" do
+    assert Page['/about/index.css'].breadcrumbs.is_a?(Hyde::Set)
+  end
+
+  test "children" do
+    assert Page['/'].children.is_a?(Hyde::Set)
+  end
+
+  test "siblings" do
+    assert Page['/about'].siblings.is_a?(Hyde::Set)
+  end
+
+  test "children" do
+    set = Page['/'].children.find(:hello => 'world')
+    assert set.map(&:path) == ['/hello.html']
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: hydeweb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Rico Sta. Cruz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 +08:00
+date: 2011-02-22 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,7 +91,9 @@ files:
 - lib/hyde/partial.rb
 - lib/hyde/project.rb
 - lib/hyde/server.rb
+- lib/hyde/set.rb
 - lib/hyde.rb
+- test/fixture/extensions/control/index.html
 - test/fixture/extensions/extensions/a/a.rb
 - test/fixture/extensions/hyde.conf
 - test/fixture/extensions/site/index.haml
@@ -100,6 +102,9 @@ files:
 - test/fixture/fail_type/control/index.html
 - test/fixture/fail_type/hyde.conf
 - test/fixture/fail_type/site/index.haml
+- test/fixture/html/control/index.html
+- test/fixture/html/hyde.conf
+- test/fixture/html/site/index.html
 - test/fixture/nested_layout/control/index.html
 - test/fixture/nested_layout/hyde.conf
 - test/fixture/nested_layout/layouts/default.haml
@@ -108,6 +113,7 @@ files:
 - test/fixture/one/control/about/index.css
 - test/fixture/one/control/about/us.html
 - test/fixture/one/control/cheers.html
+- test/fixture/one/control/css/bar.css
 - test/fixture/one/control/css/style.css
 - test/fixture/one/control/hello.html
 - test/fixture/one/control/hi.html
@@ -118,6 +124,7 @@ files:
 - test/fixture/one/site/about/index.scss
 - test/fixture/one/site/about/us.haml
 - test/fixture/one/site/cheers.html.haml
+- test/fixture/one/site/css/bar.scss
 - test/fixture/one/site/css/style.scss
 - test/fixture/one/site/hello.haml
 - test/fixture/one/site/hi.html
@@ -129,6 +136,9 @@ files:
 - test/fixture/parent/site/about/index.haml
 - test/fixture/parent/site/about/us.haml
 - test/fixture/parent/site/index.haml
+- test/fixture/sort/control/about/hardy.html
+- test/fixture/sort/control/about/intrepid.html
+- test/fixture/sort/control/about.html
 - test/fixture/sort/hyde.conf
 - test/fixture/sort/site/about/hardy.haml
 - test/fixture/sort/site/about/intrepid.haml
@@ -144,6 +154,7 @@ files:
 - test/unit/fixture_test.rb
 - test/unit/hyde_test.rb
 - test/unit/page_test.rb
+- test/unit/set_test.rb
 - data/new_site/_layouts/default.haml
 - data/new_site/config.ru
 - data/new_site/hyde.conf