hydeweb 0.0.8.pre2 → 0.1.0

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

@@ -0,0 +1 @@
+Wrong!

data/test/fixture/subclass/layouts/post.haml

@@ -0,0 +1 @@
+#post!= yield

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

@@ -0,0 +1,4 @@
+title: Hello there
+type: post
+--
+%h1= page.css_class

data/test/helper.rb

@@ -1,31 +1,25 @@
-require 'rubygems'
-require 'test/unit'
-require 'contest'
+$:.push File.expand_path('../../lib', __FILE__)
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'hyde'
+require 'contest'
 
-class Test::Unit::TestCase
-  include Hyde::Utils
-  def assert_same_file(a, b)
-    assert same_file?(a, b)
-  end
+# Unpack
+Page    = Hyde::Page
+Project = Hyde::Project
 
-  def get_project(site)
-    Hyde::Project.new fixture(site)
+class TestCase < Test::Unit::TestCase
+  def fixture(*a)
+    path = File.expand_path('../fixture', __FILE__)
+    File.join path, *a
   end
 
-  def fixture(site)
-    File.join File.dirname(__FILE__), 'fixtures', site
+  def build(path)
+    @project = Hyde::Project.new(path)
+    @project.pages.each { |p| p.write }
+    @project
   end
-end
 
-module Hyde
-  class Project
-    # Can throw a NotFound. Get rid of this!
-    def render(path)
-      self[path].render
-    end
+  def unbuild(project=@project)
+    FileUtils.rm_rf project.path(:output)
   end
 end

data/test/unit/extensions_test.rb

@@ -0,0 +1,16 @@
+require File.expand_path('../../helper', __FILE__)
+
+class ExtensionsTest < TestCase
+  setup do
+    $extension_loaded = nil
+    @project = build fixture('extensions')
+  end
+
+  teardown do
+    unbuild @project
+  end
+
+  test "extensions" do
+    assert $extension_loaded == "aoeu"
+  end
+end

data/test/unit/fixture_test.rb

@@ -0,0 +1,77 @@
+require File.expand_path('../../helper', __FILE__)
+
+class HydeTest < TestCase
+  def assert_fixture_works(path)
+    build_fixture(path) { |control, var|
+      assert File.exists?(var)
+      if read(control) != read(var)
+        flunk "Failed in #{var}\n" +
+          "Control:\n" +
+          read(control).gsub(/^/, '|    ') + "\n\n" + 
+          "Variable:\n" +
+          read(var).gsub(/^/, '|    ')
+      end
+    }
+  end
+
+  def assert_fixture_fails(path, error=Hyde::Error, &blk)
+    begin
+      build_fixture(path)
+    rescue error => e
+      yield e
+    else
+      flunk "Assertion failed"
+    end
+  end
+
+
+  def build_fixture(path, &blk)
+    # Build
+    project = build path
+
+    Dir[project.root('control/**/*')].each do |control|
+      next  unless File.file?(control)
+      var = control.sub('/control/', '/public/')
+      yield control, var
+    end   if block_given?
+  end
+
+  def read(file)
+    File.open(file) { |f| f.read }
+  end
+
+  teardown do
+    # Remove the generated
+    Dir[fixture('*', 'public')].each { |dir| FileUtils.rm_rf dir }
+  end
+
+  test "fixture one" do
+    assert_fixture_works fixture('one')
+  end
+
+  test "fixture subclass" do
+    assert_fixture_works fixture('subclass')
+  end
+
+  test "fixture extensions" do
+    assert_fixture_works fixture('extensions')
+  end
+
+  test "fixture parent" do
+    assert_fixture_works fixture('parent')
+  end
+
+  test "fixture sort" do
+    assert_fixture_works fixture('sort')
+  end
+
+  test "fixture nested_layout" do
+    assert_fixture_works fixture('nested_layout')
+  end
+
+  test "fixture fail_type" do
+    assert_fixture_fails(fixture('fail_type')) { |e|
+      assert e.message.include?('nonexistent')
+    }
+  end
+end

data/test/unit/hyde_test.rb

@@ -0,0 +1,30 @@
+require File.expand_path('../../helper', __FILE__)
+
+class HydeTest < TestCase
+  setup do
+    @path = fixture('one')
+    @project = Project.new(@path)
+    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
+
+  test "accessible" do
+    site = lambda { |*a| File.join(@path, 'site', *a) }
+
+    # site/hi.html
+    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['/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']
+    assert_equal Page['/'].file,              site['/index.haml']
+  end
+end

metadata

@@ -1,55 +1,38 @@
 --- !ruby/object:Gem::Specification 
 name: hydeweb
 version: !ruby/object:Gem::Version 
