shakespeare 0.3.0 → 0.3.1

data/Rakefile

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

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

@@ -1,7 +1,7 @@
 <h2><%= @page.title %></h2>
 
 <%- if Shakespeare::Settings.format_method -%>
-  <%= send(Shakespeare::Settings.format_method, @page.content) %>
+  <%= send(Shakespeare::Settings.format_method, @page.content).html_safe! %>
 <%- else -%>
-  <%= @page.content %>
+  <%= @page.content.html_safe! %>
 <%- end -%>

data/features/public_pages.feature

@@ -9,4 +9,5 @@ Feature: Public Pages
     
     When I am on the page for "Mr. MacAllister's Christmas"
     
-    Then I should see "I was Home Alone"
+    Then I should see "I was Home Alone"
+      And I should not see "Shakespeare"

data/lib/shakespeare.rb

@@ -3,6 +3,6 @@ require 'shakespeare/shakespeare'
 require 'shakespeare/helpers'
 require 'shakespeare/view_helpers'
 
-ApplicationController.send(:include, Shakespeare::Helpers)
+ActionController::Base.send(:include, Shakespeare::Helpers)
 ActionView::Base.send(:include, Shakespeare::Helpers)
 ActionView::Base.send(:include, Shakespeare::ViewHelpers)

data/lib/shakespeare/view_helpers.rb

@@ -1,29 +1,29 @@
-module Shakespeare
-  module ViewHelpers
-    def page_title
-      return if page_content.nil? or page_content.title.blank?
-      page_content.title
-    end
-    
-    def description_meta_tag
-      return if page_content.nil? or page_content.description.blank?
-      %Q[<meta name="description" content="#{page_content.description}">]
-    end
-    
-    def keywords_meta_tag
-      return if page_content.nil? or page_content.keywords.blank?
-      %Q[<meta name="keywords" content="#{page_content.keywords}">]
-    end
-    
-    def robots_meta_tag
-      return if page_content.nil? or page_content.robots.blank?
-      %Q[<meta name="robots" content="#{page_content.robots}">]
-    end
-    
-    def canonical_link_tag
-      return if page_content.nil? or page_content.canonical.blank?
-      return unless page_content.enable_canonical?
-      %Q[<link href="#{page_content.canonical}" rel="canonical" />]
-    end
-  end
+module Shakespeare
+  module ViewHelpers
+    def page_title
+      return if page_content.nil? or page_content.title.blank?
+      page_content.title
+    end
+    
+    def description_meta_tag
+      return if page_content.nil? or page_content.description.blank?
+      %Q[<meta name="description" content="#{page_content.description}">]
+    end
+    
+    def keywords_meta_tag
+      return if page_content.nil? or page_content.keywords.blank?
+      %Q[<meta name="keywords" content="#{page_content.keywords}">]
+    end
+    
+    def robots_meta_tag
+      return if page_content.nil? or page_content.robots.blank?
+      %Q[<meta name="robots" content="#{page_content.robots}">]
+    end
+    
+    def canonical_link_tag
+      return if page_content.nil? or page_content.canonical.blank?
+      return unless page_content.enable_canonical?
+      %Q[<link href="#{page_content.canonical}" rel="canonical" />]
+    end
+  end
 end

