ruhoh 0.2.0 → 0.2.1

data/Gemfile

@@ -3,7 +3,7 @@ gemspec
 
 gem 'rack', "~> 1.4"
 gem 'directory_watcher', "~> 1.4"
-gem 'mustache', "~> 0.99"
+gem 'kramdown', "~> 0.13"
 gem 'maruku', "~> 0.6"
 gem 'psych', "~> 1.3"
 

data/history.json

@@ -0,0 +1,62 @@
+[
+  {
+    "version" : "0.2.1",
+    "date" : "9.5.2012",
+    "changes" : [
+      "Treat all exclude values for posts/pages filenames as regular expressions. Strings are passed to Regex.new()"
+    ],
+    "features" : [
+      "Define 'pretty' paths for pages without using folder/index.md format.",
+      "Add ability to exclude files from posts folder."
+    ]
+  },
+  { "version" : "0.2.0",
+    "date" : "4.5.2012",
+    "changes" : [
+      "[change] Dates in post filenames are now optional but will be required in metadata.",
+      "[remove] _draft folder. Drafts are now simply a 'type' of post.",
+      "[remove] publish and un-publish in favor of specifying 'type' meta attribute.",
+      "[add]    titleize method to client which renames draft filenames to their titles if set.",
+      "[change] /_draft panel is now /dash with updated UI.",
+      "[change] - rackup configuration is now through Ruhoh::Program.preview."
+    ],
+    "features" : [
+      "Maintain file extensions for files that don't respond to a converter.",
+      "Add 'development'/'production' environment configuration flag.",
+      "@ben-biddington Introduces local temporary directory as SampleSitePath.",
+      "@ben-biddington adds Travis integration."
+    ]
+  },
+  { "version" : "0.1.4",
+    "date" : "4.5.2012",
+    "bugs" : [
+      "Fix invalid byte sequence in US-ASCII by forcing UTF-8"
+    ]
+  },
+  { "version" : "0.1.3",
+    "date" : "19.4.2012",
+    "bugs" : [
+      "Fix drafts not maintaining file extension when publishing",
+      "Tags helper should use tags database.",
+      "Fix for properly handling filepaths on Windows machines."
+    ]
+  },
+  { "version" : "0.1.2",
+    "date" : "18.4.2012",
+    "bugs" : [
+      "Fix bug with YAML psych/syck errors"
+    ]
+  },
+  { "version" : "0.1.1",
+    "date" : "18.4.2012",
+    "bugs" : [
+      "@tkellen tidies up partials + fix 'paths.theme' error in theme scaffold."
+    ]
+  },
+  { "version" : "0.1.0",
+    "date" : "12.4.2012",
+    "features" : [
+      "Initial public release"
+    ]
+  }
+]  

data/lib/ruhoh.rb

@@ -43,7 +43,7 @@ class Ruhoh
   Folders   = Struct.new(:database, :pages, :posts, :templates, :themes, :layouts, :partials, :media, :syntax, :compiled)
   Files     = Struct.new(:site, :config, :dashboard)
   Filters   = Struct.new(:posts, :pages, :static)
-  Config    = Struct.new(:permalink, :theme, :theme_path, :media_path, :syntax_path, :exclude, :env)
+  Config    = Struct.new(:permalink, :pages_permalink, :theme, :theme_path, :media_path, :syntax_path, :exclude, :env)
   Paths     = Struct.new(
                 :site_source, :database, :pages, :posts, :theme, :layouts, :partials, :global_partials, :media, :syntax,
                 :compiled, :dashboard)
@@ -87,7 +87,12 @@ class Ruhoh
     @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)
+    @config.pages_permalink = site_config['pages']['permalink'] rescue nil
+    excluded_pages = site_config['pages']['exclude'] rescue nil
+    @config.exclude       = {
+      "posts" => Array(site_config['exclude'] || nil),
+      "pages" => Array(excluded_pages),
+    }
     @config.env           = site_config['env'] || nil
     @config
   end
@@ -111,14 +116,8 @@ class Ruhoh
   
   # filename filters
   def self.setup_filters
