courier 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/courier.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{courier}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Danil Pismenny"]

data/lib/courier/service/gritter_notice.rb

@@ -18,8 +18,11 @@ class Courier::Service::GritterNotice < Courier::Service::Base
   #
 
   def message(owner, template, options)
-    options[:scope]=[:courier, :gritter_notice] unless options[:scope]
-    owner.gritter_notice template.name, I18n::translate(template.name, options )
+    scope = [:courier, :gritter_notice]
+    opt = I18n::translate(template.name, :scope=>scope)
+    opt.merge!(options)
+    opt[:text]||=I18n::translate([template.name,:text], opt.merge(:scope=>scope) )
+    owner.gritter_notice template.name, opt
   end
 
   def deliver!

data/spec/courier/service/gritter_notice_spec.rb

@@ -7,7 +7,8 @@ describe Courier::Service::GritterNotice do
       args={:a=>1}
       owner = double
       template = double :name=>:template_key
-      owner.should_receive(:gritter_notice).with(template.name, "translation missing: en.courier.gritter_notice.template_key")
+      I18n.should_receive(:translate).with(template.name, :scope=>[:courier, :gritter_notice]) {{:text=>'text of translation', :level=>:warning} }
+      owner.should_receive(:gritter_notice).with(template.name, {:text=>"text of translation", :a=>1, :level=>:warning})
       subject.message owner, template, args
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: courier
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Danil Pismenny