diary 0.2.1 → 0.2.2

data/lib/diary.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'date'
+require 'time'
 require 'yaml'
 require 'ostruct'
 require 'singleton'

data/lib/diary/cli/commands/edit.rb

@@ -0,0 +1,15 @@
+module Diary
+  module CLI
+    module Commands
+      def edit(args, options)
+        `#{editor} #{const_get(args.shift.capitalize).find(args.first).path}`
+      end
+
+      private
+
+      def editor
+        YAML.load_file("config.yml")["editor"] || "nano"
+      end
+    end
+  end
+end

data/lib/diary/item/creator.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 module Diary
   module Item
     module Creator
@@ -20,24 +19,11 @@ module Diary
         end
       end
 
-      ACCENTS = { 
-        ['á','à','â','ä','ã'] => 'a',
-        ['Ã','Ä','Â','À','�?'] => 'A',
-        ['é','è','ê','ë'] => 'e',
-        ['Ë','É','È','Ê'] => 'E',
-        ['í','ì','î','ï'] => 'i',
-        ['�?','Î','Ì','�?'] => 'I',
-        ['ó','ò','ô','ö','õ'] => 'o',
-        ['Õ','Ö','Ô','Ò','Ó'] => 'O',
-        ['ú','ù','û','ü'] => 'u',
-        ['Ú','Û','Ù','Ü'] => 'U',
-        ['ç'] => 'c', ['Ç'] => 'C',
-        ['ñ'] => 'n', ['Ñ'] => 'N'
-      }
-
-      def create(title)
-        slug = slugify(title)
-        path = resolve_path(slug)
+      def create(title_or_path)
+        path_fragments  = title_or_path.split("/")
+        title = path_fragments.pop
+        path_fragments << title.parameterize
+        path = resolve_path(path_fragments.join("/"))
 
         ensure_directories_exists!(path)
 
@@ -58,18 +44,8 @@ module Diary
 
       private
 
-      def slugify(str)
-        ACCENTS.each do |ac,rep|
-          ac.each do |s|
-            str = str.gsub(s, rep)
-          end
-        end
-
-        str.gsub(/[ ]+/, " ").gsub(/ /, "-").downcase
-      end
-
-      def resolve_path(slug)
-        File.join(base_directory, "#{slug}.md")
+      def resolve_path(path)
+        File.join(base_directory, "#{path}.md")
       end
 
       def ensure_directories_exists!(path)

data/lib/diary/item/data.rb

@@ -8,6 +8,22 @@ module Diary
         load_data
       end
 
+      def title
+        data.title
+      end
+
+      def author
+        data.author
+      end
+
+      def published_at
+        Time.parse(data.published_at)
+      end
+
+      def email
+        data.email
+      end
+
       def reload_data
         @data = load_data
       end
@@ -17,21 +33,10 @@ module Diary
       def load_data
         if File.exists?(path)
           @data ||= OpenStruct.new(YAML.load_file(path)).freeze
-          create_attr_readers_from_data_table!
-
-          @data
         else
           nil
         end
       end
-
-      def create_attr_readers_from_data_table!
-        data.instance_variable_get(:@table).tap do |h|
-          h.each_key do |k|
-            self.class.send(:define_method, k) { data.send k } unless self.class.method_defined?(k)
-          end
-        end
-      end
     end
   end
-end
+end

data/lib/diary/item/snippet.rb

@@ -2,7 +2,7 @@ module Diary
   module Item
     module Snippet
       def snippet(name)
-        Diary::Snippet.new(name.intern).content
+        ERB.new(Diary::Snippet.new(name.intern).content).result(binding)
       end
     end
   end

data/lib/diary/item/url.rb

@@ -2,7 +2,21 @@ module Diary
   module Item
     module Url
       def link(name)
-        "<a href=\"#{output_path.gsub("public/", "")}\">#{name}</a>"
+        "<a href=\"#{website_path}\">#{name}</a>"
+      end
+
+      private
+
+      def website_path
+        output_path.gsub("public/", website_config).gsub("index.html", "")
+      end
+
+      def website_config
+        if File.exists?("config.yml")
+          YAML.load_file("config.yml")["website"] || "/"
+        else
+          "/"
+        end
       end
     end
   end

data/lib/diary/items/page.rb

@@ -1,7 +1,7 @@
 class Page < Diary::Item::Base
   include Diary::Item::Data
-  include Diary::Item::Url
   include Diary::Item::Template
   include Diary::Item::Snippet
   include Diary::Item::Output
+  include Diary::Item::Url
 end

data/lib/diary/items/post.rb

@@ -1,6 +1,7 @@
 class Post < Diary::Item::Base
   include Diary::Item::Data
   include Diary::Item::Template
+  include Diary::Item::Snippet
   include Diary::Item::Output
   include Diary::Item::Url
 

data/lib/diary/version.rb

@@ -1,3 +1,3 @@
 module Diary
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Robin Clart
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-05 00:00:00 +01:00
+date: 2011-03-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,6 +99,7 @@ files:
 - lib/diary/cli.rb
 - lib/diary/cli/commands.rb
 - lib/diary/cli/commands/compile.rb
+- lib/diary/cli/commands/edit.rb
 - lib/diary/cli/commands/init.rb
 - lib/diary/cli/commands/new_item.rb
 - lib/diary/cli/commands/server.rb