-    exclude = @config.exclude
-    exclude.uniq!
-    
-    @filters.pages = { 'names' => [], 'regexes' => [] }
-    exclude.each {|node| 
-      @filters.pages['names'] << node if node.is_a?(String)
-      @filters.pages['regexes'] << node if node.is_a?(Regexp)
-    }
+    @filters.pages = @config.exclude['pages'].map {|node| Regexp.new(node) }
+    @filters.posts = @config.exclude['posts'].map {|node| Regexp.new(node) }
     @filters
   end
   

data/lib/ruhoh/converters/converter.rb

@@ -1,4 +1,4 @@
-require 'maruku'
+require 'kramdown'
 
 class Ruhoh
 
@@ -25,7 +25,7 @@ class Ruhoh
     
     # Markdown
     def self.markdown(page)
-      Maruku.new(page.content).to_html
+      Kramdown::Document.new(page.content).to_html
     end
     
     # Textile

data/lib/ruhoh/parsers/pages.rb

@@ -1,7 +1,5 @@
 class Ruhoh
-
   module Parsers
-    
     module Pages
     
       # Public: Generate the Pages dictionary.
@@ -45,8 +43,7 @@ class Ruhoh
       def self.is_valid_page?(filepath)
         return false if FileTest.directory?(filepath)
         return false if ['.'].include? filepath[0]
-        return false if Ruhoh.filters.pages['names'].include? filepath
-        Ruhoh.filters.pages['regexes'].each {|regex| return false if filepath =~ regex }
+        Ruhoh.filters.pages.each {|regex| return false if filepath =~ regex }
         true
       end
     
@@ -66,24 +63,24 @@ class Ruhoh
       #
       # Returns [String] the permalink for this page.
       def self.permalink(page)
-        ext = File.extname(page['id'])
         url = '/'
+        ext = File.extname(page['id'])
         url += if ['.md', '.markdown'].include?(ext)
           page['id'].gsub(Regexp.new("#{ext}$"), '.html')
         else
           page['id']
         end
         
-        # sanitize url
-        url = url.split('/').reject{ |part| part =~ /^\.+$/ }.join('/')
-        url.gsub!(/\/index.html$/, '')
+        url = url.split('/').reject{ |part| part[0] == '.' }.join('/')
+        url = url.gsub(/\/index.html$/, '')
+        if page['permalink'] == 'pretty' || Ruhoh.config.pages_permalink == 'pretty'
+          url = url.gsub(/\.html$/, '') 
+        end
         url = "/" if url.empty?
-        
+
         url
       end
     
     end # Pages
-  
   end #Parsers
-  
 end #Ruhoh

data/lib/ruhoh/parsers/posts.rb

@@ -79,13 +79,19 @@ class Ruhoh
       def self.files
         FileUtils.cd(Ruhoh.paths.site_source) {
           return Dir["#{Ruhoh.folders.posts}/**/*.*"].select { |filename|
-            next if FileTest.directory?(filename)
-            next if ['.'].include? filename[0]
+            next unless self.is_valid_page?(filename)
             true
           }
         }
       end
-
+      
+      def self.is_valid_page?(filepath)
+        return false if FileTest.directory?(filepath)
+        return false if ['.'].include? filepath[0]
+        Ruhoh.filters.posts.each {|regex| return false if filepath =~ regex }
+        true
+      end
+      
       def self.ordered_posts(dictionary)
         ordered_posts = []
         dictionary.each_value { |val| ordered_posts << val }

data/lib/ruhoh/version.rb

@@ -1,4 +1,4 @@
 class Ruhoh
-  Version = VERSION = '0.2.0'
+  Version = VERSION = '0.2.1'
   RuhohSpec = '0.2'
 end

data/ruhoh.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     Rakefile
     bin/ruhoh
     dash.html
-    history.txt
+    history.json
     lib/ruhoh.rb
     lib/ruhoh/client/client.rb
     lib/ruhoh/client/help.yml

data/spec/parsers/pages_spec.rb

@@ -72,24 +72,23 @@ title: #{page_name} (test)
       
       context "Exclude array is passed into config." do
         
-        it "should return false for a filepath matching a string in exclude array" 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_file_as_yaml).and_return({
             'theme' => "twitter",
-            'exclude' => filepath
+            'pages' => {'exclude' => "#{filepath}$"}
           })
           Ruhoh.setup(:source => SampleSitePath)
