manuscript 0.1.11 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.2.0

data/db/migrate/006_add_parent_to_pages.rb

@@ -0,0 +1,9 @@
+class AddParentToPages < ActiveRecord::Migration
+  def self.up
+    add_column "pages", "parent_id", "integer"
+  end
+
+  def self.down
+    remove_column "pages", "parent_id"
+  end
+end

data/lib/manuscript.rb

@@ -22,7 +22,6 @@ require 'manuscript/user'
 
 
 log = File.new("application.log", "a")
-$stdout.reopen(log)
 $stderr.reopen(log)
 LOGGER = Logger.new($stderr)
 ActiveRecord::Base.logger = LOGGER

data/lib/manuscript/base.rb

@@ -1,18 +1,21 @@
 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(@user)
-    end
-    
     get "/" do
       @user = session[:sso].nil? ? nil : User.new(session[:sso])
       @page = Page.find_by_name('index')
       raise Sinatra::NotFound unless @page
       @page.to_html(@user)
     end
-    
+  
+    get %r{/([-\w/]+)} do
+      begin
+        @user = session[:sso].nil? ? nil : User.new(session[:sso])
+        @page = Page.find_by_path(params[:captures].first)
+        raise Sinatra::NotFound unless @page
+        @page.to_html(@user)
+      rescue ActiveRecord::RecordNotFound
+        raise Sinatra::NotFound
+      end
+    end
   end
 end

data/lib/manuscript/page.rb

@@ -8,7 +8,42 @@ module Manuscript
     validates_presence_of :name
     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
+    named_scope :main_pages, :conditions => { :parent_id => nil }
   
+    def self.find_by_path(path)
+      page_names = path.split("/")
+      LOGGER.info("manuscript --> path: " + path.to_s)
+      LOGGER.info("manuscript --> page_names: " + page_names.inspect)
+      @page = self.main_pages.find_by_name(page_names.delete_at(0))
+      raise ActiveRecord::RecordNotFound unless @page
+      unless page_names.blank?
+        page_names.each do |page_name|
+          @page = @page.child_pages.find_by_name(page_name)
+          raise ActiveRecord::RecordNotFound unless @page
+        end
+      end
+      @page
+    end
+  
+    def url
+      if parent
+        "#{parent.url}/#{name}"
+      else
+        "/#{name}"
+      end
+    end
+    
+    def parent_url
+      if parent
+        parent.url
+      else
+        ""
+      end
+    end
+    
     def to_html(user = nil)
       if template
         template.render({'current_user' => user, 'contents' => RDiscount.new(contents).to_html})

data/lib/manuscript/page_manager.rb

@@ -8,13 +8,13 @@ module Manuscript
     end
     
     get "/admin/pages/?" do
-      @pages = Page.all
+      @pages = Page.main_pages.all
       haml :pages
     end
   
     get "/admin/pages/new" do
       @templates = Manuscript::PageTemplate.all
-      @page = Page.new
+      @page = Page.new(:parent_id => params[:parent_id])
       haml :page
     end
   
@@ -36,6 +36,13 @@ module Manuscript
       @page.update_attributes!(params[:page])
       redirect "/admin/pages/#{@page.id}/edit"
     end
+    
+    delete '/admin/pages/:id' do
+      @page = Page.find_by_id params[:id]
+      raise Sinatra::NotFound unless @page
+      @page.destroy
+      redirect '/admin/pages'
+    end
   end
   
 end

data/manuscript.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{manuscript}
-  s.version = "0.1.11"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hotink"]
-  s.date = %q{2010-01-21}
+  s.date = %q{2010-01-22}
   s.description = %q{A gem for publishing a small Hot Ink authenticated site}
   s.email = %q{chris@hotink.net}
   s.extra_rdoc_files = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "db/migrate/003_add_template_id_to_pages.rb",
      "db/migrate/004_add_layouts_to_templates.rb",
      "db/migrate/005_create_template_files.rb",
+     "db/migrate/006_add_parent_to_pages.rb",
      "lib/manuscript.rb",
      "lib/manuscript/base.rb",
      "lib/manuscript/keymaster.rb",
@@ -54,6 +55,7 @@ Gem::Specification.new do |s|
      "spec/manuscript/user_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
+     "views/_page.haml",
      "views/edit_template_file.haml",
      "views/layout.haml",
      "views/menu.haml",

data/public/css/base.css

@@ -1,13 +1,20 @@
 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#pages small { font-size: 65%;}
+ol#pages small a { text-decoration: none; font-weight: 200;}
+
 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 small { font-size: 65%;}
+ol#pages small a { text-decoration: none; }
+
 ol#pages { list-style: none; font-size: 20px; margin: 30px 0; }
