ruhoh 1.0 → 1.1

data/ruhoh.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'mustache', "~> 0.99"
   s.add_dependency 'directory_watcher', "~> 1.4"
   s.add_dependency 'redcarpet', "~> 2.1"
-  s.add_dependency 'psych', "~> 1.3"
   s.add_dependency 'nokogiri', "~> 1.5"
   
   # = MANIFEST =
@@ -27,10 +26,10 @@ Gem::Specification.new do |s|
     README.md
     Rakefile
     bin/ruhoh
-    dash.html
     history.json
     lib/ruhoh.rb
     lib/ruhoh/client/client.rb
+    lib/ruhoh/client/console_methods.rb
     lib/ruhoh/client/help.yml
     lib/ruhoh/compiler.rb
     lib/ruhoh/compilers/rss.rb
@@ -50,6 +49,7 @@ Gem::Specification.new do |s|
     lib/ruhoh/parsers/payload.rb
     lib/ruhoh/parsers/posts.rb
     lib/ruhoh/parsers/routes.rb
+    lib/ruhoh/parsers/scaffolds.rb
     lib/ruhoh/parsers/site.rb
     lib/ruhoh/parsers/stylesheets.rb
     lib/ruhoh/parsers/theme_config.rb
@@ -66,19 +66,6 @@ Gem::Specification.new do |s|
     lib/ruhoh/version.rb
     lib/ruhoh/watch.rb
     ruhoh.gemspec
-    scaffolds/draft.html
-    scaffolds/layout.html
-    scaffolds/page.html
-    scaffolds/post.html
-    scaffolds/theme/javascripts/.gitkeep
-    scaffolds/theme/layouts/default.html
-    scaffolds/theme/layouts/page.html
-    scaffolds/theme/layouts/post.html
-    scaffolds/theme/media/.gitkeep
-    scaffolds/theme/partials/.gitkeep
-    scaffolds/theme/stylesheets/style.css
-    scaffolds/theme/theme.yml
-    scaffolds/theme/widgets/.gitkeep
     spec/config_spec.rb
     spec/db_spec.rb
     spec/page_spec.rb
@@ -89,16 +76,28 @@ Gem::Specification.new do |s|
     spec/parsers/site_spec.rb
     spec/setup_spec.rb
     spec/spec_helper.rb
-    widgets/analytics/config.yml
-    widgets/analytics/layouts/getclicky.html
-    widgets/analytics/layouts/google.html
-    widgets/comments/config.yml
-    widgets/comments/layouts/disqus.html
-    widgets/comments/layouts/facebook.html
-    widgets/comments/layouts/intensedebate.html
-    widgets/comments/layouts/livefyre.html
-    widgets/google_prettify/config.yml
-    widgets/google_prettify/layouts/google_prettify.html
+    spec/support/shared_contexts.rb
+    system/dash.html
+    system/partials/categories_list.html
+    system/partials/pages_list.html
+    system/partials/posts_collate.html
+    system/partials/posts_list.html
+    system/partials/posts_summary.html
+    system/partials/tags_list.html
+    system/scaffolds/draft.html
+    system/scaffolds/layout.html
+    system/scaffolds/page.html
+    system/scaffolds/post.html
+    system/widgets/analytics/config.yml
+    system/widgets/analytics/layouts/getclicky.html
+    system/widgets/analytics/layouts/google.html
+    system/widgets/comments/config.yml
+    system/widgets/comments/layouts/disqus.html
+    system/widgets/comments/layouts/facebook.html
+    system/widgets/comments/layouts/intensedebate.html
+    system/widgets/comments/layouts/livefyre.html
+    system/widgets/google_prettify/config.yml
+    system/widgets/google_prettify/layouts/google_prettify.html
   ]
   # = MANIFEST =
 end

data/spec/config_spec.rb

@@ -8,7 +8,7 @@ module Config
           Ruhoh::Utils.should_receive(:parse_yaml_file).and_return({})
           
           Ruhoh.log.should_receive(:error)
-          Ruhoh::Config.generate('config.yml').should be_false
+          Ruhoh::Config.generate.should be_false
         end
       end
       context "Valid _config.yml file" do