data/shakespeare.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shakespeare}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]
-  s.date = %q{2010-03-09}
+  s.date = %q{2010-04-27}
   s.email = %q{paul@rslw.com}
   s.extra_rdoc_files = [
     "README.md"

data/spec/debug.log

@@ -2535,3 +2535,73 @@
   Page Load (0.3ms)   SELECT * FROM "pages" WHERE ("pages"."url" = '/') LIMIT 1
   Page Load (0.2ms)   SELECT * FROM "pages" 
   Page Create (2.0ms)   INSERT INTO "pages" ("canonical", "created_at", "title", "updated_at", "url", "enable_canonical", "content", "nofollow", "description", "noindex", "enable_keywords", "keywords") VALUES(NULL, '2010-03-09 17:53:25', 'Harry B', '2010-03-09 17:53:25', 'harry-b', NULL, NULL, NULL, NULL, NULL, NULL, NULL)
+  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.6ms)   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.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM "schema_migrations"
+  Page Load (0.3ms)   SELECT * FROM "pages" 
+  Page Load (0.2ms)   SELECT * FROM "pages" 
+  Page Create (0.6ms)   INSERT INTO "pages" ("canonical", "created_at", "title", "updated_at", "url", "enable_canonical", "content", "nofollow", "description", "noindex", "enable_keywords", "keywords") VALUES('http://hendersons.com', '2010-03-09 17:57:57', 'Harry and the Hendersons', '2010-03-09 17:57:57', '', 't', '', 't', '', 't', NULL, '80s, movie')
+  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-03-09 17:57:57', 'Harry and the Hendersons', '2010-03-09 17:57:57', 'kundesmith.co.uk', 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" 
+  Page Load (1.2ms)   SELECT * FROM "pages" WHERE ("pages"."url" = 'kundesmith.co.uk') LIMIT 1
+  Page Load (0.4ms)   SELECT * FROM "pages" WHERE ("pages"."url" = 'kundesmith.co.uk') LIMIT 1
+  Page Update (0.2ms)   UPDATE "pages" SET "keywords" = '', "updated_at" = '2010-03-09 17:57:57', "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-03-09 17:57:57', 'The Departed', '2010-03-09 17:57:57', 'kautzergoyette.name', NULL, NULL, NULL, NULL, NULL, NULL, NULL)
+  Page Load (0.5ms)   SELECT * FROM "pages" WHERE ("pages"."id" = 1) 
+  Page Load (0.4ms)   SELECT * FROM "pages" 
+  Page Load (0.4ms)   SELECT * FROM "pages" WHERE ("pages"."url" = 'kautzergoyette.name') LIMIT 1
+  Page Destroy (0.1ms)   DELETE FROM "pages" WHERE "id" = 1
+  Page Load (0.2ms)   SELECT * FROM "pages" 
+  Page Create (0.5ms)   INSERT INTO "pages" ("canonical", "created_at", "title", "updated_at", "url", "enable_canonical", "content", "nofollow", "description", "noindex", "enable_keywords", "keywords") VALUES(NULL, '2010-03-09 17:57:57', 'Mr. MacAllister''s Christmas', '2010-03-09 17:57:57', '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-03-09 17:57:57', "content" = 'I was Home Alone' WHERE "id" = 1
+  Page Load (0.3ms)   SELECT * FROM "pages" WHERE ("pages"."title" = 'Mr. MacAllister''s Christmas') LIMIT 1
+  Page Load (0.5ms)   SELECT * FROM "pages" WHERE ("pages"."url" = 'gutmann.ca') LIMIT 1
+  SQL (0.2ms)   select sqlite_version(*)
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (3.5ms)   DROP TABLE "pages"
+  SQL (1.7ms)   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.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.4ms)   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-04-27 13:15:30', 'Harry and the Hendersons', '2010-04-27 13:15:30', '', 't', '', 't', '', 't', NULL, '80s, movie')
+  Page Load (0.5ms)   SELECT * FROM "pages" 
+  Page Create (3.7ms)   INSERT INTO "pages" ("canonical", "created_at", "title", "updated_at", "url", "enable_canonical", "content", "nofollow", "description", "noindex", "enable_keywords", "keywords") VALUES(NULL, '2010-04-27 13:15:30', 'Harry and the Hendersons', '2010-04-27 13:15:30', 'kundesmith.co.uk', NULL, NULL, NULL, NULL, NULL, NULL, NULL)
+  Page Load (4.5ms)   SELECT * FROM "pages" WHERE ("pages"."id" = 1) 
+  Page Load (0.6ms)   SELECT * FROM "pages" 
+  Page Load (0.4ms)   SELECT * FROM "pages" WHERE ("pages"."url" = 'kundesmith.co.uk') LIMIT 1
+  Page Load (0.4ms)   SELECT * FROM "pages" WHERE ("pages"."url" = 'kundesmith.co.uk') LIMIT 1
+  Page Update (0.1ms)   UPDATE "pages" SET "keywords" = '', "updated_at" = '2010-04-27 13:15:30', "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-04-27 13:15:30', 'The Departed', '2010-04-27 13:15:30', 'kautzergoyette.name', NULL, NULL, NULL, NULL, NULL, NULL, NULL)
+  Page Load (0.4ms)   SELECT * FROM "pages" WHERE ("pages"."id" = 1) 
+  Page Load (0.9ms)   SELECT * FROM "pages" 
+  Page Load (0.5ms)   SELECT * FROM "pages" WHERE ("pages"."url" = 'kautzergoyette.name') LIMIT 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-04-27 13:15:30', 'Mr. MacAllister''s Christmas', '2010-04-27 13:15:30', 'gutmann.ca', 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" WHERE ("pages"."title" = 'Mr. MacAllister''s Christmas') LIMIT 1
+  Page Update (0.1ms)   UPDATE "pages" SET "updated_at" = '2010-04-27 13:15:30', "content" = 'I was Home Alone' WHERE "id" = 1
+  Page Load (0.8ms)   SELECT * FROM "pages" WHERE ("pages"."title" = 'Mr. MacAllister''s Christmas') LIMIT 1
+  Page Load (0.5ms)   SELECT * FROM "pages" WHERE ("pages"."url" = 'gutmann.ca') LIMIT 1

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Paul Campbell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +00:00
+date: 2010-04-27 00:00:00 +01:00
 default_executable: 
 dependencies: []