jabe 0.5.8 → 0.5.9

data/Gemfile

@@ -19,6 +19,8 @@ group :development, :test do
   gem 'cucumber'
   gem 'cucumber-rails'
   gem 'database_cleaner', '>= 0.6.0'
+  gem 'email_spec'
+  gem 'gravtastic'
   gem 'jeweler'
   gem 'launchy'
   gem 'machinist', '>= 2.0.0.beta2'

data/Gemfile.lock

@@ -67,6 +67,8 @@ GEM
       bcrypt-ruby (~> 2.1.2)
       warden (~> 1.0.2)
     diff-lcs (1.1.2)
+    email_spec (1.1.1)
+      rspec (~> 2.0)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     ffi (0.6.3)
@@ -80,6 +82,7 @@ GEM
     gherkin (2.3.3)
       json (~> 1.4.6)
     git (1.2.5)
+    gravtastic (3.1.0)
     haml (3.0.25)
     haml-rails (0.3.4)
       actionpack (~> 3.0)
@@ -188,8 +191,10 @@ DEPENDENCIES
   cucumber-rails
   database_cleaner (>= 0.6.0)
   devise
+  email_spec
   formtastic (>= 1.2.3.beta)
   friendly_id (= 3.1.8)
+  gravtastic
   haml (>= 3.0.23)
   haml-rails
   jeweler

data/README.textile

@@ -15,6 +15,7 @@ Edit your Gemfile and add the required gems
 <pre><code>gem 'devise'
 gem 'friendly_id', '3.1.8'
 gem 'formtastic', '>= 1.2.3.beta'
+gem 'gravtastic'
 gem 'haml', '>= 3.0.23'
 gem 'haml-rails'
 gem 'jabe'

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.5.9

data/app/helpers/jabe_helper.rb

@@ -6,4 +6,8 @@ module JabeHelper
   def public_entry_url(entry)
     "#{SETTINGS.site_url}#{public_entry_path(entry)}"
   end
+  
+  def default_gravatar_url
+    "#{request.protocol}#{request.host_with_port}/images/gravatar.gif"
+  end
 end

data/app/models/comment.rb

@@ -1,4 +1,9 @@
 class Comment < ActiveRecord::Base
+  if defined?(Gravtastic)
+    include Gravtastic
+    gravtastic :size => 64
+  end
+
   belongs_to :entry
   default_scope :order => 'created_at ASC'
   before_validation :bot_check

data/app/models/settings.rb

@@ -2,6 +2,6 @@ class Settings < ActiveRecord::Base
 
   def do_updates
     Time.zone = self.time_zone
-    ActionMailer::Base.default_url_options[:host] = self.site_url
+    ActionMailer::Base.default_url_options[:host] = self.host_name
   end
 end

data/app/stylesheets/jabe.scss

@@ -84,7 +84,7 @@ h1#site-tagline {
   }
 
   .date {
-    font-size:.9em;
+    font-size:.8em;
     padding:5px 0;
   }
 
@@ -92,7 +92,7 @@ h1#site-tagline {
     color:#eee;
     background-color:#AAA;
     font-size:.9em;
-    margin-top:10px;
+    margin-top:30px;
     padding:10px;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
@@ -105,6 +105,7 @@ h1#site-tagline {
 
 .last {
   border-bottom:none;
+  margin-bottom:0;
 }
 
 #site-title a, #site-title a:visited {
@@ -115,24 +116,44 @@ h1#site-tagline {
 #comments {
   padding-top:20px;
 
-  .author {
-    font-weight:bold;
-    padding:10px 0 5px 10px;
+  .comment {
+    clear:both;
+
+    .gravatar {
+      margin:10px 10px 10px 0;
+      float:left;
+      width:64px;
+      height:64px;
+      border:solid 5px #588EDE;
+      -webkit-border-radius: 5px;
+      -moz-border-radius: 5px;
+      border-radius: 5px;
+
+      img {
+        width:64px;
+        height:64px;
+      }
+    }
+
+    .author {
+      font-weight:bold;
+      padding:10px 0 5px 10px;
 
-    .when {
-      padding-left:10px;
-      font-size:.8em;
+      .when {
+        padding-left:10px;
+        font-size:.8em;
+      }
     }
-  }
 
-  .body {
-    padding:5px 20px;
-    border-bottom:solid 1px #333;
+    .body {
+      min-height:55px;
+      padding:5px 20px;
+      border-bottom:solid 1px #333;
+    }
   }
 
   #new_comment {
     padding-top:20px;
-
   }
 }
 
