octopress-ink 1.0.0.rc.42 → 1.0.0.rc.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a3788546bf6c3c415f0fd6d9c981980a23f2fe
-  data.tar.gz: cbdfca85d3ac072d7c3d35bc5dfa09791ff5bcd1
+  metadata.gz: d4ff4f3e6f31bb816c785ceb78da1906663bf26f
+  data.tar.gz: d0eac622e35eb83b52f41f6ff9c9ca714d9963a3
 SHA512:
-  metadata.gz: d0f97de7fb8c243ab15a50b38514477d05de8b4f39d99e0b0cc1a3044082dfed0896bf31496e4a6149f3c444e1ee723a0b9f11aa2b2c9c188ccf7daae2a859c3
-  data.tar.gz: 90feb962267ede61af217ff432b7bdceb23306994c032c75e390df763eb27c1fcbc047035da8bac575b4be49682387990acd2c65606b007b613cf5f176e5920b
+  metadata.gz: 2fab5093f285ee61ab229f733229336e74262e834c58b04081bc8ec077606d62ea1c48eefb77e717157e23f157ae6e0e6b41c55373184bfca0d42acbfc2792e8
+  data.tar.gz: b869018fc35c78fa3b512df368e7845f814d45aef92c71c47fb2e448bf0e4dd240722b81286eb7f70db88bea29792b0c9d5e94d3c98ecc9acf735ffdfb75c81e

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 1.0.0 RC43 - 2015-02-16
+- Fix: Multilingual configurations are deep merged with primary language config to allow for less unnecessary duplication.
+
 ### 1.0.0 RC42 - 2015-02-15
 - New: Plugins can define order for stylesheet and javascript assets.
 

data/lib/octopress-ink/plugin.rb

@@ -139,7 +139,12 @@ module Octopress
       #
       def config(lang=nil)
         @config ||= configs.first.read
-        lang_config_hash[lang] || @config
+
+        if lang
+          lang_config_hash[lang] || @config
+        else
+          @config
+        end
       end
 
       # Language configurations
@@ -157,13 +162,13 @@ module Octopress
           configs = {}
 
           user_lang_configs.each do |lang, file|
-            configs[lang] = SafeYAML.load_file(file)
+            configs[lang] = Jekyll::Utils.deep_merge_hashes(config, SafeYAML.load_file(file))
           end
 
           plugin_lang_configs.each do |lang, file|
             # Add to lang
             @lang_configs << Assets::LangConfig.new(self, File.basename(file), lang)
-            configs[lang] = @lang_configs.last.read
+            configs[lang] = Jekyll::Utils.deep_merge_hashes(config, @lang_configs.last.read)
           end
 
           configs

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.rc.42"
+    VERSION = "1.0.0.rc.43"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.42
+  version: 1.0.0.rc.43
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll