hydeweb 0.1.0 → 0.1.1

data/HISTORY.md

@@ -1,3 +1,13 @@
+v0.1.1
+------
+
+ - Default project is now simpler. The site_path is `.`.
+ - Implement `Project#build`.
+ - If YAML parsing of page metadata fails, treat it as content.
+ - All options in `hyde.conf` are now optional (even `hyde_requirement`).
+ - Page metadata can now only be a hash.
+ - Fix `hyde start`.
+
 v0.1.0
 ------
 

data/Rakefile

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

data/data/new_site/hyde.conf

@@ -1,32 +1,23 @@
 # This is a Hyde site.
 # Install the `hydeweb` Ruby gem and type `hyde` for help.
-
 hyde_requirement: 0.1
 
-# Path options
-# -------------
-
-# The folder where the site's main files are kept. (you can set this to '.')
-site_path: site
-
-# The folder where the layout templates (and partials) are kept.
-layouts_path: layouts
-
-# The folder where the optional extensions are kept.
-extensions_path: extensions
-
-# The folder for partials.
-partials_path: layouts
+# The folder where the site's source files are kept.
+site_path:       .
+output_path:     _public
 
-# The folder where the HTML files are to be built when typing `hyde build`.
-output_path: public
+# Other paths:
+layouts_path:    _layouts
+extensions_path: _extensions
+partials_path:   _layouts
 
-# Any files matching these in the site_path will be excluded.
+# Files to be excluded from processing
 ignore:
 - **/*~
+- README*
 - **/_*.scss
 
-# Specify engine options here. These are optional.
+# Optional options for layout engines
 tilt_options:
   haml:
     :escape_html: true

data/lib/hyde/cli.rb

@@ -41,22 +41,25 @@ class CLI < Shake
     pre = project.config.output_path
 
     begin