-ol#pages li { margin: 15px 0;}
+ol#pages ol { list-style: none; font-size: 20px; margin: 10px 0; }
+ol#pages li { margin: 15px 0; font-weight: bold; }
 
 form label { display:block; padding: 10px 0; }
 form input[type="text"] { font-size: 20px; width: 600px; border: 1px solid #AAA; padding: 3px; }

data/spec/manuscript/base_spec.rb

@@ -21,4 +21,14 @@ describe Manuscript::Base do
     get "/#{@page.name.reverse}"
     last_response.should be_not_found
   end
+  
+  it "should only display child pages beneath their parents" do
+    new_page = Manuscript::Page.create!(:name => "child", :parent_id => @page.id, :contents => "Here are some **Sample issue contents**." )
+    
+    get "/#{new_page.name}"
+    last_response.should be_not_found
+  
+    get "/#{@page.name}/#{new_page.name}"
+    last_response.should be_ok
+  end
 end

data/spec/manuscript/page_manager_spec.rb

@@ -9,28 +9,43 @@ describe "PageManager" do
   
   describe "when there are two pages" do
     before do
-      @pages = Manuscript::Page.create([{:name => "index", :contents => "Page 1"}, {:name => "contact", :contents => "Page 2"}])
+      @pages = Manuscript::Page.create([{:name => "details", :contents => "Page 1"}, {:name => "contact", :contents => "Page 2"}])
     end
   
     it "should display list with both pages" do
       get "/admin/pages"
       
       last_response.should be_ok
-      last_response.body.should include("index")
+      last_response.body.should include("details")
       last_response.body.should include("contact")
     end
     
-    it "should allow new page to be created" do
-      get "/admin/pages/new"
-      last_response.should be_ok
+    describe "creating a new page" do
+      it "should allow new top-level page to be created" do
+        get "/admin/pages/new"
+        last_response.should be_ok
       
-      post "/admin/pages", :page => { :name => "new-page", :contents => "New page contents"  }
-      last_response.should be_redirect
-      follow_redirect!
-      last_response.should be_ok
-      last_response.body.should include("New page contents")
+        post "/admin/pages", :page => { :name => "new-page", :contents => "New page contents"  }
+        last_response.should be_redirect
+        follow_redirect!
+        last_response.should be_ok
+        last_response.body.should include("New page contents")
+      end
+      
+      it "should allow a new child-page to be created" do
+        parent = @pages.first
+        get "/admin/pages/new", :parent_id => parent.id
+        last_response.should be_ok
+        last_response.body.should include(parent.name)
+        
+        post "/admin/pages", :page => { :name => "new-page", :contents => "New page contents", :parent_id => parent.id  }
+        last_response.should be_redirect
+        follow_redirect!
+        last_response.should be_ok
+        last_response.body.should include(parent.name)
+      end
     end
-    
+        
     it "should allow pages to be edited" do
       page = Manuscript::Page.first
       get "/admin/pages/#{page.id}/edit"
@@ -43,6 +58,15 @@ describe "PageManager" do
       last_response.should be_ok
       last_response.body.should include("Changed page contents")
     end
+    
+    it "should allow pages to be deleted" do
+      page = Manuscript::Page.first
+      delete "/admin/pages/#{page.id}"
+      last_response.should be_redirect
+      
+      get "/admin/pages/#{page.id}/edit"
+      last_response.should be_not_found      
+    end
   end  
   
 end

data/spec/manuscript/page_spec.rb

@@ -4,10 +4,58 @@ describe Manuscript::Page do
   
   subject { Manuscript::Page.create!(:name => 'words', :contents => 'we got em') }
   
+  it { should belong_to(:parent) }
   it { should validate_presence_of(:name) }
   it { should validate_uniqueness_of(:name) }
   it { should belong_to(:template) }
   
+  it "should identify top-level pages" do
+    page1 = Manuscript::Page.create!(:name => 'top-level1', :contents => 'we got it')
+    page2 = Manuscript::Page.create!(:name => 'top-level2', :contents => 'we got it')
+    child1 = Manuscript::Page.create!(:name => 'child1', :contents => 'we got it', :parent => page1)
+    child2 = Manuscript::Page.create!(:name => 'child2', :contents => 'we got it', :parent => page1)
+    grandchild1 = Manuscript::Page.create!(:name => 'grandchild2', :contents => 'we got it', :parent => child1)
+    
+    Manuscript::Page.main_pages.should include(page1)
+    Manuscript::Page.main_pages.should include(page1)
+    Manuscript::Page.main_pages.should_not include(child1)
+    Manuscript::Page.main_pages.should_not include(child2)
+    Manuscript::Page.main_pages.should_not include(grandchild1)
+  end
+  
+  it "should know what it's child pages are" do
+    parent1 = Manuscript::Page.create!(:name => 'top-level1', :contents => 'we got it')
+    parent2 = Manuscript::Page.create!(:name => 'top-level2', :contents => 'we got it')
+    child1 = Manuscript::Page.create!(:name => 'child1', :contents => 'we got it', :parent => parent1)
+    child2 = Manuscript::Page.create!(:name => 'child2', :contents => 'we got it', :parent => parent1)
+    grandchild1 = Manuscript::Page.create!(:name => 'grandchild2', :contents => 'we got it', :parent => child1)
+    
+    parent1.child_pages.should include(child1)
+    parent1.child_pages.should include(child2)
+
+    parent1.child_pages.should_not include(parent2)
+    parent1.child_pages.should_not include(grandchild1)
+  end
+
+  it "should know it's url" do
+    page1 = Manuscript::Page.create!(:name => 'some', :contents => 'we got em') 
+    page2 = Manuscript::Page.create!(:name => 'things', :contents => 'we got em', :parent => page1) 
+    page3 = Manuscript::Page.create!(:name => 'youneed', :contents => 'we got em', :parent => page2)
+    
+    page1.url.should == "/some"
+    page3.url.should == "/some/things/youneed"
+  end
+  
+  it "should find child pages by path" do
+    page1 = Manuscript::Page.create!(:name => 'one', :contents => 'we got one') 
+    page2 = Manuscript::Page.create!(:name => 'two', :contents => 'we got two', :parent => page1) 
+    page3 = Manuscript::Page.create!(:name => 'three', :contents => 'we got three', :parent => page2)
+    
+    Manuscript::Page.find_by_path("#{page1.name}").should == page1
+    Manuscript::Page.find_by_path("#{page1.name}/#{page2.name}").should == page2
+    Manuscript::Page.find_by_path("#{page1.name}/#{page2.name}/#{page3.name}").should == page3
+  end
+  
   it "should restrict names to uri-friendly strings" do
     should allow_value('page-name').for(:name)
     should allow_value('page1name').for(:name)
@@ -21,18 +69,17 @@ describe Manuscript::Page do
       @page = Manuscript::Page.create!(:name => 'words', :contents => 'we **got** em')
     end
     
-    describe "when the page has no template" do
+    context "when the page has no template" do
       it "should render its contents as html directly" do
         @page.to_html.should == RDiscount.new(@page.contents).to_html
       end
     end
   
-    describe "when the page has a template" do
+    context "when the page has a template" do
       it "should render its content inside the appropriate template" do
         @page.template = Manuscript::Template.new(:name =>"Test template", :code => "<h1>Hello templaters!</h1> {{ contents }}" )
         @page.to_html.should == Liquid::Template.parse(@page.template.code).render({'contents' => RDiscount.new(@page.contents).to_html})
       end
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -1,15 +1,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'active_record'
-ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database =>  'manuscript_test.sqlite3.db'
-
 require 'manuscript'
 require 'spec'
 require 'spec/autorun'
 require 'rack/test'
 require 'shoulda/active_record'
 
+ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database =>  'manuscript_test.sqlite3.db'
+
 require 'database_cleaner'
 DatabaseCleaner.strategy = :truncation
 

data/views/_page.haml

@@ -0,0 +1,10 @@
+%li
+	%a{:href => "/admin/pages/#{page.id}/edit"}
+		="/#{page.name}"
+	%small
+		%a{:style => "color: red;", :onclick => "if(confirm('You are about to delete one of your pages. 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/pages/#{page.id}" } x
+	%small
+		%a{:href => "/admin/pages/new?parent_id=#{page.id}"} (add subpage)
+	%ol.child_pages
+		- page.child_pages.each do |child|
+			= haml :_page, :locals => { :page => child }, :layout => false

data/views/page.haml

@@ -7,7 +7,7 @@
 		%legend Edit page
 		%input{ :type => :submit }
 		%label 
-			Name
+			= "Page url:&nbsp;&nbsp;<strong>#{@page.parent_url}/</strong>"
 			%input{:type => :text, :name => "page[name]", :value => "#{@page.name}"}
 		%label
 			Template
@@ -20,6 +20,8 @@
 					- else
 						%option{:value => "#{template.id}"}
 							= template.name
+		- unless @page.parent_id.nil?
+			%input{:type => :hidden, :name => "page[parent_id]", :value => "#{@page.parent_id}"}
 		%label{:for => "page_contents" } 
 			Contents
 		%textarea{:name => "page[contents]", :id => "page_contents"}= @page.contents

data/views/pages.haml

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: manuscript
 version: !ruby/object:Gem::Version 
-  version: 0.1.11
+  version: 0.2.0
 platform: ruby
 authors: 
 - hotink
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 -05:00
+date: 2010-01-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,6 +114,7 @@ files:
 - db/migrate/003_add_template_id_to_pages.rb
 - db/migrate/004_add_layouts_to_templates.rb
 - db/migrate/005_create_template_files.rb
+- db/migrate/006_add_parent_to_pages.rb
 - lib/manuscript.rb
 - lib/manuscript/base.rb
 - lib/manuscript/keymaster.rb
@@ -139,6 +140,7 @@ files:
 - spec/manuscript/user_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- views/_page.haml
 - views/edit_template_file.haml
 - views/layout.haml
 - views/menu.haml