@@ -146,9 +167,13 @@ pre {
   overflow-x:auto;
 }
 
-label abbr {
-  color:red;
-  padding:0 3px;
+label {
+  padding: 10px 0 5px;
+
+  abbr {
+    color:red;
+    padding:0 3px;
+  }
 }
 
 .inline-errors {

data/app/views/admin/settings/edit.html.haml

@@ -10,5 +10,4 @@
   = form.input :show_github_badge
   = form.input :twitter_username
   = form.input :facebook_url
-
-  = form.submit 'Save'
+  = form.submit 'Save'

data/app/views/entries/show.html.haml

@@ -13,6 +13,8 @@
       - if entry.comments.any?
         - entry.comments.each do |comment|
           .comment
+            .gravatar
+              = image_tag comment.gravatar_url(:default => default_gravatar_url)
             .author
               = comment.name
               %span.when

data/config/initializers/gravtastic.rb

@@ -0,0 +1,3 @@
+begin
+  require 'gravtastic'
+rescue LoadError; end

data/test/dummy/features/step_definitions/email_steps.rb

@@ -0,0 +1,194 @@
+# Commonly used email steps
+#
+# To add your own steps make a custom_email_steps.rb
+# The provided methods are:
+#
+# last_email_address
+# reset_mailer
+# open_last_email
+# visit_in_email
+# unread_emails_for
+# mailbox_for
+# current_email
+# open_email
+# read_emails_for
+# find_email
+#
+# General form for email scenarios are:
+#   - clear the email queue (done automatically by email_spec)
+#   - execute steps that sends an email
+#   - check the user received an/no/[0-9] emails
+#   - open the email
+#   - inspect the email contents
+#   - interact with the email (e.g. click links)
+#
+# The Cucumber steps below are setup in this order.
+
+module EmailHelpers
+  def current_email_address
+    # Replace with your a way to find your current email. e.g @current_user.email
+    # last_email_address will return the last email address used by email spec to find an email.
+    # Note that last_email_address will be reset after each Scenario.
+    last_email_address || "example@example.com"
+  end
+end
+
+World(EmailHelpers)
+
+#
+# Reset the e-mail queue within a scenario.
+# This is done automatically before each scenario.
+#
+
+Given /^(?:a clear email queue|no emails have been sent)$/ do
+  reset_mailer
+end
+
+#
+# Check how many emails have been sent/received
+#
+
+Then /^(?:I|they|"([^"]*?)") should receive (an|no|\d+) emails?$/ do |address, amount|
+  unread_emails_for(address).size.should == parse_email_count(amount)
+end
+
+Then /^(?:I|they|"([^"]*?)") should have (an|no|\d+) emails?$/ do |address, amount|
+  mailbox_for(address).size.should == parse_email_count(amount)
+end
+
+Then /^(?:I|they|"([^"]*?)") should receive (an|no|\d+) emails? with subject "([^"]*?)"$/ do |address, amount, subject|
+  unread_emails_for(address).select { |m| m.subject =~ Regexp.new(subject) }.size.should == parse_email_count(amount)
+end
+
+Then /^(?:I|they|"([^"]*?)") should receive an email with the following body:$/ do |address, expected_body|
+  open_email(address, :with_text => expected_body)
+end
+
+#
+# Accessing emails
+#
+
+# Opens the most recently received email
+When /^(?:I|they|"([^"]*?)") opens? the email$/ do |address|
+  open_email(address)
+end
+
+When /^(?:I|they|"([^"]*?)") opens? the email with subject "([^"]*?)"$/ do |address, subject|
+  open_email(address, :with_subject => subject)
+end
+
+When /^(?:I|they|"([^"]*?)") opens? the email with text "([^"]*?)"$/ do |address, text|
+  open_email(address, :with_text => text)
+end
+
+#
+# Inspect the Email Contents
+#
+
+Then /^(?:I|they) should see "([^"]*?)" in the email subject$/ do |text|
+  current_email.should have_subject(text)
+end
+
+Then /^(?:I|they) should see \/([^"]*?)\/ in the email subject$/ do |text|
+  current_email.should have_subject(Regexp.new(text))
+end
+
+Then /^(?:I|they) should see "([^"]*?)" in the email body$/ do |text|
+  current_email.default_part_body.to_s.should include(text)
+end
+
+Then /^(?:I|they) should see \/([^"]*?)\/ in the email body$/ do |text|
+  current_email.default_part_body.to_s.should =~ Regexp.new(text)
+end
+
+Then /^(?:I|they) should see the email delivered from "([^"]*?)"$/ do |text|
+  current_email.should be_delivered_from(text)
+end
+
+Then /^(?:I|they) should see "([^\"]*)" in the email "([^"]*?)" header$/ do |text, name|
+  current_email.should have_header(name, text)
+end
+
+Then /^(?:I|they) should see \/([^\"]*)\/ in the email "([^"]*?)" header$/ do |text, name|
+  current_email.should have_header(name, Regexp.new(text))
+end
+
+Then /^I should see it is a multi\-part email$/ do
+    current_email.should be_multipart
+end
+
+Then /^(?:I|they) should see "([^"]*?)" in the email html part body$/ do |text|
+    current_email.html_part.body.to_s.should include(text)
+end
+
+Then /^(?:I|they) should see "([^"]*?)" in the email text part body$/ do |text|
+    current_email.text_part.body.to_s.should include(text)
+end
+
+#
+# Inspect the Email Attachments
+#
+
+Then /^(?:I|they) should see (an|no|\d+) attachments? with the email$/ do |amount|
+  current_email_attachments.size.should == parse_email_count(amount)
+end
+
+Then /^there should be (an|no|\d+) attachments? named "([^"]*?)"$/ do |amount, filename|
+  current_email_attachments.select { |a| a.filename == filename }.size.should == parse_email_count(amount)
+end
+
+Then /^attachment (\d+) should be named "([^"]*?)"$/ do |index, filename|
+  current_email_attachments[(index.to_i - 1)].filename.should == filename
+end
+
+Then /^there should be (an|no|\d+) attachments? of type "([^"]*?)"$/ do |amount, content_type|
+  current_email_attachments.select { |a| a.content_type.include?(content_type) }.size.should == parse_email_count(amount)
+end
+
+Then /^attachment (\d+) should be of type "([^"]*?)"$/ do |index, content_type|
+  current_email_attachments[(index.to_i - 1)].content_type.should include(content_type)
+end
+
+Then /^all attachments should not be blank$/ do
+  current_email_attachments.each do |attachment|
+    attachment.read.size.should_not == 0
+  end
+end
+
+Then /^show me a list of email attachments$/ do
+  EmailSpec::EmailViewer::save_and_open_email_attachments_list(current_email)
+end
+
+#
+# Interact with Email Contents
+#
+
+When /^(?:I|they) follow "([^"]*?)" in the email$/ do |link|
+  visit_in_email(link)
+end
+
+When /^(?:I|they) click the first link in the email$/ do
+  click_first_link_in_email
+end
+
+#
+# Debugging
+# These only work with Rails and OSx ATM since EmailViewer uses RAILS_ROOT and OSx's 'open' command.
+# Patches accepted. ;)
+#
+
+Then /^save and open current email$/ do
+  EmailSpec::EmailViewer::save_and_open_email(current_email)
+end
+
+Then /^save and open all text emails$/ do
+  EmailSpec::EmailViewer::save_and_open_all_text_emails
+end
+
+Then /^save and open all html emails$/ do
+  EmailSpec::EmailViewer::save_and_open_all_html_emails
+end
+
+Then /^save and open all raw emails$/ do
+  EmailSpec::EmailViewer::save_and_open_all_raw_emails
+end

