snippr 0.16.1 → 0.16.2

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
  SHA1:
3
- metadata.gz: d9ae5d24a9ead1c45b8d22928517e1e8f0563923
4
- data.tar.gz: 39a192234c2d04cb9fae477c5baea4099911920a
3
+ metadata.gz: ab3ac24a4943900527af0835dd4c75fcef4ff65e
4
+ data.tar.gz: c5e273b76fa6e7958816d4da9091d123f5439ebc
5
5
  SHA512:
6
- metadata.gz: 280b26f9e0173227be8f9b43cacc2ed0d7127f5eeb240942f1d86da983eed4ea831c804d0cd46b8de219844a0b9338c6d2346289f3dc1f380e9d1ca714197b33
7
- data.tar.gz: 02041e9d5cbe66d244051f064aeb733880df88360752a426dea30565a1dbfd0e77a2e55bddcaebda124db0f81c94f305225bf0d8b70b3b9c2d5a0745b833c631
6
+ metadata.gz: cd91728a4b090798135643c02244943f41f60aba1449629eaf1c20b98dad385631dc1c4c62fa1de229774b63939f084e28a33da57698d9176f94a1333562a8d7
7
+ data.tar.gz: c0a5d41e4f58b5375054400807b2a61995e96726e2cc99f4c0519430c79cd3b5c13aa9517843631298a324d6bd84c54cb7bda162135586771e7b65379c83a49d
@@ -16,17 +16,18 @@ module Snippr
16
16
  content = Regexp.last_match.post_match.strip
17
17
  meta = yaml_load(name, $1)
18
18
  if meta && meta.keys.include?(INCLUDE)
19
- Array(meta[INCLUDE]).each do |includePath|
20
- if (snippet && includePath.start_with?("./"))
21
- includePath = snippet.name.gsub(/\/.*?$/,"") + "/" + includePath.gsub(/^\.\//, "")
19
+ Array(meta[INCLUDE]).each do |include_path|
20
+ if (snippet && include_path.start_with?("./"))
21
+ include_path = snippet.name.gsub(/\/.*?$/,"") + "/" + include_path.gsub(/^\.\//, "")
22
22
  end
23
- snippet = Snippr.load(includePath)
24
- meta = snippet.meta.merge(meta)
23
+ snippet = Snippr.load(include_path)
24
+ meta = snippet.meta.deep_merge(meta)
25
25
  end
26
26
  end
27
27
  end
28
28
 
29
29
  meta = meta ? meta : {}
30
+
30
31
  [content, meta]
31
32
  end
32
33
 
data/snippr.gemspec CHANGED
@@ -1,7 +1,7 @@
1
1
  # -*- encoding: utf-8 -*-
2
2
  Gem::Specification.new do |s|
3
3
  s.name = "snippr"
4
- s.version = '0.16.1'
4
+ s.version = '0.16.2'
5
5
  s.date = Time.now
6
6
  s.platform = Gem::Platform::RUBY
7
7
  s.authors = ["Daniel Harrington", "Thomas Jachmann", "Frank Schumacher"]
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: snippr
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.16.1
4
+ version: 0.16.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Daniel Harrington
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2014-07-24 00:00:00.000000000 Z
13
+ date: 2014-08-18 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: i18n