jekyll-epub 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/jekyll-epub.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jekyll-epub}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gregoire Lejeune"]
-  s.date = %q{2010-04-27}
+  s.date = %q{2010-05-02}
   s.default_executable = %q{jekyll_epub}
   s.description = %q{Create an eBook (epub) of your Jekyll blog}
   s.email = %q{gregoire.lejeune@free.fr}

data/lib/jekyll/epub.rb

@@ -17,12 +17,48 @@ module Jekyll
   class Site #:nodoc:    
     def all
       if self.config["epub"]["pages-order"]
-        pages + posts
+        self.create_order( pages.clone, posts.clone, self.config["epub"]["pages-order"], :url )
       else
         posts + pages
       end
     end
     
+    def get_item( item, method, posts, pages ) #:nodoc:
+      _out = []
+
+      posts.each do |p|
+        if p.send(method).gsub( /^\//, "" ) == item
+          _out << posts.delete(p)
+        end
+      end
+
+      pages.each do |p|
+        if p.send(method).gsub( /^\//, "" ) == item
+          _out << pages.delete(p)
+        end
+      end
+
+      return _out, posts, pages
+    end
+
+    def create_order( pages, posts, order, method ) #:nodoc:
+      _result = []
+      _order = {}
+      order.each do |item|
+        if item.class == Symbol
+          _order[item] = eval(item.to_s)
+        else
+          _order[item], posts, pages = get_item( item, method, posts, pages )
+        end
+      end
+
+      order.each do |item|
+        _result = _result + _order[item]
+      end
+
+      return _result
+    end
+    
     # This is a Jekyll[http://jekyllrb.com] extension
     #
     # Same as Site::process but generate the epub. 

data/lib/jekyll/epub/tasks.rb

@@ -18,7 +18,7 @@ module Jekyll
       end
       
       def epub( key, value )
-        @_epub["epub"][key.to_s] = value
+        @_epub[key.to_s] = value
       end
       
       def web( key, value )

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 +02:00
+date: 2010-05-02 00:00:00 +02:00
 default_executable: jekyll_epub
 dependencies: 
 - !ruby/object:Gem::Dependency