hydeweb 0.1.4 → 0.1.5

data/HISTORY.md

@@ -1,3 +1,8 @@
+v0.1.5
+------
+
+ - Ruby 1.8 compatibility.
+
 v0.1.4
 ------
 
@@ -38,6 +43,7 @@ v0.1.1
  - All options in `hyde.conf` are now optional (even `hyde_requirement`).
  - Page metadata can now only be a hash.
  - Fix `hyde start`.
+ - Minimum Ruby version is now at 1.8.6.
 
 v0.1.0
 ------

data/Rakefile

@@ -3,3 +3,9 @@ task :test do
 end
 
 task :default => :test
+
+task :gembuild do
+  require './lib/hyde'
+  v = Hyde.version
+  system "joe build && git commit -a -m \"Update to version #{v}.\" && git tag v#{v}"
+end

data/lib/hyde/config.rb

@@ -13,7 +13,9 @@ class Config < OpenStruct
   end
 
   def initialize(options={})
-    super DEFAULTS.merge(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
   end
 
   # Returns tilt options for a given file.

data/lib/hyde/meta.rb

@@ -4,6 +4,7 @@ class Meta < OpenStruct
     @table.merge(hash)
   end
 
+  # For Ruby 1.8.6 compatibility ([:type] instead of .type)
   def [](id)
     @table[id.to_sym]
   end

data/lib/hyde/page.rb

@@ -24,8 +24,8 @@ class Page
     page ||= try[Dir[site[id, "index.*"]].first]
 
     # Subclass
-    if page && page.tilt? && page.meta.type
-      klass = Page.get_type(page.meta.type)
+    if page && page.tilt? && page.meta[:type]
+      klass = Page.get_type(page.meta[:type])
       raise Error, "#{page.filepath}: Class for type '#{page.meta.type}' not found"  unless klass
       page = klass.new(id, project)
     end
@@ -187,9 +187,10 @@ class Page
   def tilt
     if tilt?
       begin
+        parts
         # HAML options and such (like :escape_html)
         options = project.config.tilt_options_for(@file)
-        offset = parts.first.count("\n") + 2
+        offset = @offset || 1
         @tilt ||= Tilt.new(@file, offset, options) { markup }
       rescue LoadError => e
         gem = e.message.split(' ').last
@@ -283,12 +284,14 @@ protected
   # Returns the two parts of the markup.
   def parts
     @parts ||= begin
-      t = File.open(@file).read.force_encoding('UTF-8')
+      t = File.open(@file).read
+      t = t.force_encoding('UTF-8')  if t.respond_to?(:force_encoding)
       m = t.match(/^(.*)--+\n(.*)$/m)
 
       if m.nil?
         [{}, t]
       else
+        @offset = m[1].count("\n") + 2
         data = YAML::load(m[1])
         raise ArgumentError unless data.is_a?(Hash)
         [data, m[2]]

data/lib/hyde.rb

@@ -1,6 +1,7 @@
 $:.push *Dir[File.expand_path('../../vendor/*/lib', __FILE__)]
 
-gem 'shake', '~> 0.1'
+gem 'shake', '>= 0.1.2'
+gem 'tilt', '>= 1.2.2'
 
 require 'fileutils'
 require 'ostruct'
@@ -12,7 +13,7 @@ require 'shake'
 Tilt.mappings['html'] = Tilt.mappings['erb']
 
 class Hyde
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
   PREFIX  = File.expand_path('../', __FILE__)
 
   Error        = Class.new(StandardError)

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

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

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

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

data/test/helper.rb

@@ -1,5 +1,7 @@
 $:.push File.expand_path('../../lib', __FILE__)
 
+gem "contest", "~> 0.1"
+
 require 'hyde'
 require 'contest'
 

metadata

@@ -2,7 +2,7 @@
 name: hydeweb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Rico Sta. Cruz
@@ -19,9 +19,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.1"
+        version: 0.1.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency