diary 0.1.5 → 0.2.0

data/lib/diary/version.rb

@@ -0,0 +1,3 @@
+module Diary
+  VERSION = "0.2.0"
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Robin Clart
@@ -14,76 +14,121 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 +02:00
-default_executable: diary
+date: 2011-03-04 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: liquid
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
+        - 3
         - 0
         - 0
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bluecloth
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 0
-        - 7
-        version: 2.0.7
+        - 11
+        version: 2.0.11
   type: :runtime
   version_requirements: *id002
-description: 
-email: robin@clart.me
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc
+        - 6
+        version: 1.0.0.rc.6
+  type: :development
+  version_requirements: *id004
+description: Diary makes it easy to maintain a file based website with template blog posts and pages.
+email: 
+- robin@charlin.be
 executables: 
 - diary
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .gitignore
-- LICENSE
-- README.rdoc
+- Gemfile
+- Gemfile.lock
 - Rakefile
-- VERSION
 - bin/diary
 - diary.gemspec
 - lib/diary.rb
 - lib/diary/cli.rb
-- lib/diary/draft.rb
-- lib/diary/item.rb
+- lib/diary/cli/commands.rb
+- lib/diary/cli/commands/compile.rb
+- lib/diary/cli/commands/init.rb
+- lib/diary/cli/commands/new_item.rb
+- lib/diary/cli/commands/server.rb
+- lib/diary/cli/commands/sync.rb
+- lib/diary/cli/parser.rb
+- lib/diary/item/base.rb
+- lib/diary/item/creator.rb
+- lib/diary/item/data.rb
+- lib/diary/item/finder.rb
+- lib/diary/item/output.rb
+- lib/diary/item/snippet.rb
+- lib/diary/item/template.rb
+- lib/diary/item/url.rb
+- lib/diary/items/page.rb
+- lib/diary/items/post.rb
 - lib/diary/message.rb
-- lib/diary/output.rb
-- lib/diary/page.rb
-- lib/diary/post.rb
-- lib/diary/site.rb
-- lib/diary/template.rb
-- test/helper.rb
-- test/test_diary.rb
+- lib/diary/server.rb
+- lib/diary/snippet.rb
+- lib/diary/version.rb
 has_rdoc: true
-homepage: http://github.com/robinclart/diary
+homepage: http://rubygems.org/gems/diary
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -91,19 +136,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: diary
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Dead Simple, Static Blog Generator
-test_files: 
-- test/helper.rb
-- test/test_diary.rb
+summary: Another static blog generator
+test_files: []
+

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Robin Clart
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,3 +0,0 @@
-= Diary
-
-Dead Simple, Static Blog Generator.

data/VERSION

@@ -1 +0,0 @@
-0.1.5

data/lib/diary/draft.rb

@@ -1,14 +0,0 @@
-class Draft < Diary::Item
-  @@base_directory = 'drafts'
-  
-  def publish(date = Date.today)
-    to   = File.join(Post.class_variable_get(:@@base_directory), *date.to_s.split('-'))
-
-    FileUtils.mkpath  to
-    FileUtils.mv      path, to
-
-    say Publish, File.join(to, "#{slug}.md")
-  rescue Errno::ENOENT
-    say Error, "No draft found"
-  end
-end

data/lib/diary/item.rb

