manuscript 0.2.3 → 0.3.9pre

data/.gitignore

@@ -19,3 +19,6 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+application.log
+template_files
+*.sqlite3.db

data/Gemfile

@@ -0,0 +1,23 @@
+source 'http://gemcutter.org'
+
+
+group :development do
+  gem 'sqlite3-ruby'
+end
+
+gem 'ruby-openid', :require => 'openid'
+gem 'sinatra'
+gem 'activerecord', :require => 'active_record'
+gem 'rdiscount'
+gem 'liquid'
+gem 'aws-s3', :require => 'aws/s3'
+gem 'paperclip'
+gem 'haml'
+gem 'gatekeeper'
+
+group :test do
+  gem 'rack-test'
+  gem 'shoulda'
+  gem 'database_cleaner'
+  gem 'rspec'
+end

data/Rakefile

@@ -8,11 +8,13 @@ begin
     gem.name = "manuscript"
     gem.summary = "A gem for publishing a small Hot Ink authenticated site"
     gem.description = "A gem for publishing a small Hot Ink authenticated site"
-    gem.email = "chris@hotink.net"
-    gem.homepage = "http://github.com/hotink/manuscript"
-    gem.authors = ["hotink"]
+    gem.email = "chrisgdinn@gmail.com"
+    gem.homepage = "http://github.com/chrisdinn/manuscript"
+    gem.authors = ["Chris Dinn"]
+    gem.add_dependency 'ruby-openid'
     gem.add_dependency 'activerecord', '>= 2.3.5'
     gem.add_dependency 'rdiscount', '>= 1.3.5'
+    gem.add_dependency 'aws-s3'
     gem.add_dependency 'sinatra', '>= 0.9.4'
     gem.add_dependency 'haml', '>= 2.2.12'
     gem.add_dependency 'gatekeeper', '>= 0.1.1'
@@ -54,7 +56,7 @@ end
 
 namespace :db do
   desc "Migrate the database"
-    task(:migrate => :environment) do
+    task :migrate do
     ActiveRecord::Base.logger = Logger.new(STDOUT)
     ActiveRecord::Migration.verbose = true
     ActiveRecord::Migrator.migrate("db/migrate")
@@ -63,5 +65,5 @@ end
 
 task :environment do
   require 'manuscript'
-  ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database =>  'manuscript.sqlite3.db'
+  ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database =>  'manuscript_test.sqlite3.db'
 end

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.6pre

data/config.ru

@@ -1,15 +1,29 @@
+begin
+  # Try to require the preresolved locked set of gems.
+  require File.expand_path('../.bundle/environment', __FILE__)
+rescue LoadError
+  # Fall back on doing an unlocked resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup :default, :development
+end
+
+Bundler.require :default, :development
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__),'lib'))
 require 'manuscript'
 
+Paperclip::Storage::S3::RAILS_ENV = "development"
+
 ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database =>  'manuscript.sqlite3.db', :encoding => 'UTF-8'
 
 use Rack::Session::Cookie
 use Rack::Static, :urls => ["/template_files"]
 use Gatekeeper::Middleware do |sso|
-  sso.sso_url = "http://hotink.theorem.ca/sso"
+  sso.sso_url = "http://digital-achiever.com/sso"
 end
-use Manuscript::Keymaster, :hotink_account_id => 1
+use Manuscript::Keymaster
 use Manuscript::PageManager
-use Manuscript::TemplateManager
-use Manuscript::TemplateFileManager
+use Manuscript::DesignManager
+use Manuscript::SettingsManager
 run Manuscript::Base.new

data/lib/manuscript.rb

@@ -6,6 +6,8 @@ require 'gatekeeper/helpers/authentication'
 require 'sinatra/base'
 require 'haml'
 require 'active_record'
+require 'paperclip'
+
 require 'logger'
 
 require 'manuscript/base'
@@ -15,13 +17,14 @@ require 'manuscript/page_manager'
 require 'manuscript/template'
 require 'manuscript/page_template'
 require 'manuscript/layout_template'
-require 'manuscript/template_manager'
+require 'manuscript/design_manager'
+require 'manuscript/settings_manager'
+require 'manuscript/settings'
 require 'manuscript/template_file'
-require 'manuscript/template_file_manager'
 require 'manuscript/user'
 
 
-log = File.new("application.log", "a")
+log = File.new("log/application.log", "a")
 $stderr.reopen(log)
 LOGGER = Logger.new($stderr)
 ActiveRecord::Base.logger = LOGGER
@@ -29,10 +32,20 @@ OpenID::Util.logger = LOGGER
 
 module Sinatra
   class Base
