amiba 0.0.8 → 0.0.9

data/lib/amiba/frontend/views/create.rb

@@ -0,0 +1,44 @@
+module Protozoa
+  module Views
+    class Create < Layout
+      include Editable
+
+      attr_reader :page, :name
+
+      def title
+        "Create a new page"
+      end
+      
+      def is_create_page
+        true
+      end
+      
+      def is_edit_page
+        false
+      end
+      
+      def format
+        @format = (@page.format || false) if @format.nil? && @page
+        @format.to_s.downcase
+      end
+
+      def has_footer
+        @footer = (@page.footer || false) if @footer.nil? && @page
+        !!@footer
+      end
+
+      def has_sidebar
+        @sidebar = (@page.sidebar || false) if @sidebar.nil? && @page
+        !!@sidebar
+      end
+
+      def page_name
+        @name.gsub('-', ' ')
+      end
+
+      def formats
+        super(:markdown)
+      end
+    end
+  end
+end

data/lib/amiba/frontend/views/edit.rb

@@ -0,0 +1,30 @@
+module Protozoa
+  module Views
+    class Edit < Layout
+      include Editable
+
+      attr_reader :page, :content
+
+      def title
+        "#{@page.title}"
+      end
+
+      def page_name
+        "#{@page.title}"
+      end
+
+      def is_create_page
+        false
+      end
+
+      def is_edit_page
+        true
+      end
+
+      def format
+        @format = (@page.format || false) if @format.nil?
+        @format.to_s.downcase
+      end
+    end
+  end
+end

data/lib/amiba/frontend/views/editable.rb

@@ -0,0 +1,21 @@
+module Protozoa
+  module Editable
+  #   def formats(selected = @page.format)
+  #     Gollum::Page::FORMAT_NAMES.map do |key, val|
+  #       { :name     => val,
+  #         :id       => key.to_s,
+  #         :selected => selected == key}
+  #     end.sort do |a, b|
+  #       a[:name].downcase <=> b[:name].downcase
+  #     end
+  #   end
+    def categories
+      Dir.glob("entries/*").map do |ef|
+        _, category = ef.split("/")
+        {id: category, name: category.singularize.titleize }
+      end.sort do |a, b|
+        a[:name].downcase <=> b[:name].downcase
+      end
+    end
+  end
+end

data/lib/amiba/frontend/views/error.rb

@@ -0,0 +1,7 @@
+module Protozoa
+  module Views
+    class Error < Layout
+      attr_reader :message
+    end
+  end
+end

data/lib/amiba/frontend/views/history.rb

