odania 0.0.34 → 0.0.35

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: 1ee2548b236d76da6e2915eb310f7218e964ca48
4
- data.tar.gz: 13aff66d95762c188985812fc497ed33a7c313a1
3
+ metadata.gz: 71c39b77fdbe736a7a7352a05acde79ff6e082e5
4
+ data.tar.gz: aec4430b75ad1736b44df6d98400aaf9ad4bf5bf
5
5
  SHA512:
6
- metadata.gz: 327a2520d5ca7124bcb05f9839d9c58dfb97b554ad9e1202688c547ac529bc9febb273d99fbbbaf22efc9c7821d437c3ac405483105802b96452d0e9d4f66370
7
- data.tar.gz: e86df2545d6e363be234438085d3fb87897c636934e115f64aae368c564d14c58e5ed18710d3eee002b41ac9bba5db0ad53ffc0fe0d8f684febe685531a8e0df
6
+ metadata.gz: 986331b8dcd18a337313e60e04a3547e68a3df4164398a311fd70bfbd661bb9959137b81254c474e01b4ac3a04e95c26b76b1ecd876f18c81d6ce13336d83c54
7
+ data.tar.gz: cc82c6eb9fe675f8f9b9bbe300e7ea021565922c9d249848bc302a60346f8b641d8f98c72be2d055614d478830745a791e92d20c8ffb18c9616d2693ac466d7b
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- odania (0.0.34)
4
+ odania (0.0.35)
5
5
  deep_merge
6
6
  diplomat
7
7
  erubis
@@ -82,10 +82,19 @@ module Odania
82
82
  duplicates
83
83
  end
84
84
 
85
+ def layout_assets
86
+ layout_assets = {}
87
+ self.layouts.each_pair do |_name, layout|
88
+ layout_assets.merge! layout.assets
89
+ end
90
+ layout_assets
91
+ end
92
+
85
93
  def [](type)
86
94
  type = type.to_sym
87
95
  return self.web if :web.eql? type
88
96
  return self.layouts if :layouts.eql? type
97
+ return self.layout_assets if :layout_assets.eql? type
89
98
  super(type)
90
99
  end
91
100
 
@@ -1,3 +1,3 @@
1
1
  module Odania
2
- VERSION = '0.0.34'
2
+ VERSION = '0.0.35'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: odania
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.34
4
+ version: 0.0.35
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mike Petersen
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-06-04 00:00:00.000000000 Z
11
+ date: 2016-06-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler