crnixon-jekyll 0.5.1 → 0.5.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 5
-:patch: 1
+:patch: 2

data/crnixon-jekyll.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crnixon-jekyll}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner", "Henrik Nyh", "Clinton R. Nixon"]
-  s.date = %q{2010-01-23}
+  s.date = %q{2010-03-08}
   s.default_executable = %q{jekyll}
   s.description = %q{Jekyll is a simple, blog aware, static site generator.}
   s.email = %q{crnixon@gmail.com}
@@ -82,7 +82,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{crnixon-jekyll}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Jekyll is a simple, blog aware, static site generator.}
   s.test_files = [
     "test/helper.rb",

data/lib/jekyll/convertible.rb

@@ -40,7 +40,7 @@ module Jekyll
       when 'haml'
         self.ext = ".html"
         # Actually rendered in do_layout.
-        self.content = Haml::Engine.new(self.content, :attr_wrapper => %{"})
+        self.content = Haml::Engine.new(self.content, self.site.config['haml_options'])
       end
     end
 
@@ -87,6 +87,7 @@ module Jekyll
         self.transform
         self.content = render_haml_in_context(self.content,
           :site => self.site,
+          :config => ClosedStruct.new(self.site.config),          
           :page => ClosedStruct.new(payload["page"]))
       else
         self.content = Liquid::Template.parse(self.content).render(payload, info)
@@ -104,6 +105,7 @@ module Jekyll
         if site.config['haml'] && layout.content.is_a?(Haml::Engine)
           self.output = render_haml_in_context(layout.content, 
             :site => self.site,
+            :config => ClosedStruct.new(self.site.config),
             :page => ClosedStruct.new(payload["page"]),
             :content => payload["content"])
         else

data/lib/jekyll/site.rb

@@ -11,6 +11,13 @@ module Jekyll
     # Returns <Site>
     def initialize(config)
       self.config          = config.clone
+      if self.config['haml_options'] && self.config['haml_options'].is_a?(Hash)
+        self.config['haml_options'] = Hash[self.config['haml_options'].map { |key, val| 
+          [key.to_sym, (val.respond_to?(:to_sym) ? val.to_sym : val)] 
+        }]
+      else
+        self.config['haml_options'] = {}
+      end
 
       self.source          = config['source']
       self.dest            = config['destination']

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: crnixon-jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -11,69 +16,93 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 -05:00
+date: 2010-03-08 00:00:00 -05:00
 default_executable: jekyll
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 4
+        - 0
+        - 4
         version: 4.0.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: liquid
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 9
+        - 0
         version: 1.9.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: classifier
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 1
         version: 1.3.1
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: maruku
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 9
         version: 0.5.9
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: directory_watcher
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 1
         version: 1.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: open4
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 6
         version: 0.9.6
-    version: 
+  type: :runtime
+  version_requirements: *id006
 description: Jekyll is a simple, blog aware, static site generator.
 email: crnixon@gmail.com
 executables: 
@@ -155,18 +184,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: crnixon-jekyll
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Jekyll is a simple, blog aware, static site generator.