awestruct 0.1.3 → 0.1.4

data/bin/awestruct

@@ -24,6 +24,7 @@ def parse(args)
               :base_url=>nil,
               :profile=>nil,
               :deploy=>false,
+              :script=>nil,
             } )
 
   opts = OptionParser.new do |opts|
@@ -73,6 +74,9 @@ def parse(args)
     opts.on( '-g', '--[no-]generate', 'Generated site' ) do |g|
       options.generate = g
     end
+    opts.on( '--run SCRIPT', 'Force a regeneration' ) do |script|
+      options.script = script
+    end
 
     opts.separator ''
     opts.separator "Common options:"
@@ -151,10 +155,23 @@ if ( options.deploy )
   exit
 end
 
-threads = []
-
 default_base_url = 'http://localhost:4242'
 
+def camelize(str)
+  str.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+end
+
+if ( options.script )
+  puts "Running #{options.script} and exiting"  
+  require "awestruct/scripts/#{options.script}"
+  script_class = eval "Awestruct::Scripts::#{camelize(options.script)}"
+  script = script_class.new(*ARGV)
+  script.run
+  exit
+end
+
+threads = []
+
 if ( options.server )
   hostname = ( options.bind_addr == '0.0.0.0' ? 'localhost' : options.bind_addr )
   default_base_url = "http://#{hostname}:#{options.port}"

data/lib/awestruct/engine.rb

@@ -5,10 +5,13 @@ require 'compass'
 require 'ninesixty'
 require 'time'
 
+require 'hashery/opencascade'
+
 require 'awestruct/config'
 require 'awestruct/site'
 require 'awestruct/haml_file'
 require 'awestruct/erb_file'
+require 'awestruct/textile_file'
 require 'awestruct/maruku_file'
 require 'awestruct/sass_file'
 require 'awestruct/scss_file'
@@ -101,6 +104,8 @@ module Awestruct
         page = HamlFile.new( site, path, fixed_relative_path )
       elsif ( path =~ /\.erb$/ )
         page = ErbFile.new( site, path, fixed_relative_path )
+      elsif ( path =~ /\.textile$/ )
+        page = TextileFile.new( site, path, fixed_relative_path )
       elsif ( path =~ /\.md$/ )
         page = MarukuFile.new( site, path, fixed_relative_path )
       elsif ( path =~ /\.sass$/ )
@@ -353,7 +358,7 @@ module Awestruct
           obj.each do |k,v|
             result[k] = massage_yaml(v)
           end
-          result = OpenStruct.new( result )
+          result = OpenCascade.new(result.inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo })
         when Array
           result = []
           obj.each do |v|

data/lib/awestruct/extensions/disqus.rb

@@ -8,42 +8,36 @@ module Awestruct
 
       module Disqus
         def disqus_comments()
-          'comments'
+          %Q{
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+            var disqus_url = "#{self.url}";
+            (function() {
+              var dsq = document.createElement("script"); dsq.type = "text/javascript"; dsq.async = true;
+              dsq.src = "http://#{site.disqus}.disqus.com/embed.js";
+              (document.getElementsByTagName("head")[0] || document.getElementsByTagName("body")[0]).appendChild(dsq);
+            })();
+            </script>
+            <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript=#{site.disqus}">comments powered by Disqus.</a></noscript>
+          }
         end
 
         def disqus_comments_link()
-          'comments link'
+          %Q{ <a href="#{self.url}#disqus_thread">Comments</a> }
         end
 
-# http://bakery.cakephp.org/articles/view/disqus-comment-system-integration-helper
-
-# <div id="disqus_thread"></div>
-# <script type="text/javascript">
-#   /**
-#     * var disqus_identifier; [Optional but recommended: Define a unique identifier (e.g. post id or slug) for this thread] 
-#     */
-#   (function() {
-#    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-#    dsq.src = 'http://vafer.disqus.com/embed.js';
-#    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-#   })();
-# </script>
-# <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript=vafer">comments powered by Disqus.</a></noscript>
-# <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
-
-# <script type="text/javascript">
-# var disqus_shortname = 'vafer';
-# (function () {
-#   var s = document.createElement('script'); s.async = true;
-#   s.src = 'http://disqus.com/forums/vafer/count.js';
-#   (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-# }());
-# </script>
-
-# <a href="http://example.com/my_article.html#disqus_thread">Comments</a>
-
-# post_id = self.post_id ? self.post_id : Digest::SHA1.hexdigest( self.url )
-
+        def disqus_comments_link_loader()
+          %Q{
+            <script type="text/javascript">
+            var disqus_shortname = "#{site.disqus}";
+            (function () {
+              var s = document.createElement('script'); s.async = true;
+              s.src = "http://disqus.com/forums/#{site.disqus}/count.js";
+              (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+            }());
+            </script>
+          }
+        end
       end
     end
   end

data/lib/awestruct/extensions/template.atom.haml

@@ -25,5 +25,5 @@
         %summary
           #{summarize( html_to_text( entry.content ), 100 )}...
         %content{:type=>'html'}
-          = clean_html( escape_once( fully_qualify_urls( site.base_url, entry.content )  ) )
+          = clean_html( escape_once( fully_qualify_urls( site.base_url, find_and_preserve( entry.content ) ) ) )
   

data/lib/awestruct/front_matter_file.rb

@@ -4,6 +4,7 @@ module Awestruct
   class FrontMatterFile < RenderableFile
 
     attr_reader :raw_page_content
+    attr_reader :front_matter
 
     def initialize(site, source_path, relative_source_path)
       super( site, source_path, relative_source_path )
@@ -40,8 +41,8 @@ module Awestruct
       end
 
       begin
-        front_matter = YAML.load( yaml_content ) || {}
-        front_matter.each do |k,v| 
+        @front_matter = YAML.load( yaml_content ) || {}
+        @front_matter.each do |k,v| 
           self.send( "#{k}=", v )
         end
       rescue=>e

data/lib/awestruct/textilable.rb

@@ -0,0 +1,21 @@
+module Awestruct
+
+  module Textilable
+    def render(context)
+      rendered = ''
+      begin
+        rendered = RedCloth.new( context.interpolate_string( raw_page_content ) ).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

data/lib/awestruct/textile_file.rb

@@ -0,0 +1,23 @@
+require 'awestruct/front_matter_file'
+require 'awestruct/textilable'
+require 'redcloth'
+
+module Awestruct
+  class TextileFile < FrontMatterFile
+
+    include Textilable
+
+    def initialize(site, source_path, relative_source_path)
+      super(site, source_path, relative_source_path)
+    end
+
+    def output_filename
+      File.basename( self.source_path, '.textile' ) + output_extension
+    end
+
+    def output_extension
+      '.html'
+    end
+
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awestruct
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Bob McWhirter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 -04:00
+date: 2011-02-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bluecloth
+  name: hashery
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,7 +61,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: compass
+  name: bluecloth
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -75,9 +75,25 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: compass-960-plugin
+  name: RedCloth
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - <=
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 4
+        - 2
+        - 5
+        version: 4.2.5
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: maruku
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -87,11 +103,39 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: compass
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: compass-960-plugin
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: org-ruby
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,7 +145,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id009
 description: 
 email: bob@mcwhirter.org
 executables: 
@@ -148,6 +192,8 @@ files:
 - lib/awestruct/sassable.rb
 - lib/awestruct/scss_file.rb
 - lib/awestruct/site.rb
+- lib/awestruct/textilable.rb
+- lib/awestruct/textile_file.rb
 - lib/awestruct/util/default_inflections.rb
 - lib/awestruct/util/inflector.rb
 - lib/awestruct/verbatim_file.rb