website_builder_engine 0.0.3 → 0.0.4

data/CHANGELOG.textile

@@ -1,5 +1,13 @@
 h1. CHANGELOG
 
+h2. 0.0.4 September 29, 2011
+
+* generate sitemap.xml after any article is published
+* fix permalink on welcome page for Facebook metadata
+* rename 'introdution' to 'about' on welcome page
+* change Facebook 'recommend' link location on articles pages
+* reduce H1 tags to just one on a page
+
 h2. 0.0.3 September 25, 2011
 
 * improve Facebook OpenGraph metadata for templates

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'rails', '3.1.1.rc1'
+gem 'rails', '3.1.0'
 group :assets do
 	gem 'sass-rails', "  ~> 3.1.0"
 	gem 'coffee-rails', "~> 3.1.0"

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    website_builder_engine (0.0.3)
+    website_builder_engine (0.0.4)
       RedCloth
       bourbon
       bson_ext
@@ -20,12 +20,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.8)
-    actionmailer (3.1.1.rc1)
-      actionpack (= 3.1.1.rc1)
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
       mail (~> 2.3.0)
-    actionpack (3.1.1.rc1)
-      activemodel (= 3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
@@ -34,21 +34,23 @@ GEM
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.0.0)
-    activemodel (3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.1.rc1)
-      activemodel (= 3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.1.rc1)
-      activemodel (= 3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
-    activesupport (3.1.1.rc1)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
       multi_json (~> 1.0)
     arel (2.2.1)
+    bcrypt-ruby (3.0.1)
     bourbon (0.1.9)
       sass (>= 3.1)
     bson (1.4.0)
@@ -103,17 +105,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.1.rc1)
-      actionmailer (= 3.1.1.rc1)
-      actionpack (= 3.1.1.rc1)
-      activerecord (= 3.1.1.rc1)
-      activeresource (= 3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
       bundler (~> 1.0)
-      railties (= 3.1.1.rc1)
-    railties (3.1.1.rc1)
-      actionpack (= 3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
+      railties (= 3.1.0)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -129,7 +131,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     sass (3.1.7)
-    sass-rails (3.1.2)
+    sass-rails (3.1.3)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
       sass (>= 3.1.4)
@@ -163,7 +165,7 @@ DEPENDENCIES
   html2textile!
   jquery-rails
   mongoid (>= 2.2.1)
-  rails (= 3.1.1.rc1)
+  rails (= 3.1.0)
   rspec (~> 2.6)
   sass-rails (~> 3.1.0)
   uglifier (>= 1.0.3)

data/app/assets/stylesheets/website_builder_engine/articles.css.scss

@@ -56,7 +56,7 @@ body.articles {
           font-family: inherit;
           color: inherit;
         }
-        h1 {
+        h2 {
           color: #444;
           border-bottom: 1px solid #ccc;
           font-size: 14px;

data/app/assets/stylesheets/website_builder_engine/welcome.css.scss

@@ -8,6 +8,7 @@ body.welcome {
     color: #555;
     
     .logo {
+      h1 {font-size: inherit;font: inherit;}
       margin-top:30px;
       margin-bottom:0px;
       .sitename{float:left;text-transform: lowercase;}
@@ -56,7 +57,7 @@ body.welcome {
           font-family: inherit;
           color: inherit;
         }
-        h1 {
+        h2 {
           color: #444;
           border-bottom: 1px solid #ccc;
           font-size: 14px;

data/app/controllers/website_builder_engine/articles_controller.rb

@@ -23,9 +23,14 @@ module WebsiteBuilderEngine
       # create (or recreate) the welcome page
       @articles = Article.where(published: true)
       @welcome_sidebar = RedCloth.new(@settings.sidebar).to_html.html_safe if @settings.sidebar
-      @welcome_intro = RedCloth.new(@settings.introduction).to_html.html_safe if @settings.introduction
+      @welcome_intro = RedCloth.new(@settings.about).to_html.html_safe if @settings.about
       welcome_page = render_to_string(:template => "website_builder_engine/welcome/template.html.haml", :layout => false )
       File.open("#{@docroot_path}index.html", 'w') {|f| f.write(welcome_page) }
+      # create a sitemap.xml page
+      @offerpages = Offerpage.all
+      sitemap_page = render_to_string(:template => "website_builder_engine/templates/sitemap.xml.haml", :layout => false )
+      File.open("#{@docroot_path}sitemap.xml", 'w') {|f| f.write(sitemap_page) }
+      # display list of articles when done
       respond_to do |format|
         format.html { redirect_to articles_path, notice: "Built a webpage for the article \"#{@article.title}\"" }
       end

data/app/models/article.rb

@@ -1,5 +1,6 @@
 class Article
   include Mongoid::Document
+  include Mongoid::Timestamps
   field :title, :type => String
   field :filename, :type => String
   field :description, :type => String

data/app/models/offerpage.rb

@@ -1,5 +1,6 @@
 class Offerpage
   include Mongoid::Document
+  include Mongoid::Timestamps
   field :title, :type => String
   field :filename, :type => String
   field :description, :type => String

data/app/models/setting.rb

@@ -10,7 +10,7 @@ class Setting
   field :articles_directory, :type => String
   field :offerpages_directory, :type => String
   field :sidebar, :type => String
-  field :introduction, :type => String
+  field :about, :type => String
   field :google_analytics_id, :type => String
   field :twitter_account, :type => String
   field :facebook_admin_id, :type => String

data/app/views/website_builder_engine/articles/show.html.haml

@@ -10,6 +10,9 @@
 %p
   %b Keywords:
   = @article.keywords
+%p
+  %b Article image URL:
+  = @article.keywords
 %p
   %b Headline:
   = @article.headline

data/app/views/website_builder_engine/articles/template.html.haml

@@ -33,6 +33,8 @@
           = @settings.site_tagline
       %hr/
       %article.twelve.columns
+        #fb-root
+          %fb:like{:action => "recommend", :send => "true", :show_faces => "false", :width => "450"}
         %header
           %hgroup
             %h1
@@ -40,11 +42,9 @@
             %h2
               = @article.subhead
         = @content
-        #fb-root
-          %fb:like{:action => "recommend", :send => "true", :show_faces => "false", :width => "450"}
       %aside.four.columns
         %section
-          %h1
+          %h2
             Recommend This Article
           %ul
             %li
@@ -53,7 +53,7 @@
               %a.twitter-share-button{"data-count" => "none", 
                 "data-via" => "#{@settings.twitter_account}", :href => "http://twitter.com/share"}
         %section
-          %h1
+          %h2
             Related Articles
           %ul
             - if @related_items.empty?

data/app/views/website_builder_engine/settings/_form.html.haml

@@ -37,8 +37,8 @@
     = f.label :sidebar
     = f.text_area :sidebar
   .field
-    = f.label :introduction
-    = f.text_area :introduction
+    = f.label :about
+    = f.text_area :about
   .field
     = f.label :google_analytics_id
     = f.text_field :google_analytics_id

data/app/views/website_builder_engine/settings/show.html.haml

@@ -16,19 +16,31 @@
 %p
   %b Site keywords:
   = @setting.site_keywords
+%p
+  %b Site image URL:
+  = @setting.site_image_url
 %p
   %b Articles directory:
   = @setting.articles_directory
 %p
   %b Offer Pages directory:
   = @setting.offerpages_directory
+%p
+  %b Google Analytics ID:
+  = @setting.twitter_account
 %p
   %b Twitter account:
   = @setting.twitter_account
+%p
+  %b Facebook admin ID:
+  = @setting.twitter_account  
 %p
   %b Article sidebar:
   = @setting.sidebar
-    
+%p
+  %b About the Website:
+  = @setting.about
+        
 = link_to 'Edit', edit_setting_path(@setting)
 \|
 = link_to 'Back', settings_path

data/app/views/website_builder_engine/templates/sitemap.xml.haml

@@ -0,0 +1,22 @@
+- def w3c_date(date) date.utc.strftime("%Y-%m-%dT%H:%M:%S+00:00") end
+!!! XML
+%urlset{:xmlns => "http://www.sitemaps.org/schemas/sitemap/0.9"}
+  %url
+    %loc= "http://#{@settings.domain}/index.html"
+    %lastmod= w3c_date Time.now
+    %changefreq daily
+    %priority 1.0
+  - unless @articles.empty?
+    - for article in @articles
+      %url
+        %loc= "http://#{@settings.domain}/#{@settings.articles_directory}/#{article.filename}.html"
+        %lastmod= w3c_date article.updated_at
+        %changefreq daily
+        %priority 0.5
+  - unless @offerpages.empty?
+    - for offerpage in @offerpages
+      %url
+        %loc= "http://#{@settings.domain}/#{@settings.offerpages_directory}/#{offerpage.filename}.html"
+        %lastmod= w3c_date offerpage.updated_at
+        %changefreq daily
+        %priority 0.5

data/app/views/website_builder_engine/welcome/template.html.haml

@@ -7,7 +7,7 @@
     %meta{:name=>'keywords', :content=>"#{@settings.site_keywords}"}
     -# meta tags for the Open Graph protocol for Facebook
     %meta{:property => "og:type", :content => "website"}
-    %meta{:property => "og:url", :content => "#{@permalink}"}
+    %meta{:property => "og:url", :content => "http://#{@settings.domain}/index.html"}
     - unless @settings.site_title.blank?
       %meta{:property => "og:title", :content => "#{@settings.site_title}"}
     - unless @settings.site_image_url.blank?
@@ -37,7 +37,7 @@
           #fb-root
             %fb:like{:action => "recommend", :send => "true", :show_faces => "false", :width => "450"}
           - unless @welcome_intro.blank?
-            %h2 Introduction
+            %h2 About the Website
             = @welcome_intro
           - unless @articles.empty?
             %h2 Articles
@@ -47,7 +47,7 @@
                   = link_to article.title, "#{@url_path + article.filename}.html"
       %aside.four.columns
         %section
-          %h1
+          %h2
             Recommend This Site
           %ul
             %li

data/spec/dummy/app/assets/stylesheets/articles.css.scss

@@ -56,7 +56,7 @@ body.articles {
           font-family: inherit;
           color: inherit;
         }
-        h1 {
+        h2 {
           color: #444;
           border-bottom: 1px solid #ccc;
           font-size: 14px;

data/spec/dummy/app/assets/stylesheets/welcome.css.scss

@@ -57,7 +57,7 @@ body.welcome {
           font-family: inherit;
           color: inherit;
         }
-        h1 {
+        h2 {
           color: #444;
           border-bottom: 1px solid #ccc;
           font-size: 14px;

data/version.rb

@@ -1,3 +1,3 @@
 module WebsiteBuilderEngine
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: website_builder_engine
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-25 00:00:00.000000000Z
+date: 2011-09-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2161260280 !ruby/object:Gem::Requirement
+  requirement: &2153356780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161260280
+  version_requirements: *2153356780
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2161259840 !ruby/object:Gem::Requirement
+  requirement: &2153355520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161259840
+  version_requirements: *2153355520
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2161259300 !ruby/object:Gem::Requirement
+  requirement: &2153354600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161259300
+  version_requirements: *2153354600
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2161258740 !ruby/object:Gem::Requirement
+  requirement: &2153353960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161258740
+  version_requirements: *2153353960
 - !ruby/object:Gem::Dependency
   name: bourbon
-  requirement: &2161258200 !ruby/object:Gem::Requirement
+  requirement: &2153353320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161258200
+  version_requirements: *2153353320
 - !ruby/object:Gem::Dependency
   name: html2textile
-  requirement: &2161257720 !ruby/object:Gem::Requirement
+  requirement: &2153352720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161257720
+  version_requirements: *2153352720
 - !ruby/object:Gem::Dependency
   name: frontend-helpers
-  requirement: &2161257180 !ruby/object:Gem::Requirement
+  requirement: &2153352060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161257180
+  version_requirements: *2153352060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161256560 !ruby/object:Gem::Requirement
+  requirement: &2153344880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2161256560
+  version_requirements: *2153344880
 description: Add this engine to any Rails 3.1 app and create static webpages from
   data added through a form.
 email:
@@ -168,6 +168,7 @@ files:
 - app/views/website_builder_engine/settings/index.html.haml
 - app/views/website_builder_engine/settings/new.html.haml
 - app/views/website_builder_engine/settings/show.html.haml
+- app/views/website_builder_engine/templates/sitemap.xml.haml
 - app/views/website_builder_engine/welcome/template.html.haml
 - config/routes.rb
 - db/seeds.rb
@@ -222,8 +223,10 @@ files:
 - version.rb
 - website_builder_engine.gemspec
 - spec/dummy/log/development.log
+- spec/dummy/public/howto/installing-rails-3-1.html
 - spec/dummy/public/howto/using-rails-3-1.html
 - spec/dummy/public/index.html
+- spec/dummy/public/sitemap.xml
 - spec/dummy/tmp/cache/assets/C4A/470/sprockets%2F06a9301ff6c8e56320419f3591463c02
 - spec/dummy/tmp/cache/assets/C62/1D0/sprockets%2F1638f87db345b13872695759502b54fe
 - spec/dummy/tmp/cache/assets/C73/800/sprockets%2Fe26c7a52215e3d8315b952630b7d6230
@@ -366,7 +369,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1298741027368882005
+      hash: 2462725749770464140
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -375,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1298741027368882005
+      hash: 2462725749770464140
 requirements: []
 rubyforge_project: website_builder_engine
 rubygems_version: 1.8.10
@@ -421,8 +424,10 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/public/howto/installing-rails-3-1.html
 - spec/dummy/public/howto/using-rails-3-1.html
 - spec/dummy/public/index.html
+- spec/dummy/public/sitemap.xml
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
 - spec/dummy/tmp/cache/assets/C4A/470/sprockets%2F06a9301ff6c8e56320419f3591463c02