-  hash: -1876988223
-  prerelease: true
-  segments: 
-  - 0
-  - 0
-  - 8
-  - pre2
-  version: 0.0.8.pre2
+  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors: 
 - Rico Sta. Cruz
-- Sinefunc, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 +08:00
-default_executable: hyde
+date: 2011-02-20 00:00:00 +08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: shake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: "0.1"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: less
+  name: tilt
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
-        segments: 
-        - 1
-        - 2
-        - 21
-        version: 1.2.21
+        version: 1.2.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -60,126 +43,112 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 2
-        - 20
-        version: 2.2.20
-  type: :runtime
+        version: "0"
+  type: :development
   version_requirements: *id003
-description: Website preprocessor
-email: rico@sinefunc.com
+- !ruby/object:Gem::Dependency 
+  name: less
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: maruku
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id005
+description: Hyde lets you create static websites from a bunch of files written in HAML, Textile, Sass, or any other.
+email: 
+- rico@sinefunc.com
 executables: 
 - hyde
+- hyde01
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
-- .yardopts
-- AUTHORS
-- CHANGELOG
-- LICENSE
-- README.md
-- Rakefile
-- VERSION
 - bin/hyde
-- data/new_site/.gitignore
-- data/new_site/README.md
-- data/new_site/hyde.conf
-- data/new_site/layouts/default.haml
-- data/new_site/site/index.html.haml
-- data/pages/404.html
-- hydeweb.gemspec
-- lib/hyde.rb
-- lib/hyde/clicommand.rb
-- lib/hyde/clicommands.rb
+- bin/hyde01
+- lib/hyde/cli/helpers.rb
+- lib/hyde/cli.rb
+- lib/hyde/config.rb
 - lib/hyde/helpers.rb
 - lib/hyde/layout.rb
 - lib/hyde/meta.rb
-- lib/hyde/ostruct.rb
 - lib/hyde/page.rb
-- lib/hyde/page_factory.rb
 - lib/hyde/partial.rb
 - lib/hyde/project.rb
