henshin 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/henshin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{henshin}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hawx"]
-  s.date = %q{2010-05-26}
+  s.date = %q{2010-05-27}
   s.default_executable = %q{henshin}
   s.description = %q{Henshin is a static site generator, with a plugin system and more}
   s.email = %q{m@hawx.me}
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
      "test/site/options.yaml",
      "test/site/plugins/test.rb",
      "test/site/posts/Testing-Stuff.markdown",
+     "test/site/posts/cat/test.markdown",
      "test/site/posts/lorem-ipsum.markdown",
      "test/site/sass/print.sass",
      "test/site/static.html",

data/lib/henshin.rb

@@ -25,7 +25,7 @@ module Henshin
               :time_zone => 'GMT',
               :author => '',
               :layout => '',
-              :file_name => '{title-with-dashes}.{extension}',
+              :file_name => '<{category}/>{title-with-dashes}.{extension}',
               :permalink => '/{year}/{month}/{date}/{title}.html',
               :plugins => ['maraku', 'liquid'],
               :root => '.',

data/lib/henshin/post.rb

@@ -30,22 +30,33 @@ module Henshin
                 'date' => '(\d{4}-\d{2}-\d{2})',
                 'date-time' => '(\d{4}-\d{2}-\d{2} at \d{2}:\d{2})',
                 'xml-date-time' => '(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(:\d{2})?((\+|-)\d{2}:\d{2})?)',
+                'category' => '([a-zA-Z0-9_ -]+)',
                 'extension' => "(#{ site.config[:extensions].join('|') })"}
       
       file_parser = config[:file_name]
-      # create string regex and keep order of info
       data_order = []
+      
+      # put together regex
       m = file_parser.gsub(/\{([a-z-]+)\}/) do
         data_order << $1
         parser[$1]
       end
+      
+      # replace optional '<stuff>'
+      m.gsub!(/<(.+)>/) do
+        # this may lead to problems, well I say may...
+        data_order.unshift( 'optional' )
+        "(#{$1})?"
+      end
+
       # convert string to actual regex
       matcher = Regexp.new(m)
       
       override = {}
-      # extract data from filename
-      file_data = path.file_name.match( matcher ).captures
-      file_data.each_with_index do |data, i|
+      name = path[ (config[:root]+'/posts/').size..-1 ]
+
+      file_data = name.match( matcher ).captures
+      file_data.each_with_index do |data, i|      
         if data_order[i].include? 'title'
           if data_order[i].include? 'dashes'
             override[:title] = data.gsub(/-/, ' ').titlize
@@ -56,6 +67,8 @@ module Henshin
           override[:date] = data
         elsif data_order[i].include? 'extension'
           override[:extension] = data
+        elsif data_order[i].include? 'category'
+          override[:category] = data
         end
       end
       self.override( override )
@@ -135,7 +148,8 @@ module Henshin
       partials = {'year' => self.date.year,
                   'month' => self.date.month,
                   'date' => self.date.day,
-                  'title' => self.title.slugify}
+                  'title' => self.title.slugify,
+                  'category' => self.category || ''}
                   
       config[:permalink].gsub(/\{([a-z-]+)\}/) do
         partials[$1]

data/lib/henshin/site.rb

@@ -43,7 +43,7 @@ module Henshin
     # Adds all items in 'posts' to the posts array
     def read_posts
       path = File.join(config[:root], 'posts')
-      Dir.glob(path + '/*.*').each do |post|
+      Dir.glob(path + '/**/*.*').each do |post|
         @posts << Post.new(post, self)
       end
     end

data/test/site/posts/cat/test.markdown

@@ -0,0 +1,6 @@
+---
+title: Test
+date: 2010-05-27 at 18:54:02
+---
+
+This should be put into the correct category, in this case 'cat'. But maybe it won't. That would be interesting.

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - hawx
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 +01:00
+date: 2010-05-27 00:00:00 +01:00
 default_executable: henshin
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,7 @@ files:
 - test/site/options.yaml
 - test/site/plugins/test.rb
 - test/site/posts/Testing-Stuff.markdown
+- test/site/posts/cat/test.markdown
 - test/site/posts/lorem-ipsum.markdown
 - test/site/sass/print.sass
 - test/site/static.html