data/test/dummy/features/support/blueprints.rb

@@ -1,3 +1,5 @@
+require 'email_spec'
+require 'email_spec/cucumber'
 require 'machinist/active_record'
 
 # takes care of

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jabe
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 5
-  - 8
-  version: 0.5.8
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - Michael Moen a.k.a. UnderpantsGnome
@@ -287,7 +287,7 @@ dependencies:
         version: "0"
   requirement: *id018
   prerelease: false
-  name: jeweler
+  name: email_spec
   type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id019 !ruby/object:Gem::Requirement 
@@ -301,10 +301,38 @@ dependencies:
         version: "0"
   requirement: *id019
   prerelease: false
-  name: launchy
+  name: gravtastic
   type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id020
+  prerelease: false
+  name: jeweler
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id021 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id021
+  prerelease: false
+  name: launchy
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -317,12 +345,12 @@ dependencies:
         - beta
         - 2
         version: 2.0.0.beta2
-  requirement: *id020
+  requirement: *id022
   prerelease: false
   name: machinist
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id021 !ruby/object:Gem::Requirement 
+  version_requirements: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -331,12 +359,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id021
+  requirement: *id023
   prerelease: false
   name: pickle
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id022 !ruby/object:Gem::Requirement 
+  version_requirements: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -345,12 +373,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id022
+  requirement: *id024
   prerelease: false
   name: rcov
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id023 !ruby/object:Gem::Requirement 
+  version_requirements: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -359,12 +387,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id023
+  requirement: *id025
   prerelease: false
   name: redgreen
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id024 !ruby/object:Gem::Requirement 
+  version_requirements: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -375,12 +403,12 @@ dependencies:
         - 0
         - 1
         version: 2.0.1
