ruhoh 0.0.2 → 0.0.3

data/lib/ruhoh/utils.rb

@@ -2,27 +2,45 @@ class Ruhoh
   
   module Utils
     
-    FMregex = /^---\n(.|\n)*---\n/
+    FMregex = /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
     ContentRegex = /\{\{\s*content\s*\}\}/i
     
-    # Relative file_path from site_source
-    def self.parse_file(*args)
-      path = File.__send__ :join, args
+    def self.parse_file_as_yaml(*args)
+      filepath = File.__send__ :join, args
+      return nil unless File.exist? filepath
 
+      file = File.open(filepath)
+      yaml = YAML.load(file) || {}
+      file.close  
+      
+      yaml
+    end
+    
+    def self.parse_file(*args)
+      path = File.__send__(:join, args)
+      path = File.join(Ruhoh.paths.site_source, path) unless path[0] == '/'
+      
       raise "File not found: #{path}" unless File.exist?(path)
 
       page = File.open(path).read
       front_matter = page.match(FMregex)
-      raise "Invalid Frontmatter" unless front_matter
+
+      return {} unless front_matter
 
       data = YAML.load(front_matter[0].gsub(/---\n/, "")) || {}
 
       { 
-        "data" => data, 
+        "data" => self.format_meta(data),
         "content" => page.gsub(FMregex, '')
       }
     end
-  
+    
+    def self.format_meta(data)
+      data['categories'] = Array(data['categories'])
+      data['tags'] = Array(data['tags'])
+      data
+    end
+    
   end
   
 end #Ruhoh

data/lib/ruhoh/version.rb

@@ -1,3 +1,3 @@
 class Ruhoh
-  Version = VERSION = '0.0.2'
+  Version = VERSION = '0.0.3'
 end

data/lib/ruhoh/watch.rb

@@ -10,7 +10,9 @@ class Ruhoh
     # Returns: Nothing
     def self.start
       raise "Ruhoh.config cannot be nil.\n To set config call: Ruhoh.setup" unless Ruhoh.config
-      puts "=> Start watching: #{Ruhoh.paths.site_source}"
+      Ruhoh::Friend.say {
+        plain "=> Start watching: #{Ruhoh.paths.site_source}"
+      }
       glob = ''
     
       # Watch all files + all sub directories except for special folders e.g '_database'
@@ -30,23 +32,34 @@ class Ruhoh
       dw.add_observer {|*args| 
         args.each {|event|
           path = event['path'].gsub(Ruhoh.paths.site_source, '')
-          puts path
-          if path =~ Regexp.new("^\/?#{Ruhoh.folders.posts}")
-            puts "Watch: update posts"
+
+          if path == "/#{Ruhoh.files.site}"
+            type = "Site"
+            Ruhoh::DB.update(:site)
+          elsif path == "/#{Ruhoh.files.config}"
+            type = "Config"
+            Ruhoh::DB.update(:site)
+          elsif path =~ Regexp.new("^\/?#{Ruhoh.folders.posts}")
+            type = "Posts"
             Ruhoh::DB.update(:posts)
             Ruhoh::DB.update(:routes)
+          elsif path =~ Regexp.new("^\/?#{Ruhoh.folders.drafts}")
+            type = "Drafts"
+            Ruhoh::DB.update(:drafts)
+            Ruhoh::DB.update(:routes)
           elsif path =~ Regexp.new("^\/?#{Ruhoh.folders.templates}")
-            puts "Watch: update themes"
+            type = "Themes"
             Ruhoh::DB.update(:layouts)
             Ruhoh::DB.update(:partials)
           else
-            puts "Watch: update pages"
+            type = "Pages"
             Ruhoh::DB.update(:pages)
             Ruhoh::DB.update(:routes)
           end
-  
-          t = Time.now.strftime("%H:%M:%S")
-          puts "[#{t}] regeneration: #{args.size} files changed"
+          
+          Ruhoh::Friend.say {
+            yellow "Watch [#{Time.now.strftime("%H:%M:%S")}] [Update #{type}] : #{args.size} files changed"
+          }
         }
       }
 

data/lib/ruhoh.rb

