shakespeare 0.3.2 → 0.3.4

data/CHANGELOG

@@ -1,6 +1,6 @@
 Wed Jun 2 2010
 - - - - - - - -
-- Added support for html_safe
+- Removed to_param on URL
 
 Feb 15 2010
 - - - - - -

data/Rakefile

@@ -25,7 +25,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "shakespeare"
-    s.version = "0.3.2"
+    s.version = "0.3.4"
     s.author = "Paul Campbell"
     s.email = "paul@rslw.com"
     s.homepage = "http://www.github.com/paulca/shakespeare"

data/app/controllers/admin/pages_controller.rb

@@ -26,11 +26,11 @@ class Admin::PagesController < ApplicationController
   end
   
   def edit
-    @page = Page.find_by_url(params[:id])
+    @page = Page.find(params[:id])
   end
   
   def update
-    @page = Page.find_by_url(params[:id])
+    @page = Page.find(params[:id])
     if @page.update_attributes(params[:page])
       redirect_to admin_pages_path
     else
@@ -39,7 +39,7 @@ class Admin::PagesController < ApplicationController
   end
   
   def destroy
-    @page = Page.find_by_url(params[:id])
+    @page = Page.find(params[:id])
     @page.destroy
     redirect_to admin_pages_path
   end

data/app/models/page.rb

@@ -12,11 +12,6 @@ class Page < ActiveRecord::Base
     out.join(', ')
   end
   
-  def to_param
-    url.respond_to?(:html_safe) ? url.html_safe : url
-      
-  end
-  
   def clean_url
     title.to_s.downcase.gsub(/[^a-z0-9\s]/, '').gsub(/\s/,'-')
   end

data/app/views/admin/pages/index.html.erb

@@ -10,12 +10,14 @@
   <table>
     <tr>
       <th>Title</th>
+      <th>URL</th>
       <th>&nbsp;</th>
     </tr>
   
     <%- @pages.each do |page| -%>
       <tr>
         <td><%= page.title %> (<%= link_to "Edit", edit_admin_page_path(page) %>)</td>
+        <td><%= page.url %></td>
         <td><%= link_to "Delete", admin_page_path(page), :method => :delete %></td>
       </tr>
     <%- end -%>

data/shakespeare.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shakespeare}
-  s.version = "0.3.2"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]

data/spec/debug.log

@@ -2757,3 +2757,45 @@
   Page Update (0.1ms)   UPDATE "pages" SET "updated_at" = '2010-06-02 09:15:47', "content" = 'I was Home Alone' WHERE "id" = 1
   Page Load (0.4ms)   SELECT * FROM "pages" WHERE ("pages"."title" = 'Mr. MacAllister''s Christmas') LIMIT 1
   Page Load (0.4ms)   SELECT * FROM "pages" WHERE ("pages"."url" = 'gutmann.ca') LIMIT 1
