hydeweb 0.0.8.pre2 → 0.1.0

data/lib/hyde/project.rb

@@ -1,223 +1,73 @@
-module Hyde
-  # TODO: This class is growing... time to refactor
-  class Project
-    include Hyde::Utils
-
-    # The filename of the configuration file, relative to the project root. (String)
-    #
-    attr :config_file
-
-    # The configuration k/v storage (OStruct)
-    #
-    attr_accessor :config
-
-    # The root path (String).
-    #
-    # @example
-    #   root
-    #   root :layouts
-    #   root :site, 'blah'
-    #
-    def root(*args)
-      where = ''
-      where = @config.send("#{args.shift.to_s}_path")  if args[0].class == Symbol
-      path = args
-      File.expand_path File.join([@root, where, path].reject { |s| s.empty? })
-    end
-
-    # Can raise a NoRootError
-    #
-    def initialize(root = Dir.pwd)
-      @config = OStruct.new defaults
-      @root, @config_file = find_root_from root
-      @config.merge! YAML::load_file(@config_file)
-
-      # Check for version
-      raise IncompatibleError, "This project requires at least Hyde v#{@config.hyde_requirement}." \
-        unless @config.hyde_requirement.nil? or \
-          ::Hyde.compatible_with?(@config.hyde_requirement)
-
-      load_extensions
-    end
-
-    # Returns an object in the project.
-    # Can be a page, layout, template...
-    #
-    # @example
-    #   @project['index.html']
-    #   @project['default', :Layout]
-    #   @project['widgets/sidebar', :Partial]
-    #
-    def [](name, default_class=Page)
-      default_class = ::Hyde.const_get(default_class)  if default_class.is_a? Symbol
-      Hyde::Page[name, self, default_class]
-    end
-
-    # Returns all pages.
-    #
-    # @example
-    #   @project.all                #=> [1, 2, 3]
-    #   @project.all(Hyde::Post)    #=> [1]
-    #
-    def all(type=nil)
-      unless type
-        @all = files.map { |f| self[f] }
-      else
-        all.select { |page| page.class == type }
-      end
-    end
-
-    # Writes the output files.
-    # @param
-    #   ostream    - (Stream) Where to send the messages
-    #
-    def build(ostream = nil)
-      if File.exists? root(:output)
-        raise Errno::EEXISTS  unless File.directory? root(:output)
-      else
-        Dir.mkdir root(:output)
-      end
-
-      begin
-        all.each do |page|
-          ostream << " * #{page.output_path}\n"  if ostream
-
-          begin
-            rendered = page.render
-            force_file_open(page.output_path) { |file| file << rendered }
-
-          rescue RenderError => e
-            ostream << " *** Error: #{e.to_s}".gsub("\n", "\n *** ") << "\n"
-          end
-        end
-
-      rescue NoGemError => e
-        ostream << " *** Error: #{e.message}\n"
-      end
-    end
-
-    # Returns a list of all URL paths
-    #
-    def files
-      @files = Dir[File.join(root(:site), '**', '*')].inject([]) do |a, match|
-        # Make sure its the canonical name
-        path = File.expand_path(match)
-        file = path.gsub /^#{Regexp.escape root(:site)}\/?/, ''
-        ext  = File.extname(file)[1..-1]
-        
-        if ignored_files.include?(path) or File.directory?(match)
-          # pass
-        elsif not get_renderer(ext).nil? # Has a renderer associated
-          fname = file.chomp(".#{ext}")
-          fname += get_renderer(ext).default_ext  unless File.basename(fname).include?('.')
-          a << fname
-        else
-          a << file
-        end
-        a
-      end
-    end
-
-    # Returns a list of file specs to be excluded from processing.
-    # @see {#ignored_files}
-    #
-    def ignore_list
-      @ignore_list ||= [
-        root(:layouts, '**/*'),
-        root(:extensions, '**/*'),
-        root(:output, '**/*'),
-        custom_ignored_files,
-        @config_file
-      ].flatten.uniq
-    end
-
-    def custom_ignored_files
-      list = @config.send("ignore")
-      return []  unless list.is_a?(Array)
-      Dir[*(list.map { |path| root(:site, path) })]
-    end
+class Hyde
+class Project
+  def initialize(root=Dir.pwd)
+    @root = root
+    $project = self
+
+    validate_version
+    load_extensions
+  end
 
