manuscript 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/manuscript/base.rb

@@ -1,15 +1,16 @@
-module Manuscript 
-  class Base < Sinatra::Base
+module Manuscript
+  class Base < Sinatra::Base    
     get "/:page_name" do
+      @user = session[:sso].nil? ? nil : User.new(session[:sso])
       @page = Page.find_by_name(params[:page_name])
       raise Sinatra::NotFound unless @page
-      @page.to_html
+      @page.to_html(@user)
     end
     
     get "/" do
       @page = Page.find_by_name('index')
       raise Sinatra::NotFound unless @page
-      @page.to_html
+      @page.to_html(@user)
     end
   end
 end

data/lib/manuscript/page.rb

@@ -7,10 +7,11 @@ module Manuscript
     
     validates_presence_of :name
     validates_uniqueness_of :name
+    validates_format_of :name, :with => /^[-a-zA-Z0-9]+$/
   
-    def to_html
+    def to_html(user = nil)
       if template
-        template.render({'contents' => RDiscount.new(contents).to_html})
+        template.render({'current_user' => user, 'contents' => RDiscount.new(contents).to_html})
       else  
         RDiscount.new(contents).to_html
       end

data/lib/manuscript/page_template.rb

@@ -4,7 +4,7 @@ module Manuscript
     
     def render(options)
       if layout
-        layout.render({ 'contents' => super(options) })
+        layout.render({ 'current_user' => options['current_user'], 'contents' => super(options) })
       else
         super(options)
       end

data/lib/manuscript/user.rb

@@ -0,0 +1,19 @@
+module Manuscript
+  class User
+    def initialize(attributes)
+      @attributes = attributes
+    end
+    
+    def id
+      @attributes[:user_id]
+    end
+    
+    def email
+      @attributes[:email]
+    end
+    
+    def to_liquid
+      {'id' => id, 'email' => email}
+    end
+  end
+end

data/lib/manuscript.rb

@@ -18,6 +18,7 @@ require 'manuscript/layout_template'
 require 'manuscript/template_manager'
 require 'manuscript/template_file'
 require 'manuscript/template_file_manager'
+require 'manuscript/user'
 
 ActiveRecord::Base.logger = Logger.new(STDERR)
 

