hydeweb 0.0.8.pre2 → 0.1.0

data/{CHANGELOG → HISTORY.md}

@@ -1,3 +1,9 @@
+v0.1.0
+------
+
+ - Complete rewrite. Many thing have been deprecated.
+ - Now uses Tilt and Shake.
+
 v0.0.8
 ------
 

data/Rakefile

@@ -1,55 +1,5 @@
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name        = "hydeweb"
-    s.authors     = ["Rico Sta. Cruz", "Sinefunc, Inc."]
-    s.email       = "rico@sinefunc.com"
-    s.summary     = "Website preprocessor"
-    s.homepage    = "http://github.com/sinefunc/hyde"
-    s.description = "Website preprocessor"
-    s.add_dependency('sinatra', '>= 1.0.0')
-    s.add_dependency('less', '>= 1.2.21')
-    s.add_dependency('haml', '>= 2.2.20')
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+task :test do
+  Dir['test/**/*_test.rb'].each { |f| load f }
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "Hyde #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-task :autotest do
-  system "rstakeout 'rake test' **/*.rb"
-end

data/bin/hyde

@@ -1,27 +1,7 @@
 #!/usr/bin/env ruby
-lib_path = File.dirname(__FILE__) + "/../lib"
-$:.unshift lib_path
+$:.push File.expand_path('../../lib', __FILE__)
 
-require 'optparse'
-require 'rubygems'
 require 'hyde'
 
-# This will load the extensions
-begin
-  $project = Hyde::Project.new
-
-rescue Hyde::IncompatibleError => e
-  $stderr << e.message << "\n"
-  exit
-
-rescue Hyde::NoRootError; end
-
-if ARGV.size == 0
-  Hyde::CLICommands::Help.run
-  exit
-end
-
-# Can error
-controller = Hyde::CLICommands.get_controller ARGV[0]
-params = ARGV[1..-1]
-controller.run(*params)
+hydefile = Hyde::CLI.find_in_project('hyde.conf')
+Hyde::CLI.run! :file => hydefile