-    # Returns a list of ignored files based on the {ignore_list}.
-    # TODO: This is innefficient... do it another way
-    #
-    def ignored_files
-      @ignored_files ||= ignore_list.inject([]) do |a, spec|
-        Dir[spec].each { |file| a << File.expand_path(file) }; a
-      end
+  def validate_version
+    return unless config_file?
+    req = config.hyde_requirement.to_s
+    if 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."
     end
+  end
 
-    def self.config_filenames
-      ['_config.yml', 'hyde.conf', '.hyderc']
-    end
+  def load_extensions
+    path = path(:extensions)
+    Dir[path(:extensions, '*', '*.rb')].each { |f| require f }  if path
+  end
 
-    protected
+  def config_file
+    try = lambda { |path| p = root(path); p if File.file?(p) }
+    try['hyde.conf'] || try['.hyderc']
+  end
 
-    # Looks for the hyde config file to determine the project root.
-    #
-    def find_root_from(start)
-      check = File.expand_path(start)
-      ret = nil
-      while ret.nil?
-        # See if any of these files exist
-        self.class.config_filenames.each do |config_name|
-          config_file = File.join(check, config_name)
-          ret ||= [check, config_file]  if File.exists? config_file
-        end
+  def config_file?
+    config_file
+  end
 
-        # Traverse back (die if we reach the root)
-        old_check = check
-        check = File.expand_path(File.join(check, '..'))
-        raise NoRootError  if check == old_check
-      end
-      ret
-    end
+  def config
+    @config ||= Config.load(config_file)
+  end
 
-    # Loads the ruby files in the extensions folder
-    #
-    def load_extensions
-      # Load the init.rb file
-      require root('init.rb')  if File.exists?(root('init.rb'))
+  # Returns the path for a certain aspect.
+  # @example path(:site)
+  def path(what, *a)
+    return nil unless [:output, :site, :layouts, :extensions, :partials].include?(what)
+    path = config.send(:"#{what}_path")
+    root path, *a  if path
+  end
 
-      # Load the gems in the config file
-      @config.gems.each { |gem| require gem }
+  def root(*args)
+    File.join @root, *(args.compact)
+  end
 
-      # Load the extensions
-      ext_roots = Dir[root(:extensions, '*')].select { |d| File.directory? d }
-      ext_roots.each do |dir|
-        ext = File.basename(dir)
+  def pages
+    files.map { |f| Page[f, self] }.compact
+  end
 
-        # 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 files
+    Dir[File.join(path(:site), '**', '*')] - ignored_files
+  end
 
-    def defaults
-      { 'layouts_path'    => 'layouts',
-        'extensions_path' => 'extensions',
-        'partials_path'   => 'layouts',
-        'site_path'       => 'site',
-        'output_path'     => 'public',
-        'port'            => 4833,
-        'gems'            => []
-      }
+  def ignored_files
+    specs  = [*config.ignore].map { |s| root(s) }
+    specs << config_file
+    [:layouts, :extensions, :partials, :output].each do |aspect|
+      specs << path(aspect, '**/*') if path(aspect)
     end
+    specs.compact.map { |s| Dir[s] }.flatten.uniq
+  end
 
-    # Returns the renderer associated with the given file extension.
-    #
-    def get_renderer(name)
-      begin
-        class_name = name.to_s.capitalize.to_sym
-        renderer = ::Hyde::Renderers.const_get(class_name)
-      rescue NameError
-        renderer = nil
-      end
-      renderer
-    end
+  def build_cleanup
+    FileUtils.rm_rf '.sass_cache'
   end
 end
+end
+

data/lib/hyde/server.rb