-    set :views, File.dirname(__FILE__) + "/../views"
+    set :views, File.dirname(__FILE__) + "/manuscript/views"
     set :static, true
     set :public, File.dirname(__FILE__) + "/../public"
-    set :raise_errors, false
+    set :raise_errors, true
     set :logging, true
+    
+    helpers do
+      def user_email
+        if session[:sso]
+          return session[:sso][:user_email]
+        else
+          nil
+        end
+      end
+    end
   end
 end

data/lib/manuscript/design_manager.rb

@@ -0,0 +1,87 @@
+module Manuscript
+  class DesignManager < Sinatra::Base
+    enable :methodoverride
+    
+    get "/admin/design/?" do
+      @templates = PageTemplate.all
+      @layouts = LayoutTemplate.all
+      @template_files = TemplateFile.all
+      haml :design
+    end
+    
+    get "/admin/design/templates/new" do
+      @template = PageTemplate.new
+      haml :template
+    end
+    
+    get "/admin/design/layouts/new" do
+      @template = LayoutTemplate.new
+      haml :template
+    end
+    
+    post "/admin/design/templates/?" do
+      @template = PageTemplate.create(params[:template])
+      redirect "/admin/design/templates/#{@template.id}/edit"
+    end
+    
+    post "/admin/design/layouts/?" do
+      @template = LayoutTemplate.create(params[:template])
+      redirect "/admin/design/templates/#{@template.id}/edit"
+    end
+    
+    get "/admin/design/templates/:id/edit" do
+      @template = Template.find_by_id params[:id]
+      halt 404, "Template not found" unless @template
+      haml :template
+    end
+    
+    put "/admin/design/templates/:id/?" do
+      @template = Template.find_by_id params[:id]
+      halt 404, "Template not found" unless @template
+      @template.update_attributes(params[:template])
+      redirect "/admin/design/templates/#{@template.id}/edit"
+    end  
+    
+    get '/admin/design/template_files/new/?' do
+      haml :new_template_file
+    end
+
+    post '/admin/design/template_files' do
+      new_file = params[:template_file][:file][:tempfile]
+      new_file.original_filename = params[:template_file][:file][:filename]
+
+      @file = TemplateFile.new
+      @file.file = new_file
+      @file.save
+      redirect '/admin/design#template_files'
+    end
+
+    get '/admin/design/template_files/:id/edit' do
+      @file = TemplateFile.find(params[:id])
+      haml :edit_template_file
+    end
+
+    put '/admin/design/template_files/:id' do
+      new_file = params[:template_file][:file][:tempfile]
+      new_file.original_filename = params[:template_file][:file][:filename]
+
+      @file = TemplateFile.find(params[:id])
+      raise Sinatra::NotFound unless @file
+      @file.file = new_file
+      @file.save
+      redirect '/admin/design/#template_files'
+    end
+
+    delete '/admin/design/template_files/:id' do
+      @file = TemplateFile.find(params[:id])
+      raise Sinatra::NotFound unless @file
+      @file.destroy
+      redirect '/admin/design/#template_files'
+    end  
+  end
+end
+
+# Paperclip expects a Rails-specific ActionController::UploadedFile, so fake it with Tempfile hack
+class Tempfile
+  attr_accessor :original_filename
+end

data/lib/manuscript/keymaster.rb

@@ -3,14 +3,13 @@ module Manuscript
     
     def initialize(app, options={})
       @app = app
-      @hotink_account_id = options[:hotink_account_id] || 1
     end
 
     def call(env)
       request = Rack::Request.new(env)
       session = env['rack.session']
       if env['PATH_INFO']=~/^\/admin/
-        if (session[:sso] && session[:sso][:user_id]) && (session[:sso][:is_admin?]=='true' || session[:sso]["account_#{@hotink_account_id}_manager"]=='true')
+        if (session[:sso] && session[:sso][:user_id])
           @app.call(env)
         else
           [302, {"Location" => "/sso/login?return_to=#{request.url}"}, "Redirecting to SSO server..."]

data/lib/manuscript/page.rb

@@ -9,8 +9,8 @@ module Manuscript
     validates_uniqueness_of :name
     validates_format_of :name, :with => /^[-a-zA-Z0-9]+$/
     
-    belongs_to :parent, :class_name => "Page"
-    has_many :child_pages, :class_name => "Page", :foreign_key => "parent_id", :order => :name
+    belongs_to :parent, :class_name => "Manuscript::Page"
+    has_many :child_pages, :class_name => "Manuscript::Page", :foreign_key => "parent_id", :order => :name
     named_scope :main_pages, :conditions => { :parent_id => nil }
   
     def self.find_by_path(path)

