amiba 0.0.8 → 0.0.9

data/bin/amiba-wp-import

@@ -47,6 +47,17 @@ end
 
 Dir.chdir options[:target]
 
+# category:
+# select wp_terms.name from wp_terms inner join wp_term_relationships on wp_terms.term_id=wp_term_relationships.term_taxonomy_id where object_id in (select ID from wp_posts where post_parent = ? or ID=?) 
+
+#images for post:
+#select * from wp_postmeta where post_id in (select ID from wp_posts where post_parent = 568 or ID=568)
+
+#post:
+#select * from wp_posts where post_parent = NULL
+#select * from wp_posts where post_parent = 568
+
+#change vector - look for post_type revision, figure out the highest id, stash as metadata
 
 DB = Sequel.connect(:adapter=>options[:dbtype], :host => options[:dbhost], :database=>options[:db], :user => options[:dbuser], :password => options[:dbpass], :encoding => 'utf8')
 Sequel::MySQL.convert_invalid_date_time = nil 

data/lib/amiba/all.rb

@@ -1,15 +1,21 @@
+require 'yaml'
+YAML::ENGINE.yamler= 'syck'
 require 'tilt'
 require 'haml'
 require 'active_support/all'
 require 'active_model'
 require 'i18n'
 require 'redcarpet'
+Tilt.prefer Tilt::RedcarpetTemplate
 
 require 'amiba/core_ext/file'
 require 'amiba/core_ext/symbol'
 
 require 'amiba/repo'
 require 'amiba/configuration'
+require 'amiba/tilt'
+
+require 'amiba/scope'
 
 require 'amiba/source'
 require 'amiba/source/entry_finder'

data/lib/amiba/entry.rb

@@ -12,7 +12,7 @@ module Amiba
       class_option :category, :required => true
       class_option :title, :required => true
       class_option :state, :default => 'draft'
-      class_option :layout, :default => 'default'
+      class_option :layout
       class_option :author, :default => Etc.getpwnam(ENV["USER"])["gecos"].split(",")[0]
       class_option :slug
 

data/lib/amiba/frontend/Gemfile

@@ -0,0 +1,12 @@
+# A sample Gemfile
+source "http://rubygems.org"
+
+gem "rack"
+gem "sinatra"
+gem "mustache"
+gem "rack-auth-dscildap", :path => "/Users/thom/code/central-rack-auth-ldap"
+gem "amiba", :path =>"/Users/thom/code/amiba"
+
+group :development do
+  gem "shotgun"
+end

data/lib/amiba/frontend/Gemfile.lock

