maily 0.3.1 → 0.3.2

data/README.md

@@ -1,6 +1,6 @@
 # Maily
 
-[![Gem Version](https://badge.fury.io/rb/maily.png)](http://badge.fury.io/rb/maily) [![Build Status](https://travis-ci.org/markets/maily.png?branch=master)](https://travis-ci.org/markets/maily)
+[![Gem Version](https://badge.fury.io/rb/maily.svg)](http://badge.fury.io/rb/maily) [![Build Status](https://travis-ci.org/markets/maily.svg?branch=master)](https://travis-ci.org/markets/maily)
 
 Stop to delivery emails every time you change it!
 

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

@@ -1 +1,5 @@
 //= require_tree .
+
+function resizeIframe(obj) {
+  obj.style.height = obj.contentWindow.document.body.scrollHeight + 'px';
+}

data/app/assets/stylesheets/maily/application.scss

@@ -44,9 +44,7 @@ body {
   }
 }
 
-.title {
-  margin-top: 0;
-}
+.title { margin-top: 0; }
 
 
 header.header, footer.footer {
@@ -92,6 +90,7 @@ footer.footer {
 .wrap_content {
   display: inline-block;
   box-sizing: border-box;
+  -moz-box-sizing: border-box;
   padding: 6em .75em 4em;
   width: 100%;
 }
@@ -152,6 +151,7 @@ footer.footer {
   .maily_mail_preview {
     height: 100%;
     box-sizing: border-box;
+    -moz-box-sizing: border-box;
     padding: 1em;
     border: solid 1px #ccc;
     border-radius: 3px;
@@ -205,6 +205,7 @@ footer.footer {
 
   .maily_button {
     box-sizing: border-box;
+    -moz-box-sizing: border-box;
     padding: 0;
     border: none;
     background: none;

data/app/views/maily/emails/show.html.erb

@@ -47,9 +47,8 @@
     <% end %>
 
     <% if @email.html_part || @email.text_part || @email.body.present? %>
-      <iframe class="maily_preview" src="<%= raw_maily_email_path(mailer: params[:mailer], email: params[:email], locale: params[:locale], part: params[:part]) %>" frameborder="1" height="100%" width="100%"></iframe>
+      <iframe class="maily_preview"  onload='javascript:resizeIframe(this);' src="<%= raw_maily_email_path(mailer: params[:mailer], email: params[:email], locale: params[:locale], part: params[:part]) %>" frameborder="1" width="100%"></iframe>
     <% end %>
-
     <% if @email.attachments.present? %>
       <ul class="maily_mail_attachments">
         <li>Attachments:</li>

data/lib/maily/version.rb

@@ -1,3 +1,3 @@
 module Maily
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/email_spec.rb

@@ -4,11 +4,15 @@ describe Maily::Email do
   let(:mailer) { Maily::Mailer.find('notifier') }
 
   context "with no arguments" do
+    let (:email) { mailer.find_email('welcome') }
+
     it "should not require hook" do
-      email  = mailer.find_email('welcome')
+      expect(email.required_arguments).to be_blank
+      expect(email.require_hook?).to be_false
+    end
 
-      email.required_arguments.should be_blank
-      email.require_hook?.should be_false
+    it ".call" do
+      expect { email.call }.to_not raise_error
     end
   end
 
@@ -16,18 +20,22 @@ describe Maily::Email do
     let (:email) { mailer.find_email('invitation') }
 
     it "should require hook" do
-      email.required_arguments.should be_present
-      email.require_hook?.should be_true
+      expect(email.required_arguments).to be_present
+      expect(email.require_hook?).to be_true
     end
 
     it "should handle arguments successfully" do
-      email.arguments.size.should == 1
+      expect(email.arguments).to be_present
+      expect(email.arguments.size).to eq(email.required_arguments.size)
+    end
+
+    it ".call" do
       expect { email.call }.to_not raise_error
     end
   end
 
   it "should handle template_path via hook" do
     email = mailer.find_email('recommendation')
-    email.template_path.should == 'notifications'
+    expect(email.template_path).to eq('notifications')
   end
 end

data/spec/mailer_spec.rb

@@ -2,20 +2,20 @@ require 'spec_helper'
 
 describe Maily::Mailer do
   it "should load mailers" do
-    Maily::Mailer.all.size.should == 1
+    expect(Maily::Mailer.all.size).to eq(1)
   end
 
   it "should build emails" do
     mailer = Maily::Mailer.find('notifier')
-    mailer.emails.size.should == 3
+    expect(mailer.emails.size).to eq(3)
   end
 
   it "should find mailers by name" do
-    Maily::Mailer.find('notifier').name.should == 'notifier'
+    expect(Maily::Mailer.find('notifier').name).to eq('notifier')
   end
 
   it "should find emails by name" do
     mailer = Maily::Mailer.find('notifier')
-    mailer.find_email('welcome').name.should == 'welcome'
+    expect(mailer.find_email('welcome').name).to eq('welcome')
   end
 end

data/spec/maily_spec.rb

@@ -4,23 +4,23 @@ describe Maily do
   it "should set up with defaults if no block provided" do
     Maily.setup
 
-    Maily.enabled.should be_true
-    Maily.allow_edition.should be_true
-    Maily.allow_delivery.should be_true
-    Maily.available_locales.should == I18n.available_locales
-    Maily.base_controller.should == 'ActionController::Base'
+    expect(Maily.enabled).to be_true
+    expect(Maily.allow_edition).to be_true
+    expect(Maily.allow_delivery).to be_true
+    expect(Maily.available_locales).to eq(I18n.available_locales)
+    expect(Maily.base_controller).to eq('ActionController::Base')
   end
 
   it "should not allow edition if edition is disabled" do
     Maily.allow_edition = false
 
-    Maily.allowed_action?(:edit).should be_false
-    Maily.allowed_action?(:update).should be_false
+    expect(Maily.allowed_action?(:edit)).to be_false
+    expect(Maily.allowed_action?(:update)).to be_false
   end
 
   it "should not allow delivery if delivery is disabled" do
     Maily.allow_delivery = false
 
-    Maily.allowed_action?(:deliver).should be_false
+    expect(Maily.allowed_action?(:deliver)).to be_false
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maily
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -148,12 +148,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4181981977769088006
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4181981977769088006
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23