hydeweb 0.1.14 → 0.2.2

data/HISTORY.md

@@ -1,3 +1,15 @@
+v0.2.2 - Jun 16, 2011
+---------------------
+
+### Added:
+  * **Built-in Compass support.**
+  * **Enable Sass, SCSS, Haml, Textile and Markdown by default.**
+  * Extensions from `_extensions/*rb` will now be loaded.
+
+### Changed:
+  * The default `hyde.conf` now comments out the default stuff you don't need to set.
+  * Update dependencies to Cuba 2.0, and Hashie 1.0.
+
 v0.1.14 - Jun 04, 2011
 ----------------------
 

data/README.md

@@ -1,9 +1,11 @@
-Hyde
-====
+# [Hyde](http://sinefunc.com/hyde?)
+#### Hyde is a website preprocessor.
 
-Hyde is a website preprocessor.
+http://sinefunc.com/hyde/
 
-http://labs.sinefunc.com/hyde/
+ - __HAML, Sass, Compass and more:__ Hyde will let you write in HAML, SCSS,
+   Sass, and more by default. It also comes preloaded with 
+   [Compass](http://compass-style.org).
 
  - __Layouts and Partials:__ Hyde lets you define your site's header and footer
    layouts in a separate file, and even separate snippets of your site
@@ -52,3 +54,22 @@ Here's how you can get started:
     hyde start                       # <= Serve via a local web server
 
 
+Testing
+-------
+
+Run tests:
+
+    rake test
+
+To try it in a different Ruby version, you can use RVM + Bundler to make 
+things easier. For instance:
+
+    rvm use 1.8.7@hyde --create     # Create a gemset
+    bundle install                  # Install the needed gems on that set
+    rake test
+
+Authors
+-------
+
+Authored and maintained by Rico Sta. Cruz and Sinefunc, Inc.  
+See [sinefunc.com](http://sinefunc.com) for more about our work!

data/data/new_site/hyde.conf

@@ -1,6 +1,6 @@
 # This is a Hyde site.
-# Install the `hydeweb` Ruby gem and type `hyde` for help.
-hyde_requirement: 0.1
+# Install Hyde (`gem install hydeweb`) and type `hyde` for help.
+hyde_requirement: 0.2
 
 # The folder where the site's source files are kept.
 site_path:       .
@@ -11,25 +11,24 @@ layouts_path:    _layouts
 extensions_path: _extensions
 partials_path:   .
 
-# Files to be excluded from processing
-ignore:
-- **/*~
-- README*
-- config.ru
-- **/.*
-- **/_*
-
-# Optional options for layout engines
-tilt_options:
-  haml:
-    :escape_html: true
-  scss:
-    :load_paths: [ 'css' ]
-    :style: :compact
-    :line_numbers: true
-
-# Optional settings for doing a build
-tilt_build_options:
-  scss:
-    :style: :compressed
-    :line_numbers: false
+## Files to be excluded from processing.
+
+# ignore:
+# - **/*~
+
+## Optional options for layout engines.
+
+# tilt_options:
+#  haml:
+#    escape_html: true
+#  scss:
+#    load_paths: [ 'css' ]
+#    style: :compact
+#    line_numbers: true
+
+## Optional settings for doing a build.
+
+# tilt_build_options:
+#   scss:
+#     style: :compressed
+#     line_numbers: false

data/lib/hyde/compass_support.rb

@@ -0,0 +1,8 @@
+require 'compass'
+
+opts = Compass.sass_engine_options
+
+[:sass, :scss].each do |type|
+  Hyde.project.config.tilt_options(type)[:load_paths] ||= Array.new
+  Hyde.project.config.tilt_options(type)[:load_paths] += opts[:load_paths]
+end

data/lib/hyde/config.rb

@@ -9,13 +9,38 @@ class Hyde
 #   Hyde.project.config.site_path
 #   Hyde.project.config.layouts_path
 #
-class Config < OpenStruct
+class Config
   DEFAULTS = {
     :site_path => '.',
-    :layouts_path => nil,
-    :extensions_path => nil,
-    :partials_path => nil,
-    :output_path => nil
+    :layouts_path => '_layouts',
+    :extensions_path => '_extensions',
+    :partials_path => '_layouts',
+    :output_path => '_output',
+    :tilt_options => {
+      :haml => {
+        :escape_html => true
+      },
+      :sass => {
+        :load_paths => ['css', '.'],
+        :style => :compact,
+        :line_numbers => true
+      },
+      :scss => {
+        :load_paths => ['css', '..'],
+        :style => :compact,
+        :line_numbers => true
+      },
+    },
+    :tilt_build_options => {
+      :scss => {
+        :style => :compressed,
+        :line_numbers => false
+      },
+      :sass => {
+        :style => :compressed,
+        :line_numbers => false
+      }
+    }
   }
 
   def self.load(config_file)
@@ -24,31 +49,37 @@ class Config < OpenStruct
 
   def initialize(options={})
     # Try to emulate proper .merge behavior in Ruby 1.8
-    options.each { |k, v| options[k] ||= DEFAULTS[k]  if DEFAULTS.keys.include?(k) }
-    super options
+    #DEFAULTS.each { |k, v| options[k] ||= v }
+    @table = Hashie::Mash.new
+    @table.deep_merge! DEFAULTS
+    @table.deep_merge! options
+  end
+
+  # Passthru
+  def method_missing(meth, *args, &blk)
+    @table.send meth, *args
   end
 
   # Returns tilt options for a given file.
   # @example tilt_options('index.haml')  # { :escape_html => ... }
-  def tilt_options_for(file, options)
+  def tilt_options_for(file, options={})
     ext = file.split('.').last.downcase
     opts = tilt_options(ext) || Hash.new
-    opts = opts.merge(tilt_options(ext, :tilt_build_options) || Hash.new)  if options[:build]
-    opts
+    opts = opts.merge(tilt_options(ext, :tilt_build_options))  if options[:build]
+
+    to_hash opts
   end
 
   # Returns tilt options for a given engine.
   # @example tilt_options('haml')  # { :escape_html => ... }
   def tilt_options(what, key=:tilt_options)
-    @table[key] ||= begin
-      h = Hash.new { |h, k| h[k] = Hash.new }
-      h['haml'] = { :escape_html => true }
-      h['scss'] = { :load_path => ['css'] }
-      h['sass'] = { :load_path => ['css'] }
-      h
-    end
-
+    @table[key] ||= Hash.new
     @table[key][what.to_s] ||= Hash.new
   end
+
+private
+  def to_hash(mash)
+    mash.inject(Hash.new) { |h, (k, v)| h[k.to_sym] = v; h } 
+  end
 end
 end

data/lib/hyde/project.rb

@@ -42,6 +42,8 @@ class Project
 
     validate_version
     load_extensions
+
+    require 'hyde/compass_support'
   end
 
   def validate_version
@@ -61,7 +63,10 @@ class Project
 
   def load_extensions
     path = path(:extensions)
-    Dir[path(:extensions, '*', '*.rb')].each { |f| require f }  if path
+
+    ( Dir[path(:extensions, '*.rb')] +
+      Dir[path(:extensions, '*', '*.rb')]
+    ).sort.each { |f| require f }  if path
   end
 
   def config_file
@@ -103,10 +108,16 @@ class Project
   def ignored_files
     specs  = [*config.ignore].map { |s| root(s) }
     specs << config_file
+
+    # Ignore the standard files
     [:layouts, :extensions, :partials, :output].each do |aspect|
-      specs << path(aspect, '**/*') if path(aspect) && path(aspect) != path(:site)
+      specs << File.join(config.send(:"#{aspect}_path"), '**/*') if path(aspect) && path(aspect) != path(:site)
     end
-    specs.compact.map { |s| Dir[s] }.flatten.uniq
+
+    # Ignore dotfiles and hyde.conf by default
+    specs += %w[.* _* *~ README* /hyde.conf /config.ru]
+
+    specs.compact.map { |s| glob(s) }.flatten.uniq
   end
 
   def build(&blk)
@@ -119,6 +130,14 @@ class Project
   end
 
 protected
+  def glob(str)
+    if str[0] == '/'
+      Dir[str] + Dir[root(str)] + Dir["#{root(str)}/**"]
+    else
+      Dir[root("**/#{str}")] + Dir[root("**/#{str}/**")]
+    end
+  end
+
   def build_cleanup
     FileUtils.rm_rf '.sass_cache'
   end

data/lib/hyde/version.rb

@@ -0,0 +1,7 @@
+class Hyde
+  VERSION = "0.2.2"
+
+  def self.version
+    VERSION
+  end
+end

data/lib/hyde.rb

@@ -2,15 +2,18 @@ $:.push *Dir[File.expand_path('../../vendor/*/lib', __FILE__)]
 
 require 'fileutils'
 require 'ostruct'
+require 'hashie'
 require 'yaml'
 require 'tilt'
 require 'shake'
 
+# For Compass and such
+Encoding.default_external = 'utf-8' if defined?(::Encoding)
+
 # HTML files as ERB
 Tilt.mappings['html'] = Tilt.mappings['erb']
 
 class Hyde
-  VERSION = "0.1.14"
   PREFIX  = File.expand_path('../', __FILE__)
 
   Error        = Class.new(StandardError)
@@ -30,12 +33,10 @@ class Hyde
   autoload :Partial, "#{PREFIX}/hyde/partial"
   autoload :Helpers, "#{PREFIX}/hyde/helpers"
 
+  require "#{PREFIX}/hyde/version"
+
   class << self
     # The latest project.
     attr_accessor :project
-
-    def version
-      VERSION
-    end
   end
 end

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

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

data/test/fixture/extensions/extensions/hi.rb

@@ -0,0 +1 @@
+$hi = 1

data/test/fixture/high_version/hyde.conf

@@ -0,0 +1 @@
+hyde_requirement: 9000.0

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

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

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

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

data/test/unit/extensions_test.rb

@@ -12,5 +12,6 @@ class ExtensionsTest < TestCase
 
   test "extensions" do
     assert $extension_loaded == "aoeu"
+    assert $hi == 1
   end
 end

data/test/unit/fixture_test.rb

@@ -1,9 +1,9 @@
 require File.expand_path('../../helper', __FILE__)
 
 class HydeTest < TestCase
-  def assert_fixture_works(path)
-    build_fixture(path) { |control, var|
-      assert File.exists?(var)
+  def assert_fixture_works(path, options={})
+    build_fixture(path, options) { |control, var|
+      assert File.exists?(var), "#{var} doesn't exist"
       if read(control) != read(var)
         flunk "Failed in #{var}\n" +
           "Control:\n" +
@@ -25,17 +25,24 @@ class HydeTest < TestCase
   end
 
 
-  def build_fixture(path, &blk)
+  def build_fixture(path, options={}, &blk)
     # Build
     project = build path
 
-    assert \
-      Dir[project.root('control/**/*')].length == 
-      Dir[project.root('public/**/*')].length
+    options[:control_path] ||= '_control'
+    options[:public_path]  ||= '_public'
 
-    Dir[project.root('control/**/*')].each do |control|
+    control_path = project.root(options[:control_path])
+    public_path  = project.root(options[:public_path])
+
+    from = Dir["#{control_path}/**/*"].map { |dir| dir.gsub(control_path, '') }.sort
+    to   = Dir["#{public_path}/**/*"].map  { |dir| dir.gsub(public_path, '') }.sort
+
+    assert_equal from, to, "The build happened to make less files"
+
+    Dir["#{control_path}/**/*"].each do |control|
       next  unless File.file?(control)
-      var = control.sub('/control/', '/public/')
+      var = control.sub(control_path, public_path)
       yield control, var
     end   if block_given?
   end
@@ -46,7 +53,9 @@ class HydeTest < TestCase
 
   teardown do
     # Remove the generated
-    Dir[fixture('*', 'public')].each { |dir| FileUtils.rm_rf dir }
+    ( Dir[fixture('*', 'public')] +
+      Dir[fixture('*', '_public')]
+    ).each { |dir| FileUtils.rm_rf dir }
   end
 
   test "fixture one" do
@@ -85,6 +94,18 @@ class HydeTest < TestCase
     assert_fixture_works fixture('build_options')
   end
 
+  test "fixture empty_config" do
+    assert_fixture_works fixture('empty_config'),
+      :control_path => '_control',
+      :public_path  => '_output'
+  end
+
+  test "fixture high_version" do
+    assert_fixture_fails(fixture('high_version')) { |e|
+      assert e.message.include?('>= 9000')
+    }
+  end
+
   test "fixture fail_type" do
     assert_fixture_fails(fixture('fail_type')) { |e|
       assert e.message.include?('nonexistent')

metadata

@@ -2,7 +2,7 @@
 name: hydeweb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.14
+  version: 0.2.2
 platform: ruby
 authors: 
 - Rico Sta. Cruz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-04 00:00:00 +08:00
+date: 2011-06-16 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 1.2.2
   type: :runtime
@@ -41,44 +41,99 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: hashie
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
+        version: 1.0.0
+  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: less
+  name: haml
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.1.1
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sass
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.1.1
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: compass
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.11.1
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 4.2.3
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: maruku
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: less
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: maruku
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id011
 description: Hyde lets you create static websites from a bunch of files written in HAML, Textile, Sass, or any other.
 email: 
 - rico@sinefunc.com
@@ -94,6 +149,7 @@ files:
 - bin/hyde01
 - lib/hyde/cli/helpers.rb
 - lib/hyde/cli.rb
+- lib/hyde/compass_support.rb
 - lib/hyde/config.rb
 - lib/hyde/helpers.rb
 - lib/hyde/layout.rb
@@ -103,14 +159,17 @@ files:
 - lib/hyde/project.rb
 - lib/hyde/server.rb
 - lib/hyde/set.rb
+- lib/hyde/version.rb
 - lib/hyde.rb
 - test/fixture/build_options/control/page.html
 - test/fixture/build_options/control/style.css
 - test/fixture/build_options/hyde.conf
 - test/fixture/build_options/site/page.haml
 - test/fixture/build_options/site/style.scss
+- test/fixture/empty_config/hyde.conf
 - test/fixture/extensions/control/index.html
 - test/fixture/extensions/extensions/a/a.rb
+- test/fixture/extensions/extensions/hi.rb
 - test/fixture/extensions/hyde.conf
 - test/fixture/extensions/site/index.haml
 - test/fixture/fail_type/control/about/index.html
@@ -118,6 +177,7 @@ files:
 - test/fixture/fail_type/control/index.html
 - test/fixture/fail_type/hyde.conf
 - test/fixture/fail_type/site/index.haml
+- test/fixture/high_version/hyde.conf
 - test/fixture/html/control/index.html
 - test/fixture/html/hyde.conf
 - test/fixture/html/site/index.html