data/lib/manuscript/page_manager.rb

@@ -8,6 +8,7 @@ module Manuscript
     end
     
     get "/admin/pages/?" do
+      @settings = Settings.new('settings.yml')
       @pages = Page.main_pages.all
       haml :pages
     end

data/lib/manuscript/settings.rb

@@ -0,0 +1,30 @@
+module Manuscript
+  class Settings
+    attr_reader :settings_file_name, :settings
+
+    def initialize(filename)
+      @settings = Hash.new
+      @settings_file_name = filename
+      settings = YAML::load(File.new(@settings_file_name).read)
+      @settings.update(settings) if settings.is_a? Hash 
+    end
+    
+    def [](key)
+      return @settings[key]
+    end
+    
+    def []=(key, value)
+      @settings[key] = value
+    end
+    
+    def to_hash
+      return @settings
+    end
+    
+    def save
+      File.open(@settings_file_name,'w') do |file|
+        file << YAML::dump(@settings)
+      end
+    end
+  end
+end

data/lib/manuscript/settings_manager.rb

@@ -0,0 +1,17 @@
+module Manuscript
+  class SettingsManager < Sinatra::Base
+    
+    get '/admin/settings' do
+      @settings = Settings.new('settings.yml')
+      haml :settings
+    end
+    
+    post '/admin/settings' do
+      @settings = Settings.new('settings.yml')
+      params[:settings].each { |k, v| @settings[k.to_sym] = v }
+      @settings.save
+      redirect "/admin"
+    end
+    
+  end
+end

data/lib/manuscript/template_file.rb

@@ -1,12 +1,19 @@
 require 'paperclip'
+require 'yaml'
 
 module Manuscript
-  class TemplateFile < ActiveRecord::Base
+  class TemplateFile < ActiveRecord::Base    
     validates_presence_of :file_file_name
+    validates_uniqueness_of :file_file_name
+    
+    S3_CREDENTIALS = YAML.load(File.read('config/s3.yml'))
     
     has_attached_file :file,
-        :path => "./template_files/:id/:basename.:extension",
-        :url => "/template_files/:id/:basename.:extension"
+        #:url => "./template_files/:id/:basename.:extension",
+        :path => "/template_files/:basename.:extension",
+        :storage => :s3,
+        :s3_credentials => { :access_key_id => S3_CREDENTIALS["access_key_id"], :secret_access_key => S3_CREDENTIALS["secret_access_key"], :bucket_name => S3_CREDENTIALS["bucket_name"] },
+        :bucket => S3_CREDENTIALS["bucket_name"]
 
     def url
       file.url

data/lib/manuscript/views/_page.haml

@@ -0,0 +1,8 @@
+%li
+	%a{:href => "/admin/pages/#{page.id}/edit"}
+		="/#{page.name}"
+	%a.btn.red.small{:style => "padding:2px 5px 4px 5px;margin:0px 0px 0px 6px;top:-5px;", :onclick => "if(confirm('You are about to delete the page:\\n\\n\"#{page.name}\" \\n\\nThis cannot be undone.\\n\\nClick \\'OK\\' to delete or \\'Cancel\\' to return to the page.\\n')) { var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); {  f.method = 'POST'; f.action = this.href;var m = document.createElement('input'); m.setAttribute('type', 'hidden'); m.setAttribute('name', '_method'); m.setAttribute('value', 'delete'); f.appendChild(m);f.submit(); } } return false;", :href => "/admin/pages/#{page.id}" } x
+	%a.btn.green.small{:style => "padding:2px 5px 4px 5px;margin:0px;top:-5px;text-decoration:none;", :href => "/admin/pages/new?parent_id=#{page.id}"} + subpage
+	%ol.child_pages
+		- page.child_pages.each do |child|
+			= haml :_page, :locals => { :page => child }, :layout => false

data/lib/manuscript/views/design.haml

