maily 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b143eb37ea922863a831b9cd11c6dea69114477
-  data.tar.gz: 9ad22c49d8c49ce3d064c5f29e01f56fa3aa4f7d
+  metadata.gz: d1e9bad7d3c7b7eb13ed1a089389af4d831cfacc
+  data.tar.gz: 9c4fcf7c4c73886dcdab225b0502063f7c580873
 SHA512:
-  metadata.gz: 940fbdebbb81ebba521d6a6cfbd09a1dc40970711447f94f50245dabcb0e1bfe9fdca319b0ad304bfe17d6d820695847da4d52b71813f0081b02d1b463bfb6bc
-  data.tar.gz: 9d0307a2ef4e1c8728927b755837701fb02d657220fbbe702e9ca83e7d2ebd4438d200b85800228ef95106b65e5ff15a0914723b04b1c3ee6454d1641c37fc99
+  metadata.gz: 13ed37c28422b6fc3e9212fd3f44abcec459d10bcf36a7d050547f7f92b834e4883d9b7c3f2a57b8389585191f66ebd08cb529295a787621006e9e716eec5223
+  data.tar.gz: 49dc5c0869782d4f58dd7d28f20640832a5aa7cf136bef7af807ac86e6298fdba07351cca58309554efa946aa63ff26c48adfecf3b12d7d345d28305b71a22a8

data/app/controllers/maily/emails_controller.rb

@@ -10,7 +10,13 @@ module Maily
 
     def show
       if !@maily_email.correct_number_of_arguments?
-        alert = "#{@maily_email.required_arguments.size} arguments needed for #{@maily_email.name} email"
+        alert = if @maily_email.optional_arguments.size > 0
+          "#{@maily_email.name} email requires #{@maily_email.required_arguments.size} \
+          to #{@maily_email.required_arguments.size + @maily_email.optional_arguments.size} arguments"
+        else
+          "#{@maily_email.required_arguments.size} arguments needed for #{@maily_email.name} email"
+        end
+
         redirect_to(root_path, alert: alert)
       end
     end

data/app/views/maily/shared/_sidebar.html.erb

@@ -1,9 +1,9 @@
 <aside class="sidebar">
-  <% @mailers.each do |mailer| %>
+  <% @mailers.sort_by(&:name).each do |mailer| %>
     <section class="nav_list">
       <h3 class="title nav_title"><%= "#{mailer.name.humanize} (#{mailer.emails.length})" %></h3>
       <ul>
-        <% mailer.emails.each do |email| %>
+        <% mailer.emails.sort_by(&:name).each do |email| %>
           <li><%= link_to email.name.humanize, maily_email_path(mailer: mailer.name, email: email.name), class: sidebar_class(mailer, email) %></li>
         <% end %>
       </ul>

data/lib/generators/maily/install_generator.rb

@@ -21,6 +21,8 @@ module Maily
       end
 
       def build_hooks
+        Maily.init!
+
         fixtures = []
         hooks    = []
 

data/lib/maily/email.rb

@@ -19,11 +19,18 @@ module Maily
     end
 
     def required_arguments
-      parameters.map(&:last)
+      parameters.select{ |param| param.first == :req }.map(&:last)
+    end
+
+    def optional_arguments
+      parameters.select{ |param| param.first == :opt }.map(&:last)
     end
 
     def correct_number_of_arguments?
-      required_arguments.size == arguments.size
+      from = required_arguments.size
+      to = from + optional_arguments.size
+
+      (from..to).cover?(arguments.size)
     end
 
     def register_hook(*args)

data/lib/maily/version.rb

@@ -1,3 +1,3 @@
 module Maily
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/dummy/app/mailers/notifier.rb

@@ -5,7 +5,7 @@ class Notifier < ActionMailer::Base
     mail
   end
 
-  def invitation(email)
+  def invitation(email, opt_arg = nil)
     mail
   end
 

data/spec/email_spec.rb

@@ -49,4 +49,20 @@ describe Maily::Email do
     email = mailer.find_email('recommendation')
     expect(email.description).to eq('description')
   end
+
+  describe 'correct_number_of_arguments?' do
+    let (:email) { mailer.find_email('invitation') }
+
+    it 'when it lacks of arguments' do
+      allow_any_instance_of(Maily::Email).to receive(:parameters).and_return([])
+
+      expect(email.correct_number_of_arguments?).to be(false)
+    end
+
+    it 'when there is a correct number of arguments' do
+      allow_any_instance_of(Maily::Email).to receive(:parameters).and_return([[:req, 'email'], [:opt, 'optional']])
+
+      expect(email.correct_number_of_arguments?).to be(true)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maily
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - markets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails Engine to preview emails in the browser.