-          
           Ruhoh::Parsers::Pages.is_valid_page?(filepath).should == false
         end
         
-        it "should return false for a filepath matching a regular expression in exclude array" do
+        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_file_as_yaml).and_return({
             'theme' => "twitter",
-            'exclude' => /^test/
+            'pages' => {'exclude' => ['^test', 'blah'] }
           })
           Ruhoh.setup(:source => SampleSitePath)
           

data/spec/setup_spec.rb

@@ -35,14 +35,14 @@ module Setup
           Ruhoh.config.permalink.should == custom_permalink
           Ruhoh.config.theme.should == custom_theme
           Ruhoh.config.theme_path.should == "/_templates/themes/#{custom_theme}"
-          Ruhoh.config.exclude.should == custom_exclude
+          Ruhoh.config.exclude['posts'].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/]
+        custom_exclude = ['.secret', '^test']
         Ruhoh::Utils.should_receive(:parse_file_as_yaml).and_return({
           'theme' => "twitter",
           'exclude' => custom_exclude
@@ -50,8 +50,8 @@ module Setup
         Ruhoh.setup_config
         Ruhoh.setup_filters
         
-        Ruhoh.filters.pages['names'].should include('.secret')
-        Ruhoh.filters.pages['regexes'].should include(/^test/)
+        Ruhoh.filters.posts.should include(/.secret/)
+        Ruhoh.filters.posts.should include(/^test/)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruhoh
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70148787084820 !ruby/object:Gem::Requirement
+  requirement: &70126524196260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70148787084820
+  version_requirements: *70126524196260
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70148787084320 !ruby/object:Gem::Requirement
+  requirement: &70126524225960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.99'
   type: :runtime
   prerelease: false
-  version_requirements: *70148787084320
+  version_requirements: *70126524225960
 - !ruby/object:Gem::Dependency
   name: directory_watcher
-  requirement: &70148787083860 !ruby/object:Gem::Requirement
+  requirement: &70126524225500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70148787083860
+  version_requirements: *70126524225500
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70148787083400 !ruby/object:Gem::Requirement
+  requirement: &70126524225040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70148787083400
+  version_requirements: *70126524225040
 - !ruby/object:Gem::Dependency
   name: psych
-  requirement: &70148787113120 !ruby/object:Gem::Requirement
+  requirement: &70126524224580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70148787113120
+  version_requirements: *70126524224580
 description: Ruhoh is a Universal API for your static blog.
 email: plusjade@gmail.com
 executables:
@@ -78,7 +78,7 @@ files:
 - Rakefile
 - bin/ruhoh
 - dash.html
-- history.txt
+- history.json
 - lib/ruhoh.rb
 - lib/ruhoh/client/client.rb
 - lib/ruhoh/client/help.yml

data/history.txt

@@ -1,25 +0,0 @@
-
-4.5.2012
-  0.2.0  - API changes:
-           - [change] Dates in post filenames are now optional but will be required in metadata.
-           - [remove] _draft folder. Drafts are now simply a 'type' of post.
-           - [remove] publish and un-publish in favor of specifying 'type' meta attribute.
-           - [add]    titleize method to client which renames draft filenames to their titles if set.
-           - [change] /_draft panel is now /dash with updated UI.
-           - [change] - rackup configuration is now through Ruhoh::Program.preview.
-         - FEATURES:
-           - Maintain file extensions for files that don't respond to a converter.
-           - Add 'development'/'production' environment configuration flag.
-           - @ben-biddington Introduces local temporary directory as SampleSitePath.
-           - @ben-biddington adds Travis integration.
-  0.1.4  - BUG: Fix invalid byte sequence in US-ASCII by forcing UTF-8
-19.4.2012
-  0.1.3  - BUG: Fix drafts not maintaining file extension when publishing
-           BUG: tags helper should use tags database.
-           BUG: Fix for properly handling filepaths on Windows machines.
-18.4.2012
-  0.1.2  - BUG: Fix bug with YAML psych/syck errors.
-  0.1.1  - @tkellen tidies up partials + fix 'paths.theme' error in theme scaffold.
-12.4.2012
-  0.1.0  - Initial public release.
-