awestruct 0.2.5 → 0.2.6

data/bin/awestruct

@@ -4,6 +4,7 @@ $: << File.dirname(__FILE__) + '/../lib'
 
 require 'rubygems'
 require 'optparse'
+require 'awestruct/version'
 require 'awestruct/commands/init'
 require 'awestruct/commands/generate'
 require 'awestruct/commands/server'
@@ -87,6 +88,12 @@ def parse(args)
       exit
     end
 
+    opts.on_tail("-v", "--version", "Display the version") do
+      puts "Awestruct: #{Awestruct::VERSION}"
+      puts "http://awestruct.org/"
+    end
+
+
   end
   
   opts.parse!(args)

data/lib/awestruct/extensions/disqus.rb

@@ -1,3 +1,5 @@
+require 'digest/sha1'
+
 module Awestruct
   module Extensions
     class Disqus
@@ -8,15 +10,17 @@ 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}";} : ''
+          identifier = "null"
+          if self.disqus_identifier or site.disqus_generate_id
+            identifier = %Q("#{self.resolve_disqus_identifier()}")
+          end
           %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}
+            var disqus_developer = #{site.disqus_developer ? 1 : "null"};
+            var disqus_identifier = #{identifier};
             (function() {
               var dsq = document.createElement("script"); dsq.type = "text/javascript"; dsq.async = true;
               dsq.src = "http://#{site.disqus}.disqus.com/embed.js";
@@ -28,8 +32,11 @@ module Awestruct
         end
 
         def disqus_comments_link()
-          identifier = self.disqus_identifier ? %Q(data-disqus-identifier="#{self.disqus_identifier}") : ''
-          %Q{ <a href="#{self.url}#disqus_thread" #{identifier}>Comments</a> }
+          identifier = ''
+          if self.disqus_identifier or site.disqus_generate_id
+            identifier = %Q{ data-disqus-identifier="#{self.resolve_disqus_identifier()}"}
+          end
+          %Q{ <a href="#{self.url}#disqus_thread"#{identifier}>Comments</a> }
         end
 
         def disqus_comments_count()
@@ -44,6 +51,10 @@ module Awestruct
             </script>
           }
         end
+
+        def resolve_disqus_identifier()
+          self.disqus_identifier ? self.disqus_identifier : Digest::SHA1.hexdigest(self.date.strftime('%Y-%m-%d-') + self.slug)
+        end
       end
     end
   end

data/lib/awestruct/extensions/gsub.rb

@@ -0,0 +1,19 @@
+
+module Awestruct
+  module Extensions
+    class Gsub      
+      def initialize(pattern, replacement, options = {})
+        @pattern = pattern
+        @replacement = replacement
+        @gsub_required = options[:gsub_required] || lambda { |site, page| page.output_path.end_with?(".html") }
+      end
+      
+      def transform(site, page, rendered)
+        if (@gsub_required.call(site, page))
+          rendered = rendered.gsub(@pattern, @replacement)
+        end
+        rendered
+      end
+    end
+  end
+end

data/lib/awestruct/sassable.rb

@@ -1,5 +1,5 @@
 require 'sass'
-
+require 'sass/plugin'
 require 'compass'
 
 module Sass::Script::Functions

data/lib/awestruct/textilable.rb

@@ -4,7 +4,11 @@ module Awestruct
     def render(context)
       rendered = ''
       begin
-        rendered = RedCloth.new( context.interpolate_string( raw_page_content ) ).to_html
+        # a module of rule functions is included in RedCloth using RedCloth.send(:include, MyRules)
+        # rule functions on that module are activated by setting the property site.textile_rules
+        # ex. site.textile_rules = ['emoticons']
+        rules = context.site.textile_rules ? context.site.textile_rules.map { |r| r.to_sym } : []
+        rendered = RedCloth.new( context.interpolate_string( raw_page_content ) ).to_html(*rules)
       rescue => e
         puts e
         puts e.backtrace

data/lib/awestruct/version.rb

@@ -0,0 +1,4 @@
+
+module Awestruct
+  VERSION='0.2.6'
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Bob McWhirter
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-23 00:00:00 -04:00
+date: 2011-10-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -180,6 +180,7 @@ files:
 - lib/awestruct/extensions/disqus.rb
 - lib/awestruct/extensions/flattr.rb
 - lib/awestruct/extensions/google_analytics.rb
+- lib/awestruct/extensions/gsub.rb
 - lib/awestruct/extensions/indexifier.rb
 - lib/awestruct/extensions/intense_debate.rb
 - lib/awestruct/extensions/paginator.rb
@@ -206,6 +207,7 @@ files:
 - lib/awestruct/util/default_inflections.rb
 - lib/awestruct/util/inflector.rb
 - lib/awestruct/verbatim_file.rb
+- lib/awestruct/version.rb
 - lib/awestruct.rb
 - lib/awestruct/commands/frameworks/960/base_layout.html.haml
 - lib/awestruct/commands/frameworks/base_index.html.haml