odania 0.0.34 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ee2548b236d76da6e2915eb310f7218e964ca48
-  data.tar.gz: 13aff66d95762c188985812fc497ed33a7c313a1
+  metadata.gz: 71c39b77fdbe736a7a7352a05acde79ff6e082e5
+  data.tar.gz: aec4430b75ad1736b44df6d98400aaf9ad4bf5bf
 SHA512:
-  metadata.gz: 327a2520d5ca7124bcb05f9839d9c58dfb97b554ad9e1202688c547ac529bc9febb273d99fbbbaf22efc9c7821d437c3ac405483105802b96452d0e9d4f66370
-  data.tar.gz: e86df2545d6e363be234438085d3fb87897c636934e115f64aae368c564d14c58e5ed18710d3eee002b41ac9bba5db0ad53ffc0fe0d8f684febe685531a8e0df
+  metadata.gz: 986331b8dcd18a337313e60e04a3547e68a3df4164398a311fd70bfbd661bb9959137b81254c474e01b4ac3a04e95c26b76b1ecd876f18c81d6ce13336d83c54
+  data.tar.gz: cc82c6eb9fe675f8f9b9bbe300e7ea021565922c9d249848bc302a60346f8b641d8f98c72be2d055614d478830745a791e92d20c8ffb18c9616d2693ac466d7b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    odania (0.0.34)
+    odania (0.0.35)
       deep_merge
       diplomat
       erubis

data/lib/odania/config/sub_domain.rb

@@ -82,10 +82,19 @@ module Odania
 				duplicates
 			end
 
+			def layout_assets
+				layout_assets = {}
+				self.layouts.each_pair do |_name, layout|
+					layout_assets.merge! layout.assets
+				end
+				layout_assets
+			end
+
 			def [](type)
 				type = type.to_sym
 				return self.web if :web.eql? type
 				return self.layouts if :layouts.eql? type
+				return self.layout_assets if :layout_assets.eql? type
 				super(type)
 			end
 

data/lib/odania/version.rb

@@ -1,3 +1,3 @@
 module Odania
-  VERSION = '0.0.34'
+  VERSION = '0.0.35'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odania
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - Mike Petersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-04 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler