amiba 0.0.9 → 1.0.0

data/lib/amiba/frontend/app.rb

@@ -40,12 +40,46 @@ module Protozoa
       enable :logging, :raise_errors, :dump_errors
     end
 
+    helpers do
+      def all_pages
+        Dir.glob('pages/**/[^_]*').inject([]) do |acc, page_file|
+          if !File.directory? page_file
+            page = Amiba::Source::Page.new(File.relpath(page_file, "pages"))
+            ent = Amiba::Source::PageEntry.new(page)
+            acc << page unless ent.new?
+          end
+          acc
+        end
+      end
+    end
+
     get '/' do
+      pull
       @entries = Amiba::Source::Entry.any.all.sort {|a,b| a.category <=> b.category }
+      @pages = all_pages
       mustache :index
     end
 
+    get %r{/pages/edit/(.+)\.html$} do
+      pull
+      @page = Amiba::Source::Page.new(params[:captures][0],"haml")
+      @entry = Amiba::Source::PageEntry.new(@page)
+      @content = @entry.content
+      @name = @page.title
+      mustache :edit
+    end
+
+    get %r{/pages/(.+)\.html$} do
+      @page = Amiba::Source::Page.new(params[:captures][0],"haml")
+      @entry = Amiba::Source::PageEntry.new(@page)
+      @content = @entry.render
+      @name = @page.title
+      @editable = true
+      mustache :page
+    end
+
     get %r{/entries/edit/(.+?)/(.+)\.html$} do
+      pull
       @page = Amiba::Source::Entry.new(params[:captures][0],params[:captures][1],"markdown")
       @content = @page.content
       @name = @page.title
@@ -60,7 +94,21 @@ module Protozoa
       mustache :page
     end
 
+    post %r{/pages/edit/(.+)\.html$} do
+      pull
+      @page = Amiba::Source::Page.new(params[:captures][0],"haml")
+      @entry = Amiba::Source::PageEntry.new(@page)
+      @entry.content = params[:content]
+      @entry.save do |filename, file_data|
+        File.open(filename, 'w') { |f| f.write(file_data) }
+      end
+      add_and_commit @entry.filename
+      push
+      redirect "/pages#{@page.link}"
+    end
+
     post %r{/entries/edit/(.+?)/(.+)\.html$} do
+      pull
       @page = Amiba::Source::Entry.new(params[:captures][0],params[:captures][1],"markdown")
       @page.content = params[:content]
       @page.author = env["X-DSCI-USER"] || "Anonymous"
@@ -68,7 +116,7 @@ module Protozoa
         File.open(filename, 'w') { |f| f.write(file_data) }
       end
       add_and_commit @page.filename
-      # push
+      push
       redirect "/entries#{@page.link}"
     end
 
@@ -88,6 +136,7 @@ module Protozoa
     end
 
     post '/entries/create' do
+      pull
       name = params[:title].parameterize
       metadata  = {state: "published", title: params[:title]}
       @page = Amiba::Source::Entry.new(params[:category], name, "markdown", metadata, params[:content])
@@ -96,7 +145,7 @@ module Protozoa
         File.open(filename, 'w') { |f| f.write(file_data) }
       end
       add_and_commit @page.filename
-      # push
+      push
       redirect "/entries#{@page.link}"
     end
 

data/lib/amiba/frontend/templates/edit.mustache

@@ -2,7 +2,7 @@
 <div id="head">
   <h1>Editing <strong>{{title}}</strong></h1>
   <ul class="actions">
-    <li class="minibutton"><a href="/entries{{page.link}}"
+    <li class="minibutton"><a href="{{view_url}}"
        class="action-view-page">View Page</a></li>
   <!--  <li class="minibutton"><a href="/history{{page.link}}"
        class="action-page-history">Page History</a></li> -->

data/lib/amiba/frontend/templates/index.mustache

@@ -10,6 +10,7 @@
 </div>
 <div id="results">
 
+<h2> Individual Entries</h2>
 {{#has_entries}}
   <ul>
     {{#entries}}
@@ -20,6 +21,15 @@
   </ul>
 {{/has_entries}}
 
+<h2>Pages</h2>
+<ul>
+  {{#pages}}
+  <li>
+    <a href="/pages{{link}}">{{title}}</a> 
+  </li>
+  {{/pages}}
+</ul>
+
 {{#no_entries}}
   <p id="no-entries">
     There are no pages in <strong>{{ref}}</strong>.

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

@@ -1,7 +1,7 @@
 module Protozoa
   module Views
     class Index < Layout
-      attr_reader :entries, :ref
+      attr_reader :entries, :ref, :pages
 
       def title
         "All pages for #{Amiba::Configuration.site_name}"

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

@@ -16,6 +16,14 @@ module Protozoa
         "Home"
       end
 
+      def view_url
+        if @page.class == Amiba::Source::Entry
+          "/entries#{@page.link}"
+        else
+          "/pages#{@page.link}"
+        end
+      end
+
       def edit_url
         if @page.class == Amiba::Source::Entry
           "/entries/edit#{@page.link}"

data/lib/amiba/repo.rb

@@ -29,5 +29,9 @@ module Amiba
     def push(remote=nil,branch=nil,args={}) 
       repo.git.push(args,remote,branch)
     end
+
+    def pull
+      repo.git.pull
+    end
   end
 end

data/lib/amiba/source/entry.rb

@@ -65,6 +65,10 @@ module Amiba
         File.join("entries", name + ".#{format.to_s}")
       end
 
+      def render
+        Amiba::Tilt.new(self).render(Amiba::Scope.new(self))
+      end
+
       alias_method :output_filename, :filename
     end
 

data/lib/amiba/source.rb

@@ -124,6 +124,10 @@ module Amiba
       VALID_FORMATS = %w{haml markdown}
       validates_presence_of :layout, :title, :description, :category, :state
 
+      def link
+        URI.escape( ["", "#{name}.html"].join("/") )
+      end
+
       def output_filename
         File.join(Amiba::Configuration.site_dir, "public/#{name}.html")
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amiba
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-16 00:00:00.000000000Z
+date: 2011-08-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70105019667120 !ruby/object:Gem::Requirement
+  requirement: &70152402485620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70105019667120
+  version_requirements: *70152402485620
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70105019666660 !ruby/object:Gem::Requirement
+  requirement: &70152402485020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70105019666660
+  version_requirements: *70152402485020
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70105019666120 !ruby/object:Gem::Requirement
+  requirement: &70152402484280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 3.0.25
   type: :runtime
   prerelease: false
-  version_requirements: *70105019666120
+  version_requirements: *70152402484280
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70105019665640 !ruby/object:Gem::Requirement
+  requirement: &70152402483660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70105019665640
+  version_requirements: *70152402483660
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70105019665180 !ruby/object:Gem::Requirement
+  requirement: &70152402483080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70105019665180
+  version_requirements: *70152402483080
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70105019664800 !ruby/object:Gem::Requirement
+  requirement: &70152402482660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70105019664800
+  version_requirements: *70152402482660
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70105019664320 !ruby/object:Gem::Requirement
+  requirement: &70152402482080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70105019664320
+  version_requirements: *70152402482080
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70105019663700 !ruby/object:Gem::Requirement
+  requirement: &70152402481500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70105019663700
+  version_requirements: *70152402481500
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70105019663200 !ruby/object:Gem::Requirement
+  requirement: &70152402480820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70105019663200
+  version_requirements: *70152402480820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70105019662820 !ruby/object:Gem::Requirement
+  requirement: &70152402480360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70105019662820
+  version_requirements: *70152402480360
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
-  requirement: &70105019662360 !ruby/object:Gem::Requirement
+  requirement: &70152402479880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70105019662360
+  version_requirements: *70152402479880
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70105019661940 !ruby/object:Gem::Requirement
+  requirement: &70152402479280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70105019661940
+  version_requirements: *70152402479280
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70105019661380 !ruby/object:Gem::Requirement
+  requirement: &70152402478700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +154,7 @@ dependencies:
         version: 2.0.0.beta1
   type: :development
   prerelease: false
-  version_requirements: *70105019661380
+  version_requirements: *70152402478700
 description: Description TBD
 email:
 - s.mohapi-banks@digital-science.com