letter_opener_web 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 635c1ee37b5f5af26958ed5352c8c2f993836837
-  data.tar.gz: 0f726ba70c2dc43486f1dd1aa08ee723f7ba4ed3
+  metadata.gz: fc14aca146ed087b4338ac541248a3d9f1959eac
+  data.tar.gz: 40c58615d7b5da34ebb616056a15d95890b29784
 SHA512:
-  metadata.gz: bd1ef70c5276f5b97907d6e088d96303c9dd2b59bae2e33b680264046fd7b25c9bacf6474ef911e3c9966a659b7fe9e2398a39ce5c0487362231da92141e988e
-  data.tar.gz: e56d00193cc694602d18749cb76e9dc111d6456b1cab5266762851fc0b7b40379db9aba93ae9628cea9139985e8bcfb25485dd2cc9692a927a0da4cca6e3db11
+  metadata.gz: 7767870d3426c8b5e412c5393c1915e9095dc8f2c889462d3f8dd3ae50c88099a465399e550aeb2267609124e54e610fb5b67c5b46db402ef4fdd0f49cfec516
+  data.tar.gz: 837fb0d561726c6284e1444df8244f74b2cf491b2174489a7e6a34bac5538e5767ac2776170db6687af7753b4ea73e6499927fb6bf0e39161fea64c63258d140

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
-bundler_args: --without devonly
+bundler_args: --without development
 rvm:
+  - 2.1.1
   - 2.1.0
   - 2.0.0
   - 1.9.3

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## [1.1.3](https://github.com/fgrehm/letter_opener_web/compare/v1.1.2...master) (Feb 21, 2014)
+## [1.2.0](https://github.com/fgrehm/letter_opener_web/compare/v1.1.3...v1.2.0) (Apr 07, 2014)
+
+  - Add support for removing a single email [#23](https://github.com/fgrehm/letter_opener_web/pull/23)
+  - Move vendored assets into the `letter_opener_web` folder [#24](https://github.com/fgrehm/letter_opener_web/issues/24)
+  - Avoid matching `<address>` when changing email links to open on new tabs [#22](https://github.com/fgrehm/letter_opener_web/pull/22)
+
+## [1.1.3](https://github.com/fgrehm/letter_opener_web/compare/v1.1.2...v1.1.3) (Feb 21, 2014)
 
   - Include assets into `precompile` list [#21](https://github.com/fgrehm/letter_opener_web/pull/21)
 

data/Gemfile

@@ -5,9 +5,8 @@ source "http://rubygems.org"
 # development dependencies will be added by default to the :development group.
 gemspec
 
-group :devonly do
-  gem 'debugger'
-  gem 'rb-inotify', '~> 0.8.8'
+group :development do
+  gem 'rb-inotify'
   gem 'guard'
   gem 'guard-rspec'
 end

data/Gemfile.lock

@@ -1,162 +1,153 @@
 PATH
   remote: .
   specs:
-    letter_opener_web (1.1.3)
+    letter_opener_web (1.2.0)
       letter_opener (~> 1.0)
       rails (>= 3.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.12)
-      actionpack (= 3.2.12)
-      mail (~> 2.4.4)
-    actionpack (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
+    actionmailer (4.0.4)
+      actionpack (= 4.0.4)
+      mail (~> 2.5.4)
+    actionpack (4.0.4)
+      activesupport (= 4.0.4)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    addressable (2.3.5)
-    arel (3.0.2)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
-    builder (3.0.4)
-    coderay (1.0.8)
-    columnize (0.3.6)
-    combustion (0.3.3)
-      rails (>= 3.0.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.4)
+      activesupport (= 4.0.4)
+      builder (~> 3.1.0)
+    activerecord (4.0.4)
+      activemodel (= 4.0.4)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.4)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.4)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.3.6)
+    arel (4.0.2)
+    builder (3.1.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
+    coderay (1.1.0)
+    combustion (0.5.1)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
       thor (>= 0.14.6)
-    debugger (1.3.1)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.8)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.8)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
-    ffi (1.4.0)
-    guard (1.6.2)
-      listen (>= 0.6.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      terminal-table (>= 1.4.3)
-      thor (>= 0.14.6)
-    guard-rspec (2.4.0)
-      guard (>= 1.1)
-      rspec (~> 2.11)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.7)
-    launchy (2.3.0)
+    ffi (1.9.3)
+    formatador (0.2.4)
+    guard (2.6.0)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rspec (4.2.8)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    hike (1.2.3)
+    i18n (0.6.9)
+    launchy (2.4.2)
       addressable (~> 2.3)
-    letter_opener (1.1.2)
+    letter_opener (1.2.0)
       launchy (~> 2.2)
-    listen (0.7.2)
-    lumberjack (1.0.2)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    listen (2.7.1)
+      celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.5)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    method_source (0.8.1)
-    mime-types (1.21)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.6.1)
-    polyglot (0.3.3)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    minitest (4.7.5)
+    multi_json (1.9.2)
+    nio4r (1.0.0)
+    polyglot (0.3.4)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.12)
-      actionmailer (= 3.2.12)
-      actionpack (= 3.2.12)
-      activerecord (= 3.2.12)
-      activeresource (= 3.2.12)
-      activesupport (= 3.2.12)
-      bundler (~> 1.0)
-      railties (= 3.2.12)
-    railties (3.2.12)
-      actionpack (= 3.2.12)
-      activesupport (= 3.2.12)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.4)
+      actionmailer (= 4.0.4)
+      actionpack (= 4.0.4)
+      activerecord (= 4.0.4)
+      activesupport (= 4.0.4)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.4)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.4)
+      actionpack (= 4.0.4)
+      activesupport (= 4.0.4)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rb-inotify (0.8.8)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.2.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
       ffi (>= 0.5.0)
