hydeweb 0.0.1.pre5 → 0.0.2.pre

data/README.md

@@ -18,12 +18,12 @@ To do
 -----
 
  - partials support
- - extensions support
  - _meta.yml 
 
 Done:
 
  - hyde build
+ - extensions support
  - hyde gen
  - more renderers
    - less

data/VERSION

@@ -1 +1 @@
-0.0.1.pre5
+0.0.2.pre

data/bin/hyde

@@ -6,6 +6,11 @@ require 'optparse'
 require 'rubygems'
 require 'hyde'
 
+# This will load the extensions
+begin
+  $project = Hyde::Project.new
+rescue Hyde::NoRootError; end
+
 if ARGV.size == 0
   Hyde::CLICommands::Help.run
   exit

data/data/new_site/README.md

@@ -8,7 +8,7 @@ Instructions
 ------------
 
  1. Make sure Ruby (>= v1.8) is installed.
- 2. Install the hydeweb gem: `gem install hydeweb`
+ 2. Install the hydeweb gem: `gem install hydeweb --pre`
  3. Build the site HTML files by typing: `hyde build`
 
  You may also type `hyde serve` to serve the files in a local web server.

data/data/new_site/{_config.yml → hyde.conf}

@@ -15,3 +15,9 @@ extensions_path: extensions
 
 # The folder where the HTML files are to be built when typing `hyde build`.
 output_path: public
+
+# Put any custom gems here.
+# gems:
+# - hyde-rst
+# - hyde-minify
+# - hyde-zip

data/docs/ExtendingHyde.md

@@ -0,0 +1,9 @@
+Extending Hyde
+==============
+
+Adding commands
+---------------
+
+Adding parsers
+--------------
+

data/docs/GettingStarted.md

@@ -0,0 +1,2 @@
+Getting started
+===============

data/lib/hyde/clicommand.rb

@@ -11,6 +11,7 @@ module Hyde
     end
 
     def self.help
+      log "Usage: hyde #{self.to_s.downcase.split(':')[-1]}"
       log "No help for this command."
     end
 
@@ -19,12 +20,12 @@ module Hyde
     end
 
     def self.project
-      begin
-        Hyde::Project.new
-      rescue NoRootError
-        ostream << "No Hyde config file found. (looking for: hyde.conf, _config.yml)\n"
+      if $project.nil?
+        log "Error: Hyde config file not found. (looking for: hyde.conf, _config.yml)"
+        log "Run this command in a Hyde project directory.\nTo start a new Hyde project, type `hyde create <name>`"
         exit
       end
+      $project
     end
 
     def self.desc(str)

data/lib/hyde/project.rb

@@ -1,4 +1,5 @@
 module Hyde
+  # TODO: This class is growing... time to refactor
   class Project
     include Hyde::Utils
 
@@ -24,26 +25,47 @@ module Hyde
       @config = OStruct.new defaults
       @root, @config_file = find_root_from root
       @config.merge! YAML::load_file(@config_file)  if File.exists? @config_file
+      load_extensions
     end
 
     def find_root_from(start)
-      root = File.expand_path(start)
+      check = File.expand_path(start)
       ret = nil
       while ret.nil?
         # See if any of these files exist
         ['_config.yml', 'hyde.conf'].each do |config_name|
-          config_file = File.join(root, config_name)
-          ret ||= [root, config_file]  if File.exists? config_file
+          config_file = File.join(check, config_name)
+          ret ||= [check, config_file]  if File.exists? config_file
         end
 
         # Traverse back (die if we reach the root)
-        old_root = root
-        root = File.expand_path(File.join(root, '..'))
-        raise NoRootError  if root == old_root
+        old_check = check
+        check = File.expand_path(File.join(check, '..'))
+        raise NoRootError  if check == old_check
       end
       ret
     end
 
+    def load_extensions
+      @config.gems.each do |gem|
+        require gem
+      end
+
+      ext_roots = Dir[root :extensions, '*'].select { |d| File.directory? d }
+      ext_roots.each do |dir|
+        ext = File.basename(dir)
+
+        # Try extensions/name/name.rb
+        # Try extensions/name/lib/name.rb
+        ext_files = [
+          File.join(dir, "#{ext}.rb"),
+          File.join(dir, 'lib', "#{ext}.rb")
+        ]
+        ext_files.reject! { |f| not File.exists? f }
+        require ext_files[0]  if ext_files[0]
+      end
+    end
+
     def method_missing(meth, *args, &blk)
       raise NoMethodError, "No method `#{meth}`"  unless @config.include?(meth)
       @config.send meth
@@ -82,7 +104,7 @@ module Hyde
             mfile << rendered
             mfile.close
           rescue RenderError => e
-            ostream << " *** Error: #{e.message}".gsub("\n", "\n *** ") << "\n"
+            ostream << " *** Error: #{e.to_s}".gsub("\n", "\n *** ") << "\n"
           end
         end
       rescue NoGemError => e
