public_pages 0.1.0 → 0.1.1

data/app/controllers/public_pages_controller.rb

@@ -1,61 +1,58 @@
-module PublicPages
+class PublicPagesController < ApplicationController
 
-  class PublicpagesController < ApplicationController
+  unloadable
 
-    unloadable
+  respond_to :html, :xml, :css, :js
 
-    respond_to :html, :xml, :css, :js
-
-    def index
-      @pages = PublicPage.all
-    end
+  def index
+    @pages = PublicPage.all
+  end
 
-    def new
-      @page = PublicPage.new
-    end
+  def new
+    @page = PublicPage.new
+    render :action => 'edit'
+  end
 
-    def create
-      @page = PublicPage.new(params[:public_page])
-      if @page.save
-        redirect_to public_pages_path
-      else
-        render :action => :new, :note => 'Nothing can be blank.'
-      end
+  def create
+    @page = PublicPage.new(params[:public_page])
+    if @page.save
+      redirect_to public_pages_path
+    else
+      render :action => :new, :note => 'Nothing can be blank.'
     end
+  end
 
-    def show
-      @page = PublicPage.find_by_full_url(:parent_url => params[:parent_url], :url => params[:url], :format => params[:format])
+  def show
+    @page = PublicPage.find_by_url(params[:parent], params[:child])
 
-      raise ActiveRecord::RecordNotFound unless @page
+    raise ActiveRecord::RecordNotFound unless @page
 
-      respond_with @page
+    respond_with @page, :layout => false
 
-    end
-
-    def edit
-      @page = PublicPage.find(params[:id])
-    end
-
-    def update
-      @page = PublicPage.find(params[:id])
-      if @page.update_attributes(params[:public_page])
-        redirect_to @page.public_url
-      else
-        render :action => :edit, :notice => 'Nothing can be blank.'
-      end
-    end
+  end
 
-    def destroy
-      PublicPage.find(params[:id]).destroy
-      redirect_to public_pages_path
-    end
+  def edit
+    @page = PublicPage.find(params[:id])
+  end
 
-    
-    def sitemap
-      @pages = PublicPage.all
-      respond_wth @pages
+  def update
+    @page = PublicPage.find(params[:id])
+    if @page.update_attributes(params[:public_page])
+      redirect_to :action => :edit, :notice => "Updated"
+    else
+      render :action => :edit, :notice => 'Nothing can be blank.'
     end
+  end
 
+  def destroy
+    PublicPage.find(params[:id]).destroy
+    redirect_to public_pages_path
+  end
 
+  
+  def sitemap
+    @pages = PublicPage.all
+    respond_wth @pages
   end
+
 end

data/app/models/public_page.rb

@@ -1,3 +1,21 @@
+require "acts_as_tree"
+
 class PublicPage < ActiveRecord::Base
+  validates_presence_of :name
+  validates_format_of :name, :with => /^\w+$/
+
+  acts_as_tree
+
+  def self.for_select
+    all.map { |page| [page.name, page.id] }
+  end
+
+  def self.find_by_url(parent_name, child_name)
+    puts PublicPage.roots.map(&:name)
+    parent_page = PublicPage.roots.find_by_name(parent_name)  
+    return parent_page unless parent_page && child_name
+
+    parent_page.children.find_by_name(child_name) 
+  end
 
 end

data/app/views/public_pages/edit.html.erb

@@ -0,0 +1,21 @@
+<%= form_for @page do |f| %>
+
+  <p>
+    <%= f.label :name %>
+    <%= f.text_field :name %>
+  </p>
+ 
+  <p>
+    <%= f.label :parent_id %>
+    <%= f.select :parent_id, PublicPage.for_select, :include_blank => true %>
+  </p>
+
+  <p>
+    <%= f.label :body %>
+    <%= f.text_area :body %>
+  </p>
+
+  <p>
+    <%= f.submit %>
+  </p>
+<% end %>

data/app/views/public_pages/index.html.erb

@@ -0,0 +1,14 @@
+<h1>Here are all of your pages</h1>
+
+<h2>
+  <%= link_to "Create a new page", new_public_page_path %>
+</h2>
+  
+
+<ul>
+  <% @pages.each do |page| %>
+    <li>
+      <%= link_to page.name, [:edit, page] %>
+    </li>
+  <% end %>
+</ul>

data/app/views/public_pages/show.html.erb

@@ -0,0 +1 @@
+ <%= raw @page.body %>

data/config/routes.rb

@@ -1,5 +1,6 @@
 Rails.application.routes.draw do |map|
 
   resources :public_pages
+  match '/:parent(/:child)', :to => 'public_pages#show'
 
- end
+end

data/lib/generators/public_pages/migration_generator.rb

@@ -6,11 +6,13 @@ module PublicPages
     class MigrationGenerator < Rails::Generators::Base
 
       def add_migration
-        generate :model, "PublicPage name:string parent_name:string body:text"
+        generate :model, "PublicPage parent_id:integer name:string body:text"
       end
 
-      def remove_the_local_model
+      def remove_the_local_model_and_tests
         %x{rm #{Rails.root}/app/models/public_page.rb}
+        %x{rm #{Rails.root}/test/unit/public_page_test.rb}
+        %x{rm #{Rails.root}/test/fixtures/public_pages.yml}
       end
 
     end

data/lib/public_pages/engine.rb

@@ -7,3 +7,4 @@ module PublicPages
   end
 
 end
+

data/spec/models/public_page_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe PublicPage do
+
+  describe "#configuration" do
+
+    it "returns the same object every time" do
+      RSpec.configuration.should equal(RSpec.configuration)
+    end
+
+  end
+
+  describe "#configure" do
+
+    it "yields the current configuration" do
+      RSpec.configure do |config|
+        config.should == RSpec::configuration
+      end
+    end
+
+  end
+
+  describe "#world" do
+
+    it "returns the RSpec::Core::World instance the current run is using" do
+      RSpec.world.should be_instance_of(RSpec::Core::World)
+    end
+
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: []
 
@@ -29,11 +29,16 @@ extra_rdoc_files:
 files: 
 - app/controllers/public_pages_controller.rb
 - app/models/public_page.rb
+- app/views/public_pages/edit.html.erb
+- app/views/public_pages/index.html.erb
+- app/views/public_pages/show.html.erb
 - config/routes.rb
 - lib/generators/public_pages/migration_generator.rb
 - lib/public_pages.rb
 - lib/public_pages/engine.rb
 - README
+- spec/models/public_page_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -48,6 +53,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -3447327586130444845
       segments: 
       - 0
       version: "0"
@@ -66,5 +72,6 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simplest possible CMS for Rails 3
-test_files: []
-
+test_files: 
+- spec/models/public_page_spec.rb
+- spec/spec_helper.rb