@@ -0,0 +1,57 @@
+require 'cuba'
+require 'rack'
+require 'hyde'
+
+class Hyde
+  Server = Cuba.dup
+
+  module Server; end
+
+  module Server::PageHelpers
+    def not_found
+      show_status nil
+      res.status = 404
+      res.write "404"
+    end
+
+    def show_status(page)
+      path = env['PATH_INFO']
+      return  if path == '/favicon.ico'
+
+      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?
+    end
+  end
+
+  module Hyde::Server
+    Ron.send :include, PageHelpers
+
+    define do
+      on default do
+        page = Hyde::Page[env['PATH_INFO']]  or break not_found
+        res.write page.to_html
+        show_status page
+      end
+    end
+  end
+end
+
+module Hyde::Server
+  # :Host, :Port
+  def self.run!(options={})
+    handler = rack_handler  or return false
+    handler.run self, options
+  end
+
+  def self.rack_handler
+    %w(thin mongrel webrick).each do |svr|
+      begin
+        return Rack::Handler.get(svr)
+      rescue LoadError
+      rescue NameError
+      end
+    end
+  end
+end

data/lib/hyde.rb

@@ -1,55 +1,32 @@
-require 'yaml'
-
-module Hyde
-  LIB_PATH = File.dirname(__FILE__)
-
-  autoload :OStruct,     "#{LIB_PATH}/hyde/ostruct"
-  autoload :Project,     "#{LIB_PATH}/hyde/project"
-  autoload :Layout,      "#{LIB_PATH}/hyde/layout"
-  autoload :Page,        "#{LIB_PATH}/hyde/page"
-  autoload :PageFactory, "#{LIB_PATH}/hyde/page_factory"
-  autoload :Renderer,    "#{LIB_PATH}/hyde/renderer"
-  autoload :Renderers,   "#{LIB_PATH}/hyde/renderers"
-  autoload :Utils,       "#{LIB_PATH}/hyde/utils"
-  autoload :Meta,        "#{LIB_PATH}/hyde/meta"
-  autoload :CLICommand,  "#{LIB_PATH}/hyde/clicommand"
-  autoload :CLICommands, "#{LIB_PATH}/hyde/clicommands"
-  autoload :Helpers,     "#{LIB_PATH}/hyde/helpers"
-  autoload :Partial,     "#{LIB_PATH}/hyde/partial"
+$:.push *Dir[File.expand_path('../../vendor/*/lib', __FILE__)]
 
-  Error = Class.new(::StandardError)
-  NoGemError        = Class.new(Error)
-  NotFound          = Class.new(Error)
-  NoRootError       = Class.new(Error) 
-  IncompatibleError = Class.new(Error)
+gem 'shake', '~> 0.1'
 
-  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
-
-  extend self
-
-  def version
-    @version ||= begin
-      v = File.open(File.join(File.dirname(__FILE__), '..', 'VERSION')) { |f| f.read.strip }
-      v = v.match(/^[0-9]+(\.[0-9]+){2}/)[0] rescue v
-    end
-  end
-
-  def compatible_with?(given_version)
-    Gem::Version.new(version) >= Gem::Version.new(given_version)
+require 'fileutils'
+require 'ostruct'
+require 'yaml'
+require 'tilt'
+require 'shake'
+
+class Hyde
+  VERSION = "0.1.0"
+  PREFIX  = File.expand_path('../', __FILE__)
+
+  Error        = Class.new(StandardError)
+  LegacyError  = Class.new(Error)
+  VersionError = Class.new(Error)
+  NoGemError   = Class.new(Error)
+
+  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 :Layout,  "#{PREFIX}/hyde/layout"
+  autoload :Partial, "#{PREFIX}/hyde/partial"
+  autoload :Helpers, "#{PREFIX}/hyde/helpers"
+
+  def self.version
+    VERSION
   end
 end

data/test/fixture/extensions/extensions/a/a.rb

@@ -0,0 +1 @@
+$extension_loaded = 'aoeu'

data/test/fixture/extensions/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/extensions/site/index.haml

@@ -0,0 +1 @@
+%h1 hey

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

@@ -0,0 +1,2 @@
+Parent:
+<a href='/index.html'>Back to parent</a>

data/test/fixture/fail_type/control/about/us.html

@@ -0,0 +1,2 @@
+Parent:
+<a href='/about/index.html'>Back to parent</a>

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

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

data/test/fixture/fail_type/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/fail_type/site/index.haml

@@ -0,0 +1,4 @@
+title: Hello there
+type: nonexistent
+--
+#ok

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

@@ -0,0 +1,2 @@
+<div id='default'><h1>Boo!</h1></div>
+<div id='number'>10</div>

