artifact 0.0.5 → 0.0.6

data/lib/artifact.rb

@@ -15,6 +15,9 @@ module Artifact
 
   def self.configure
     yield config
+    unless config.author_name && config.author_email
+      raise "Both author_name and author_email are needed."
+    end
   end
 
   def self.root
@@ -57,7 +60,8 @@ module Artifact
   class Config
 
     attr_accessor *%w(
-      root source_root posts_path drafts_path uploads_path directory_indexes
+      root source_root posts_path drafts_path uploads_path 
+      directory_indexes rebuild_args author_name author_email
     )
 
     def initialize
@@ -67,6 +71,7 @@ module Artifact
       @drafts_path       = 'drafts'
       @uploads_path      = 'uploads'
       @directory_indexes = true
+      @rebuild_args      = ''
     end
 
   end
@@ -183,7 +188,10 @@ module Artifact
       end
     end
 
+    # the author signature is a Hash containing :name, :email of the author
+    # and :time of the change.
     def write_commit(message, author)
+      author[:time] = Time.now
       commit_sha = Rugged::Commit.create(@git,
         :author     => author,
         :message    => message,
@@ -296,10 +304,10 @@ module Artifact
     end
 
     def update(content, meta = {})
-      yaml_data = sanitized_meta(meta)
+      yaml_data = sanitized_meta(meta) # insert date and author if missing
       body = "#{yaml_data}---\n\n#{content}"
       super(body)
-      @data = nil
+      @data = nil # force reload
     end
 
     def update_meta(key, val)
@@ -322,6 +330,7 @@ module Artifact
       read.split("---\n\n")
     end
 
+    # include existing date and author in yaml hash in case they're not set
     def sanitized_meta(hash)
       hash.stringify_keys!
       if exists?

data/lib/artifact/app.rb

@@ -34,12 +34,10 @@ module Artifact
 
     private
 
-    # FIXME: SOON!
     def current_user
-      author = {
-        :email => "ofofofof@gmail.com",
-        :time  => Time.now,
-        :name  => "The User"
+      {
+        :name  => Artifact.config.author_name,
+        :email => Artifact.config.author_email
       }
     end
 

data/lib/artifact/middleman.rb

@@ -87,6 +87,7 @@ module Artifact
       view 'posts/new'
     end
 
+    # create new draft (non-existing file)
     post '/posts' do
       data = params[:meta] # includes title and maybe something else
       filename = data[:title].parameterize
@@ -107,26 +108,31 @@ module Artifact
       view 'posts/edit'
     end
 
+    # save, and optionally publish or unpublish post
     post '/posts/*' do
       @post = MarkdownFile.new(params[:splat][0])
 
-      meta = (params[:meta] || {}).merge('last_updated_by' => current_user[:email])
+      # ensure date is valid and insert author/last_updated_by
+      meta = check_post_meta! or halt(422, "Invalid meta.") 
+
+      # puts "Writing content and meta to file: #{meta.inspect}"
       @post.update(params[:content].gsub("\r\n", "\n"), meta)
 
-      if params[:save] # user clicked on 'save' or 'published'
+      if params[:save] # user clicked on 'save', 'publish' or 'unpublish' (not auto-save)
+
+        # save changes to repo!
         # if draft was previously saved this will raise 'coz no changes.
         Artifact.repo.save(@post.path, current_user, false)
 
         if params[:save] == 'Publish'
-          @post.update_meta(:date, Time.now.utc.strftime("%Y-%m-%d %H:%M %Z"))
           publish_post!(@post)
         elsif params[:save] == 'Unpublish'
           unpublish_post!(@post)
         end
       end
 
-      updated!
-      redirect to('/posts')
+      updated! # force middleman to rebuild resource list
+      redirect to('/posts') unless request.xhr?
     end
 
     delete '/posts/*' do
@@ -160,13 +166,31 @@ module Artifact
         file.update(tmpfile.read)
         Artifact.repo.save(file.path, current_user) # pass relative path
 
-        updated!
+        updated! # force middleman to rebuild resource list
         redirect to('/')
       end
     end
 
     private
 
+    def check_post_meta!
+      meta = (params[:meta] || {}).symbolize_keys.merge(:last_updated_by => current_user[:email])
+
+      if meta[:date]
+        puts "Meta date is #{meta[:date]}"
+        return false unless valid_date?(meta[:date])
+      else # no date, set current
+        meta[:date] = Time.now.utc.strftime("%Y-%m-%d %H:%M %Z")
+      end
+
+      meta[:author] = current_user[:name] unless meta[:author]
+      meta
+    end
+
+    def valid_date?(str)
+      Time.parse(str) rescue false
+    end
+
     def get_uploads
       @uploads = Artifact.uploads.all.last(10).reverse
     end
@@ -190,7 +214,7 @@ module Artifact
     end
 
     def rebuild!
-      puts `bundle exec middleman build`
+      puts `bundle exec middleman build #{Artifact.config.rebuild_args}`
     end
 
     def updated!

data/lib/artifact/version.rb

@@ -1,3 +1,3 @@
 module Artifact
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/artifact/views/posts/_meta.erb

@@ -1,6 +1,6 @@
 <table class="right table" id="post-meta" style="display: none">
   <% @post.data.each do |key, val| %>
-    <% next if %w(title date last_updated_by).include?(key.to_s) %>
+    <% next if %w(title last_updated_by).include?(key.to_s) %>
     <tr>
       <td><input type="text" value="<%= key %>" disabled="disabled" /></td>
       <td><input id="post-#{key}" type="text" name="meta[<%= key %>]" value="<%= val %>" /></td>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-06-05 00:00:00 -07:00
+date: 2015-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency