ruhoh 0.1.3 → 0.2.0

data/spec/parsers/pages_spec.rb

@@ -9,19 +9,38 @@ module Pages
       before(:each) do
         Ruhoh::Utils.should_receive(:parse_file_as_yaml).and_return({'theme' => "twitter"})
         Ruhoh.setup(:source => SampleSitePath)
+        
+        the_pages_dir = File.join SampleSitePath, "_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)
+          File.open full_file_name, "w+" do |file|
+            file.puts <<-TEXT
+---
+title: #{page_name} (test)
+---  
+            TEXT
+          end
+        end
       end
       
+      let(:expected_pages) {
+        %w{about.md archive.html categories.html index.html pages.html sitemap.txt tags.html}
+      }
+
       let(:pages){
         Ruhoh::Parsers::Pages.generate
       }
       
       it 'should extract valid pages from source directory.' do
-        pages.keys.sort.should ==  ['about.md', 'archive.html', 'categories.html', 'index.html', 'pages.html', 'tags.html']
+        pages.keys.sort.should == ['about.md', 'archive.html', 'categories.html', 'index.html', 'pages.html', 'sitemap.txt', 'tags.html']
       end
       
       it 'should return a properly formatted hash for each page' do
         pages.each_value { |value|
-          value.should have_key("layout")
           value.should have_key("id")
           value.should have_key("url")
           value.should have_key("title")
@@ -44,11 +63,6 @@ module Pages
           Ruhoh::Parsers::Pages.is_valid_page?(filepath).should == true
         end
       
-        it "should return false for a filepath beginning with _" do
-          filepath = '_blah/about.md'
-          Ruhoh::Parsers::Pages.is_valid_page?(filepath).should == false
-        end
-      
         it "should return false for a filepath beginning with ." do
           filepath = '.vim'
           Ruhoh::Parsers::Pages.is_valid_page?(filepath).should == false
@@ -89,9 +103,9 @@ module Pages
     end
     
     
-    pending "#titleize"
-    pending "#permalink"
+    describe "#to_title"
+    describe "#permalink"
     
   end
   
-end
+end

data/spec/parsers/posts_spec.rb

@@ -9,7 +9,7 @@ module Posts
       Ruhoh.setup(:source => SampleSitePath)
     end
     
-    describe "#generate" do
+    pending "#generate" do
       
       it 'should return a valid data structures for core API' do
         posts = Ruhoh::Parsers::Posts.generate
@@ -31,11 +31,10 @@ module Posts
           dictionary.keys.sort.should ==  ['_posts/2012-01-01-hello-world.md']
         end
         
-        it 'should return a properly formatted hash for each post' do
+        pending 'should return a properly formatted hash for each post' do
           dictionary = Ruhoh::Parsers::Posts.process
 
           dictionary.each_value { |value|
-            value.should have_key("layout")
             value.should have_key("id")
             value.should have_key("url")
             value.should have_key("title")
@@ -94,7 +93,7 @@ module Posts
     end
     
     describe "#parse_filename" do
-      it "should parse a post filename into corresponding metadata" do
+      it "should parse a post filename with DATE into corresponding metadata" do
         filename = '_posts/2011-10-10-my-post-title.md'
         data = Ruhoh::Parsers::Posts.parse_filename(filename)
 
@@ -104,9 +103,18 @@ module Posts
         data['extension'].should == ".md"
       end
       
-      it "should return a blank hash if the filename format is invalid" do
+      it "should parse a post filename without DATE into corresponding metadata" do
         filename = '_posts/my-post-title.md'
         data = Ruhoh::Parsers::Posts.parse_filename(filename)
+        data['path'].should == "_posts/"
+        data['date'].should == nil
+        data['slug'].should == "my-post-title"
+        data['extension'].should == ".md"
+      end
+      
+      it "should return a blank hash if the filename has no extension and therefore invalid" do
+        filename = '_posts/my-post-title'
+        data = Ruhoh::Parsers::Posts.parse_filename(filename)
         data.should == {}
       end
     end
@@ -151,10 +159,10 @@ module Posts
       end
     end
     
-    describe "#titleize" do
+    describe "#to_title" do
       it "should prettify a filename slug for use as a title/header" do
         file_slug = 'my-post-title'
-        title = Ruhoh::Parsers::Posts.titleize(file_slug)
+        title = Ruhoh::Parsers::Posts.to_title(file_slug)
         title.should == "My Post Title"
       end
     end

data/spec/setup_spec.rb

@@ -1,33 +1,25 @@
 require 'spec_helper'
 
 module Setup
-  
   describe "Setup" do
-    
     describe "#setup" do
-      
       it 'should setup config, paths, and filters' do
-        Ruhoh.should_receive(:setup_config)
-        Ruhoh.should_receive(:setup_paths)
-        Ruhoh.should_receive(:setup_filters)
+        Ruhoh.should_receive(:setup_config).and_return(true)
+        Ruhoh.should_receive(:setup_paths).and_return(true)
+        Ruhoh.should_receive(:setup_filters).and_return(true)
         Ruhoh.setup
       end
-      
     end
     
     describe "#setup_config" do
-
       context "Invalid _config.yml file" do
-
-        it 'should raise an exception if theme is not specified.' do
+        it 'should log error and return false if theme is not specified.' do
           Ruhoh::Utils.should_receive(:parse_file_as_yaml).and_return({})
-          lambda { Ruhoh.setup_config }.should raise_error
+          Ruhoh.log.should_receive(:error)
+          Ruhoh.setup_config.should be_false
         end
-
       end
-      
       context "Valid _config.yml file" do
-        
         it 'should setup the config struct based on configuration input.' do
           custom_permalink = '/my/custom/link'
           custom_theme = 'table'
@@ -45,13 +37,10 @@ module Setup
           Ruhoh.config.theme_path.should == "/_templates/themes/#{custom_theme}"
           Ruhoh.config.exclude.should == custom_exclude
         end
-      
       end
-      
     end
     
     describe "#setup_filters" do
-      
       it 'should add custom exclude filters to the filters variable' do
         custom_exclude = ['.secret', /^test/]
         Ruhoh::Utils.should_receive(:parse_file_as_yaml).and_return({
@@ -64,9 +53,6 @@ module Setup
         Ruhoh.filters.pages['names'].should include('.secret')
         Ruhoh.filters.pages['regexes'].should include(/^test/)
       end
-      
     end
-    
   end
-  
 end

data/spec/spec_helper.rb

@@ -19,5 +19,7 @@ RSpec.configure do |config|
   end
 end
 
-SampleSitePath = File.expand_path(File.join(File.dirname(__FILE__), '../scaffolds/blog'))
+SampleSitePath = '__tmp'
 
+FileUtils.remove_dir(SampleSitePath,1) if Dir.exists? SampleSitePath
+Dir.mkdir SampleSitePath

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruhoh
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70227452372580 !ruby/object:Gem::Requirement
+  requirement: &70148787084820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70227452372580
+  version_requirements: *70148787084820
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70227452372080 !ruby/object:Gem::Requirement
+  requirement: &70148787084320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.99'
   type: :runtime
   prerelease: false
-  version_requirements: *70227452372080
+  version_requirements: *70148787084320
 - !ruby/object:Gem::Dependency
   name: directory_watcher
-  requirement: &70227452371620 !ruby/object:Gem::Requirement
+  requirement: &70148787083860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70227452371620
+  version_requirements: *70148787083860
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70227452371160 !ruby/object:Gem::Requirement
+  requirement: &70148787083400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,18 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70227452371160
+  version_requirements: *70148787083400
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: &70148787113120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70148787113120
 description: Ruhoh is a Universal API for your static blog.
 email: plusjade@gmail.com
 executables:
@@ -66,6 +77,7 @@ files:
 - README.md
 - Rakefile
 - bin/ruhoh
+- dash.html
 - history.txt
 - lib/ruhoh.rb
 - lib/ruhoh/client/client.rb
@@ -77,7 +89,6 @@ files:
 - lib/ruhoh/friend.rb
 - lib/ruhoh/logger.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
@@ -85,6 +96,7 @@ files:
 - lib/ruhoh/parsers/routes.rb
 - lib/ruhoh/parsers/site.rb
 - lib/ruhoh/previewer.rb
+- lib/ruhoh/program.rb
 - lib/ruhoh/templaters/base.rb
 - lib/ruhoh/templaters/helpers.rb
 - lib/ruhoh/templaters/rmustache.rb

data/lib/ruhoh/parsers/drafts.rb

@@ -1,54 +0,0 @@
-class Ruhoh
-  module Parsers
-    module Drafts
-      
-      def self.generate
-        raise "Ruhoh.config cannot be nil.\n To set config call: Ruhoh.setup" unless Ruhoh.config
-        
-        dictionary = {}
-        invalid = []
-        
-        self.files.each do |filename|
-          parsed_page = Ruhoh::Utils.parse_file(filename)
-          if parsed_page.empty?
-            error = "Invalid YAML Front Matter. Ensure this page has valid YAML, even if it's empty."
-            invalid << [filename, error] ; next
-          end
-
-          data                  = parsed_page['data']
-          data['id']            = filename
-          data['url']           = "/#{filename}"
-          dictionary[filename]  = data
-        end
-        
-        self.report(dictionary, invalid)
-        dictionary
-      end
-      
-      def self.files
-        FileUtils.cd(Ruhoh.paths.site_source) {
-          return Dir["#{Ruhoh.folders.drafts}/**/*.*"].select { |filename|
-            next if FileTest.directory?(filename)
-            next if ['.'].include? filename[0]
-            true
-          }
-        }
-      end
-      
-      def self.report(dictionary, invalid)
-        output = "#{dictionary.count}/#{dictionary.count + invalid.count} drafts processed."
-        if dictionary.empty? && invalid.empty?
-          Ruhoh::Friend.say { plain "0 drafts to process." }
-        elsif invalid.empty?
-          Ruhoh::Friend.say { green output }
-        else
-          Ruhoh::Friend.say {
-            yellow output
-            list "Drafts not processed:", invalid
-          }
-        end
-      end
-      
-    end #Drafts
-  end #Parsers
-end #Ruhoh