Merge remote branch 'origin/master'

.gitignore

@@ -1,3 +1,4 @@
 *.swp
 *.gem
 _tmp
+.DS_Store

lib/awestruct/context_helper.rb

@@ -34,7 +34,7 @@ def close_tags(s)
     end
 
     def summarize(text, numwords=20, ellipsis='...')
-      close_tags(text.split()[0, numwords].join(' ') + ellipsis)
+      close_tags(text.split(/ /)[0, numwords].join(' ') + ellipsis)
     end
 
     def fully_qualify_urls(base_url, text)

lib/awestruct/engine.rb

@@ -30,6 +30,7 @@
 require 'awestruct/extensions/tag_cloud'
 require 'awestruct/extensions/intense_debate'
 require 'awestruct/extensions/disqus'
+require 'awestruct/extensions/flattr'
 require 'awestruct/extensions/google_analytics'
 require 'awestruct/extensions/partial'
 
@@ -128,14 +129,17 @@ def create_context(page, content='')
       context.page = page
       class << context
         def interpolate_string(str)
-          str = str || ''
-          str = str.gsub( /\\/, '\\\\\\\\' )
-          str = str.gsub( /\\\\#/, '\\#' )
-          str = str.gsub( '@', '\@' )
-          str = str.gsub( '#{', '\#\{' ) unless site.interpolate
-          str = "%@#{str}@"
-          result = instance_eval( str )
-          result
+          if site.interpolate
+            str = str || ''
+            str = str.gsub( /\\/, '\\\\\\\\' )
+            str = str.gsub( /\\\\#/, '\\#' )
+            str = str.gsub( '@', '' ) #'\@' )
+            str = "%@#{str}@"
+            result = instance_eval( str )
+            result
+          else
+            str || ''
+          end
         end
         def evaluate_erb(erb)
           erb.result( binding )

lib/awestruct/extensions/disqus.rb

@@ -9,12 +9,14 @@ def execute(site)
       module Disqus
         def disqus_comments()
           developer = (site.disqus_developer) ? 'var disqus_developer = 1;' : ''
+          identifier = (self.disqus_identifier) ? %Q{var disqus_identifier = "#{self.disqus_identifier}";} : ''
           %Q{
             <div id="disqus_thread"></div>
             <script type="text/javascript">
             var disqus_shortname = '#{site.disqus}';
             var disqus_url = "#{site.base_url}/#{self.url}";
             #{developer}
+            #{identifier}
             (function() {
               var dsq = document.createElement("script"); dsq.type = "text/javascript"; dsq.async = true;
               dsq.src = "http://#{site.disqus}.disqus.com/embed.js";
@@ -26,7 +28,8 @@ def disqus_comments()
         end
 
         def disqus_comments_link()
-          %Q{ <a href="#{self.url}#disqus_thread">Comments</a> }
+          identifier = self.disqus_identifier ? %Q(data-disqus-identifier="#{self.disqus_identifier}") : ''
+          %Q{ <a href="#{self.url}#disqus_thread" #{identifier}>Comments</a> }
         end
 
         def disqus_comments_count()

lib/awestruct/extensions/flattr.rb

@@ -0,0 +1,42 @@
+
+module Awestruct
+  module Extensions
+    class Flattr
+
+      def execute(site)
+        site.pages.each{|p| p.extend Flattrable }
+      end
+
+      module Flattrable
+        def flattr_javascript()
+          html = %Q|<script type='text/javascript'> /* <![CDATA[ */     (function() {\n|
+          html += %Q|var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];|
+          html += %Q|s.type = 'text/javascript';\n|
+          html += %Q|s.async = true;\n|
+          html += %Q|s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto&uid=#{site.flattr_username}&category=text';\n|
+          html += %Q|t.parentNode.insertBefore(s, t);\n|
+          html += %Q|})(); /* ]]> */ </script>|
+          html
+        end
+        def flattr_large_counter(param={})
+          url = param[:url] ? param[:url] : site.base_url + self.url
+          title = param[:title] ? param[:title] : self.title
+          category = param[:category] ? param[:category] : "text"
+          tags = param[:tags] ? "tags:" + param[:tags] + ";" : ""
+          html = %Q|<a class="FlattrButton" style="display:none;" href="#{url}" title="#{title}" |
+          html += %Q|rev="flattr;uid:#{site.flattr_username};category:#{category};#{tags}"></a>|
+          html
+        end
+        def flattr_compact_counter(param={})
+          url = param[:url] ? param[:url] : site.base_url + self.url
+          title = param[:title] ? param[:title] : self.title
+          category = param[:category] ? param[:category] : "text"
+          tags = param[:tags] ? "tags:" + param[:tags] + ";" : ""
+          html = %Q|<a class="FlattrButton" style="display:none;" href="#{url}" title="#{title}" |
+          html += %Q|rev="flattr;button:compact;uid:#{site.flattr_username};category:#{category};#{tags}"></a>|
+          html
+        end
+      end
+    end
+  end
+end

lib/awestruct/extensions/template.atom.haml

@@ -4,7 +4,7 @@
 
 %feed{ 'xml:lang'=>'en-US', :xmlns=>'http://www.w3.org/2005/Atom' }
   %id= "#{site.base_url}/"
-  %title #{page.title}
+  %title= escape_once( page.title )
   - if ( defined?( site.author ) )
     %author
       - if ( defined?( site.author.name ) )

lib/awestruct/rdiscountable.rb

@@ -0,0 +1,33 @@
+require 'rdiscount'
+
+module Awestruct
+
+  module Rdiscountable
+    def render(context)
+      rendered = ''
+
+      begin
+        options = { }
+
+        unless self.options.nil?
+          options.merge!(self.options)
+        end
+
+        doc = RDiscount.new(context.interpolate_string( raw_page_content ))
+
+        rendered = doc.to_html
+      rescue => e
+        puts e
+        puts e.backtrace
+      end
+      rendered
+    end
+
+    def content
+      context = site.engine.create_context( self )
+      render( context )
+    end
+  end
+
+end
+