herbes 0.0.6 → 0.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2a0a47590ad366138ea42c6dbf44d45f6b6d2bca425fad849b52f661cf430a48
4
- data.tar.gz: 64106255fb8eb7473139f21c096c717c6c278b5fda559571bfe561019fd2bd8a
3
+ metadata.gz: 606c1b624127d6aacf29b9d8fd6e9ec8882bd1c9310e333cd30686f89664b538
4
+ data.tar.gz: d9020b237aa2442f3421166e7cc3613ab5461d4eea6d8b4969456d2c8046408c
5
5
  SHA512:
6
- metadata.gz: 8cd5d007879ba6c63537118558dbc2f052aa8a6f5cfd29040fc6cf2b6c30182823c47e55ad77f85547cc277d764538be2e3a0358bfad49643cf852243e46845f
7
- data.tar.gz: 4d2340df6a7e194eb6479669b349df3120acd008f4ebaabc4d191aca8a737c1ef64eb2fc2d551117564a802512a90a9e8c703f91419d2665d0e2861a01fadfb5
6
+ metadata.gz: 85cb1f13d37eb375cb5997a0970e0646ec1e5772dedff6ccd2afed22aa15717bddc1e96fdd4fd970c4e8839a7b1a9678ee2df3c95510b70702c7aa59a9474cf3
7
+ data.tar.gz: 494753e103954369d176051f0a027e6e1f31b2b0d91484893736a13a275cc2abda6303525d7afdd202a9259d771f20c4f8361447999358be91ee049567e79952
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- herbes (0.0.6)
4
+ herbes (0.0.7)
5
5
  nokogiri
6
6
  premailer
7
7
 
@@ -26,7 +26,7 @@ GEM
26
26
  pry (0.13.0)
27
27
  coderay (~> 1.1)
28
28
  method_source (~> 1.0)
29
- public_suffix (4.0.3)
29
+ public_suffix (4.0.4)
30
30
  rspec (3.9.0)
31
31
  rspec-core (~> 3.9.0)
32
32
  rspec-expectations (~> 3.9.0)
@@ -9,8 +9,8 @@ GLOBAL RESETS
9
9
  img {
10
10
  border: none;
11
11
  max-height: 100px;
12
- -ms-interpolation-mode: bicubic;
13
12
  max-width: 100%;
13
+ -ms-interpolation-mode: bicubic;
14
14
  }
15
15
 
16
16
  body {
@@ -11,10 +11,11 @@ module Herbes
11
11
  end
12
12
 
13
13
  def resolve_style(params)
14
- return render_style(params[:style_path]) if params.key?(:style_path)
15
- return style_string if params.key?(:style_string)
14
+ s = params[:style_string] ||
15
+ (params.key?(:style_path) ? render_style(params[:style_path]) : nil)
16
+ return s if s && params[:extend_default_style] != true
16
17
 
17
- render_style
18
+ [render_style, s].join("\n")
18
19
  end
19
20
 
20
21
  def initialize(template_params, options = {})
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Herbes
4
- VERSION = '0.0.6'
4
+ VERSION = '0.0.7'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: herbes
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.6
4
+ version: 0.0.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - haydenmcfarland