@@ -1,138 +0,0 @@
-# coding: utf-8
-
-module Diary
-  class Item
-    include Message
-    
-    ACCENTS = { 
-		  ['á','à','â','ä','ã'] => 'a',
-		  ['Ã','Ä','Â','À','�?'] => 'A',
-		  ['é','è','ê','ë'] => 'e',
-		  ['Ë','É','È','Ê'] => 'E',
-		  ['í','ì','î','ï'] => 'i',
-		  ['�?','Î','Ì','�?'] => 'I',
-		  ['ó','ò','ô','ö','õ'] => 'o',
-		  ['Õ','Ö','Ô','Ò','Ó'] => 'O',
-		  ['ú','ù','û','ü'] => 'u',
-		  ['Ú','Û','Ù','Ü'] => 'U',
-		  ['ç'] => 'c', ['Ç'] => 'C',
-		  ['ñ'] => 'n', ['Ñ'] => 'N'
-    }
-    
-    attr_reader :file
-        
-    def initialize(title_or_file, attributes = {})
-      case title_or_file
-      when File
-        @new_file   = false
-        @file       = title_or_file
-      else
-        @new_file   = true
-        @attributes = attributes
-        @directory  = extract_directory!
-        @title      = title_or_file
-        @slug       = nice_slug
-        
-        create!
-      end
-    end
-    
-    def slug
-      @slug || basename
-    end
-    
-    def title
-      @title || data.title
-    end
-        
-    def path
-      file ? file.path : File.join(base_directory, directory, "#{slug}.md")
-    end
-    
-    def directory
-      @directory || File.dirname(path).gsub("#{base_directory}/", "")
-    end
-        
-    def data
-      OpenStruct.new(YAML.load_file(path))
-    end
-        
-    def self.all
-      Dir[File.join(self.class_variable_get(:@@base_directory), "**", "*.md")].map do |p|
-        self.new File.new(p, 'r')
-      end
-    end
-    
-    def self.first
-      all.first
-    end
-    
-    def self.last
-      all.last
-    end
-    
-    private
-    
-    def base_directory
-      self.class.class_variable_get(:@@base_directory)
-    end
-    
-    def basename
-      File.basename(file, '.md')
-    end
-    
-    def nice_slug
-      str = ""
-      ACCENTS.each do |ac,rep|
-        ac.each do |s|
-          str = @title.gsub(s, rep)
-        end
-      end
-      str.gsub(/[^a-zA-Z0-9 ]/, "")
-         .gsub(/[ ]+/, " ")
-         .gsub(/ /, "-")
-         .downcase
-    end
-    
-    def extract_directory!
-      @attributes.delete(:directory) { |el| "" }
-    end
-    
-    def create!
-      if new_file?
-        ensure_directories_exists
-        @file = File.new(path, "w+")
-        write!
-                
-        say Create, path
-      else
-        @file     = File.new(path)
-        @new_file = false
-        
-        say Exist, path
-      end
-      
-      remove_instance_variable(:@attributes)
-      remove_instance_variable(:@title)
-      remove_instance_variable(:@slug)
-    end
-    
-    def new_file?
-      @new_file and not File.exists?(path)
-    end
-    
-    def write!
-      file.puts "---\n"
-      file.puts "title: #{@title}"
-      @attributes.each do |key, value|
-        file.puts "#{key}: #{value}\n"
-      end
-      file.puts "\n---\n"
-      file.close
-    end
-        
-    def ensure_directories_exists
-      FileUtils.mkpath(File.dirname(path))
-    end
-  end
-end

data/lib/diary/output.rb

@@ -1,57 +0,0 @@
-module Diary
-  module Output    
-    include Message
-
-    @@output_base_directory = 'output'
-    
-    def output(force = false)
-      if changed? or force
-        FileUtils.mkpath output_directory
-        f = File.new(output_path, 'w+')
-        f.puts render
-        f.close
-        
-        say Update, output_path
-      else
-        say Identical, output_path
-      end
-    end
-    
-    def content
-      file.rewind
-      file.read.split(/---\n/).slice(-1).strip
-    end
-    
-    def render
-      Liquid::Template.parse(template.read).render('yield' => html)
-    end
-    
-    private
-    
-    def changed?
-      file.mtime > output_file.ctime
-    rescue Errno::ENOENT
-      true
-    end
-    
-    def html
-      BlueCloth.new(content).to_html
-    end
-    
-    def output_path
-      path.gsub(base_directory, output_base_directory).gsub('.md', '.html')
-    end
-    
-    def output_directory
-      File.dirname(output_path)
-    end
-    
-    def output_file
-      File.new(output_path)
-    end
-    
-    def output_base_directory
-      self.class.class_variable_get(:@@output_base_directory)
-    end
-  end
-end

data/lib/diary/page.rb

@@ -1,6 +0,0 @@
-class Page < Diary::Item
-  @@base_directory = 'pages'
-
-  include Diary::Template
-  include Diary::Output
-end

data/lib/diary/post.rb

@@ -1,22 +0,0 @@
-class Post < Diary::Item
-  @@base_directory = 'posts'
-  
-  include Diary::Template
-  include Diary::Output
-  
-  def initialize(title_or_file)
-    super(title_or_file)
-  end
-  
-  def date
-    Date.parse(directory)
-  end
-  
-  def output(force = false)
-    if date <= Date.today
-      super(force)
-    else
-      say Skip, path
-    end
-  end
-end