@@ -131,7 +153,8 @@ module Hyde
       { 'layouts_path'    => 'layouts',
         'extensions_path' => 'extensions',
         'site_path'       => 'site',
-        'output_path'     => 'public'
+        'output_path'     => 'public',
+        'gems'            => []
       }
     end
 

data/lib/hyde/renderer.rb

@@ -48,7 +48,7 @@ module Hyde
         scope_object.instance_eval do
           def eval_block(src, &block)
             # This will let you eval something, and `yield` within that block.
-            eval src
+            eval src, &block
           end
           extend Hyde::TemplateHelpers
         end

data/lib/hyde/renderers.rb

@@ -3,8 +3,12 @@ module Hyde
     class Haml < Renderer::Parsable
       def evaluate(scope, data={}, &block)
         require_lib 'haml'
-        @engine = ::Haml::Engine.new(markup, {})
-        @engine.render scope, data, &block
+        begin
+          @engine = ::Haml::Engine.new(markup, {})
+          @engine.render scope, data, &block
+        rescue ::Haml::SyntaxError => e
+          raise Hyde::RenderError.new(e.message, :line => e.line)
+        end
       end
     end
 
@@ -12,7 +16,6 @@ module Hyde
       def evaluate(scope, data={}, &block)
         require_lib 'erb'
         @engine = ::ERB.new markup
-        # So that we can yield!
         eval("self", scope).eval_block @engine.src, &block
       end
     end
@@ -24,7 +27,10 @@ module Hyde
           @engine = ::Less::Engine.new(File.open(filename))
           @engine.to_css
         rescue ::Less::SyntaxError => e
-          raise Hyde::RenderError, e.message
+          matches = /^on line ([0-9]+): (.*)$/.match(e.message)
+          line    = matches[1]
+          message = matches[2]
+          raise Hyde::RenderError.new(message, :line => line)
         end
       end
     end

data/lib/hyde.rb

@@ -15,8 +15,24 @@ module Hyde
   autoload :TemplateHelpers,"#{prefix}/hyde/template_helpers"
 
   Error = Class.new(::StandardError)
-  RenderError = Class.new(Error)
   NoGemError  = Class.new(Error)
   NotFound    = Class.new(Error)
   NoRootError = Class.new(Error) 
+
+  class RenderError < Error
+    attr_accessor :message
+    attr_accessor :line
+
+    def initialize(msg, *args)
+      @message = msg
+      a = args.inject({}) { |a, i| a.merge! i  if i.is_a? Hash; a }
+      @line = a[:line]  if a[:line]
+    end
+
+    def to_s
+      @line ?
+        "line #{@line}: #{@message}" :
+        "#{@message}"
+    end
+  end
 end

data/test/test_all_fixtures.rb

@@ -18,23 +18,23 @@ class TestAllFixtures < Test::Unit::TestCase
 
   def self.all_sites
     @@sites ||= Dir["#{@@root}/*"] \
-      .reject { |f| not Dir.exists? f } \
+      .select { |f| File.directory? f } \
       .map    { |f| File.basename(f) }
   end
 
   all_sites.each do |site|
     describe "Test `#{site}`" do
-      should "Build it properly and have identical files to the control" do
+      should "Build #{site} properly and have identical files to the control" do
         @project = Hyde::Project.new File.join(@@root, site)
         @project.build
 
         unknown_root = @project.root :site
         control_root = @project.root 'www_control'
 
-        if not Dir.exists? control_root
+        if not File.directory? control_root
           flunk "No www_control"
         else
-          @project.files.reject { |f| not Dir.exists? f }.each do |path|
+          @project.files.select { |f| File.directory? f }.each do |path|
             unknown = File.open(File.join(unknown_root, path)).read
             control = File.open(File.join(control_root, path)).read
 

data/test/test_utils.rb

@@ -15,8 +15,8 @@ class TestUtils < Test::Unit::TestCase
 
   should "force_file_open" do
     f = force_file_open File.join(@pwd, 'bbb/ccc/test.txt')
-    assert Dir.exists? 'bbb'
-    assert Dir.exists? 'bbb/ccc'
+    assert File.directory? 'bbb'
+    assert File.directory? 'bbb/ccc'
     assert File.exists? 'bbb/ccc/test.txt'
   end
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  - pre5
-  version: 0.0.1.pre5
+  - 2
+  - pre
+  version: 0.0.2.pre
 platform: ruby
 authors: 
 - Rico Sta. Cruz
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-30 00:00:00 +08:00
+date: 2010-05-01 00:00:00 +08:00
 default_executable: hyde
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,9 +80,11 @@ files:
 - bin/hyde
 - data/new_site/.gitignore
 - data/new_site/README.md
-- data/new_site/_config.yml
+- data/new_site/hyde.conf
 - data/new_site/layouts/default.haml
 - data/new_site/site/index.html.haml
+- docs/ExtendingHyde.md
+- docs/GettingStarted.md
 - lib/hyde.rb
 - lib/hyde/clicommand.rb
 - lib/hyde/clicommands.rb