@@ -7,6 +7,8 @@ require 'fileutils'
 require 'mustache'
 
 require 'ruhoh/utils'
+require 'ruhoh/friend'
+require 'ruhoh/parsers/drafts'
 require 'ruhoh/parsers/posts'
 require 'ruhoh/parsers/pages'
 require 'ruhoh/parsers/routes'
@@ -14,63 +16,102 @@ require 'ruhoh/parsers/layouts'
 require 'ruhoh/parsers/partials'
 require 'ruhoh/parsers/site'
 require 'ruhoh/db'
-require 'ruhoh/templaters/helper_mustache'
-require 'ruhoh/templaters/templater'
+require 'ruhoh/templaters/helpers'
+require 'ruhoh/templaters/rmustache'
+require 'ruhoh/templaters/base'
 require 'ruhoh/converters/converter'
 require 'ruhoh/page'
-require 'ruhoh/preview'
+require 'ruhoh/previewer'
 require 'ruhoh/watch'
 
 class Ruhoh
 
   class << self; attr_reader :folders, :files, :config, :paths, :filters end
   
-  Folders = Struct.new(:database, :posts, :templates, :themes, :layouts, :partials, :media)
+  Root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  DefaultExclude = ['Gemfile', 'Gemfile.lock', 'config.ru', 'README.md']
+  Folders = Struct.new(:database, :posts, :drafts, :templates, :themes, :layouts, :partials, :media, :syntax, :compiled)
   Files = Struct.new(:site, :config)
   Filters = Struct.new(:posts, :pages, :static)
-  Config = Struct.new(:permalink, :theme, :asset_path)
+  Config = Struct.new(:permalink, :theme, :theme_path, :media_path, :syntax_path, :exclude)
   Paths = Struct.new(
     :site_source,
     :database,
     :posts,
+    :drafts,
     :theme,
     :layouts,
     :partials,
     :global_partials,
-    :media
+    :media,
+    :syntax,
+    :compiled
   )
   
+  
   # Public: Setup Ruhoh utilities relative to the current directory
   # of the application and its corresponding ruhoh.json file.
   #
-  def self.setup
-    @folders    = Folders.new('_database', '_posts', '_templates', 'themes', 'layouts', 'partials', "_media")
-    @files      = Files.new('_site.yml', '_config.yml')
-    @filters    = Filters.new
-    @config     = Config.new
-    @paths      = Paths.new
-    
-    config = { 'site_source' => Dir.getwd }
-    site_config = YAML.load_file( File.join(config['site_source'], '_config.yml') )
+  def self.setup(site_source = nil)
+    self.reset
 
-    @config.permalink         = site_config['permalink'] || :date
-    @config.theme             = site_config['theme']
-    @config.asset_path        = File.join('/', @folders.templates, @folders.themes, @config.theme)
+    @site_source = site_source if site_source
+    self.setup_config
+    self.setup_paths
+    self.setup_filters
+  end
+  
+  def self.reset
+    @folders     = Folders.new('_database', '_posts', '_drafts', '_templates', 'themes', 'layouts', 'partials', "_media", "syntax", '_compiled')
+    @files       = Files.new('_site.yml', '_config.yml')
+    @filters     = Filters.new
+    @config      = Config.new
+    @paths       = Paths.new
+    @site_source = Dir.getwd
+  end
+  
+  def self.setup_config
+    site_config = Ruhoh::Utils.parse_file_as_yaml(@site_source, @files.config)
+    unless site_config
+      Ruhoh::Friend.say {
+        red "Empty site_config"
+        red "Please ensure ./#{Ruhoh.files.config} exists and contains valid YAML"
+      }
+      exit
+    end
     
-    @paths.site_source = config['site_source']
-    @paths.database    = self.absolute_path(@folders.database)
-    @paths.posts       = self.absolute_path(@folders.posts)
+    theme = site_config['theme'] ? site_config['theme'].to_s.gsub(/\s/, '') : ''
+    raise "Theme not specified in _config.yml" if theme.empty?
 
