snippr 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9ae5d24a9ead1c45b8d22928517e1e8f0563923
-  data.tar.gz: 39a192234c2d04cb9fae477c5baea4099911920a
+  metadata.gz: ab3ac24a4943900527af0835dd4c75fcef4ff65e
+  data.tar.gz: c5e273b76fa6e7958816d4da9091d123f5439ebc
 SHA512:
-  metadata.gz: 280b26f9e0173227be8f9b43cacc2ed0d7127f5eeb240942f1d86da983eed4ea831c804d0cd46b8de219844a0b9338c6d2346289f3dc1f380e9d1ca714197b33
-  data.tar.gz: 02041e9d5cbe66d244051f064aeb733880df88360752a426dea30565a1dbfd0e77a2e55bddcaebda124db0f81c94f305225bf0d8b70b3b9c2d5a0745b833c631
+  metadata.gz: cd91728a4b090798135643c02244943f41f60aba1449629eaf1c20b98dad385631dc1c4c62fa1de229774b63939f084e28a33da57698d9176f94a1333562a8d7
+  data.tar.gz: c0a5d41e4f58b5375054400807b2a61995e96726e2cc99f4c0519430c79cd3b5c13aa9517843631298a324d6bd84c54cb7bda162135586771e7b65379c83a49d

data/lib/snippr/meta_data.rb

@@ -16,17 +16,18 @@ module Snippr
         content = Regexp.last_match.post_match.strip
         meta = yaml_load(name, $1)
         if meta && meta.keys.include?(INCLUDE)
-          Array(meta[INCLUDE]).each do |includePath|
-            if (snippet && includePath.start_with?("./"))
-              includePath = snippet.name.gsub(/\/.*?$/,"") + "/" + includePath.gsub(/^\.\//, "")
+          Array(meta[INCLUDE]).each do |include_path|
+            if (snippet && include_path.start_with?("./"))
+              include_path = snippet.name.gsub(/\/.*?$/,"") + "/" + include_path.gsub(/^\.\//, "")
             end
-            snippet = Snippr.load(includePath)
-            meta = snippet.meta.merge(meta)
+            snippet = Snippr.load(include_path)
+            meta = snippet.meta.deep_merge(meta)
           end
         end
       end
 
       meta = meta ? meta : {}
+
       [content, meta]
     end
 

data/snippr.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "snippr"
-  s.version     = '0.16.1'
+  s.version     = '0.16.2'
   s.date        = Time.now
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Daniel Harrington", "Thomas Jachmann", "Frank Schumacher"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snippr
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Daniel Harrington
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n