awestruct 0.1.8 → 0.1.9

data/bin/awestruct

@@ -98,13 +98,20 @@ def site_path
 end
 
 options = parse(ARGV)
+
 unless options.init
   site_yaml_file = File.join( Dir.pwd, '_config', 'site.yml' )
   site_yaml      = YAML.load( File.read( site_yaml_file ) )
-  @profiles_data  = site_yaml ? site_yaml['profiles'] : {}
-  @profile_data   = @profiles_data.nil? ? nil : @profiles_data[options.profile]
+  if site_yaml
+    @profiles_data  = site_yaml['profiles'] || {}
+    @profile_data   = @profiles_data.nil? ? nil : @profiles_data[options.profile]
+  end
 end
 
+config = Awestruct::Config.new(Dir.pwd)
+# config.input_dir = File.join(Dir.pwd, '_root')
+
+
 if ( options.init )
   if ( options.generate || options.auto || options.server )
     $stderr.puts "--init may not be used with --generate, --auto or --server"
@@ -178,13 +185,13 @@ if ( options.server )
 end
 
 if ( options.generate )
-  cmd = Awestruct::Commands::Generate.new( Dir.pwd, options.profile, options.base_url, default_base_url, options.force )
+  cmd = Awestruct::Commands::Generate.new( config, options.profile, options.base_url, default_base_url, options.force )
   cmd.run
 end
 
 if ( options.auto )
   threads << Thread.new {
-    generate_cmd = Awestruct::Commands::Generate.new( Dir.pwd, options.profile, options.base_url, default_base_url )
+    generate_cmd = Awestruct::Commands::Generate.new( config, options.profile, options.base_url, default_base_url )
     while ( true )
       generate_cmd.run
       sleep(1)

data/lib/awestruct/commands/generate.rb

@@ -4,13 +4,13 @@ module Awestruct
   module Commands
     class Generate
 
-      def initialize(dir=Dir.pwd, profile=nil, base_url=nil, default_base_url='http://localhost:4242', force=false)
-        @dir              = dir
+      def initialize(config, profile=nil, base_url=nil, default_base_url='http://localhost:4242', force=false)
+        @dir              = config.input_dir
         @profile          = profile
         @base_url         = base_url
         @default_base_url = default_base_url
         @force            = force
-        @engine           = Awestruct::Engine.new( @dir )
+        @engine           = Awestruct::Engine.new( config )
       end
 
       def run()

data/lib/awestruct/config.rb

@@ -6,16 +6,20 @@ module Awestruct
     attr_accessor :layouts_dir
     attr_accessor :config_dir
     attr_accessor :extension_dir
+    attr_accessor :input_dir
     attr_accessor :output_dir
+    attr_accessor :tmp_dir
     attr_accessor :skin_dir
     attr_accessor :ignore
 
-    def initialize()
-      @layouts_dir    = '_layouts'
-      @config_dir     = '_config'
-      @output_dir     = '_site'
-      @extension_dir  = '_ext'
-      @skin_dir       = '_skin'
+    def initialize(dir)
+      @layouts_dir    = File.join(dir, '_layouts')
+      @config_dir     = File.join(dir, '_config')
+      @input_dir      = File.join(dir, '')
+      @output_dir     = File.join(dir, '_site')
+      @extension_dir  = File.join(dir, '_ext')
+      @skin_dir       = File.join(dir, '_skin')
+      @tmp_dir        = File.join(dir, '_tmp')
       @ignore         = [ ]
     end
 

data/lib/awestruct/engine.rb

@@ -22,6 +22,7 @@ require 'awestruct/context_helper'
 
 require 'awestruct/extensions/pipeline'
 require 'awestruct/extensions/posts'
+require 'awestruct/extensions/collection'
 require 'awestruct/extensions/indexifier'
 require 'awestruct/extensions/data_dir'
 require 'awestruct/extensions/paginator'
@@ -44,15 +45,14 @@ module Awestruct
     attr_reader :dir
     attr_reader :site
 
-    def initialize(dir, config=::Awestruct::Config.new)
-      @dir    = dir
+    def initialize(config)
+      @dir    = config.input_dir
       @config = config
-      @site   = Site.new( @dir )
+
+      @site   = Site.new( config )
       @site.engine = self
-      @site.tmp_dir = File.join( dir, '_tmp' )
+
       @helpers = []
-      FileUtils.mkdir_p( @site.tmp_dir )
-      FileUtils.mkdir_p( @site.output_dir )
       @max_yaml_mtime = nil
     end
 
@@ -76,7 +76,7 @@ module Awestruct
     end
 
     def find_and_load_site_page(simple_path)
-      path_glob = File.join( dir, simple_path + '.*' )
+      path_glob = File.join( config.input_dir, simple_path + '.*' )
       candidates = Dir[ path_glob ]
       return nil if candidates.empty?
       throw Exception.new( "too many choices for #{simple_path}" ) if candidates.size != 1
@@ -194,7 +194,7 @@ module Awestruct
     def generate_page(page, force)
       return unless requires_generation?(page, force)
 
-      generated_path = File.join( dir, config.output_dir, page.output_path )
+      generated_path = File.join( config.output_dir, page.output_path )
       $stderr.puts "rendering #{page.source_path} -> #{page.output_path}"
       rendered = render_page(page, true)
       FileUtils.mkdir_p( File.dirname( generated_path ) )
@@ -205,7 +205,7 @@ module Awestruct
 
     def requires_generation?(page,force)
       return true if force
-      generated_path = File.join( @dir, config.output_dir, page.output_path )
+      generated_path = File.join( config.output_dir, page.output_path )
       return true unless File.exist?( generated_path )
       now = Time.now
       generated_mtime = File.mtime( generated_path )
@@ -247,7 +247,7 @@ module Awestruct
     def load_layouts
       site.layouts.clear
       dir_pathname = Pathname.new( dir )
-      Dir[ File.join( dir, config.layouts_dir, '*.haml' ) ].each do |layout_path|
+      Dir[ File.join( config.layouts_dir, '*.haml' ) ].each do |layout_path|
         layout_pathname = Pathname.new( layout_path )
         relative_path = layout_pathname.relative_path_from( dir_pathname ).to_s
         name = File.basename( layout_path, '.haml' )
@@ -267,7 +267,7 @@ module Awestruct
     end
 
     def load_site_yaml(profile)
-      site_yaml = File.join( dir, config.config_dir, 'site.yml' )
+      site_yaml = File.join( config.config_dir, 'site.yml' )
       if ( File.exist?( site_yaml ) )
         mtime = File.mtime( site_yaml )
         if ( mtime > ( @max_yaml_mtime || Time.at(0) ) )
@@ -290,7 +290,7 @@ module Awestruct
     end
 
     def load_yamls
-      Dir[ File.join( dir, config.config_dir, '*.yml' ) ].each do |yaml_path|
+      Dir[ File.join( config.config_dir, '*.yml' ) ].each do |yaml_path|
         load_yaml( yaml_path ) unless ( File.basename( yaml_path ) == 'site.yml' ) 
       end
     end
@@ -373,7 +373,7 @@ module Awestruct
       pipeline = nil
       skin_pipeline = nil
 
-      ext_dir = File.join( dir, config.extension_dir ) 
+      ext_dir = File.join( config.extension_dir ) 
       if ( $LOAD_PATH.index( ext_dir ).nil? )
         $LOAD_PATH << ext_dir
       end

data/lib/awestruct/extensions/atomizer.rb

@@ -8,9 +8,9 @@ module Awestruct
       end
 
       def execute(site)
-        entries = site.send( @entries_name )
+        entries = site.send( @entries_name ) || []
         unless ( @num_entries == :all )
-          entries = entries[0,@num_entries]
+          entries = entries[0, @num_entries]
         end
         input_page = File.join( File.dirname(__FILE__), 'template.atom.haml' )
         page = site.engine.load_page( input_page )

data/lib/awestruct/extensions/collection.rb

@@ -0,0 +1,52 @@
+
+module Awestruct
+  module Extensions
+    class Collection
+
+      def initialize(assign_to, path_prefix = nil, default_layout = nil)
+        @assign_to      = assign_to
+        @path_prefix    = path_prefix || '_' + assign_to.to_s
+        @default_layout = default_layout || assign_to.to_s.singularize
+      end
+
+      def execute(site)
+        posts = []
+
+        Dir[ "#{@path_prefix}/*" ].each do |entry|
+          if entry =~ /^#{@path_prefix}\/(20[01][0-9])-([01][0-9])-([0123][0-9])-([^.]+)\..*$/
+            if ( File.directory?( entry ) )
+              # TODO deal with dirs
+            else
+              page = site.engine.load_page( entry )
+              year  = $1
+              month = $2
+              day   = $3
+              slug  = $4
+              page.date = Time.utc( year.to_i, month.to_i, day.to_i )
+              page.slug = slug
+              page.output_path = "/#{year}/#{month}/#{day}/#{slug}/index.html"
+              page.layout ||= @default_layout
+
+              posts << page
+              site.pages << page
+            end
+          end
+        end
+
+        posts = posts.sort_by{|each| [each.date, each.sequence || 0, File.mtime( each.source_path ), each.slug ] }.reverse
+
+        last = nil
+        singular = @assign_to.to_s.singularize
+        posts.each do |e|
+          if ( last != nil )
+             e.send( "next_#{singular}=", last )
+             last.send( "previous_#{singular}=", e )
+          end
+          last = e
+        end
+
+        site.send( "#{@assign_to}=", posts )
+      end
+    end
+  end
+end

data/lib/awestruct/extensions/disqus.rb

@@ -3,15 +3,17 @@ module Awestruct
     class Disqus
 
       def execute(site)
-        site.pages.each{|p| p.extend Disqus }
+        site.pages.each{ |p| p.extend Disqus }
       end
 
       module Disqus
         def disqus_comments()
+          developer = (site.disqus_developer) ? 'var disqus_developer = 1;' : ''
           %Q{
             <div id="disqus_thread"></div>
             <script type="text/javascript">
             var disqus_url = "#{self.url}";
+            #{developer}
             (function() {
               var dsq = document.createElement("script"); dsq.type = "text/javascript"; dsq.async = true;
               dsq.src = "http://#{site.disqus}.disqus.com/embed.js";
@@ -26,10 +28,10 @@ module Awestruct
           %Q{ <a href="#{self.url}#disqus_thread">Comments</a> }
         end
 
-        def disqus_comments_link_loader()
+        def disqus_comments_count()
           %Q{
             <script type="text/javascript">
-            var disqus_shortname = "#{site.disqus}";
+            var disqus = "#{site.disqus}";
             (function () {
               var s = document.createElement('script'); s.async = true;
               s.src = "http://disqus.com/forums/#{site.disqus}/count.js";

data/lib/awestruct/extensions/google_analytics.rb

@@ -14,7 +14,25 @@ module Awestruct
         html += %Q(var pageTracker = _gat._getTracker("#{site.google_analytics}");\n)
         html += %Q(pageTracker._trackPageview();\n)
         html += %Q(} catch(err) {}</script>\n)
-        html 
+        html
+      end
+
+      def google_analytics_async()
+        html = ''
+        html += %Q(<script type="text/javascript">\n)
+        html += %Q(var _gaq = [['_setAccount','#{site.google_analytics}"'],)
+        if site.google_analytics_anonymize
+          html += %Q(['_gat._anonymizeIp'],)
+        end
+        html += %Q(['_trackPageview']];\n)
+        html += %Q[(function(d, t) {\n]
+        html += %Q( var g = d.createElement(t),\n)
+        html += %Q(     s = d.getElementsByTagName(t)[0];\n)
+        html += %Q( g.async = true;\n)
+        html += %Q( g.src = ('https:' == location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\n)
+        html += %Q( s.parentNode.insertBefore(g, s);\n)
+        html += %Q[})(document, 'script');\n]
+        html
       end
     end
   end

data/lib/awestruct/extensions/posts.rb

@@ -10,7 +10,7 @@ module Awestruct
 
       def execute(site)
         posts = []
-    
+
         site.pages.each do |page|
           if ( page.relative_source_path =~ /^#{@path_prefix}\/(20[01][0-9])-([01][0-9])-([0123][0-9])-([^.]+)\..*$/ )
             year  = $1
@@ -25,6 +25,7 @@ module Awestruct
             })
             #page.body = page.render( context )
             page.output_path = "#{@path_prefix}/#{year}/#{month}/#{day}/#{slug}.html"
+            #page.layout = 'post'
             posts << page
           end
         end

data/lib/awestruct/renderable_file.rb

@@ -18,6 +18,10 @@ module Awestruct
       end
     end
 
+    def to_root
+      '../' * ( self.output_path.count('/') - 1 )
+    end
+
     def raw_page_content
       File.read( self.source_path )
     end

data/lib/awestruct/site.rb

@@ -9,11 +9,16 @@ module Awestruct
     attr_reader   :layouts
     attr_accessor :pages
 
-    def initialize(dir)
+    attr_accessor :config
+
+    def initialize(config)
       super({})
 
-      @dir = dir
-      @output_dir = File.join( dir, '_site' )
+      @dir = config.input_dir
+      @output_dir = config.output_dir
+      @config = config
+
+      FileUtils.mkdir_p( @output_dir )
 
       @pages   = []
       @layouts = {}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awestruct
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Bob McWhirter
@@ -167,6 +167,7 @@ files:
 - lib/awestruct/erb_file.rb
 - lib/awestruct/erbable.rb
 - lib/awestruct/extensions/atomizer.rb
+- lib/awestruct/extensions/collection.rb
 - lib/awestruct/extensions/data_dir.rb
 - lib/awestruct/extensions/disqus.rb
 - lib/awestruct/extensions/google_analytics.rb