letter_opener_web 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e948d6b3a8faf888e0f105028bf9b4051b7fa67
-  data.tar.gz: 9f62ee471d1d30ecf94e8f23b487059d40ed821f
+  metadata.gz: c6a68770b043595bf19b9615ae05ed7ebd136c29
+  data.tar.gz: 35cc68611bee3af314dec5272832a425576f3af9
 SHA512:
-  metadata.gz: 9e1dd49900294cad2345ac17344a715954ad769f0d9fd24a6f60f0b712c55c3b321320d65689eb56c044c91eec1ba3180c17de486fce420d2f8587bd0288d0de
-  data.tar.gz: fedad057c7efe7e5f8b1c7679f975cf1ad0494e789cbf072fddead0277112b4145a3e2fdec3c65dc36faedc77efab38d36d4972305d6827de46d06c8d38c3454
+  metadata.gz: 5ecc4124d756e3ce10db48afe67600d3ea7cea179f15acbb4b60033da481d43142c8edd5a21fec7faef1ea722bea198e80ff15361669fe6276be9a57ae8b38db
+  data.tar.gz: 4d0f62dc1159ec23afcb9803f965d363d0a310087df622d1b29e3863f0be2024869a4ff2d6b3b746698bc2f8ee01a66c5af418ab4a59f7e643eaa97d94f71a9b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [1.2.2](https://github.com/fgrehm/letter_opener_web/compare/v1.2.1...v1.2.2) (Jul 17, 2014)
+
+  - Precompile glyphicons [#30](https://github.com/fgrehm/letter_opener_web/pull/30)
+  - Display letters count on the favicon [#29](https://github.com/fgrehm/letter_opener_web/pull/29)
+  - Validate params passed in to the LettersController and return a 404 in case an email can't be found [#28](https://github.com/fgrehm/letter_opener_web/pull/28)
+
 ## [1.2.1](https://github.com/fgrehm/letter_opener_web/compare/v1.2.0...v1.2.1) (Apr 07, 2014)
 
   - Improve Rails 3 compatibility [#26](https://github.com/fgrehm/letter_opener_web/pull/26) / [#27](https://github.com/fgrehm/letter_opener_web/pull/27)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    letter_opener_web (1.2.1)
+    letter_opener_web (1.2.2)
       letter_opener (~> 1.0)
       rails (>= 3.2)
 

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

@@ -1,7 +1,15 @@
 //= require letter_opener_web/jquery-1.8.3.min
 //= require letter_opener_web/jquery_ujs
+//= require letter_opener_web/favcount
+
+function update_favicon(favicon) {
+  favicon.set($('.letter-opener tbody tr').length);
+}
 
 jQuery(function($) {
+  var favicon = new Favcount($('link[rel="icon"]').attr('href'));
+  update_favicon(favicon);
+
   $('.letter-opener').on('click', 'tr', function() {
     var $this = $(this);
     $('iframe').attr('src', $this.find('a').attr('href'));
@@ -16,6 +24,7 @@ jQuery(function($) {
     table.find('tbody').empty().append('<tr><td colspan="2">Loading...</td></tr>');
     table.load(table.data('letters-path') + ' .letter-opener', function() {
       $('iframe').attr('src', $('.letter-opener tbody a:first-child()').attr('href'));
+      update_favicon(favicon);
     });
   });
 });

data/app/controllers/letter_opener_web/letters_controller.rb

@@ -2,23 +2,25 @@ require_dependency "letter_opener_web/application_controller"
 
 module LetterOpenerWeb
   class LettersController < ApplicationController
+    before_filter :check_style, :only => [:show]
+    before_filter :load_letter, :only => [:show, :attachment, :destroy]
+
     def index
       @letters = Letter.search
     end
 
     def show
-      letter = Letter.find(params[:id])
-      text   = letter.send("#{params[:style]}_text").
-        gsub(/"plain\.html"/, "\"#{LetterOpenerWeb.railtie_routes_url_helpers.letter_path(:id => letter.id, :style => 'plain')}\"").
-        gsub(/"rich\.html"/, "\"#{LetterOpenerWeb.railtie_routes_url_helpers.letter_path(:id => letter.id, :style => 'rich')}\"")
+      text = @letter.send("#{params[:style]}_text").
+        gsub(/"plain\.html"/, "\"#{LetterOpenerWeb.railtie_routes_url_helpers.letter_path(:id => @letter.id, :style => 'plain')}\"").
+        gsub(/"rich\.html"/, "\"#{LetterOpenerWeb.railtie_routes_url_helpers.letter_path(:id => @letter.id, :style => 'rich')}\"")
       render :text => text
     end
 
     def attachment
-      letter   = Letter.find(params[:id])
+      @letter = Letter.find(params[:id])
       filename = "#{params[:file]}.#{params[:format]}"
 
-      if file = letter.attachments[filename]
+      if file = @letter.attachments[filename]
         send_file(file, :filename => filename, :disposition => 'inline')
       else
         render :text => 'Attachment not found!', :status => 404
@@ -31,9 +33,22 @@ module LetterOpenerWeb
     end
 
     def destroy
-      letter = Letter.find(params[:id])
-      letter.delete
+      @letter = Letter.find(params[:id])
+      @letter.delete
       redirect_to LetterOpenerWeb.railtie_routes_url_helpers.letters_path
     end
+
+    private
+
+    def check_style
+      params[:style] = 'rich' unless ['plain', 'rich'].include? params[:style]
+    end
+
+    def load_letter
+      if params[:id]
+        @letter = Letter.find(params[:id])
+        render :nothing => true, :status => 404 unless @letter.exists?
+      end
+    end
   end
 end

data/app/models/letter_opener_web/letter.rb

@@ -54,6 +54,10 @@ module LetterOpenerWeb
       FileUtils.rm_rf("#{letters_location}/#{self.id}")
     end
 
+    def exists?
+      File.exists?(base_dir)
+    end
+
     private
 
     def base_dir

data/app/views/layouts/letter_opener_web/application.html.erb

@@ -4,6 +4,7 @@
   <title>LetterOpenerWeb</title>
   <%= stylesheet_link_tag    "letter_opener_web/application", :media => "all" %>
   <%= javascript_include_tag "letter_opener_web/application" %>
+  <%= favicon_link_tag       asset_path("letter_opener_web/blue-dot.ico"), :rel => "icon" %>
   <%= csrf_meta_tags %>
 </head>
 <body>

data/lib/letter_opener_web/engine.rb

@@ -13,7 +13,13 @@ module LetterOpenerWeb
     end
 
     initializer "assets" do |app|
-      Rails.application.config.assets.precompile += %w( letter_opener_web/application.js letter_opener_web/application.css )
+      Rails.application.config.assets.precompile += %w(
+        letter_opener_web/application.js
+        letter_opener_web/application.css
+        letter_opener_web/glyphicons-halflings.png
+        letter_opener_web/glyphicons-halflings-white.png
+        letter_opener_web/blue-dot.ico
+      )
     end
   end
 end

data/lib/letter_opener_web/version.rb

@@ -1,3 +1,3 @@
 module LetterOpenerWeb
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/controllers/letter_opener_web/letters_controller_spec.rb

@@ -18,12 +18,12 @@ describe LetterOpenerWeb::LettersController do
     let(:plain_text) { "plain text href=\"rich.html\"" }
     let(:letter)     { double(:letter, :rich_text => rich_text, :plain_text => plain_text, :id => id) }
 
-    before do
-      allow(LetterOpenerWeb::Letter).to receive_messages(:find => letter)
-    end
-
     context 'rich text version' do
-      before { get :show, :id => id, :style => 'rich' }
+      before do
+        allow(LetterOpenerWeb::Letter).to receive_messages(:find => letter)
+        allow(letter).to receive_messages(:exists? => true)
+        get :show, :id => id, :style => 'rich'
+      end
 
       it "returns letter's rich text contents" do
         expect(response.body).to match(/^rich text/)
@@ -36,7 +36,11 @@ describe LetterOpenerWeb::LettersController do
     end
 
     context 'plain text version' do
-      before { get :show, :id => id, :style => 'plain' }
+      before do 
+        allow(LetterOpenerWeb::Letter).to receive_messages(:find => letter)
+        allow(letter).to receive_messages(:exists? => true)
+        get :show, :id => id, :style => 'plain'
+      end
 
       it "returns letter's plain text contents" do
         expect(response.body).to match(/^plain text/)
@@ -47,6 +51,13 @@ describe LetterOpenerWeb::LettersController do
         expect(response.body).to match(/href="#{Regexp.escape letter_path(:id => letter.id, :style => 'rich')}"/)
       end
     end
+
+    context 'with wrong parameters' do 
+      it 'should return 404 when invalid id given' do 
+        get :show, :id => id, :style => 'rich'
+        expect(response.status).to eq(404)
+      end
+    end
   end
 
   describe 'GET attachment' do
@@ -58,6 +69,7 @@ describe LetterOpenerWeb::LettersController do
     before do
       allow(LetterOpenerWeb::Letter).to receive_messages(:find => letter)
       allow(controller).to receive(:send_file) { controller.render :nothing => true }
+      allow(letter).to receive_messages(:exists? => true)
     end
 
     it 'sends the file as an inline attachment' do
@@ -87,6 +99,7 @@ describe LetterOpenerWeb::LettersController do
   describe 'DELETE destroy' do
     let(:id) { 'an-id' }
     it 'removes the selected letter' do
+      allow_any_instance_of(LetterOpenerWeb::Letter).to receive(:exists?).and_return(true)
       expect_any_instance_of(LetterOpenerWeb::Letter).to receive(:delete)
       delete :destroy, :id => id, :use_route => :letter_opener_web
     end

data/vendor/assets/javascripts/letter_opener_web/favcount.js

@@ -0,0 +1,102 @@
+/*
+ * favcount.js v1.5.0
+ * http://chrishunt.co/favcount
+ * Dynamically updates the favicon with a number.
+ *
+ * Copyright 2013, Chris Hunt
+ * Released under the MIT license
+ */
+
+(function(){
+  function Favcount(icon) {
+    this.icon = icon;
+    this.opacity = 0.4;
+    this.canvas = document.createElement('canvas');
+    this.font = "Helvetica, Arial, sans-serif";
+  }
+
+  Favcount.prototype.set = function(count) {
+    var self = this,
+        img  = document.createElement('img');
+
+    if (self.canvas.getContext) {
+      img.crossOrigin = "anonymous";
+
+      img.onload = function() {
+        drawCanvas(self.canvas, self.opacity, self.font, img, normalize(count));
+      };
+
+      img.src = this.icon;
+    }
+  };
+
+  function normalize(count) {
+    count = Math.round(count);
+
+    if (isNaN(count) || count < 1) {
+      return '';
+    } else if (count < 10) {
+      return ' ' + count;
+    } else if (count > 99) {
+      return '99';
+    } else {
+      return count;
+    }
+  }
+
+  function drawCanvas(canvas, opacity, font, img, count) {
+    var head = document.getElementsByTagName('head')[0],
+        favicon = document.createElement('link'),
+        multiplier, fontSize, context, xOffset, yOffset, border, shadow;
+
+    favicon.rel = 'icon';
+
+    // Scale canvas elements based on favicon size
+    multiplier = img.width / 16;
+    fontSize   = multiplier * 11;
+    xOffset    = multiplier;
+    yOffset    = multiplier * 11;
+    border     = multiplier;
+    shadow     = multiplier * 2;
+
+    canvas.height = canvas.width = img.width;
+    context = canvas.getContext('2d');
+    context.font = 'bold ' + fontSize + 'px ' + font;
+
+    // Draw faded favicon background
+    if (count) { context.globalAlpha = opacity; }
+    context.drawImage(img, 0, 0);
+    context.globalAlpha = 1.0;
+
+    // Draw white drop shadow
+    context.shadowColor = '#FFF';
+    context.shadowBlur = shadow;
+    context.shadowOffsetX = 0;
+    context.shadowOffsetY = 0;
+
+    // Draw white border
+    context.fillStyle = '#FFF';
+    context.fillText(count, xOffset, yOffset);
+    context.fillText(count, xOffset + border, yOffset);
+    context.fillText(count, xOffset, yOffset + border);
+    context.fillText(count, xOffset + border, yOffset + border);
+
+    // Draw black count
+    context.fillStyle = '#000';
+    context.fillText(count,
+      xOffset + (border / 2.0),
+      yOffset + (border / 2.0)
+    );
+
+    // Replace favicon with new favicon
+    favicon.href = canvas.toDataURL('image/png');
+    head.removeChild(document.querySelector('link[rel=icon]'));
+    head.appendChild(favicon);
+  }
+
+  this.Favcount = Favcount;
+}).call(this);
+
+(function(){
+  Favcount.VERSION = '1.5.0';
+}).call(this);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: letter_opener_web
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -120,9 +120,11 @@ files:
 - spec/internal/public/favicon.ico
 - spec/models/letter_opener_web/letter_spec.rb
 - spec/spec_helper.rb
+- vendor/assets/images/letter_opener_web/blue-dot.ico
 - 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/favcount.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