+  SQL (0.2ms)   select sqlite_version(*)
+  SQL (0.4ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (2.6ms)   DROP TABLE "pages"
+  SQL (1.5ms)   CREATE TABLE "pages" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "url" varchar(255), "keywords" text, "description" text, "content" text, "created_at" datetime, "updated_at" datetime, "noindex" boolean, "nofollow" boolean, "canonical" varchar(255), "enable_canonical" boolean, "enable_keywords" boolean) 
+  SQL (0.4ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   SELECT version FROM "schema_migrations"
+  Page Load (0.2ms)   SELECT * FROM "pages" 
+  Page Load (0.2ms)   SELECT * FROM "pages" 
+  Page Create (0.4ms)   INSERT INTO "pages" ("canonical", "created_at", "title", "updated_at", "url", "enable_canonical", "content", "nofollow", "description", "noindex", "enable_keywords", "keywords") VALUES('http://hendersons.com', '2010-06-02 09:25:34', 'Harry and the Hendersons', '2010-06-02 09:25:34', '', 't', '', 't', '', 't', NULL, '80s, movie')
+  Page Load (0.4ms)   SELECT * FROM "pages" 
+  Page Load (0.2ms)   SELECT * FROM "pages" 
+  Page Create (0.4ms)   INSERT INTO "pages" ("canonical", "created_at", "title", "updated_at", "url", "enable_canonical", "content", "nofollow", "description", "noindex", "enable_keywords", "keywords") VALUES('', '2010-06-02 09:25:34', 'A test', '2010-06-02 09:25:34', 'home/show', 'f', '', 'f', '', 'f', NULL, '')
+  Page Load (0.4ms)   SELECT * FROM "pages" 
+  Page Load (0.4ms)   SELECT * FROM "pages" WHERE ("pages"."id" = 1) 
+  Page Load (0.4ms)   SELECT * FROM "pages" WHERE ("pages"."id" = 1) 
+  Page Update (0.1ms)   UPDATE "pages" SET "updated_at" = '2010-06-02 09:25:35', "title" = 'It worked!' WHERE "id" = 1
+  Page Load (0.4ms)   SELECT * FROM "pages" 
+  Page Create (0.4ms)   INSERT INTO "pages" ("canonical", "created_at", "title", "updated_at", "url", "enable_canonical", "content", "nofollow", "description", "noindex", "enable_keywords", "keywords") VALUES(NULL, '2010-06-02 09:25:35', 'Harry and the Hendersons', '2010-06-02 09:25:35', 'kundesmith.co.uk', NULL, NULL, NULL, NULL, NULL, NULL, NULL)
+  Page Load (0.3ms)   SELECT * FROM "pages" WHERE ("pages"."id" = 1) 
+  Page Load (0.4ms)   SELECT * FROM "pages" 
+  Page Load (0.4ms)   SELECT * FROM "pages" WHERE ("pages"."id" = 1) 
+  Page Load (0.4ms)   SELECT * FROM "pages" WHERE ("pages"."id" = 1) 
+  Page Update (0.1ms)   UPDATE "pages" SET "keywords" = '', "updated_at" = '2010-06-02 09:25:35', "title" = 'Three Men and a Baby', "content" = '', "nofollow" = 'f', "canonical" = '', "description" = '', "noindex" = 'f', "enable_canonical" = 'f' WHERE "id" = 1
+  Page Load (0.4ms)   SELECT * FROM "pages" 
+  Page Create (0.4ms)   INSERT INTO "pages" ("canonical", "created_at", "title", "updated_at", "url", "enable_canonical", "content", "nofollow", "description", "noindex", "enable_keywords", "keywords") VALUES(NULL, '2010-06-02 09:25:35', 'The Departed', '2010-06-02 09:25:35', 'kautzergoyette.name', NULL, NULL, NULL, NULL, NULL, NULL, NULL)
+  Page Load (0.3ms)   SELECT * FROM "pages" WHERE ("pages"."id" = 1) 
+  Page Load (0.4ms)   SELECT * FROM "pages" 
+  Page Load (0.4ms)   SELECT * FROM "pages" WHERE ("pages"."id" = 1) 
+  Page Destroy (0.1ms)   DELETE FROM "pages" WHERE "id" = 1
+  Page Load (0.1ms)   SELECT * FROM "pages" 
+  Page Create (0.4ms)   INSERT INTO "pages" ("canonical", "created_at", "title", "updated_at", "url", "enable_canonical", "content", "nofollow", "description", "noindex", "enable_keywords", "keywords") VALUES(NULL, '2010-06-02 09:25:35', 'Mr. MacAllister''s Christmas', '2010-06-02 09:25:35', 'gutmann.ca', NULL, NULL, NULL, NULL, NULL, NULL, NULL)
+  Page Load (0.3ms)   SELECT * FROM "pages" WHERE ("pages"."id" = 1) 
+  Page Load (0.3ms)   SELECT * FROM "pages" WHERE ("pages"."title" = 'Mr. MacAllister''s Christmas') LIMIT 1
+  Page Update (0.1ms)   UPDATE "pages" SET "updated_at" = '2010-06-02 09:25:35', "content" = 'I was Home Alone' WHERE "id" = 1
+  Page Load (0.4ms)   SELECT * FROM "pages" WHERE ("pages"."title" = 'Mr. MacAllister''s Christmas') LIMIT 1
+  Page Load (0.4ms)   SELECT * FROM "pages" WHERE ("pages"."url" = 'gutmann.ca') LIMIT 1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shakespeare
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Paul Campbell