-    rdoc (3.12.1)
-      json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    rspec-rails (2.12.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.2)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    shoulda-matchers (1.5.6)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    shoulda-matchers (2.5.0)
       activesupport (>= 3.0.0)
-      bourne (~> 1.3)
-    slop (3.4.3)
-    sprockets (2.2.2)
+    slop (3.5.0)
+    sprockets (2.12.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    terminal-table (1.4.5)
-    thor (0.17.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.19.1)
+    thread_safe (0.3.2)
+    tilt (1.4.1)
+    timers (1.1.0)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  combustion (~> 0.3.1)
-  debugger
+  combustion (~> 0.5)
   guard
   guard-rspec
   letter_opener_web!
-  rb-inotify (~> 0.8.8)
+  rb-inotify
   rspec-rails (~> 2.0)
-  shoulda-matchers (= 1.5.6)
+  shoulda-matchers (~> 2.5)

data/README.md

@@ -1,6 +1,6 @@
 # letter_opener_web
 
-[![Build Status](https://travis-ci.org/fgrehm/letter_opener_web.png?branch=master)](https://travis-ci.org/fgrehm/letter_opener_web)
+[![Build Status](https://travis-ci.org/fgrehm/letter_opener_web.png?branch=master)](https://travis-ci.org/fgrehm/letter_opener_web) [![Gem Version](https://badge.fury.io/rb/letter_opener_web.png)](http://badge.fury.io/rb/letter_opener_web) [![Code Climate](https://codeclimate.com/github/fgrehm/letter_opener_web.png)](https://codeclimate.com/github/fgrehm/letter_opener_web) [![Gittip](http://img.shields.io/gittip/fgrehm.svg)](https://www.gittip.com/fgrehm/)
 
 Gives [letter_opener](https://github.com/ryanb/letter_opener) an interface for
 browsing sent emails.
@@ -44,23 +44,6 @@ can set `:letter_opener_web` as your delivery method on your
   config.action_mailer.delivery_method = ENV['USER'] == 'vagrant' ? :letter_opener_web : :letter_opener
 ```
 
-## Usage with [rails-footnotes](https://github.com/josevalim/rails-footnotes)
-
-To prevent `rails-footnotes` from outputing debug information to your mails add
-the following to your `config/initializers/footnotes.rb`:
-
-```ruby
-notes = Footnotes::Filter.notes
-Footnotes.setup do |config|
-  config.before do |controller, filter|
-    if controller.class.name =~ /LetterOpenerWeb/
-      filter.notes = []
-    else
-      filter.notes = notes
-    end
-  end
-end
-```
 
 ## Try it out
 
@@ -75,11 +58,13 @@ bundle
 unicorn
 ```
 
+
 ## Acknowledgements
 
 Special thanks to [@alexrothenberg](https://github.com/alexrothenberg) for some
 ideas on [this pull request](https://github.com/ryanb/letter_opener/pull/12).
 
+
 ## Contributing
 
 1. Fork it
@@ -87,5 +72,3 @@ ideas on [this pull request](https://github.com/ryanb/letter_opener/pull/12).
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/fgrehm/letter_opener_web/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

data/app/assets/javascripts/letter_opener_web/application.js

@@ -1,6 +1,5 @@
-//= require jquery-1.8.3.min
-//= require jquery_ujs
-//= require_tree .
+//= require letter_opener_web/jquery-1.8.3.min
+//= require letter_opener_web/jquery_ujs
 
 jQuery(function($) {
   $('.letter-opener').on('click', 'tr', function() {

data/app/assets/stylesheets/letter_opener_web/application.css.erb

@@ -1,7 +1,5 @@
 /*
- *= require bootstrap.min
- *= require_self
- *= require_tree .
+ *= require letter_opener_web/bootstrap.min
  */
 
 body {
@@ -48,9 +46,9 @@ h1 {
 }
 
 [class^="icon-"], [class*=" icon-"] {
-  background-image: url(<%=asset_path "glyphicons-halflings.png"%>);
+  background-image: url(<%=asset_path "letter_opener_web/glyphicons-halflings.png"%>);
 }
 
 .icon-white {
-  background-image: url(<%=asset_path "glyphicons-halflings-white.png"%>);
+  background-image: url(<%=asset_path "letter_opener_web/glyphicons-halflings-white.png"%>);
 }

data/app/controllers/letter_opener_web/letters_controller.rb

@@ -29,5 +29,11 @@ module LetterOpenerWeb
       Letter.destroy_all
       redirect_to letters_path
     end
+
+    def destroy
+      letter = Letter.find(params[:id])
+      letter.delete
+      redirect_to letters_path
+    end
   end
 end

data/app/models/letter_opener_web/letter.rb

@@ -50,6 +50,10 @@ module LetterOpenerWeb
       end
     end
 
+    def delete
+      FileUtils.rm_rf("#{letters_location}/#{self.id}")
+    end
+
     private
 
     def base_dir
@@ -69,7 +73,7 @@ module LetterOpenerWeb
       # "complete" (as in they have the whole <html> structure) and letter_opener
       # prepends some information about the mail being sent, making REXML
       # complain about it
-      contents.scan(/<a[^>]+>(?:.|\s)*?<\/a>/).each do |link|
+      contents.scan(/<a\s[^>]+>(?:.|\s)*?<\/a>/).each do |link|
         fixed_link = fix_link_html(link)
         xml        = REXML::Document.new(fixed_link).root
         unless xml.attributes['href'] =~ /(plain|rich).html/

data/app/views/letter_opener_web/letters/index.html.erb

@@ -17,6 +17,7 @@
       <tr>
         <th>ID</th>
         <th>Sent at</th>
+        <th>Action</th>
       </tr>
     </thead>
     <tbody>
@@ -26,6 +27,13 @@
             <%= link_to(first_letter.id, letter_path(first_letter, style: first_letter.default_style), target: 'mail') %>
           </td>
           <td><%= first_letter.sent_at %></td>
+          <td>
+            <%= link_to delete_letter_path(first_letter), method: 'delete', data: { confirm: 'Are you sure you want to delete this email?' } do %>
+              <span class="pull-right">
+                <i class="icon-remove-circle" title="Delete"></i>
+              </span>
+            <% end %>
+          </td>
         </tr>
       <% end %>
       <% @letters.each do |letter| %>
@@ -34,6 +42,13 @@
             <%= link_to(letter.id, letter_path(letter, style: letter.default_style), target: 'mail') %>
           </td>
           <td><%= letter.sent_at %></td>
+          <td>
+            <%= link_to delete_letter_path(letter), :method => 'delete', data: { confirm: 'Are you sure you want to delete this email?' } do %>
+              <span class="pull-right">
+                <i class="icon-remove-circle"></i>
+              </span>
+            <% end %>
+          </td>
         </tr>
       <% end %>
     </tbody>

data/config/routes.rb

@@ -1,6 +1,7 @@
 LetterOpenerWeb::Engine.routes.draw do
-  delete 'clear'                 => 'letters#clear', :as => :clear_letters
-  get    '/'                     => 'letters#index', :as => :letters
-  get    ':id(/:style)'          => 'letters#show',  :as => :letter
+  delete 'clear'                 => 'letters#clear',    :as => :clear_letters
+  delete ':id/delete'            => 'letters#destroy',  :as => :delete_letter
+  get    '/'                     => 'letters#index',    :as => :letters
+  get    ':id(/:style)'          => 'letters#show',     :as => :letter
   get    ':id/attachments/:file' => 'letters#attachment'
 end

data/demo/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "http://rubygems.org"
 
 # Required by active_support
 gem "tzinfo"
@@ -11,6 +11,4 @@ gem "railties",     "~> 3.2"
 gem "letter_opener_web", path: '../'
 gem "actionmailer_inline_css"
 
-gem "rails-footnotes"
-
 gem "unicorn"

data/demo/Gemfile.lock

@@ -1,114 +1,112 @@
 PATH
   remote: ../
   specs:
-    letter_opener_web (1.1.3.dev)
+    letter_opener_web (1.2.0)
       letter_opener (~> 1.0)
       rails (>= 3.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
-      mail (~> 2.4.4)
-    actionmailer_inline_css (1.5.2)
+    actionmailer (3.2.17)
+      actionpack (= 3.2.17)
+      mail (~> 2.5.4)
+    actionmailer_inline_css (1.5.3)
       actionmailer (>= 3.0.0)
       nokogiri (>= 1.4.4)
       premailer (>= 1.7.1)
-    actionpack (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    actionpack (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
+    activemodel (3.2.17)
+      activesupport (= 3.2.17)
       builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    activerecord (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
+    activeresource (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+    activesupport (3.2.17)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.2)
-    arel (3.0.2)
+    addressable (2.3.6)
+    arel (3.0.3)
     builder (3.0.4)
-    css_parser (1.2.6)
+    css_parser (1.3.5)
       addressable
-      rdoc
     erubis (2.7.0)
-    hike (1.2.1)
+    hike (1.2.3)
     htmlentities (4.3.1)
-    i18n (0.6.1)
+    i18n (0.6.9)
     journey (1.0.4)
-    json (1.7.6)
-    kgio (2.7.4)
-    launchy (2.3.0)
+    json (1.8.1)
+    kgio (2.9.2)
+    launchy (2.4.2)
       addressable (~> 2.3)
-    letter_opener (1.1.2)
+    letter_opener (1.2.0)
       launchy (~> 2.2)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.5.0)
-    nokogiri (1.5.6)
-    polyglot (0.3.3)
-    premailer (1.7.3)
-      css_parser (>= 1.1.9)
+    mime-types (1.25.1)
+    mini_portile (0.5.3)
+    multi_json (1.9.2)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    polyglot (0.3.4)
+    premailer (1.8.2)
+      css_parser (>= 1.3.5)
       htmlentities (>= 4.0.0)
-    rack (1.4.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.11)
-      actionmailer (= 3.2.11)
-      actionpack (= 3.2.11)
-      activerecord (= 3.2.11)
-      activeresource (= 3.2.11)
-      activesupport (= 3.2.11)
+    rails (3.2.17)
+      actionmailer (= 3.2.17)
+      actionpack (= 3.2.17)
+      activerecord (= 3.2.17)
+      activeresource (= 3.2.17)
+      activesupport (= 3.2.17)
       bundler (~> 1.0)
-      railties (= 3.2.11)
-    rails-footnotes (3.7.9)
-      rails (>= 3.0.0)
-    railties (3.2.11)
-      actionpack (= 3.2.11)
-      activesupport (= 3.2.11)
+      railties (= 3.2.17)
+    railties (3.2.17)
+      actionpack (= 3.2.17)
+      activesupport (= 3.2.17)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    raindrops (0.10.0)
-    rake (10.0.3)
-    rdoc (3.12)
+    raindrops (0.13.0)
+    rake (10.2.2)
+    rdoc (3.12.2)
       json (~> 1.4)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.16.0)
-    tilt (1.3.3)
+    thor (0.19.1)
+    tilt (1.4.1)
     tiny-rails (0.1.1)
       thor (>= 0.14.6, < 2.0)
-    treetop (1.4.12)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-    unicorn (4.5.0)
+    tzinfo (0.3.39)
+    unicorn (4.8.2)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
@@ -121,7 +119,6 @@ DEPENDENCIES
   actionmailer_inline_css
   actionpack (~> 3.2)
   letter_opener_web!
-  rails-footnotes
   railties (~> 3.2)
   tiny-rails
   tzinfo

data/demo/index.html.erb

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>LetterOpenerWeb Test APP</title>
-    <%= stylesheet_link_tag    "bootstrap.min" %>
+    <%= stylesheet_link_tag    "letter_opener_web/bootstrap.min" %>
     <style>
       body {
         padding-top: 20px;
@@ -17,7 +17,7 @@
       }
 
       .icon-white {
-        background-image: url(<%=asset_path "glyphicons-halflings-white.png"%>);
+        background-image: url(<%=asset_path "letter_opener_web/glyphicons-halflings-white.png"%>);
       }
     </style>
   </head>

data/letter_opener_web.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'letter_opener', '~> 1.0'
 
   gem.add_development_dependency 'rspec-rails', '~> 2.0'
-  gem.add_development_dependency 'shoulda-matchers', '1.5.6'
-  gem.add_development_dependency 'combustion', '~> 0.3.1'
+  gem.add_development_dependency 'shoulda-matchers', '~> 2.5'
+  gem.add_development_dependency 'combustion', '~> 0.5'
 end

data/lib/letter_opener_web/version.rb

@@ -1,3 +1,3 @@
 module LetterOpenerWeb
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

data/spec/controllers/letter_opener_web/letters_controller_spec.rb

@@ -7,7 +7,7 @@ describe LetterOpenerWeb::LettersController do
       get :index
     end
     it 'should assign all letters to @letters' do
-      assigns[:letters].should == :all_letters
+      expect(assigns[:letters]).to eq(:all_letters)
     end
   end
 
@@ -16,7 +16,7 @@ describe LetterOpenerWeb::LettersController do
     # TODO: Move these to fixture files
     let(:rich_text)  { "rich text href=\"plain.html\"" }
     let(:plain_text) { "plain text href=\"rich.html\"" }
-    let(:letter)     { mock(:letter, :rich_text => rich_text, :plain_text => plain_text, :id => id) }
+    let(:letter)     { double(:letter, :rich_text => rich_text, :plain_text => plain_text, :id => id) }
 
     before do
       LetterOpenerWeb::Letter.stub(:find => letter)
@@ -26,12 +26,12 @@ describe LetterOpenerWeb::LettersController do
       before { get :show, :id => id, :style => 'rich' }
 
       it "returns letter's rich text contents" do
-        response.body.should =~ /^rich text/
+        expect(response.body).to match(/^rich text/)
       end
 
       it 'fixes plain text link' do
-        response.body.should_not =~ /href="plain.html"/
-        response.body.should =~ /href="#{Regexp.escape letter_path(:id => letter.id, :style => 'plain')}"/
+        expect(response.body).not_to match(/href="plain.html"/)
+        expect(response.body).to match(/href="#{Regexp.escape letter_path(:id => letter.id, :style => 'plain')}"/)
       end
     end
 
@@ -39,12 +39,12 @@ describe LetterOpenerWeb::LettersController do
       before { get :show, :id => id, :style => 'plain' }
 
       it "returns letter's plain text contents" do
-        response.body.should =~ /^plain text/
+        expect(response.body).to match(/^plain text/)
       end
 
       it 'fixes rich text link' do
-        response.body.should_not =~ /href="rich.html"/
-        response.body.should =~ /href="#{Regexp.escape letter_path(:id => letter.id, :style => 'rich')}"/
+        expect(response.body).not_to match(/href="rich.html"/)
+        expect(response.body).to match(/href="#{Regexp.escape letter_path(:id => letter.id, :style => 'rich')}"/)
       end
     end
   end
@@ -53,34 +53,42 @@ describe LetterOpenerWeb::LettersController do
     let(:id)              { 'an-id' }
     let(:attachment_path) { "path/to/attachment" }
     let(:file_name)       { 'image.jpg' }
-    let(:letter)          { mock(:letter, :attachments => { file_name => attachment_path}, :id => id) }
+    let(:letter)          { double(:letter, :attachments => { file_name => attachment_path}, :id => id) }
 
     before do
       LetterOpenerWeb::Letter.stub(:find => letter)
-      controller.stub(:send_file) { controller.render :nothing => true }
+      allow(controller).to receive(:send_file) { controller.render :nothing => true }
     end
 
     it 'sends the file as an inline attachment' do
-      controller.should_receive(:send_file).with(attachment_path, :filename => file_name, :disposition => 'inline')
+      expect(controller).to receive(:send_file).with(attachment_path, :filename => file_name, :disposition => 'inline')
       get :attachment, :id => id, :file => file_name.gsub(/\.\w+/, ''), :format => File.extname(file_name)[1..-1]
-      response.status.should == 200
+      expect(response.status).to eq(200)
     end
 
     it "throws a 404 if attachment file can't be found" do
       get :attachment, :id => id, :file => 'unknown', :format => 'woot'
-      response.status.should == 404
+      expect(response.status).to eq(404)
     end
   end
 
   describe 'DELETE clear' do
     it 'removes all letters' do
-      LetterOpenerWeb::Letter.should_receive(:destroy_all)
+      expect(LetterOpenerWeb::Letter).to receive(:destroy_all)
       delete :clear
     end
 
     it 'redirects back to index' do
       delete :clear
-      response.should redirect_to(letters_path)
+      expect(response).to redirect_to(letters_path)
+    end
+  end
+
+  describe 'DELETE destroy' do
+    let(:id) { 'an-id' }
+    it 'removes the selected letter' do
+      expect_any_instance_of(LetterOpenerWeb::Letter).to receive(:delete)
+      delete :destroy, :id => id, :use_route => :letter_opener_web
     end
   end
 end

data/spec/internal/config/routes.rb

@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
   delete 'clear'                 => 'letter_opener_web/letters#clear'
+  delete ':id/delete'            => 'letters#destroy',                 :as => :delete_letter
   get    '/'                     => 'letter_opener_web/letters#index', :as => :letters
   get    ':id(/:style)'          => 'letter_opener_web/letters#show',  :as => :letter
   get    ':id/attachments/:file' => 'letter_opener_web/letters#attachment'

data/spec/models/letter_opener_web/letter_spec.rb

@@ -13,12 +13,13 @@ Rich text for #{mail_id}
 </a>
 <a href='fooo.html'>Bar</a>
 <a href="example.html" class="blank"></a>
+<address><a href="inside-address.html">inside address</a></address>
 MAIL
   end
 
   before :each do
-    described_class.stub(:letters_location).and_return(location)
-    described_class.any_instance.stub(:letters_location).and_return(location)
+    allow(described_class).to receive(:letters_location).and_return(location)
+    allow_any_instance_of(described_class).to receive(:letters_location).and_return(location)
 
     ['1111_1111', '2222_2222'].each do |folder|
       FileUtils.mkdir_p("#{location}/#{folder}")
@@ -40,11 +41,11 @@ MAIL
     it { should =~ /Rich text for 1111_1111/ }
 
     it 'changes links to show up on a new window' do
-      subject.should include("<a href='a-link.html' target='_blank'>\n  <img src='an-image.jpg'/>\n  Link text\n</a>")
+      expect(subject).to include("<a href='a-link.html' target='_blank'>\n  <img src='an-image.jpg'/>\n  Link text\n</a>")
     end
 
     it 'always rewrites links with a closing tag rather than making them selfclosing' do
-      subject.should include("<a class='blank' href='example.html' target='_blank'></a>")
+      expect(subject).to include("<a class='blank' href='example.html' target='_blank'></a>")
     end
   end
 
@@ -60,12 +61,12 @@ MAIL
     subject { described_class.new(:id => id) }
 
     it 'returns rich if rich text version is present' do
-      subject.default_style.should == 'rich'
+      expect(subject.default_style).to eq('rich')
     end
 
     it 'returns plain if rich text version is not present' do
       File.stub(:exists? => false)
-      subject.default_style.should == 'plain'
+      expect(subject.default_style).to eq('plain')
     end
   end
 
@@ -82,7 +83,7 @@ MAIL
     end
 
     it 'builds a hash with file name as key and full path as value' do
-      subject.attachments.should == { file => "#{attachments_dir}/#{file}" }
+      expect(subject.attachments).to eq({ file => "#{attachments_dir}/#{file}" })
     end
   end
 
@@ -92,12 +93,12 @@ MAIL
     let(:last_letter)    { search_results.last }
 
     before do
-      File.stub(:mtime).with("#{location}/1111_1111").and_return(Date.today - 1.day)
-      File.stub(:mtime).with("#{location}/2222_2222").and_return(Date.today)
+      allow(File).to receive(:mtime).with("#{location}/1111_1111").and_return(Date.today - 1.day)
+      allow(File).to receive(:mtime).with("#{location}/2222_2222").and_return(Date.today)
     end
 
     it 'returns a list of ordered letters' do
-      first_letter.sent_at.should > last_letter.sent_at
+      expect(first_letter.sent_at).to be > last_letter.sent_at
     end
   end
 
@@ -106,14 +107,26 @@ MAIL
     let(:letter) { described_class.find(id) }
 
     it 'returns a letter with id set' do
-      letter.id.should == id
+      expect(letter.id).to eq(id)
     end
   end
 
   describe '.destroy_all' do
     it 'removes all letters' do
       described_class.destroy_all
-      Dir["#{location}/**/*"].should be_empty
+      expect(Dir["#{location}/**/*"]).to be_empty
+    end
+  end
+
+  describe '#delete' do
+    let(:id) { '1111_1111' }
+    subject { described_class.new(:id => id).delete }
+
+    it'removes the letter with given id' do
+      subject
+      directories = Dir["#{location}/*"]
+      expect(directories.count).to eql(1)
+      expect(directories.first).not_to match(id)
     end
   end
 end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: letter_opener_web
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: letter_opener
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.5'
 description: Gives letter_opener an interface for browsing sent emails
 email:
 - fgrehm@gmail.com
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -112,7 +112,6 @@ files:
 - demo/boot.rb
 - demo/config.ru
 - demo/index.html.erb
-- demo/initializers.rb
 - demo/new_message.html.erb
 - letter_opener_web.gemspec
 - lib/letter_opener_web.rb
@@ -129,12 +128,12 @@ files:
 - spec/internal/public/favicon.ico
 - spec/models/letter_opener_web/letter_spec.rb
 - spec/spec_helper.rb
-- vendor/assets/images/glyphicons-halflings-white.png
-- vendor/assets/images/glyphicons-halflings.png
-- vendor/assets/javascripts/bootstrap.min.js
-- vendor/assets/javascripts/jquery-1.8.3.min.js
-- vendor/assets/javascripts/jquery_ujs.js
-- vendor/assets/stylesheets/bootstrap.min.css
+- vendor/assets/images/letter_opener_web/glyphicons-halflings-white.png
+- vendor/assets/images/letter_opener_web/glyphicons-halflings.png
+- vendor/assets/javascripts/letter_opener_web/bootstrap.min.js
+- vendor/assets/javascripts/letter_opener_web/jquery-1.8.3.min.js
+- vendor/assets/javascripts/letter_opener_web/jquery_ujs.js
+- vendor/assets/stylesheets/letter_opener_web/bootstrap.min.css
 homepage: https://github.com/fgrehm/letter_opener_web
 licenses:
 - MIT
@@ -145,17 +144,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Gives letter_opener an interface for browsing sent emails

data/demo/initializers.rb

@@ -1,9 +0,0 @@
-Footnotes.setup do |config|
-  config.before do |controller, filter|
-    controller.class.name =~ /LetterOpenerWeb/ ?
-      filter.notes.clear :
-      filter.notes
-  end
-end
-
-Footnotes.run!