-    @paths.theme       = self.absolute_path(@folders.templates, @folders.themes, @config.theme)
-    @paths.layouts     = self.absolute_path(@folders.templates, @folders.themes, @config.theme, @folders.layouts)
-    @paths.partials    = self.absolute_path(@folders.templates, @folders.themes, @config.theme, @folders.partials)
-    @paths.global_partials = self.absolute_path(@folders.templates, @folders.partials)
-    @paths.media = self.absolute_path(@folders.media)
-    
+    @config.theme         = theme
+    @config.theme_path    = File.join('/', @folders.templates, @folders.themes, @config.theme)
+    @config.media_path    = File.join('/', @folders.media)
+    @config.syntax_path   = File.join('/', @folders.templates, @folders.syntax)
+    @config.permalink     = site_config['permalink']
+    @config.exclude       = Array(site_config['exclude'] || nil)
+  end
+  
+  def self.setup_paths
+    @paths.site_source      = @site_source
+    @paths.database         = self.absolute_path(@folders.database)
+    @paths.posts            = self.absolute_path(@folders.posts)
+    @paths.drafts           = self.absolute_path(@folders.drafts)
 
-    # filename filters:
+    @paths.theme            = self.absolute_path(@folders.templates, @folders.themes, @config.theme)
+    @paths.layouts          = self.absolute_path(@folders.templates, @folders.themes, @config.theme, @folders.layouts)
+    @paths.partials         = self.absolute_path(@folders.templates, @folders.themes, @config.theme, @folders.partials)
+    @paths.global_partials  = self.absolute_path(@folders.templates, @folders.partials)
+    @paths.media            = self.absolute_path(@folders.media)
+    @paths.syntax           = self.absolute_path(@folders.templates, @folders.syntax)
+    @paths.compiled         = self.absolute_path(@folders.compiled)
+  end
+  
+  # filename filters
+  def self.setup_filters
+    exclude = @config.exclude + DefaultExclude
+    exclude.uniq!
+    
     @filters.pages = { 'names' => [], 'regexes' => [] }