-- lib/hyde/renderer.rb
-- lib/hyde/renderers.rb
-- lib/hyde/sinatra/init.rb
-- lib/hyde/utils.rb
-- lib/hyde_misc/console.rb
-- manual/Extending/ExtendingHyde.md
-- manual/Hyde.md
-- manual/Introduction/Configuration.md
-- manual/Introduction/GettingStarted.md
-- manual/Introduction/Installation.md
-- manual/Introduction/Layouts.md
-- manual/Introduction/Metadata.md
-- manual/Introduction/Partials.md
-- manual/Introduction/TemplateLanguages.md
-- manual/Tips/Tips.md
-- test/fixtures/content_for/_config.yml
-- test/fixtures/content_for/layouts/cf-args.haml
-- test/fixtures/content_for/layouts/cf.haml
-- test/fixtures/content_for/layouts/default.haml
-- test/fixtures/content_for/layouts/shared/test.haml
-- test/fixtures/content_for/site/cf-args-default.haml
-- test/fixtures/content_for/site/cf-args.haml
-- test/fixtures/content_for/site/cf.haml
-- test/fixtures/content_for/site/cf2.haml
-- test/fixtures/content_for/site/default.html.haml
-- test/fixtures/content_for/site/index.html.haml
-- test/fixtures/content_for/site/var.html.haml
-- test/fixtures/content_for/www_control/cf-args-default.html
-- test/fixtures/content_for/www_control/cf-args.html
-- test/fixtures/content_for/www_control/cf.html
-- test/fixtures/content_for/www_control/cf2.html
-- test/fixtures/content_for/www_control/default.html
-- test/fixtures/content_for/www_control/index.html
-- test/fixtures/content_for/www_control/var.html
-- test/fixtures/custom/_config.yml
-- test/fixtures/custom/extensions/custom/custom.rb
-- test/fixtures/custom/layouts/default.haml
-- test/fixtures/custom/layouts/erbtest.erb
-- test/fixtures/custom/layouts/shared/sidebar.haml
-- test/fixtures/custom/site/about/index.html
-- test/fixtures/custom/site/assets/common.css.less
-- test/fixtures/custom/site/assets/style.css.less
-- test/fixtures/custom/site/foo.html.haml
-- test/fixtures/custom/site/index.html.haml
-- test/fixtures/custom/site/layout_test.html.haml
-- test/fixtures/custom/site/lol.html.erb
-- test/fixtures/custom/site/markdown.html.md
-- test/fixtures/custom/site/yes.html
-- test/fixtures/custom/www_control/about/index.html
-- test/fixtures/custom/www_control/assets/common.css
-- test/fixtures/custom/www_control/assets/style.css
-- test/fixtures/custom/www_control/foo.html
-- test/fixtures/custom/www_control/index.html
-- test/fixtures/custom/www_control/layout_test.html
-- test/fixtures/custom/www_control/lol.html
-- test/fixtures/custom/www_control/markdown.html
-- test/fixtures/custom/www_control/yes.html
-- test/fixtures/default/_config.yml
-- test/fixtures/default/extensions/custom/custom.rb
-- test/fixtures/default/layouts/default.haml
-- test/fixtures/default/site/about/index.html
-- test/fixtures/default/site/foo.html.haml
-- test/fixtures/default/site/index.html.haml
-- test/fixtures/default/site/layout_test.html.haml
-- test/fixtures/default/site/yes.html
-- test/fixtures/default/www_control/about/index.html
-- test/fixtures/default/www_control/foo.html
-- test/fixtures/default/www_control/index.html
-- test/fixtures/default/www_control/layout_test.html
-- test/fixtures/default/www_control/yes.html
+- lib/hyde/server.rb
+- lib/hyde.rb
+- test/fixture/extensions/extensions/a/a.rb
+- test/fixture/extensions/hyde.conf
+- test/fixture/extensions/site/index.haml
+- test/fixture/fail_type/control/about/index.html
+- test/fixture/fail_type/control/about/us.html
+- test/fixture/fail_type/control/index.html
+- test/fixture/fail_type/hyde.conf
+- test/fixture/fail_type/site/index.haml
+- test/fixture/nested_layout/control/index.html
+- test/fixture/nested_layout/hyde.conf
+- test/fixture/nested_layout/layouts/default.haml
+- test/fixture/nested_layout/layouts/post.haml
+- test/fixture/nested_layout/site/index.haml
+- test/fixture/one/control/about/index.css
+- test/fixture/one/control/cheers.html
+- test/fixture/one/control/css/style.css
+- test/fixture/one/control/hello.html
+- test/fixture/one/control/hi.html
+- test/fixture/one/control/index.html
+- test/fixture/one/hyde.conf
+- test/fixture/one/layouts/default.haml
+- test/fixture/one/partials/menu.haml
+- test/fixture/one/site/about/index.scss
+- test/fixture/one/site/cheers.html.haml
+- test/fixture/one/site/css/style.scss
+- test/fixture/one/site/hello.haml
+- test/fixture/one/site/hi.html
+- test/fixture/one/site/index.haml
+- test/fixture/parent/control/about/index.html
+- test/fixture/parent/control/about/us.html
+- test/fixture/parent/control/index.html
+- test/fixture/parent/hyde.conf
+- test/fixture/parent/site/about/index.haml
+- test/fixture/parent/site/about/us.haml
+- test/fixture/parent/site/index.haml
+- test/fixture/sort/hyde.conf
+- test/fixture/sort/site/about/hardy.haml
+- test/fixture/sort/site/about/intrepid.haml
+- test/fixture/sort/site/about.haml
+- test/fixture/subclass/control/index.html
+- test/fixture/subclass/extensions/a/a.rb
+- test/fixture/subclass/hyde.conf
+- test/fixture/subclass/layouts/default.haml
+- test/fixture/subclass/layouts/post.haml
+- test/fixture/subclass/site/index.haml
 - test/helper.rb
-- test/test_all_fixtures.rb
-- test/test_build.rb
-- test/test_hyde.rb
-- test/test_page.rb
-- test/test_utils.rb
+- test/unit/extensions_test.rb
+- test/unit/fixture_test.rb
+- test/unit/hyde_test.rb
+- data/new_site/hyde.conf
+- data/new_site/layouts/default.haml
+- data/new_site/README.md
+- data/new_site/site/index.html.haml
+- HISTORY.md
+- README.md
+- Rakefile
+- AUTHORS
 has_rdoc: true
 homepage: http://github.com/sinefunc/hyde
 licenses: []
@@ -194,34 +163,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: Website preprocessor
-test_files: 
-- test/fixtures/custom/extensions/custom/custom.rb
-- test/fixtures/default/extensions/custom/custom.rb
-- test/helper.rb
-- test/test_all_fixtures.rb
-- test/test_build.rb
-- test/test_hyde.rb
-- test/test_page.rb
-- test/test_utils.rb
+summary: Website preprocessor.
+test_files: []
+

data/.yardopts

@@ -1,5 +0,0 @@
---files="manual/*/*"
---files="AUTHORS"
---files="LICENSE"
---files="CHANGELOG"
---main="manual/Hyde.md"

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010 Rico Sta. Cruz and Sinefunc, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/VERSION

@@ -1 +0,0 @@
-0.0.8.pre2

data/data/new_site/.gitignore

@@ -1,24 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-*.swo
-*.swn
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-public

data/data/pages/404.html

@@ -1,3 +0,0 @@
-    <body style='text-align: center'>
-    <h1>Not found.</h1>
-    <a href='/-'>List of pages</a>