-      project.pages.each { |page|
+      project.build { |page|
         handler = ''
         handler = "(#{page.tilt_engine_name})"  if page.tilt?
         puts ("\033[0;33m*\033[0;32m #{pre}\033[0;m%-50s%s" % [ page.path, handler ]).strip
-        page.write
       }
     rescue NoGemError => e
       err "Error: #{e.message}"
+    rescue Error => e
+      err "Error: #{e.message}"
     ensure
-      project.build_cleanup
+      project.send :build_cleanup
     end
   end
 
   task.description = "Builds the current project"
 
   task(:start) do
+    project
+
     port = (params.extract('-p') || 4833).to_i
     host = (params.extract('-o') || '0.0.0.0')
 

data/lib/hyde/config.rb

@@ -2,10 +2,10 @@ class Hyde
 class Config < OpenStruct
   DEFAULTS = {
     :site_path => '.',
-    :layouts_path => 'layouts',
+    :layouts_path => nil,
     :extensions_path => nil,
-    :partials_path => 'partials',
-    :output_path => 'public'
+    :partials_path => nil,
+    :output_path => nil
   }
 
   def self.load(config_file)

data/lib/hyde/page.rb

@@ -3,9 +3,44 @@ class Page
   attr_reader :project
   attr_reader :file
 
+  def self.[](id, project=$project)
+    site_path = root_path(project)
+    return nil  if site_path.nil?
+
+    site = lambda { |*x| File.join site_path, *(x.compact) }
+    try  = lambda { |id| p = new(id, project); p if p.exists? }
+
+    # Account for:
+    #   ~/mysite/site/about/us.html.haml
+    #   about/us.html.haml => ~/mysite/site/about/us.html.haml
+    #   about/us.html      => ~/mysite/site/about/us.html.*
+    #   about/us.html      => ~/mysite/site/about/us.*
+    #   about/us           => ~/mysite/site/about/us/index.*
+    #
+    page   = try[id]
+    page ||= try[site[id]]
+    page ||= try[Dir[site["#{id}.*"]].first]
+    page ||= try[Dir[site["#{id.to_s.sub(/\.[^\.]*/,'')}.*"]].first]
+    page ||= try[Dir[site[id, "index.*"]].first]
+
+    # Subclass
+    if page && page.tilt? && page.meta.type
+      klass = Page.get_type(page.meta.type)
+      raise Error, "#{page.filepath}: Class for type '#{page.meta.type}' not found"  unless klass
+      page = klass.new(id, project)
+    end
+    page
+  end
+
+  def initialize(file, project=$project)
+    @file = File.expand_path(file)  if file.is_a?(String)
+    @project = project
+    raise Error  if project.nil?
+  end
+
   # Returns the URL path for a page.
   def path
-    path = @file.sub(root_path, '')
+    path = @file.sub(File.expand_path(root_path), '')
 
     # if xx.haml (but not xx.html.haml), 
     if tilt?
@@ -16,6 +51,14 @@ class Page
     path
   end
 
+  # Returns a short filepath relative to the project path
+  def filepath
+    root = project.root
+    fpath = file
+    fpath = fpath[root.size..-1]  if fpath[0...root.size] == root
+    fpath
+  end
+
   def title
     (meta.title if tilt?) || path
   end
@@ -58,32 +101,6 @@ class Page
     end
   end
 
-  def self.[](id, project=$project)
-    site = lambda { |*x| File.join root_path(project), *(x.compact) }
-    try  = lambda { |id| p = new(id, project); p if p.exists? }
-
-    # Account for:
-    #   ~/mysite/site/about/us.html.haml
-    #   about/us.html.haml => ~/mysite/site/about/us.html.haml
-    #   about/us.html      => ~/mysite/site/about/us.html.*
-    #   about/us.html      => ~/mysite/site/about/us.*
-    #   about/us           => ~/mysite/site/about/us/index.*
-    #
-    page   = try[id]
-    page ||= try[site[id]]
-    page ||= try[Dir[site["#{id}.*"]].first]
-    page ||= try[Dir[site["#{id.to_s.sub(/\.[^\.]*/,'')}.*"]].first]
-    page ||= try[Dir[site[id, "index.*"]].first]
-
-    # Subclass
-    if page && page.tilt? && page.meta.type
-      klass = Page.get_type(page.meta.type)
-      raise Error, "Class for type '#{page.meta.type}' not found"  unless klass
-      page = klass.new(id, project)
-    end
-    page
-  end
-
   # Returns a page subtype.
   # @example Page.get_type('post') => Hyde::Page::Post
   def self.get_type(type)
@@ -92,12 +109,6 @@ class Page
     self.const_get(klass)  if self.const_defined?(klass)
   end
 
-  def initialize(file, project=$project)
-    @file = file
-    @project = project
-    raise Error  if project.nil?
-  end
-
   def exists?
     @file and File.file?(@file) and valid?
   end
@@ -139,7 +150,7 @@ class Page
   end
 
   def meta
-    @meta ||= Meta.new(YAML::load(parts.first))
+    @meta ||= Meta.new(parts.first)
   end
 
   # Writes to the given output file.
@@ -242,7 +253,16 @@ protected
     @parts ||= begin
       t = File.open(@file).read.force_encoding('UTF-8')
       m = t.match(/^(.*)--+\n(.*)$/m)
-      m.nil? ? ['', t] : [m[1], m[2]]
+
+      if m.nil?
+        [{}, t]
+      else
+        data = YAML::load(m[1])
+        raise ArgumentError unless data.is_a?(Hash)
+        [data, m[2]]
+      end
+    rescue ArgumentError
+      [{}, t]
     end
   end
 

data/lib/hyde/project.rb

@@ -11,7 +11,8 @@ class Project
   def validate_version
     return unless config_file?
     req = config.hyde_requirement.to_s
-    if req < "0.1"
+    if req.empty?
+    elsif req < "0.1"
       raise LegacyError, "This is a legacy project"
     elsif req > Hyde.version
       raise VersionError, "You will need Hyde version >= #{req} for this project."
@@ -53,7 +54,10 @@ class Project
   end
 
   def files
-    Dir[File.join(path(:site), '**', '*')] - ignored_files
+    files = Dir[File.join(path(:site), '**', '*')]
+    files = files.select { |f| File.file?(f) }
+    files = files.map { |f| File.expand_path(f) }
+    files - ignored_files
   end
 
   def ignored_files
@@ -65,6 +69,16 @@ class Project
     specs.compact.map { |s| Dir[s] }.flatten.uniq
   end
 
+  def build(&blk)
+    pages.each do |page|
+      yield page
+      page.write
+    end
+  ensure
+    build_cleanup
+  end
+
+protected
   def build_cleanup
     FileUtils.rm_rf '.sass_cache'
   end

data/lib/hyde/server.rb

@@ -21,7 +21,7 @@ class Hyde
       status = page ? "\033[0;32m[ OK ]" : "\033[0;31m[404 ]"
       verb = get ? 'GET ' : (post ? 'POST' : '')
       puts "%s\033[0;m %s %s" % [ status, verb, env['PATH_INFO'] ]
-      puts "       Source: #{page.file.sub(page.project.path(:site), '')} (#{page.tilt_engine_name})"  if page.tilt?
+      puts "       src: #{page.filepath} (#{page.tilt_engine_name})"  if page.tilt?
     end
   end
 
@@ -30,9 +30,14 @@ class Hyde
 
     define do
       on default do
-        page = Hyde::Page[env['PATH_INFO']]  or break not_found
-        res.write page.to_html
-        show_status page
+        begin
+          page = Hyde::Page[env['PATH_INFO']]  or break not_found
+          res['Content-Type'] = page.mime_type
+          res.write page.to_html
+          show_status page
+        rescue => e
+          res.write "<h1>#{e.class}: #{e.message}</h1><ul>#{e.backtrace.map{|l|"<li>#{l}</li>"}.join('')}</ul>"
+        end
       end
     end
   end

data/lib/hyde.rb

@@ -9,7 +9,7 @@ require 'tilt'
 require 'shake'
 
 class Hyde
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
   PREFIX  = File.expand_path('../', __FILE__)
 
   Error        = Class.new(StandardError)

data/test/fixture/nested_layout/hyde.conf

@@ -1,6 +1,7 @@
 hyde_requirement: 0.1
 site_path: site
 extensions_path: extensions
+layouts_path: layouts
 output_path: public
 ignore:
 - **/*~

data/test/fixture/subclass/hyde.conf

@@ -2,6 +2,7 @@ hyde_requirement: 0.1
 site_path: site
 extensions_path: extensions
 output_path: public
+layouts_path: layouts
 ignore:
 - **/*~
 - **/compass/**/*

metadata

@@ -2,7 +2,7 @@
 name: hydeweb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Rico Sta. Cruz
@@ -141,10 +141,10 @@ files:
 - test/unit/extensions_test.rb
 - test/unit/fixture_test.rb
 - test/unit/hyde_test.rb
+- data/new_site/_layouts/default.haml
 - data/new_site/hyde.conf
-- data/new_site/layouts/default.haml
+- data/new_site/index.haml
 - data/new_site/README.md
-- data/new_site/site/index.html.haml
 - HISTORY.md
 - README.md
 - Rakefile