-    exclude = ['Gemfile', 'Gemfile.lock', 'config.ru', 'README.md']
     exclude.each {|node| 
       @filters.pages['names'] << node if node.is_a?(String)
       @filters.pages['regexes'] << node if node.is_a?(Regexp)
@@ -80,5 +121,9 @@ class Ruhoh
   def self.absolute_path(*args)
     File.__send__ :join, args.unshift(self.paths.site_source)
   end
+  
+  def self.relative_path(filename)
+    filename.gsub( Regexp.new("^#{self.paths.site_source}/"), '' )
+  end
     
 end # Ruhoh  

data/ruhoh.gemspec

@@ -7,41 +7,102 @@ Gem::Specification.new do |s|
   s.date              = Time.now.strftime('%Y-%m-%d')
   s.license           = "http://unlicense.org/"
   s.summary           = 'Ruby based library to process your Ruhoh static blog.'
-  s.homepage          = "http://github.com/plusjade/ruhoh.rb"
+  s.homepage          = "http://github.com/ruhoh/ruhoh.rb"
   s.email             = "plusjade@gmail.com"
   s.authors           = ['Jade Dominguez']
   s.description       = 'Ruhoh is a Universal API for your static blog.'
   s.executables       = ["ruhoh"]
   
   # dependencies defined in Gemfile
-  s.add_dependency 'rack'
-  s.add_dependency 'mustache'
-  s.add_dependency 'directory_watcher'
-  s.add_dependency 'maruku'
+  s.add_dependency 'rack', "~> 1.4"
+  s.add_dependency 'mustache', "~> 0.99"
+  s.add_dependency 'directory_watcher', "~> 1.4"
+  s.add_dependency 'maruku', "~> 0.6"
   
   # = MANIFEST =
   s.files = %w[
+    Gemfile
     README.md
+    Rakefile
     bin/ruhoh
     lib/ruhoh.rb
-    lib/ruhoh/client.rb
+    lib/ruhoh/client/client.rb
+    lib/ruhoh/client/help.yml
     lib/ruhoh/compiler.rb
     lib/ruhoh/converters/converter.rb
     lib/ruhoh/db.rb
+    lib/ruhoh/deployers/s3.rb
+    lib/ruhoh/friend.rb
     lib/ruhoh/page.rb
+    lib/ruhoh/parsers/drafts.rb
     lib/ruhoh/parsers/layouts.rb
     lib/ruhoh/parsers/pages.rb
     lib/ruhoh/parsers/partials.rb
     lib/ruhoh/parsers/posts.rb
     lib/ruhoh/parsers/routes.rb
     lib/ruhoh/parsers/site.rb
-    lib/ruhoh/preview.rb
-    lib/ruhoh/templaters/helper_mustache.rb
-    lib/ruhoh/templaters/templater.rb
+    lib/ruhoh/previewer.rb
+    lib/ruhoh/templaters/base.rb
+    lib/ruhoh/templaters/helpers.rb
+    lib/ruhoh/templaters/rmustache.rb
     lib/ruhoh/utils.rb
     lib/ruhoh/version.rb
     lib/ruhoh/watch.rb
     ruhoh.gemspec
+    scaffolds/blog/_config.yml
+    scaffolds/blog/_drafts/.gitkeep
+    scaffolds/blog/_posts/.gitkeep
+    scaffolds/blog/_site.yml
+    scaffolds/blog/_templates/partials/categories_list
+    scaffolds/blog/_templates/partials/pages_list
+    scaffolds/blog/_templates/partials/posts_collate
+    scaffolds/blog/_templates/partials/posts_list
+    scaffolds/blog/_templates/partials/tags_list
+    scaffolds/blog/_templates/syntax/google_prettify/default.css
+    scaffolds/blog/_templates/syntax/google_prettify/desert.css
+    scaffolds/blog/_templates/syntax/google_prettify/sons-of-obsidian.css
+    scaffolds/blog/_templates/syntax/google_prettify/sunburst.css
+    scaffolds/blog/_templates/syntax/google_prettify/twitter-bootstrap.css
+    scaffolds/blog/_templates/themes/twitter/bootstrap/css/bootstrap.min.css
+    scaffolds/blog/_templates/themes/twitter/bootstrap/img/glyphicons-halflings-white.png
+    scaffolds/blog/_templates/themes/twitter/bootstrap/img/glyphicons-halflings.png
+    scaffolds/blog/_templates/themes/twitter/css/style.css
+    scaffolds/blog/_templates/themes/twitter/layouts/default.html
+    scaffolds/blog/_templates/themes/twitter/layouts/page.html
+    scaffolds/blog/_templates/themes/twitter/layouts/post.html
+    scaffolds/blog/_templates/themes/twitter/manifest.yml
+    scaffolds/blog/about.md
+    scaffolds/blog/archive.html
+    scaffolds/blog/categories.html
+    scaffolds/blog/config.ru
+    scaffolds/blog/index.html
+    scaffolds/blog/pages.html
+    scaffolds/blog/tags.html
+    scaffolds/layout.html
+    scaffolds/page.html
+    scaffolds/post.html
+    scaffolds/theme/css/style.css
+    scaffolds/theme/images/.gitkeep
+    scaffolds/theme/layouts/default.html
+    scaffolds/theme/layouts/page.html
+    scaffolds/theme/layouts/post.html
+    scaffolds/theme/partials/.gitkeep
+    spec/db_spec.rb
+    spec/page_spec.rb
+    spec/parsers/layouts_spec.rb
+    spec/parsers/pages_spec.rb
+    spec/parsers/posts_spec.rb
+    spec/parsers/routes_spec.rb
+    spec/parsers/site_spec.rb
+    spec/setup_spec.rb
+    spec/spec_helper.rb
+    system_partials/analytics/getclicky
+    system_partials/analytics/google
+    system_partials/comments/disqus
+    system_partials/comments/facebook
+    system_partials/comments/intensedebate
+    system_partials/comments/livefyre
+    system_partials/syntax/google_prettify
   ]
   # = MANIFEST =
 end

data/scaffolds/blog/_config.yml

@@ -0,0 +1,33 @@
+---
+version : 0.0.3
+permalink: /:categories/:title
+theme : twitter
+
+production_url : http://sample.com
+
+comments :
+  provider : disqus
+  disqus :
+    short_name : jekyllbootstrap
+  livefyre :
+    site_id : 123
+  intensedebate :
+    account : 123abc
+  facebook :
+    appid : 123
+    num_posts: 5
+    width: 580
+    colorscheme: light
+
+analytics :
+  provider : google
+  google : 
+      tracking_id : 'UA-123-12'
+  getclicky :
+    site_id : 
+
+syntax :
+  provider : google_prettify
+  google_prettify : 
+      theme: twitter-bootstrap
+      linenums : true

data/scaffolds/blog/_site.yml

@@ -0,0 +1,16 @@
+title : Blog Title
+tagline: Blog Tagline
+author :
+  name : Firstname Lastname
+  email : blah@email.test
+  github : username
+  twitter : username
+  feedburner : feedname
+
+navigation :
+  - archive.html
+  - tags.html
+  - categories.html
+  - pages.html
+  - about.md
+  

data/scaffolds/blog/_templates/partials/categories_list

@@ -0,0 +1,3 @@
+<li>
+  <a href="{{ url }}">{{ name }} <span>{{ count }}</span></a>
+</li>

data/scaffolds/blog/_templates/partials/pages_list

@@ -0,0 +1,7 @@
+{{#is_active_page }}
+  <li class="active"><a href="{{url}}" class="active">{{title}}</a></li>
+{{/is_active_page}}
+
+{{^is_active_page}}
+  <li><a href="{{url}}">{{title}}</a></li>
+{{/is_active_page }}

data/scaffolds/blog/_templates/partials/posts_collate

@@ -0,0 +1,9 @@
+<h2>{{year}}</h2>
+{{#months}}
+  <h3>{{month}}</h3>
+  <ul>
+  {{#posts?to_posts}}
+    <li><span>{{date}}</span> &raquo; <a href="{{url}}">{{title}}</a></li>
+  {{/posts?to_posts}}
+  </ul>
+{{/months}}

data/scaffolds/blog/_templates/partials/posts_list

@@ -0,0 +1 @@
+<li><a href="{{url}}">{{title}}</a></li>

data/scaffolds/blog/_templates/partials/tags_list

@@ -0,0 +1,3 @@
+<li>
+  <a href="{{ url }}">{{ name }} <span>{{ count }}</span></a>
+</li>

data/scaffolds/blog/_templates/syntax/google_prettify/default.css

@@ -0,0 +1,52 @@
+/* Pretty printing styles. Used with prettify.js. */
+
+/* SPAN elements with the classes below are added by prettyprint. */
+.pln { color: #000 }  /* plain text */
+
+@media screen {
+  .str { color: #080 }  /* string content */
+  .kwd { color: #008 }  /* a keyword */
+  .com { color: #800 }  /* a comment */
+  .typ { color: #606 }  /* a type name */
+  .lit { color: #066 }  /* a literal value */
+  /* punctuation, lisp open bracket, lisp close bracket */
+  .pun, .opn, .clo { color: #660 }
+  .tag { color: #008 }  /* a markup tag name */
+  .atn { color: #606 }  /* a markup attribute name */
+  .atv { color: #080 }  /* a markup attribute value */
+  .dec, .var { color: #606 }  /* a declaration; a variable name */
+  .fun { color: red }  /* a function name */
+}
+
+/* Use higher contrast and text-weight for printable form. */
+@media print, projection {
+  .str { color: #060 }
+  .kwd { color: #006; font-weight: bold }
+  .com { color: #600; font-style: italic }
+  .typ { color: #404; font-weight: bold }
+  .lit { color: #044 }
+  .pun, .opn, .clo { color: #440 }
+  .tag { color: #006; font-weight: bold }
+  .atn { color: #404 }
+  .atv { color: #060 }
+}
+
+/* Put a border around prettyprinted code snippets. */
+pre.prettyprint { padding: 2px; border: 1px solid #888 }
+
+/* Specify class=linenums on a pre to get line numbering */
+ol.linenums { margin-top: 0; margin-bottom: 0 } /* IE indents via margin-left */
+li.L0,
+li.L1,
+li.L2,
+li.L3,
+li.L5,
+li.L6,
+li.L7,
+li.L8 { list-style-type: none }
+/* Alternate shading for lines */
+li.L1,
+li.L3,
+li.L5,
+li.L7,
+li.L9 { background: #eee }

data/scaffolds/blog/_templates/syntax/google_prettify/desert.css

@@ -0,0 +1,34 @@
+/* desert scheme ported from vim to google prettify */
+pre { display: block; background-color: #333 }
+pre .nocode { background-color: none; color: #000 }
+pre .str { color: #ffa0a0 } /* string  - pink */
+pre .kwd { color: #f0e68c; font-weight: bold }
+pre .com { color: #87ceeb } /* comment - skyblue */
+pre .typ { color: #98fb98 } /* type    - lightgreen */
+pre .lit { color: #cd5c5c } /* literal - darkred */
+pre .pun { color: #fff }    /* punctuation */
+pre .pln { color: #fff }    /* plaintext */
+pre .tag { color: #f0e68c; font-weight: bold } /* html/xml tag    - lightyellow */
+pre .atn { color: #bdb76b; font-weight: bold } /* attribute name  - khaki */
+pre .atv { color: #ffa0a0 } /* attribute value - pink */
+pre .dec { color: #98fb98 } /* decimal         - lightgreen */
+
+/* Specify class=linenums on a pre to get line numbering */
+ol.linenums { margin-top: 0; margin-bottom: 0; color: #AEAEAE } /* IE indents via margin-left */
+li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8 { list-style-type: none }
+/* Alternate shading for lines */
+li.L1,li.L3,li.L5,li.L7,li.L9 { }
+
+@media print {
+  pre { background-color: none }
+  pre .str, code .str { color: #060 }
+  pre .kwd, code .kwd { color: #006; font-weight: bold }
+  pre .com, code .com { color: #600; font-style: italic }
+  pre .typ, code .typ { color: #404; font-weight: bold }
+  pre .lit, code .lit { color: #044 }
+  pre .pun, code .pun { color: #440 }
+  pre .pln, code .pln { color: #000 }
+  pre .tag, code .tag { color: #006; font-weight: bold }
+  pre .atn, code .atn { color: #404 }
+  pre .atv, code .atv { color: #060 }
+}

data/scaffolds/blog/_templates/syntax/google_prettify/sons-of-obsidian.css

@@ -0,0 +1,117 @@
+/*
+ * Derived from einaros's Sons of Obsidian theme at
+ * http://studiostyl.es/schemes/son-of-obsidian by
+ * Alex Ford of CodeTunnel:
+ * http://CodeTunnel.com/blog/post/71/google-code-prettify-obsidian-theme
+ */
+
+.str
+{
+    color: #EC7600;
+}
+.kwd
+{
+    color: #93C763;
+}
+.com
+{
+    color: #66747B;
+}
+.typ
+{
+    color: #678CB1;
+}
+.lit
+{
+    color: #FACD22;
+}
+.pun
+{
+    color: #F1F2F3;
+}
+.pln
+{
+    color: #F1F2F3;
+}
+.tag
+{
+    color: #8AC763;
+}
+.atn
+{
+    color: #E0E2E4;
+}
+.atv
+{
+    color: #EC7600;
+}
+.dec
+{
+    color: purple;
+}
+pre.prettyprint
+{
+    border: 0px solid #888;
+}
+ol.linenums
+{
+    margin-top: 0;
+    margin-bottom: 0;
+}
+.prettyprint {
+    background: #000;
+}
+li.L0, li.L1, li.L2, li.L3, li.L4, li.L5, li.L6, li.L7, li.L8, li.L9
+{
+    color: #555;
+}
+li.L1, li.L3, li.L5, li.L7, li.L9 {
+    background: #111;
+}
+@media print
+{
+    .str
+    {
+        color: #060;
+    }
+    .kwd
+    {
+        color: #006;
+        font-weight: bold;
+    }
+    .com
+    {
+        color: #600;
+        font-style: italic;
+    }
+    .typ
+    {
+        color: #404;
+        font-weight: bold;
+    }
+    .lit
+    {
+        color: #044;
+    }
+    .pun
+    {
+        color: #440;
+    }
+    .pln
+    {
+        color: #000;
+    }
+    .tag
+    {
+        color: #006;
+        font-weight: bold;
+    }
+    .atn
+    {
+        color: #404;
+    }
+    .atv
+    {
+        color: #060;
+    }
+}