@@ -0,0 +1,76 @@
+PATH
+  remote: /Users/thom/code/amiba
+  specs:
+    amiba (0.0.9)
+      activemodel (~> 3.0.4)
+      fog (>= 0.7.0)
+      grit (~> 2.4.1)
+      haml (~> 3.0.25)
+      i18n (~> 0.5.0)
+      redcarpet
+      thor (~> 0.14.6)
+      tilt (~> 1.3.2)
+
+PATH
+  remote: /Users/thom/code/central-rack-auth-ldap
+  specs:
+    rack-auth-dscildap (0.0.1)
+      net-ldap
+      rack
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activesupport (3.0.9)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    excon (0.6.5)
+    fog (0.10.0)
+      builder
+      excon (~> 0.6.5)
+      formatador (~> 0.2.0)
+      mime-types
+      multi_json (~> 1.0.3)
+      net-scp (~> 1.0.4)
+      net-ssh (~> 2.1.4)
+      nokogiri (~> 1.5.0)
+      ruby-hmac
+    formatador (0.2.0)
+    grit (2.4.1)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+    haml (3.0.25)
+    i18n (0.5.0)
+    mime-types (1.16)
+    multi_json (1.0.3)
+    mustache (0.99.4)
+    net-ldap (0.2.2)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.1.4)
+    nokogiri (1.5.0)
+    rack (1.3.2)
+    redcarpet (1.17.2)
+    ruby-hmac (0.4.0)
+    shotgun (0.9)
+      rack (>= 1.0)
+    sinatra (1.2.6)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+    thor (0.14.6)
+    tilt (1.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  amiba!
+  mustache
+  rack
+  rack-auth-dscildap!
+  shotgun
+  sinatra

data/lib/amiba/frontend/app.rb

@@ -0,0 +1,214 @@
+require 'cgi'
+require 'sinatra'
+require 'amiba'
+require 'mustache/sinatra'
+
+require 'amiba/frontend/views/layout'
+require 'amiba/frontend/views/editable'
+
+module Protozoa
+  class App < Sinatra::Base
+    register Mustache::Sinatra
+
+    include Amiba::Repo
+
+    dir = File.dirname(File.expand_path(__FILE__))
+
+    # We want to serve public assets for now
+
+    set :public,    "#{dir}/public"
+    set :static,    true
+
+    set :mustache, {
+      # Tell mustache where the Views constant lives
+      :namespace => Protozoa,
+
+      # Mustache templates live here
+      :templates => "#{dir}/templates",
+
+      # Tell mustache where the views are
+      :views => "#{dir}/views"
+    }
+
+    # Sinatra error handling
+    configure :development, :staging do
+      enable :show_exceptions, :dump_errors
+      disable :raise_errors, :clean_trace
+    end
+
+    configure :test do
+      enable :logging, :raise_errors, :dump_errors
+    end
+
+    get '/' do
+      @entries = Amiba::Source::Entry.any.all.sort {|a,b| a.category <=> b.category }
+      mustache :index
+    end
+
+    get %r{/entries/edit/(.+?)/(.+)\.html$} do
+      @page = Amiba::Source::Entry.new(params[:captures][0],params[:captures][1],"markdown")
+      @content = @page.content
+      @name = @page.title
+      mustache :edit
+    end
+
+    get %r{/entries/(.+?)/(.+)\.html$} do
+      @page = Amiba::Source::Entry.new(params[:captures][0],params[:captures][1],"markdown")
+      @content = @page.render
+      @name = @page.title
+      @editable = true
+      mustache :page
+    end
+
+    post %r{/entries/edit/(.+?)/(.+)\.html$} do
+      @page = Amiba::Source::Entry.new(params[:captures][0],params[:captures][1],"markdown")
+      @page.content = params[:content]
+      @page.author = env["X-DSCI-USER"] || "Anonymous"
+      @page.save do |filename, file_data|
+        File.open(filename, 'w') { |f| f.write(file_data) }
+      end
+      add_and_commit @page.filename
+      # push
+      redirect "/entries#{@page.link}"
+    end
+
+    post '/preview' do
+      @name     = "Preview"
+      metadata  = {state: "draft", title: params[:title]}
+      name      = params[:title].parameterize
+      @page     = Amiba::Source::Entry.new(params[:category], name, "markdown", metadata, params[:content])
+      @content  = @page.render
+      @editable = false
+      mustache :page
+    end
+
+    get '/entries/create' do
+      @name = "New Entry"
+      mustache :create
+    end
+
+    post '/entries/create' do
+      name = params[:title].parameterize
+      metadata  = {state: "published", title: params[:title]}
+      @page = Amiba::Source::Entry.new(params[:category], name, "markdown", metadata, params[:content])
+      @page.author = env["X-DSCI-USER"] || "Anonymous"
+      @page.save do |filename, file_data|
+        File.open(filename, 'w') { |f| f.write(file_data) }
+      end
+      add_and_commit @page.filename
+      # push
+      redirect "/entries#{@page.link}"
+    end
+
+    # post '/revert/:page/*' do
+    #   wiki  = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
+    #   @name = params[:page]
+    #   @page = wiki.page(@name)
+    #   shas  = params[:splat].first.split("/")
+    #   sha1  = shas.shift
+    #   sha2  = shas.shift
+
+    #   if wiki.revert_page(@page, sha1, sha2, commit_message)
+    #     redirect "/#{CGI.escape(@name)}"
+    #   else
+    #     sha2, sha1 = sha1, "#{sha1}^" if !sha2
+    #     @versions = [sha1, sha2]
+    #     diffs     = wiki.repo.diff(@versions.first, @versions.last, @page.path)
+    #     @diff     = diffs.first
+    #     @message  = "The patch does not apply."
+    #     mustache :compare
+    #   end
+    # end
+
+    # get '/history/:name' do
+    #   @name     = params[:name]
+    #   wiki      = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
+    #   @page     = wiki.page(@name)
+    #   @page_num = [params[:page].to_i, 1].max
+    #   @versions = @page.versions :page => @page_num
+    #   mustache :history
+    # end
+
+    # post '/compare/:name' do
+    #   @versions = params[:versions] || []
+    #   if @versions.size < 2
+    #     redirect "/history/#{CGI.escape(params[:name])}"
+    #   else
+    #     redirect "/compare/%s/%s...%s" % [
+    #       CGI.escape(params[:name]),
+    #       @versions.last,
+    #       @versions.first]
+    #   end
+    # end
+
+    # get '/compare/:name/:version_list' do
+    #   @name     = params[:name]
+    #   @versions = params[:version_list].split(/\.{2,3}/)
+    #   wiki      = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
+    #   @page     = wiki.page(@name)
+    #   diffs     = wiki.repo.diff(@versions.first, @versions.last, @page.path)
+    #   @diff     = diffs.first
+    #   mustache :compare
+    # end
+
+    get %r{^/(javascript|css|images)} do
+      halt 404
+    end
+
+    get %r{/(.+?)/([0-9a-f]{40})} do
+      name = params[:captures][0]
+      wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
+      if page = wiki.page(name, params[:captures][1])
+        @page = page
+        @name = name
+        @content = page.formatted_data
+        @editable = true
+        mustache :page
+      else
+        halt 404
+      end
+    end
+
+    # get '/search' do
+    #   @query = params[:q]
+    #   wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
+    #   @results = wiki.search @query
+    #   @name = @query
+    #   mustache :search
+    # end
+
+    # get '/*' do
+      # show_page_or_file(params[:splat].first)
+    # end
+
+    def show_page_or_file(name)
+      wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
+      if page = wiki.page(name)
+        @page = page
+        @name = name
+        @content = page.formatted_data
+        @editable = true
+        mustache :page
+      elsif file = wiki.file(name)
+        content_type file.mime_type
+        file.raw_data
+      else
+        @name = name
+        mustache :create
+      end
+    end
+
+    def update_wiki_page(wiki, page, content, commit_message, name = nil, format = nil)
+      return if !page ||  
+        ((!content || page.raw_data == content) && page.format == format)
+      name    ||= page.name
+      format    = (format || page.format).to_sym
+      content ||= page.raw_data
+      wiki.update_page(page, name, format, content.to_s, commit_message)
+    end
+
+    def commit_message
+      { :message => params[:message] }
+    end
+  end
+end

data/lib/amiba/frontend/config.ru

@@ -0,0 +1,6 @@
+require 'amiba'
+require 'amiba/frontend/app'
+require 'rack/auth/dscildap'
+
+use Rack::Auth::DsciLdap
+run Protozoa::App.new

data/lib/amiba/frontend/public/css/dialog.css

@@ -0,0 +1,141 @@
+/* @control dialog */
+
+#gollum-dialog-dialog {
+  display: block;
+  overflow: visible;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+}
+
+#gollum-dialog-dialog.active {
+  display: block;
+}
+
+#gollum-dialog-dialog-inner {
+  margin: 0 0 0 -225px;
+  position: relative;
+  width: 450px;
+
+  border: 7px solid #999;
+  border: 7px solid rgba(0, 0, 0, 0.3); 
+  border-radius: 5px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+}
+
+#gollum-dialog-dialog-bg {
+  background-color: #fff;
+  overflow: hidden;
+  padding: 1em;
+  
+  background: -webkit-gradient(linear, left top, left bottom, from(#f7f7f7), to(#ffffff));
+  background: -moz-linear-gradient(top, #f7f7f7, #ffffff);
+}
+
+#gollum-dialog-dialog-inner h4 {
+  border-bottom: 1px solid #ddd;
+  color: #000;
+  font-size: 1.8em;
+  line-height: normal;
+  font-weight: bold;
+  margin: 0 0 0.75em 0;
+  padding: 0 0 0.3em 0;
+}
+
+#gollum-dialog-dialog-body {
+  font-size: 1.2em;
+  line-height: 1.6em;
+}
+
+#gollum-dialog-dialog-body fieldset {
+  display: block;
+  border: 0;
+  margin: 0;
+  overflow: hidden;
+  padding: 0;
+}
+
+#gollum-dialog-dialog-body fieldset .field {
+  margin: 0 0 1.5em 0;
+  padding: 0;
+}
+
+  #gollum-dialog-dialog-body fieldset .field label {
+    color: #000;
+    display: block;
+    font-size: 1.2em;
+    font-weight: bold;
+    line-height: 1.6em;
+    margin: 0;
+    padding: 0;
+    min-width: 80px;
+  }
+  
+  #gollum-dialog-dialog-body fieldset .field input[type="text"] {
+    border: 1px solid #ddd;
+    display: block;
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    font-size: 1.2em;
+    line-height: 1.6em;
+    margin: 0.3em 0 0 0;
+    padding: 0.3em 0.5em;
+    width: 96.5%;
+  }
+  
+  #gollum-dialog-dialog-body fieldset .field input.code {
+    font-family: 'Monaco', 'Courier New', Courier, monospace;
+  }
+  
+#gollum-dialog-dialog-body fieldset .field:last-child {
+  margin: 0 0 1em 0;
+}
+
+#gollum-dialog-dialog-buttons {
+  border-top: 1px solid #ddd;
+  overflow: hidden;
+  margin: 1.5em 0 0 0;
+  padding: 1em 0 0 0;
+}
+
+#gollum-dialog-dialog a.minibutton {
+  float: right;
+  margin-right: 0.5em;
+  width: auto;
+}
+
+#gollum-dialog-dialog a.minibutton,
+#gollum-dialog-dialog a.minibutton:visited {
+  background-color: #f7f7f7;
+  border: 1px solid #d4d4d4;
+  color: #333;
+  cursor: pointer;
+  display: block;
+  font-size: 1.2em;
+  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  font-weight: bold;
+  margin: 0 0 0 0.8em;
+  padding: 0.4em 1em;
+
+  text-shadow: 0 1px 0 #fff;
+
+  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec');
+  background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec));
+  background: -moz-linear-gradient(top, #f4f4f4, #ececec);
+
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+}
+
+#gollum-dialog-dialog a.minibutton:hover {
+  background: #3072b3;
+  border-color: #518cc6 #518cc6 #2a65a0;
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
+  text-decoration: none;
+
+  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#599bdc', endColorstr='#3072b3');
+  background: -webkit-gradient(linear, left top, left bottom, from(#599bdc), to(#3072b3));
+  background: -moz-linear-gradient(top, #599bdc, #3072b3);
+}