@@ -24,7 +24,7 @@ module Config
             }
           })
 
-          config = Ruhoh::Config.generate('config.yml')
+          config = Ruhoh::Config.generate
           config.theme.should == custom_theme
           config.posts_exclude.should == [/.secret/]
         end
@@ -41,7 +41,7 @@ module Config
           },
         })
         
-        config = Ruhoh::Config.generate('config.yml')
+        config = Ruhoh::Config.generate
         config.posts_exclude.should include(/.secret/)
         config.posts_exclude.should include(/^test/)
       end

data/spec/db_spec.rb

@@ -1,14 +1,11 @@
+require 'spec_helper'
+
 module DB
-  
   describe Ruhoh::DB do
-    let(:whitelist){ Ruhoh::DB::WhiteList }
-    
-    before(:each) do
-      Ruhoh::Utils.stub(:parse_yaml_file).and_return({'theme' => "twitter"})
-      Ruhoh::Paths.stub(:theme_is_valid?).and_return(true)
-      Ruhoh.setup(:source => SampleSitePath)
-    end
+    include_context "write_default_theme"
+    include_context "default_setup"
     
+    let(:whitelist){ Ruhoh::DB::WhiteList }
     context "database has not been updated" do
       it "should return nil for all whitelisted variables except payload" do
         whitelist.each do |var|
@@ -20,7 +17,6 @@ module DB
     end
     
     describe "#update" do
-      
       it "should raise an exception when updating a variable not whitelisted" do
         lambda { Ruhoh::DB.update(:table) }.should raise_error
       end

data/spec/page_spec.rb

@@ -7,7 +7,7 @@ module Page
     before(:each) do
       Ruhoh::Utils.stub(:parse_yaml_file).and_return({'theme' => "twitter"})
       Ruhoh::Paths.stub(:theme_is_valid?).and_return(true)
-      Ruhoh.setup(:source => SampleSitePath)
+      
     end
     
     describe "Page initialization" do

data/spec/parsers/layouts_spec.rb

@@ -5,7 +5,6 @@ module Layouts
     before(:each) do
       expected_theme = "twitter"
       the_layouts_dir = File.join(SampleSitePath, Ruhoh.names.themes, expected_theme, Ruhoh.names.layouts)
-      FileUtils.remove_dir(the_layouts_dir, 1) if Dir.exists? the_layouts_dir
       FileUtils.makedirs the_layouts_dir
       expected_layouts.each do |layout_name| 
         full_file_name = File.join(the_layouts_dir, layout_name)
@@ -18,9 +17,6 @@ title: #{layout_name} (test)
           TEXT
         end
       end
-      
-      Ruhoh::Utils.should_receive(:parse_yaml_file).and_return({'theme' => expected_theme})
-      Ruhoh.setup(:source => SampleSitePath)
     end
 
     let(:expected_layouts) { %w{default.html page.html post.html} }

data/spec/parsers/pages_spec.rb

@@ -1,15 +1,13 @@
 require 'spec_helper'
 
 module Pages
-  
   describe Ruhoh::Parsers::Pages do
-    
     describe "#generate" do
+      include_context "write_default_theme"
+      include_context "default_setup"
       
       before(:each) do
-        Ruhoh::Utils.should_receive(:parse_yaml_file).and_return({'theme' => "twitter"})
         the_pages_dir = File.join(SampleSitePath, Ruhoh.names.pages)
-        FileUtils.remove_dir(the_pages_dir, 1) if Dir.exists? the_pages_dir
         Dir.mkdir the_pages_dir
         expected_pages.each do |page_name| 
           full_file_name = File.join(the_pages_dir, page_name)
@@ -21,9 +19,6 @@ title: #{page_name} (test)
             TEXT
           end
         end