-  requirement: *id024
+  requirement: *id026
   prerelease: false
   name: rspec-rails
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id025 !ruby/object:Gem::Requirement 
+  version_requirements: &id027 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -389,12 +417,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id025
+  requirement: *id027
   prerelease: false
   name: ruby-debug
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id026 !ruby/object:Gem::Requirement 
+  version_requirements: &id028 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -403,12 +431,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id026
+  requirement: *id028
   prerelease: false
   name: mysql
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id027 !ruby/object:Gem::Requirement 
+  version_requirements: &id029 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -417,12 +445,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id027
+  requirement: *id029
   prerelease: false
   name: sqlite3-ruby
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id028 !ruby/object:Gem::Requirement 
+  version_requirements: &id030 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -431,7 +459,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id028
+  requirement: *id030
   prerelease: false
   name: wirble
   type: :development
@@ -471,7 +499,6 @@ files:
 - app/views/admin/entries/index.html.haml
 - app/views/admin/entries/new.html.haml
 - app/views/admin/settings/edit.html.haml
-- app/views/entries/_comment.html.haml
 - app/views/entries/_comment_form.html.haml
 - app/views/entries/index.html.haml
 - app/views/entries/show.html.haml
@@ -480,6 +507,7 @@ files:
 - app/views/layouts/_header.html.haml
 - app/views/layouts/_sidebar.html.haml
 - app/views/layouts/application.html.haml
+- config/initializers/gravtastic.rb
 - config/initializers/sass.rb
 - config/initializers/settings.rb
 - config/initializers/time_formats.rb
@@ -501,6 +529,7 @@ files:
 - public/crossdomain.xml
 - public/images/delete_page.png
 - public/images/full_page.png
+- public/images/gravatar.gif
 - public/javascripts/application.js
 - public/javascripts/jquery-ui.js
 - public/javascripts/jquery-ui.min.js
@@ -539,6 +568,7 @@ files:
 - test/dummy/db/migrate/20110104004400_add_new_settings.rb
 - test/dummy/db/schema.rb
 - test/dummy/features/step_definitions/admin_steps.rb
+- test/dummy/features/step_definitions/email_steps.rb
 - test/dummy/features/step_definitions/entry_steps.rb
 - test/dummy/features/step_definitions/support_steps.rb
 - test/dummy/features/step_definitions/web_steps.rb
@@ -611,6 +641,7 @@ test_files:
 - test/dummy/db/migrate/20110104004400_add_new_settings.rb
 - test/dummy/db/schema.rb
 - test/dummy/features/step_definitions/admin_steps.rb
+- test/dummy/features/step_definitions/email_steps.rb
 - test/dummy/features/step_definitions/entry_steps.rb
 - test/dummy/features/step_definitions/support_steps.rb
 - test/dummy/features/step_definitions/web_steps.rb