data/test/fixture/nested_layout/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/nested_layout/layouts/default.haml

@@ -0,0 +1,2 @@
+#default!= yield
+#number!= page.ten

data/test/{fixtures/content_for/site/default.html.haml → fixture/nested_layout/layouts/post.haml}

@@ -1,2 +1,3 @@
 layout: default
 --
+%h1!= yield

data/test/fixture/nested_layout/site/index.haml

@@ -0,0 +1,4 @@
+layout: post
+ten: 10
+--
+Boo!

data/test/fixture/one/control/about/index.css

@@ -0,0 +1,2 @@
+div {
+  color: red; }

data/test/fixture/one/control/cheers.html

@@ -0,0 +1,5 @@
+<html>
+  <h1>Site</h1>
+  <hr />
+  <div id='content'>lo.</div>
+</html>

data/test/fixture/one/control/css/style.css

@@ -0,0 +1,2 @@
+dir {
+  color: #332211; }

data/test/fixture/one/control/hello.html

@@ -0,0 +1,5 @@
+<html>
+  <h1>Site</h1>
+  <hr />
+  <div id='content'><h1>Welcome!</h1></div>
+</html>

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

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

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

@@ -0,0 +1,7 @@
+<ul>
+  <li>Home</li>
+  <li>About us</li>
+</ul>
+<h2>Home page</h2>
+&lt;a&gt;
+<a>

data/test/fixture/one/hyde.conf

@@ -0,0 +1,9 @@
+hyde_requirement: "0.1"
+site_path: site
+layouts_path: layouts
+partials_path: partials
+output_path: public
+ignore:
+- **/*~
+- **/compass/**/*
+- **/_*.scss

data/test/fixture/one/layouts/default.haml

@@ -0,0 +1,4 @@
+%html
+  %h1 Site
+  %hr
+  #content!= yield

data/test/fixture/one/partials/menu.haml

@@ -0,0 +1,3 @@
+%ul
+  %li Home
+  %li About us

data/test/fixture/one/site/about/index.scss

@@ -0,0 +1 @@
+div { color: red; }

data/test/fixture/one/site/cheers.html.haml

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

data/test/fixture/one/site/css/style.scss

@@ -0,0 +1,2 @@
+$red: #321;
+dir { color: $red; }

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

@@ -0,0 +1 @@
+%h1 Welcome!

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

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

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

@@ -0,0 +1,7 @@
+layout: false
+lol: <a>
+--
+!= partial :'menu'
+%h2 Home page
+= page.meta.lol
+!= page.meta.lol

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

@@ -0,0 +1,2 @@
+Parent:
+<a href='/index.html'>Back to parent</a>

data/test/fixture/parent/control/about/us.html

@@ -0,0 +1,2 @@
+Parent:
+<a href='/about/index.html'>Back to parent</a>

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

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

data/test/fixture/parent/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/parent/site/about/index.haml

@@ -0,0 +1,3 @@
+Parent:
+- if parent
+  %a{href: parent.path} Back to parent

data/test/fixture/parent/site/about/us.haml

@@ -0,0 +1,3 @@
+Parent:
+- if parent
+  %a{href: parent.path} Back to parent

data/test/fixture/parent/site/index.haml

@@ -0,0 +1,3 @@
+title: Hello there
+--
+%h1 Yo

data/test/fixture/sort/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/sort/site/about/hardy.haml

@@ -0,0 +1,4 @@
+position: 2
+title: Two, hardy
+--
+="..."

data/test/fixture/sort/site/about/intrepid.haml

@@ -0,0 +1,4 @@
+position: 1
+title: One, intrepid
+--
+="..."

data/test/fixture/sort/site/about.haml

@@ -0,0 +1,3 @@
+- children.each do |p|
+  %li
+    %a{:href => p.path}= p

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

@@ -0,0 +1 @@
+<div id='post'><h1>hello-there</h1></div>

data/test/fixture/subclass/extensions/a/a.rb

@@ -0,0 +1,12 @@
+class Hyde::Page::Post < Hyde::Page
+  def css_class
+    title.downcase.gsub(' ', '-')
+  end
+
+  def default_layout
+    'post'  if html?
+  end
+
+  # Alias
+  ::Post = self
+end