data/manuscript.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{manuscript}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hotink"]
-  s.date = %q{2010-01-14}
+  s.date = %q{2010-01-16}
   s.description = %q{A gem for publishing a small Hot Ink authenticated site}
   s.email = %q{chris@hotink.net}
   s.extra_rdoc_files = [
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
      "lib/manuscript/template_file.rb",
      "lib/manuscript/template_file_manager.rb",
      "lib/manuscript/template_manager.rb",
+     "lib/manuscript/user.rb",
      "manuscript.gemspec",
      "public/css/base.css",
      "spec/manuscript/base_spec.rb",
@@ -50,6 +51,7 @@ Gem::Specification.new do |s|
      "spec/manuscript/template_file_manager_spec.rb",
      "spec/manuscript/template_file_spec.rb",
      "spec/manuscript/template_manager_spec.rb",
+     "spec/manuscript/user_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "views/edit_template_file.haml",
@@ -76,6 +78,7 @@ Gem::Specification.new do |s|
      "spec/manuscript/template_file_manager_spec.rb",
      "spec/manuscript/template_file_spec.rb",
      "spec/manuscript/template_manager_spec.rb",
+     "spec/manuscript/user_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/public/css/base.css

@@ -1,10 +1,20 @@
-body { font-size: 16px; line-height: 1.1em; font-family: "Helvetica Neue", verdana, tahoma, arial, sans-serif; }
-div#page_container { width: 960px; }
+body { font-size: 16px; color: #222; line-height: 1.1em; margin:0; font-family: "Helvetica Neue", verdana, tahoma, arial, sans-serif; }
+div#page_container { width: 960px; margin: 5px 10px; }
 
-ol.menu { list-style: none; padding-left: 0; }
+ol.menu { list-style: none; padding: 5px; margin-top: 0; background-color: #FFF6DD; }
 ol.menu li { display: inline; margin: 0 10px; }
+ol.menu li a { text-decoration: none; }
+ol.menu li a.current { font-weight: bold; text-decoration: underline; }
+
+ol#pages { list-style: none; font-size: 20px; margin: 30px 0; }
+ol#pages li { margin: 15px 0;}
 
 form label { display:block; padding: 10px 0; }
-form input[type="text"] { font-size: 18px; width: 600px;}
-form textarea { font-family: "andale mono", courier, tahoma, mono; font-size: 15px; width: 940px; height: 500px; }
-form input[type="submit"] { float: right; }
+form input[type="text"] { font-size: 20px; width: 600px; border: 1px solid #AAA; padding: 3px; }
+form textarea { font-family: "andale mono", courier, tahoma, mono; padding: 5px; font-size: 15px; width: 940px; height: 500px; }
+form input[type="submit"] { float: right; }
+
+.button_link { text-decoration: none; outline: none; font-size: 12px; padding: 3px; color: black; background-color: #FFF6DD; border: 1px solid #333;-moz-border-radius: 3px; -webkit-border-radius: 3px; }
+.button_link:visited { color: black; }
+.button_link:hover { background-color: #CEE4F3; }
+.button_link:active { background-color: #EEF4FF; }

data/spec/manuscript/page_spec.rb

@@ -8,6 +8,14 @@ describe Manuscript::Page do
   it { should validate_uniqueness_of(:name) }
   it { should belong_to(:template) }
   
+  it "should restrict names to uri-friendly strings" do
+    should allow_value('page-name').for(:name)
+    should allow_value('page1name').for(:name)
+    should_not allow_value('page#name').for(:name)
+    should_not allow_value('page name').for(:name)
+    should_not allow_value('page/name').for(:name)
+  end
+  
   describe "rendering a page as HTML" do
     before do
       @page = Manuscript::Page.create!(:name => 'words', :contents => 'we **got** em')

data/spec/manuscript/user_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Manuscript::User do
+  
+  it "should make options from initialization hash" do
+    user = Manuscript::User.new({:user_id => 2, :email => "test@testaddress.com"})
+    user.id.should == 2
+    user.email.should == "test@testaddress.com"
+  end
+  
+  it "should expose it's details to Liquid" do
+    user = Manuscript::User.new({:user_id => 2, :email => "test@testaddress.com"})
+    user.to_liquid.should == {'id' => 2, 'email' => "test@testaddress.com"}
+  end
+end

data/views/layout.haml

@@ -3,7 +3,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/views/menu.haml

@@ -1,7 +1,16 @@
 %ol.menu
 	%li 
-		%a{:href => "/admin/pages"} Pages
+		- if request.path_info =~ /^\/admin\/pages/
+			%a.current{:href => "/admin/pages"} Pages
+		- else
+			%a{:href => "/admin/pages"} Pages
 	%li 
-		%a{:href => "/admin/templates"} Templates		
+		- if (request.path_info =~ /^\/admin\/templates/) || (request.path_info =~ /^\/admin\/layouts/)
+			%a.current{:href => "/admin/templates"} Templates		
+		- else
+			%a{:href => "/admin/templates"} Templates		
 	%li 
-		%a{:href => "/admin/template_files"} Files
+		- if request.path_info =~ /^\/admin\/template_files/
+			%a.current{:href => "/admin/template_files"} Files
+		- else
+			%a{:href => "/admin/template_files"} Files

data/views/pages.haml

@@ -1,7 +1,8 @@
 %h1 Pages
-%ol
+%ol#pages
 	- @pages.each do |page|
 		%li
 			%a{:href => "/admin/pages/#{page.id}/edit"}
-				= page.name
-%a{ :href => "/admin/pages/new" } New page
+				= "/#{page.name}"
+
+%a.button_link{ :href => "/admin/pages/new" } New page

data/views/template_files.haml

@@ -6,4 +6,4 @@
 			%small
 				%a{:href => "/admin/template_files/#{file.id}/edit"} edit
 				%a{ :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/template_files/#{file.id}" } delete
-%a{ :href => "/admin/template_files/new" } Upload a file
+%a.button_link{ :href => "/admin/template_files/new" } Upload a file

data/views/templates.haml

@@ -4,7 +4,7 @@
 		%li
 			%a{:href => "/admin/templates/#{template.id}/edit"}
 				= template.name
-%a{ :href => "/admin/templates/new" } New template
+%a.button_link{ :href => "/admin/templates/new" } New template
 
 %h1 Layouts
 %ol
@@ -12,4 +12,4 @@
 		%li
 			%a{:href => "/admin/templates/#{template.id}/edit"}
 				= template.name
-%a{ :href => "/admin/layouts/new" } New layout
+%a.button_link{ :href => "/admin/layouts/new" } New layout

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: manuscript
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - hotink
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 -05:00
+date: 2010-01-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,6 +125,7 @@ files:
 - lib/manuscript/template_file.rb
 - lib/manuscript/template_file_manager.rb
 - lib/manuscript/template_manager.rb
+- lib/manuscript/user.rb
 - manuscript.gemspec
 - public/css/base.css
 - spec/manuscript/base_spec.rb
@@ -135,6 +136,7 @@ files:
 - spec/manuscript/template_file_manager_spec.rb
 - spec/manuscript/template_file_spec.rb
 - spec/manuscript/template_manager_spec.rb
+- spec/manuscript/user_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - views/edit_template_file.haml
@@ -183,4 +185,5 @@ test_files:
 - spec/manuscript/template_file_manager_spec.rb
 - spec/manuscript/template_file_spec.rb
 - spec/manuscript/template_manager_spec.rb
+- spec/manuscript/user_spec.rb
 - spec/spec_helper.rb