gollum-site 0.1.2 → 0.1.3

data/lib/gollum-site/markup.rb

@@ -1,9 +1,34 @@
 module Gollum
   class Markup
+    # Removing sanitization; this will be configurable after Gollum 1.1.0
+    def render(no_follow = false)
+      sanitize_options = no_follow   ?
+        HISTORY_SANITIZATION_OPTIONS :
+        SANITIZATION_OPTIONS
+      data = extract_tex(@data)
+      data = extract_code(data)
+      data = extract_tags(data)
+      begin
+        data = GitHub::Markup.render(@name, data)
+        if data.nil?
+          raise "There was an error converting #{@name} to HTML."
+        end
+      rescue Object => e
+        data = %{<p class="gollum-error">#{e.message}</p>}
+      end
+      data = process_tags(data)
+      data = process_code(data)
+      sanitize_options[:elements] << 'iframe'
+      sanitize_options[:attributes][:all] << 'frameborder'
+      data = Sanitize.clean(data, sanitize_options)
+      data = process_tex(data)
+      data.gsub!(/<p><\/p>/, '')
+      data
+    end
 
     # Attempt to process the tag as a page link tag.
     #
-    # tag       - The String tag contents (the stuff inside the double 
+    # tag       - The String tag contents (the stuff inside the double
     #             brackets).
     # no_follow - Boolean that determines if rel="nofollow" is added to all
     #             <a> tags.

data/lib/gollum-site/site.rb

@@ -14,7 +14,9 @@ module Gollum
                                  # need to change class name in markup.rb
                                  #:markup_class => Gollum::SiteMarkup,
                                  :page_class => Gollum::SitePage,
-                                 :base_path => options[:base_path]
+                                 :base_path => options[:base_path],
+                                 :sanitization => false,
+                                 :history_sanitization => false
                                })
       @wiki.site = self
       @output_path = options[:output_path] || "_site"

data/lib/gollum-site/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   class Site
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gollum-site
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Daniel Reverri
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 -08:00
+date: 2010-12-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency