herbes 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a0a47590ad366138ea42c6dbf44d45f6b6d2bca425fad849b52f661cf430a48
-  data.tar.gz: 64106255fb8eb7473139f21c096c717c6c278b5fda559571bfe561019fd2bd8a
+  metadata.gz: 606c1b624127d6aacf29b9d8fd6e9ec8882bd1c9310e333cd30686f89664b538
+  data.tar.gz: d9020b237aa2442f3421166e7cc3613ab5461d4eea6d8b4969456d2c8046408c
 SHA512:
-  metadata.gz: 8cd5d007879ba6c63537118558dbc2f052aa8a6f5cfd29040fc6cf2b6c30182823c47e55ad77f85547cc277d764538be2e3a0358bfad49643cf852243e46845f
-  data.tar.gz: 4d2340df6a7e194eb6479669b349df3120acd008f4ebaabc4d191aca8a737c1ef64eb2fc2d551117564a802512a90a9e8c703f91419d2665d0e2861a01fadfb5
+  metadata.gz: 85cb1f13d37eb375cb5997a0970e0646ec1e5772dedff6ccd2afed22aa15717bddc1e96fdd4fd970c4e8839a7b1a9678ee2df3c95510b70702c7aa59a9474cf3
+  data.tar.gz: 494753e103954369d176051f0a027e6e1f31b2b0d91484893736a13a275cc2abda6303525d7afdd202a9259d771f20c4f8361447999358be91ee049567e79952

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    herbes (0.0.6)
+    herbes (0.0.7)
       nokogiri
       premailer
 
@@ -26,7 +26,7 @@ GEM
     pry (0.13.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.3)
+    public_suffix (4.0.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)

data/lib/herbes/assets/styles/herbes.css

@@ -9,8 +9,8 @@ GLOBAL RESETS
 img {
   border: none;
   max-height: 100px;
-  -ms-interpolation-mode: bicubic;
   max-width: 100%;
+  -ms-interpolation-mode: bicubic;
 }
 
 body {

data/lib/herbes/email.rb

@@ -11,10 +11,11 @@ module Herbes
     end
 
     def resolve_style(params)
-      return render_style(params[:style_path]) if params.key?(:style_path)
-      return style_string if params.key?(:style_string)
+      s = params[:style_string] ||
+          (params.key?(:style_path) ? render_style(params[:style_path]) : nil)
+      return s if s && params[:extend_default_style] != true
 
-      render_style
+      [render_style, s].join("\n")
     end
 
     def initialize(template_params, options = {})

data/lib/herbes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Herbes
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herbes
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - haydenmcfarland