data/bin/hyde01

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+$:.push File.expand_path('../../lib', __FILE__)
+
+require 'hyde'
+
+hydefile = Hyde::CLI.find_in_project('hyde.conf')
+Hyde::CLI.run! :file => hydefile

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 --pre`
+ 2. Install the hydeweb gem: `gem install hydeweb --pre -v "~> 0.1"`
  3. Build the site HTML files by typing: `hyde build`
 
  You may also type `hyde start` to serve the files in a local web server.

data/data/new_site/hyde.conf

@@ -1,7 +1,7 @@
 # This is a Hyde site.
 # Install the `hydeweb` Ruby gem and type `hyde` for help.
 
-hyde_requirement: 0.0.5
+hyde_requirement: 0.1
 
 # Path options
 # -------------
@@ -24,9 +24,12 @@ output_path: public
 # Any files matching these in the site_path will be excluded.
 ignore:
 - **/*~
+- **/_*.scss
+
+# Specify engine options here. These are optional.
+tilt_options:
+  haml:
+    :escape_html: true
+  scss:
+    :load_paths: [ 'site/css' ]
 
-# Put any custom gems here.
-# gems:
-# - hyde-rst
-# - hyde-minify
-# - hyde-zip

data/lib/hyde/cli/helpers.rb

@@ -0,0 +1,40 @@
+class Hyde
+class CLI
+module Helpers
+  def say_info(str)
+    say_status '*', str, 30
+  end
+
+  def say_status(what, cmd, color=32)
+    c1 = "\033[0;#{color}m"
+    c0 = "\033[0;m"
+    puts "#{c1}%10s#{c0}  %s" % [ what, cmd ]
+  end
+
+  def no_project
+    "No project file here."
+  end
+
+  def project
+    @project ||= begin
+      pass no_project unless @hydefile
+      Dir.chdir File.dirname(@hydefile)
+
+      begin
+        project = Hyde::Project.new
+        pass no_project  unless project.config_file?
+      rescue LegacyError
+        err "This is a legacy Hyde project."
+        err "To force it, try editing `hyde.conf` and upgrade the version line to `hyde_requirement: 0.1`."
+        pass
+      rescue VersionError => e
+        err e.message
+        pass
+      end
+
+      project
+    end
+  end
+end
+end
+end

data/lib/hyde/cli.rb

@@ -0,0 +1,86 @@
+class Hyde
+class CLI < Shake
+  autoload :Helpers, "#{PREFIX}/hyde/cli/helpers"
+
+  extend  Helpers
+  include Defaults
+
+  task(:create) do
+    wrong_usage  unless params.size == 1
+
+    template = File.expand_path('../../../data/new_site', __FILE__)
+    target   = params.first
+
+    pass "Error: target directory already exists."  if File.directory?(target)
+
+    puts "Creating files in #{target}:"
+    puts
+
+    FileUtils.cp_r template, target
+    Dir[File.join(target, '**', '*')].sort.each do |f|
+      say_status :create, f  if File.file?(f)
+    end
+
+    puts ""
+    puts "Done! You've created a new project in #{target}."
+    puts "Get started now:"
+    puts ""
+    puts "  $ cd #{target}"
+    puts "  $ #{executable} start"
+    puts ""
+    puts "Or build the HTML files:"
+    puts ""
+    puts "  $ #{executable} build"
+    puts ""
+  end
+
+  task.description = "Starts a new Hyde project"
+  task.usage = "create NAME"
+
+  task(:build) do
+    pre = project.config.output_path
+
+    begin
+      project.pages.each { |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}"
+    ensure
+      project.build_cleanup
+    end
+  end
+
+  task.description = "Builds the current project"
+
+  task(:start) do
+    port = (params.extract('-p') || 4833).to_i
+    host = (params.extract('-o') || '0.0.0.0')
+
+    require 'hyde/server'
+
+    Hyde::Server.run! :Host => host, :Port => port
+  end
+
+  task.description = "Starts the server"
+
+  task(:version) do
+    puts "Hyde #{Hyde::VERSION}"
+  end
+
+  task.description = "Shows the current version"
+
+  def self.run!(options={})
+    @hydefile = options[:file]
+    return invoke(:version)  if ARGV == ['-v']
+    return invoke(:version)  if ARGV == ['--version']
+
+    begin
+      super *[]
+    end
+  end
+end
+end

data/lib/hyde/config.rb

@@ -0,0 +1,37 @@
+class Hyde
+class Config < OpenStruct
+  DEFAULTS = {
+    :site_path => '.',
+    :layouts_path => 'layouts',
+    :extensions_path => nil,
+    :partials_path => 'partials',
+    :output_path => 'public'
+  }
+
+  def self.load(config_file)
+    new(YAML::load_file(config_file)) rescue new
+  end
+
+  def initialize(options={})
+    super DEFAULTS.merge(options)
+  end
+
+  # Returns tilt options for a given file.
+  # @example tilt_options('index.haml')  # { :escape_html => ... }
+  def tilt_options_for(file)
+    tilt_options file.split('.').last.downcase
+  end
+
+  # Returns tilt options for a given engine.
+  # @example tilt_options('haml')  # { :escape_html => ... }
+  def tilt_options(what)
+    @tilt_options ||= begin
+      o = @table[:tilt_options] || Hash.new
+      o['haml'] ||= { :escape_html => true }
+      o
+    end
+
+    @tilt_options[what.to_s]
+  end
+end
+end

data/lib/hyde/helpers.rb

@@ -1,49 +1,8 @@
-module Hyde
-  module Helpers
-    def partial(partial_path, locals = {})
-      begin
-        p = project[partial_path.to_s, :Partial]
-        p.referrer = (referrer || self)
-        p.render locals
-
-      rescue ::Hyde::NotFound
-        "<!-- Can't find #{partial_path.to_s} -->"
-      end
-    end
-
-    def content_for(key, &block)
-      content_block[key.to_sym] = block
-    end
-
-    def has_content?(key)
-      content_block.keys.include? key.to_sym
-    end
-
-    def yield_content(key, *args, &default_block)
-      block = content_block[key.to_sym]
-
-      if respond_to?(:block_is_haml?) && block_is_haml?(block)
-        capture_haml *args, &block
-
-      elsif block.respond_to?(:call)
-        block.call *args
-
-      elsif block_given? and respond_to(:block_is_haml?) and block_is_haml?(default_block)
-        capture_haml *args, &default_block
-
-      elsif block_given?
-        yield
-
-      else
-        ''
-      end
-    end
-
-  protected
-    def content_block
-      file_key = (referrer || self).to_sym
-      @@content_blocks ||= Hash.new
-      @@content_blocks[file_key] ||= Hash.new
-    end
+class Hyde
+module Helpers
+  def partial(path, locals={})
+    partial = Partial[path.to_s, page]  or return ''
+    partial.to_html :page => self
   end
 end
+end

data/lib/hyde/layout.rb

@@ -1,12 +1,20 @@
-module Hyde
-  class Layout < Page
-    def self.get_filename(path, project)
-      project.root(:layouts, path)
-    end
+class Hyde
+class Layout < Page
+  attr_accessor :page
 
-    def layout
-      # Don't try a default layout.
-      @layout
-    end
+  def self.[](id, page)
+    object = super(id, page.project)
+    object.page = page  if object
+    object
   end
+
+protected
+  def self.root_path(project, *a)
+    project.path(:layouts, *a)
+  end
+
+  def default_layout
+    nil
+  end
+end
 end

data/lib/hyde/meta.rb

@@ -1,23 +1,7 @@
-module Hyde
-  class Meta < OStruct
-    attr_reader :page
-
-    def initialize(page)
-      @page = page
-      super nil
-    end
-
-    def |(data)
-      # TODO: Consider OStruct here?
-      @table.merge data  #if data.is_a? Hash
-    end
-
-    def layout=(value)
-      super value
-      if value.is_a?(String)
-        @page.layout = @page.project[value, :Layout]
-        @page.layout.referrer = (page.referrer || page)
-      end
-    end
+class Hyde
+class Meta < OpenStruct
+  def merge!(hash)
+    @table.merge(hash)
   end
 end
+end