decoration_mail 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d0a474271ee1e5cd289bdba16b7130a1969f81b
-  data.tar.gz: 44cf247349b4ae24f86816a85499d8bb5988bd74
+  metadata.gz: 2d7556c609c70c2e9d612827105bbe8a43314391
+  data.tar.gz: fc75966a7363b32e78ab925377ec1fb6ee769dad
 SHA512:
-  metadata.gz: 4be509f5787e387a62e312a953a4903fef87ae247115154518be97354d439f7badc038dff2104e144022eae3ee5e6903a48fdcf36af4f04a593fb775c1ae5d07
-  data.tar.gz: 02f983ed779354de25dbc2f4b03e503e27fcabbf12e2c5fd089f101332134e3e689fd20bd1dc621a24e71604c5cab31b590e8965a44f1cc1590b231d8718d556
+  metadata.gz: 78b3b99dd20fd9020f034ccd3075ba7befa43f002f2a44298c5461b9f42ccc38faa796f36a686d1c00a67a571b4c9d7b25272ccbef156eb96217c856aee3b3fe
+  data.tar.gz: d1a1d911d951077d8135e63b6ddc069a732819c1c25fd89b14e5a73f9726f6cf6068ed19913279ffca75dabe452ab25642dc6c5cef354c87e3dc1d2e381edc3b

data/decoration_mail.gemspec

@@ -22,6 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "nokogiri"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "debugger"
+  spec.add_development_dependency "rspec", "~> 2.14"
 end

data/lib/decoration_mail/base.rb

@@ -17,7 +17,7 @@ module DecorationMail
         image.instance_eval(&block)
 
         if @html_body.match /#{image.content_id}/
-          @html_body.update_img_src(image.content_id, image.src)
+          @html_body.update_img_src(image.content_id, image.path)
         else
           case options[:other_images]
           when :top

data/lib/decoration_mail/html.rb

@@ -18,15 +18,21 @@ module DecorationMail
     end
 
     def append_img(src)
-      @tree.css('body').children.after(%(<br /><div style="text-align:center;"><img src="#{src}" /></div>))
+      @tree.css('body').children.after(%(<br /><div style="text-align:center;"><img src="#{src}" /></div>)) if src
     end
 
     def prepend_img(src)
-      @tree.css('body').children.before(%(<div style="text-align:center;"><img src="#{src}" /></div><br />))
+      @tree.css('body').children.before(%(<div style="text-align:center;"><img src="#{src}" /></div><br />)) if src
     end
 
     def update_img_src(from, to)
-      @tree.css("img[src=\"#{from}\"]").each{|e| e['src'] = to }
+      @tree.css("img[src=\"#{from}\"]").each do |e|
+        if to
+          e['src'] = to
+        else
+          e.remove
+        end
+      end
     end
 
     def to_s

data/lib/decoration_mail/version.rb

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

data/spec/decoration_mail/base_spec.rb

@@ -66,6 +66,13 @@ describe DecorationMail::Base do
         html.should match /http:\/\/exmaple\.com/
       end
 
+      it "imageのpathがnilだと、imgタグ自体が削除されること" do
+        html = subject.save do |image|
+          image.path = nil
+        end
+        html.should_not match /<img/
+      end
+
       it "other_imagesオプションで:topを指定すると添付画像をデコメ上部に貼り付ける" do
         html = subject.save(:other_images => :top) {}
         html.should match /20110205153513\.jpg/

data/spec/decoration_mail/html_spec.rb

@@ -27,6 +27,14 @@ describe DecorationMail::HTML do
       subject.append_img('http://example.com/img.gif')
       subject.to_s.should == %(<div>ほげほげ<br><div style="text-align:center;"><img src="http://example.com/img.gif"></div>\n</div>)
     end
+
+    context "when src is nil" do
+      before{ subject.append_img(nil) }
+
+      it "ignores the img" do
+        subject.to_s.should == %(<div>ほげほげ</div>)
+      end
+    end
   end
 
   describe "#prepend_img" do
@@ -36,6 +44,14 @@ describe DecorationMail::HTML do
       subject.prepend_img('http://example.com/img.gif')
       subject.to_s.should == %(<div>\n<div style="text-align:center;"><img src="http://example.com/img.gif"></div>\n<br>ほげほげ</div>)
     end
+
+    context "when src is nil" do
+      before{ subject.prepend_img(nil) }
+
+      it "ignores the img" do
+        subject.to_s.should == %(<div>ほげほげ</div>)
+      end
+    end
   end
 
   describe "#update_img_src" do
@@ -45,6 +61,14 @@ describe DecorationMail::HTML do
       subject.update_img_src('cid:hoge', 'http://example.com/img.gif')
       subject.to_s.should == %(<div>ほげほげ<img src="http://example.com/img.gif"><img src="fuga.gif">\n</div>)
     end
+
+    context "when src is nil" do
+      before{ subject.update_img_src('cid:hoge', nil) }
+
+      it "deletes the img tag" do
+        subject.to_s.should == %(<div>ほげほげ<img src="fuga.gif">\n</div>)
+      end
+    end
   end
 
   describe "#to_s" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decoration_mail
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Dai Akatsuka
@@ -9,92 +9,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 description: Decoration Mail Parser
 email:
 - d.akatsuka@gmail.com
@@ -103,7 +89,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -136,17 +122,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.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Decoration Mail Parser