@@ -0,0 +1,44 @@
+module Protozoa
+  module Views
+    class History < Layout
+      attr_reader :page, :page_num
+
+      def title
+        @page.title
+      end
+
+      def versions
+        i = @versions.size + 1
+        @versions.map do |v|
+          i -= 1
+          { :id       => v.id,
+            :id7      => v.id[0..6],
+            :num      => i,
+            :selected => @page.version.id == v.id,
+            :author   => v.author.name,
+            :message  => v.message,
+            :date     => v.committed_date.strftime("%B %d, %Y"),
+            :gravatar => Digest::MD5.hexdigest(v.author.email) }
+        end
+      end
+
+      def previous_link
+        label = "&laquo; Previous"
+        if @page_num == 1
+          %(<span class="disabled">#{label}</span>)
+        else
+          %(<a href="/history/#{@page.name}?page=#{@page_num-1}" hotkey="h">#{label}</a>)
+        end
+      end
+
+      def next_link
+        label = "Next &raquo;"
+        if @versions.size == Gollum::Page.per_page
+          %(<a href="/history/#{@page.name}?page=#{@page_num+1}" hotkey="l">#{label}</a>)
+        else
+          %(<span class="disabled">#{label}</span>)
+        end
+      end
+    end
+  end
+end

data/lib/amiba/frontend/views/index.rb

@@ -0,0 +1,19 @@
+module Protozoa
+  module Views
+    class Index < Layout
+      attr_reader :entries, :ref
+
+      def title
+        "All pages for #{Amiba::Configuration.site_name}"
+      end
+
+      def has_entries
+        !@entries.empty?
+      end
+      
+      def no_entries 
+        @entries.empty?
+      end
+    end
+  end
+end

data/lib/amiba/frontend/views/layout.rb

@@ -0,0 +1,29 @@
+require 'cgi'
+
+module Protozoa
+  module Views
+    class Layout < Mustache
+      include Rack::Utils
+      alias_method :h, :escape_html
+
+      attr_reader :name
+
+      def escaped_name
+        CGI.escape(@name)
+      end
+
+      def title
+        "Home"
+      end
+
+      def edit_url
+        if @page.class == Amiba::Source::Entry
+          "/entries/edit#{@page.link}"
+        else
+          "/pages/edit#{@page.link}"
+        end
+      end
+
+    end
+  end
+end

data/lib/amiba/frontend/views/page.rb

@@ -0,0 +1,27 @@
+module Protozoa
+  module Views
+    class Page < Layout
+      attr_reader :content, :page, :footer
+
+      def title
+        @page.title
+      end
+
+      def format
+        @page.format.to_s
+      end
+
+      def author
+        @page.new? ? "No Author" : @page.author
+      end
+
+      def date
+        @page.new? ? DateTime.now.strftime("%Y-%m-%d %H:%M:%S") : @page.pubdate.strftime("%Y-%m-%d %H:%M:%S")
+      end
+      
+      def editable
+        @editable
+      end
+    end
+  end
+end

data/lib/amiba/frontend/views/search.rb

@@ -0,0 +1,20 @@
+module Protozoa
+  module Views
+    class Search < Layout
+      attr_reader :content, :page, :footer, :results, :query
+
+      def title
+        "Search results for " + @query
+      end
+
+      def has_results
+        !@results.empty?
+      end
+      
+      def no_results 
+        @results.empty?
+      end
+
+    end
+  end
+end

data/lib/amiba/page.rb

@@ -21,6 +21,7 @@ module Amiba
 
       def init_source
         @source = Amiba::Source::Page.new(name, format, options, Templates.send(format.to_sym))
+        @entry = Amiba::Source::PageEntry.new(@source)
       end
 
       def should_not_exist
@@ -40,10 +41,14 @@ module Amiba
         @source.save do |filename, file_data|
           create_file filename, file_data
         end
+        @entry.save do |filename, file_data|
+          create_file filename, file_data
+        end
       end
 
       def add_to_git
         add_and_commit @source.filename
+        add_and_commit @entry.filename
       end
 
     end
@@ -127,7 +132,7 @@ module Amiba
     class Templates
       class << self
         def haml
-          "%h1 Title\n%p Body\n"
+          "= content\n"
         end
 
         def markdown

data/lib/amiba/scope.rb

@@ -16,7 +16,16 @@ module Amiba
     end
 
     def content
-      page_renderer.render(self)
+      if @page.is_a? Amiba::Source::Page
+        c = Amiba::Source::PageEntry.new(page)
+        if c.new?
+          Amiba::Tilt.new(@page).render(self)
+        else
+          Amiba::Tilt.new(@page).render(Amiba::Scope.new(c))
+        end
+      else
+        Amiba::Tilt.new(@page).render(self)
+      end
     end
 
     def entries
@@ -25,7 +34,7 @@ module Amiba
 
     def partial(path, locals={})
       p = Amiba::Source::Partial.new path
-      Tilt.new(p.filename).render(Amiba::Scope.new(p), locals)
+      Amiba::Tilt.new(p.filename).render(Amiba::Scope.new(p), locals)
     end
 
     def site_name
@@ -44,10 +53,5 @@ module Amiba
       end
     end
 
-    protected
-
-    def page_renderer
-      Tilt.new page.staged_filename
-    end
   end
 end

data/lib/amiba/site.rb

@@ -4,15 +4,24 @@ require 'webrick'
 module Amiba
   module Site
 
+    class Editor < Thor::Group
+      include Amiba::Generator
+
+      namespace :"site:editor"
+      class_option :port, :default => 4567
+
+      def edit
+        require 'amiba/frontend/app'
+        Protozoa::App.run!(options)
+      end
+    end
     class Preview < Thor::Group
       include Amiba::Generator
 
       namespace :"site:preview"
       class_option :port, :default => 4321
-      # class_option :drafts, :default => false
 
       def create
-        # invoke Amiba::Site::Generate, [], :drafts => options[:drafts]
         invoke Amiba::Site::Generate
       end
 
@@ -145,7 +154,7 @@ module Amiba
       def process_and_copy_sass
         Dir.glob('public/css/[^_]*.scss').each do |scss_file|
           create_file File.join(Amiba::Configuration.site_dir,"public/css/", File.basename(scss_file).gsub('scss', 'css')) do
-            Tilt.new(scss_file).render
+            Amiba::Tilt.new(scss_file).render
           end
         end
       end
@@ -167,6 +176,7 @@ module Amiba
 
       def build_json
         Dir.glob('entries/*').each do |cat|
+          next unless File.directory? cat
           c = File.basename cat
           create_file(File.join(Amiba::Configuration.site_dir, "public", c, "latest.json")) do
             Amiba::Source::Entry.send(c.to_sym.pluralize).limit(20).each.inject([]) do |acc, ent|
@@ -183,7 +193,7 @@ module Amiba
           feed = Amiba::Source::Feed.new(feed_file)
           begin
             create_file(feed.output_filename) do
-              Tilt.new(feed.filename).render(Amiba::Scope.new(feed), :xml => Builder::XmlMarkup.new)
+              Amiba::Tilt.new(feed.filename).render(Amiba::Scope.new(feed), :xml => Builder::XmlMarkup.new)
             end
           rescue
             say_status "Failed", "Unable to process #{feed.name}: #{$!}, skipping", :red
@@ -203,17 +213,18 @@ module Amiba
 
       def build_layout(page)
         layout = Amiba::Source::Layout.new(page.layout)
-        return layout if File.exists? layout.staged_filename
-        create_file(layout.staged_filename) do layout.content end
+        # Fall back to the default layout if we can't find the requested one
+        if layout.new?
+          layout = Amiba::Source::Layout.new("default")
+        end
         layout
       end
 
       def build_page(page)
         layout = build_layout(page)
-        create_file(page.staged_filename) do page.content end
         begin
           create_file(page.output_filename) do
-            Tilt.new(layout.staged_filename).render(Amiba::Scope.new(page))
+            Amiba::Tilt.new(layout, :smartypants=>true).render(Amiba::Scope.new(page))
           end
         rescue
           say_status "Failed", "Unable to process #{page.name}: #{$!}, skipping", :red

data/lib/amiba/source.rb

@@ -55,9 +55,6 @@ module Amiba
         @filename ||= File.join(self.class.pluralized_name, "#{name}.#{format}")
       end
 
-      def staged_filename
-        File.join Amiba::Configuration.staged_dir, filename
-      end
 
       def new?
         !File.exist?(filename)
@@ -85,32 +82,27 @@ module Amiba
         @metadata["pubdate"] ||= last_commit_date filename
       end
 
+      def metadata=(meta)
+        m = meta ? metadata.merge(meta) : metadata
+        @metadata = HashWithIndifferentAccess.new(m)
+      end
+
+      def content=(c)
+        @content = c ? c : documents.last
+      end
+
       protected
 
       def method_missing(method_sym, *args, &block)
         md = method_sym.to_s.gsub(/=$/,'')
-        if !metadata[md.to_s].nil?
-          self.class.define_metadata_accessor(md)
-          send(method_sym, *args, &block)
-        else
-          super
-        end
+        self.class.define_metadata_accessor(md)
+        send(method_sym, *args, &block)
       end
 
       def name=(n)
         @name = n
       end
 
-      def metadata=(meta)
-        m = meta ? metadata.merge(meta) : metadata
-        @metadata = HashWithIndifferentAccess.new(m)
-      end
-
-      def content=(c)
-        return @content unless @content.nil?
-        @content = self.new? ? c : documents.last
-      end
-
       def documents
         @documents ||= YAML.load_stream(File.read(filename)).documents
       rescue