-        
-        Ruhoh::Paths.stub(:theme_is_valid?).and_return(true)
-        Ruhoh.setup(:source => SampleSitePath)
       end
       
       let(:expected_pages) {
@@ -49,15 +44,7 @@ title: #{page_name} (test)
     end
     
     describe "#is_valid_page?" do
-      
       context "No user specified exclusions in config." do
-        
-        before(:each) do
-          Ruhoh::Utils.should_receive(:parse_yaml_file).and_return({'theme' => "twitter"})
-          Ruhoh::Paths.stub(:theme_is_valid?).and_return(true)
-          Ruhoh.setup(:source => SampleSitePath)
-        end
-        
         it "should return true for a valid page filepath" do
           filepath = 'about.md'
           Ruhoh::Parsers::Pages.is_valid_page?(filepath).should == true
@@ -71,39 +58,60 @@ title: #{page_name} (test)
       end
       
       context "Exclude array is passed into config." do
-        
-        it "should return false for a page whose filepath matches a page exclude regular expression." do
-          filepath = 'about.md'
-          Ruhoh::Utils.should_receive(:parse_yaml_file).and_return({
-            'theme' => "twitter",
-            'pages' => {'exclude' => "#{filepath}$"}
-          })
-          Ruhoh::Paths.stub(:theme_is_valid?).and_return(true)
-          Ruhoh.setup(:source => SampleSitePath)
-          Ruhoh::Parsers::Pages.is_valid_page?(filepath).should == false
-        end
+        before(:each){
+          Dir.mkdir SampleSitePath
+          theme = "twitter"
+          # Create base config.yml + base theme
+          File.open(File.join(SampleSitePath, Ruhoh.names.config_data), "w+") { |file|
+            file.puts <<-TEXT
+---
+theme: '#{theme}'
+pages:
+  exclude: ['^test', 'blah']
+---  
+  TEXT
+          }
+          theme_dir = File.join(SampleSitePath, Ruhoh.names.themes, theme)
+          FileUtils.makedirs theme_dir
+        }
+        include_context "default_setup"
         
         it "should return false for a page filepath matching a regular expression in pages exclude array" do
           filepath1 = 'test/about.md'
           filepath2 = 'test/yay.md'
           filepath3 = 'vest/yay.md'
-          Ruhoh::Utils.should_receive(:parse_yaml_file).and_return({
-            'theme' => "twitter",
-            'pages' => {'exclude' => ['^test', 'blah'] }
-          })
-          Ruhoh::Paths.stub(:theme_is_valid?).and_return(true)
-          Ruhoh.setup(:source => SampleSitePath)
-          
           Ruhoh::Parsers::Pages.is_valid_page?(filepath1).should == false
           Ruhoh::Parsers::Pages.is_valid_page?(filepath2).should == false
           Ruhoh::Parsers::Pages.is_valid_page?(filepath3).should == true
         end
-        
       end
       
+      context "Exclude string is passed into config." do
+        let(:filepath){'about.md'}
+        before(:each){
+          Dir.mkdir SampleSitePath
+          theme = "twitter"
+          # Create base config.yml + base theme
+          File.open(File.join(SampleSitePath, Ruhoh.names.config_data), "w+") { |file|
+            file.puts <<-TEXT
+---
+theme: '#{theme}'
+pages:
+  exclude: '#{filepath}$'
+---  
+  TEXT
+          }
+          theme_dir = File.join(SampleSitePath, Ruhoh.names.themes, theme)
+          FileUtils.makedirs theme_dir
+        }
+        include_context "default_setup"
+        
+        it "should return false for a page whose filepath matches a page exclude regular expression." do
+          Ruhoh::Parsers::Pages.is_valid_page?(filepath).should == false
+        end
+      end
     end
-    
-    
+
     describe "#to_title"
     describe "#permalink"
     

data/spec/parsers/posts_spec.rb

@@ -2,14 +2,9 @@
 require 'spec_helper'
 
 module Posts
-  
   describe Ruhoh::Parsers::Posts do
-    
-    before(:each) do
-      Ruhoh::Utils.should_receive(:parse_yaml_file).and_return({'theme' => "twitter"})
-      Ruhoh::Paths.stub(:theme_is_valid?).and_return(true)
-      Ruhoh.setup(:source => SampleSitePath)
-    end
+    include_context "write_default_theme"
+    include_context "default_setup"
     
     pending "#generate" do
       

data/spec/parsers/routes_spec.rb

@@ -5,13 +5,6 @@ module Routes
   describe Ruhoh::Parsers::Routes do
     
     describe "#generate" do
-
-      before(:each) do
-        Ruhoh::Utils.should_receive(:parse_yaml_file).and_return({'theme' => "twitter"})
-        Ruhoh::Paths.stub(:theme_is_valid?).and_return(true)
-        Ruhoh.setup(:source => SampleSitePath)
-      end
-      
       let(:pages){
         {
           "blah.md" => {'url' => '/blah.html', "id" => "blah.md"},

data/spec/parsers/site_spec.rb

@@ -3,15 +3,10 @@ require 'spec_helper'
 module Site
   
   describe Ruhoh::Parsers::Site do
+    include_context "write_default_theme"
+    include_context "default_setup"
     
     describe "#generate" do
-
-      before(:each) do
-        Ruhoh::Utils.should_receive(:parse_yaml_file).and_return({'theme' => "twitter"})
-        Ruhoh::Paths.stub(:theme_is_valid?).and_return(true)
-        Ruhoh.setup(:source => SampleSitePath)
-      end
-      
       it 'should parse the config and site yaml files' do
         Ruhoh::Utils.should_receive(:parse_yaml_file).with(Ruhoh.paths.site_data).and_return({})
         Ruhoh::Utils.should_receive(:parse_yaml_file).with(Ruhoh.paths.config_data).and_return({})

data/spec/setup_spec.rb

@@ -5,9 +5,6 @@ module Setup
     describe "#setup" do
       it 'should setup config, paths, and filters' do
         Ruhoh::Config.should_receive(:generate).and_return(true)
-        Ruhoh::Paths.should_receive(:generate).and_return(true)
-        Ruhoh::Urls.should_receive(:generate).and_return(true)
-        Ruhoh.should_receive(:setup_plugins).and_return(true)
         Ruhoh.setup
       end
     end

data/spec/spec_helper.rb

@@ -12,14 +12,18 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'ruhoh'
 
+Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f}
+
+# Full path to mock blog directory
+SampleSitePath = File.expand_path(File.join(File.dirname(__FILE__), '..', '__tmp'))
+
 RSpec.configure do |config|
+  config.before(:each){
+    FileUtils.remove_dir(SampleSitePath,1) if Dir.exists? SampleSitePath
+  }
   config.after(:each) do 
     # Reset all configuration variables after each test.
     Ruhoh.reset
+    FileUtils.remove_dir(SampleSitePath,1) if Dir.exists? SampleSitePath
   end
-end
-
-SampleSitePath = '__tmp'
-
-FileUtils.remove_dir(SampleSitePath,1) if Dir.exists? SampleSitePath
-Dir.mkdir SampleSitePath
+end

data/spec/support/shared_contexts.rb

@@ -0,0 +1,24 @@
+shared_context 'write_default_theme' do
+  before(:each) do
+    Dir.mkdir SampleSitePath
+    theme = "twitter"
+    # Create base config.yml + base theme
+    File.open(File.join(SampleSitePath, Ruhoh.names.config_data), "w+") { |file|
+      file.puts <<-TEXT
+---
+theme: '#{theme}'
+---  
+  TEXT
+    }
+    theme_dir = File.join(SampleSitePath, Ruhoh.names.themes, theme)
+    FileUtils.makedirs theme_dir
+  end
+end
+
+shared_context 'default_setup' do
+  before(:each) do
+    Ruhoh.setup(:source => SampleSitePath)
+    Ruhoh.setup_paths
+    Ruhoh.setup_urls
+  end
+end

data/system/partials/categories_list.html

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

data/system/partials/pages_list.html

@@ -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/system/partials/posts_collate.html

@@ -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/system/partials/posts_list.html

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

data/system/partials/posts_summary.html

@@ -0,0 +1,30 @@
+<br/><br/>
+<div class="page-header">
+  <h1>{{ title }} {{# tagline }} <small>{{ . }}</small>{{/ tagline }}</h1>
+</div>
+
+<div class="row">
+  <div class="span8">
+    {{{ content }}}  
+
+ <hr>
+  
+{{{comments_count}}}
+
+  </div>
+  
+  <div class="span4">
+    <h4>Published</h4>
+    <div class="date"><span>{{ date }}</span></div>
+    <br>
+    
+    <h4>Tags</h4>
+    <ul class="tag_box">
+    {{# tags?to_tags }}
+      {{> tags_list }}
+    {{/ tags?to_tags }}
+    </ul>
+    
+     {{{share_this}}}
+  </div>  
+</div>

data/system/partials/tags_list.html

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruhoh
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -75,22 +75,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: psych
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -118,10 +102,10 @@ files:
 - README.md
 - Rakefile
 - bin/ruhoh
-- dash.html
 - history.json
 - lib/ruhoh.rb
 - lib/ruhoh/client/client.rb
+- lib/ruhoh/client/console_methods.rb
 - lib/ruhoh/client/help.yml
 - lib/ruhoh/compiler.rb
 - lib/ruhoh/compilers/rss.rb
@@ -141,6 +125,7 @@ files:
 - lib/ruhoh/parsers/payload.rb
 - lib/ruhoh/parsers/posts.rb
 - lib/ruhoh/parsers/routes.rb
+- lib/ruhoh/parsers/scaffolds.rb
 - lib/ruhoh/parsers/site.rb
 - lib/ruhoh/parsers/stylesheets.rb
 - lib/ruhoh/parsers/theme_config.rb
@@ -157,19 +142,6 @@ files:
 - lib/ruhoh/version.rb
 - lib/ruhoh/watch.rb
 - ruhoh.gemspec
-- scaffolds/draft.html
-- scaffolds/layout.html
-- scaffolds/page.html
-- scaffolds/post.html
-- scaffolds/theme/javascripts/.gitkeep
-- scaffolds/theme/layouts/default.html
-- scaffolds/theme/layouts/page.html
-- scaffolds/theme/layouts/post.html
-- scaffolds/theme/media/.gitkeep
-- scaffolds/theme/partials/.gitkeep
-- scaffolds/theme/stylesheets/style.css
-- scaffolds/theme/theme.yml
-- scaffolds/theme/widgets/.gitkeep
 - spec/config_spec.rb
 - spec/db_spec.rb
 - spec/page_spec.rb
@@ -180,16 +152,28 @@ files:
 - spec/parsers/site_spec.rb
 - spec/setup_spec.rb
 - spec/spec_helper.rb
-- widgets/analytics/config.yml
-- widgets/analytics/layouts/getclicky.html
-- widgets/analytics/layouts/google.html
-- widgets/comments/config.yml
-- widgets/comments/layouts/disqus.html
-- widgets/comments/layouts/facebook.html
-- widgets/comments/layouts/intensedebate.html
-- widgets/comments/layouts/livefyre.html
-- widgets/google_prettify/config.yml
-- widgets/google_prettify/layouts/google_prettify.html
+- spec/support/shared_contexts.rb
+- system/dash.html
+- system/partials/categories_list.html
+- system/partials/pages_list.html
+- system/partials/posts_collate.html
+- system/partials/posts_list.html
+- system/partials/posts_summary.html
+- system/partials/tags_list.html
+- system/scaffolds/draft.html
+- system/scaffolds/layout.html
+- system/scaffolds/page.html
+- system/scaffolds/post.html
+- system/widgets/analytics/config.yml
+- system/widgets/analytics/layouts/getclicky.html
+- system/widgets/analytics/layouts/google.html
+- system/widgets/comments/config.yml
+- system/widgets/comments/layouts/disqus.html
+- system/widgets/comments/layouts/facebook.html
+- system/widgets/comments/layouts/intensedebate.html
+- system/widgets/comments/layouts/livefyre.html
+- system/widgets/google_prettify/config.yml
+- system/widgets/google_prettify/layouts/google_prettify.html
 homepage: http://github.com/ruhoh/ruhoh.rb
 licenses:
 - http://www.opensource.org/licenses/MIT
@@ -203,12 +187,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2404318061189800228
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2404318061189800228
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/scaffolds/theme/layouts/default.html

@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  {{{ assets }}}
-</head>
-<body>
-
-    <div class="content">
-      {{{ content }}}
-    </div>
-
-  {{{ analytics }}}
-  </body>
-</html>