awestruct 0.2.1 → 0.2.2

data/lib/awestruct/context_helper.rb

@@ -34,7 +34,7 @@ module Awestruct
     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)

data/lib/awestruct/engine.rb

@@ -12,7 +12,7 @@ require 'awestruct/site'
 require 'awestruct/haml_file'
 require 'awestruct/erb_file'
 require 'awestruct/textile_file'
-require 'awestruct/maruku_file'
+require 'awestruct/markdown_file'
 require 'awestruct/sass_file'
 require 'awestruct/scss_file'
 require 'awestruct/org_mode_file'
@@ -30,6 +30,7 @@ require 'awestruct/extensions/tagger'
 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'
 
@@ -106,7 +107,7 @@ module Awestruct
       elsif ( path =~ /\.textile$/ )
         page = TextileFile.new( site, path, fixed_relative_path, options )
       elsif ( path =~ /\.md$/ )
-        page = MarukuFile.new( site, path, fixed_relative_path, options )
+        page = MarkdownFile.new( site, path, fixed_relative_path, options )
       elsif ( path =~ /\.sass$/ )
         page = SassFile.new( site, path, fixed_relative_path, options )
       elsif ( path =~ /\.scss$/ )
@@ -128,14 +129,17 @@ module Awestruct
       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 )

data/lib/awestruct/extensions/disqus.rb

@@ -9,12 +9,14 @@ module Awestruct
       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 @@ module Awestruct
         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()

data/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

data/lib/awestruct/extensions/intense_debate.rb

@@ -15,7 +15,7 @@ module Awestruct
           html = %Q(<script>\n)
           html += %Q(  var idcomments_acct='#{site.intense_debate_acct}';\n)
           html += %Q(  var idcomments_post_id='#{post_id}';\n )
-          html += %Q(  var idcomments_post_url='#{site.base_url}/#{self.url}';\n)
+          html += %Q(  var idcomments_post_url='#{site.intense_debate_base_url || site.base_url}#{self.url}';\n)
           html += %Q(</script>\n)
           html += %Q(<span id="IDCommentsPostTitle" style="display:none"></span>\n)
           html += %Q(<script type='text/javascript' src='http://www.intensedebate.com/js/genericCommentWrapperV2.js'></script>\n)

data/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 ) )

data/lib/awestruct/{maruku_file.rb → markdown_file.rb}

@@ -1,13 +1,11 @@
 
 require 'awestruct/front_matter_file'
-require 'awestruct/marukuable'
-require 'awestruct/blueclothable'
+require 'awestruct/markdownable'
 
 module Awestruct
-  class MarukuFile < FrontMatterFile
+  class MarkdownFile < FrontMatterFile
 
-    #include Marukuable
-    include Blueclothable
+    include Markdownable
 
     def initialize(site, source_path, relative_source_path, options = {})
       super(site, source_path, relative_source_path, options)

data/lib/awestruct/{marukuable.rb → markdownable.rb}

@@ -1,12 +1,12 @@
-require 'maruku'
+require 'rdiscount'
 
 module Awestruct
 
-  module Marukuable
+  module Markdownable
     def render(context)
       rendered = ''
       begin
-        doc = Maruku.new( context.interpolate_string( raw_page_content ) )
+        doc = RDiscount.new( context.interpolate_string( raw_page_content ) )
         rendered = doc.to_html
       rescue => e
         puts e

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awestruct
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Bob McWhirter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 Z
+date: 2011-07-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
@@ -37,70 +37,78 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <=
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 3
+        - 1
         - 0
-        version: "0"
+        version: 3.1.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: hashery
+  name: sass
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <=
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 3
+        - 1
         - 0
-        version: "0"
+        version: 3.1.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bluecloth
+  name: hashery
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 1
+        - 4
         - 0
-        version: "0"
+        version: 1.4.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
+  name: rdiscount
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <=
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 31
         segments: 
-        - 4
-        - 2
-        - 5
-        version: 4.2.5
+        - 1
+        - 6
+        - 8
+        version: 1.6.8
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: maruku
+  name: RedCloth
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <=
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 61
         segments: 
-        - 0
-        version: "0"
+        - 4
+        - 2
+        - 5
+        version: 4.2.5
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -109,12 +117,14 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <=
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 59
         segments: 
         - 0
-        version: "0"
+        - 10
+        - 6
+        version: 0.10.6
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -123,12 +133,14 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <=
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 63
         segments: 
         - 0
-        version: "0"
+        - 10
+        - 4
+        version: 0.10.4
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -137,12 +149,14 @@ dependencies:
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
         - 0
-        version: "0"
+        - 5
+        - 3
+        version: 0.5.3
   type: :runtime
   version_requirements: *id009
 description: 
@@ -154,7 +168,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/awestruct/blueclothable.rb
 - lib/awestruct/commands/deploy.rb
 - lib/awestruct/commands/frameworks/base_pipeline.rb
 - lib/awestruct/commands/generate.rb
@@ -169,6 +182,7 @@ files:
 - lib/awestruct/extensions/atomizer.rb
 - lib/awestruct/extensions/data_dir.rb
 - lib/awestruct/extensions/disqus.rb
+- lib/awestruct/extensions/flattr.rb
 - lib/awestruct/extensions/google_analytics.rb
 - lib/awestruct/extensions/indexifier.rb
 - lib/awestruct/extensions/intense_debate.rb
@@ -181,8 +195,8 @@ files:
 - lib/awestruct/front_matter_file.rb
 - lib/awestruct/haml_file.rb
 - lib/awestruct/hamlable.rb
-- lib/awestruct/maruku_file.rb
-- lib/awestruct/marukuable.rb
+- lib/awestruct/markdown_file.rb
+- lib/awestruct/markdownable.rb
 - lib/awestruct/org_mode_file.rb
 - lib/awestruct/org_modeable.rb
 - lib/awestruct/renderable.rb

data/lib/awestruct/blueclothable.rb

@@ -1,30 +0,0 @@
-require 'bluecloth'
-
-module Awestruct
-
-  module Blueclothable
-    def render(context)
-      rendered = ''
-      begin
-        bluecloth_options = { :smartypants => true }
-
-        unless self.options.nil?
-          bluecloth_options.merge!({ :smartypants => false }) if self.options[:html_entities] == false
-        end
-
-        doc = BlueCloth.new( context.interpolate_string( raw_page_content ), bluecloth_options )
-        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