@@ -0,0 +1,29 @@
+%h1 Site design
+
+%h2 Templates
+%a.btn.small.green{ :href => "/admin/design/templates/new" } New template
+%ol#templates
+	- @templates.each do |template|
+		%li
+			%a{:href => "/admin/design/templates/#{template.id}/edit"}
+				= template.name
+				
+%hr{ :style => "clear:both; margin-top:10px;"}
+%h2 Layouts
+%a.btn.small.yellow{ :href => "/admin/design/layouts/new" } New layout
+%ol#layouts
+	- @layouts.each do |template|
+		%li
+			%a{:href => "/admin/design/templates/#{template.id}/edit"}
+				= template.name
+				
+%hr{ :style => "clear:both; margin-top:10px;"}
+%h2 Template files
+%a.btn.small.pink{ :href => "/admin/design/template_files/new" } Upload a file
+%ol#template_files
+	- @template_files.each do |file|
+		%li
+			= "#{file.file_file_name} "
+			%small
+				%a.btn.red.small{:style => "padding:2px 5px 4px 5px;margin:0px 6px 0px 6px;top:-5px;", :onclick => "if(confirm('You are about to delete a template file. Click OK to delete or Cancel to return to the page.')) { var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); {  f.method = 'POST'; f.action = this.href;var m = document.createElement('input'); m.setAttribute('type', 'hidden'); m.setAttribute('name', '_method'); m.setAttribute('value', 'delete'); f.appendChild(m);f.submit(); } } return false;", :href => "/admin/design/template_files/#{file.id}" } x
+				%a.btn.blue.small{:style => "padding:2px 5px 4px 5px;margin:0px;top:-5px;text-decoration:none;", :href => "/admin/design/template_files/#{file.id}/edit"} edit

data/lib/manuscript/views/edit_template_file.haml

@@ -0,0 +1,7 @@
+%h1 Site design
+%h2= "Replace file: #{@file.file_file_name}"
+%form{:method =>:post, :action => "/admin/design/template_files/#{@file.id}", :enctype => "multipart/form-data"}
+	%fieldset			
+		%input{:type => 'file', :name => 'template_file[file]', :id => 'template_file_file', :style => "float:left;"}
+		%input{:type => 'hidden', :name => '_method', :value => 'put'}
+		%input{ :type => :submit, :class => "btn large green", :value => "Upload", :style => "float:left;" }

data/{views → lib/manuscript/views}/layout.haml

@@ -4,7 +4,7 @@
 		%title Manuscript, simple content management
 		%link{ :rel=>'stylesheet', :href=>'/css/base.css', :type=>'text/css', :media=>'screen' }
 	%body
-		= haml(:menu, :layout => false)
 		#page_container
+			= haml(:menu, :layout => false)
 			= yield
 	

data/lib/manuscript/views/menu.haml

@@ -0,0 +1,16 @@
+%ol.menu
+	- if request.path_info =~ /^\/admin\/pages/
+		%li.current 
+			%a{:href => "/admin/pages"} Pages
+	- else
+		%li
+			%a{:href => "/admin/pages"} Pages
+	- if request.path_info =~ /^\/admin\/design/
+		%li.current
+			%a{:href => "/admin/design"} Design
+	- else
+		%li
+			%a{:href => "/admin/design"} Design
+	%li{:style => "float: right; font-size: 12px;padding-left: 35px; margin-top:2px;" }
+		= user_email
+		%a{:href => "/sso/logout", :style => "margin-left: 7px; font-size: 12px;" } Sign out

data/lib/manuscript/views/new_template_file.haml

@@ -0,0 +1,6 @@
+%h1 Site design
+%h2 Upload template file
+%form{:method =>:post, :action => "/admin/design/template_files", :enctype => "multipart/form-data"}
+	%fieldset
+		%input{:type => 'file', :name => 'template_file[file]', :id => 'template_file_file', :style => "float:left;"}
+		%input{ :type => :submit, :class => "btn large green", :value => "Upload", :style => "float:left;" }

data/{views → lib/manuscript/views}/page.haml

@@ -1,11 +1,9 @@
-%p
-	%a{ :href => "/admin/pages" } &laquo back
+%h1 Edit page
 %form{:method =>:post, 'accept-charset' => "utf-8", :action => "/admin/pages/#{@page.id unless @page.new_record? }"}
 	- unless @page.new_record?
 		%input{ :type => :hidden, :name => "_method", :value => :put }
 	%fieldset
-		%legend Edit page
-		%input{ :type => :submit }
+		%input{ :type => :submit, :class => "btn large blue", :value => "Save" }
 		%label 
 			= "Page url:&nbsp;&nbsp;<strong>#{@page.parent_url}/</strong>"
 			%input{:type => :text, :name => "page[name]", :value => "#{@page.name}"}
@@ -22,6 +20,9 @@
 							= template.name
 		- unless @page.parent_id.nil?
 			%input{:type => :hidden, :name => "page[parent_id]", :value => "#{@page.parent_id}"}
-		%label{:for => "page_contents" } 
+		%label{:for => "wmd-input" } 
 			Contents
-		%textarea{:name => "page[contents]", :id => "page_contents"}= @page.contents
+		#wmd-button-bar
+		%textarea{:name => "page[contents]", :id => "wmd-input"}= @page.contents
+		<script src="/js/wmd.min.js" type="text/javascript"></script>
+