cytoplasm 0.2.4 → 0.2.5
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.
- data/lib/cytoplasm.rb +4 -10
- data/lib/cytoplasm/version.rb +1 -1
- metadata +4 -4
data/lib/cytoplasm.rb
CHANGED
|
@@ -212,13 +212,7 @@ module Cytoplasm
|
|
|
212
212
|
return false unless valid_types.include? type
|
|
213
213
|
case type
|
|
214
214
|
when "*"
|
|
215
|
-
valid_types.each
|
|
216
|
-
if t!="*"
|
|
217
|
-
dependencies(t).each do |d|
|
|
218
|
-
deps << d
|
|
219
|
-
end
|
|
220
|
-
end
|
|
221
|
-
end
|
|
215
|
+
valid_types.each {|t| dependencies(t).each {|d| deps << d} if t!="*"}
|
|
222
216
|
when "css"
|
|
223
217
|
deps << "http://ajax.googleapis.com/ajax/libs/jqueryui/"+vars("setup.jqueryui.version")+"/themes/"+vars("setup.jqueryui.theme")+"/jquery-ui.css"
|
|
224
218
|
deps += load_fonts()
|
|
@@ -276,15 +270,15 @@ module Cytoplasm
|
|
|
276
270
|
|
|
277
271
|
def self.load_fonts
|
|
278
272
|
sheets = []
|
|
273
|
+
enabled = {}
|
|
279
274
|
begin
|
|
280
275
|
enabled = YAML::load_file("public/fonts/enabled.yml")
|
|
281
276
|
rescue
|
|
282
277
|
puts "Failed to parse YAML in public/fonts/enabled.yml!"
|
|
283
|
-
enabled = {}
|
|
284
278
|
end
|
|
285
|
-
if enabled.any?
|
|
279
|
+
if enabled.is_a? Hash and enabled.any?
|
|
286
280
|
enabled.each do |dir,fonts|
|
|
287
|
-
if fonts.any?
|
|
281
|
+
if fonts.is_a? Hash and fonts.any?
|
|
288
282
|
fonts.each do |fam,variants|
|
|
289
283
|
if dir == "fontsquirrel"
|
|
290
284
|
sheets << "/fonts/"+fam+"/stylesheet.css"
|
data/lib/cytoplasm/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cytoplasm
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.
|
|
4
|
+
version: 0.2.5
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2013-01-
|
|
12
|
+
date: 2013-01-29 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rails
|
|
@@ -394,7 +394,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
394
394
|
version: '0'
|
|
395
395
|
segments:
|
|
396
396
|
- 0
|
|
397
|
-
hash: -
|
|
397
|
+
hash: -3713911084599963434
|
|
398
398
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
399
399
|
none: false
|
|
400
400
|
requirements:
|
|
@@ -403,7 +403,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
403
403
|
version: '0'
|
|
404
404
|
segments:
|
|
405
405
|
- 0
|
|
406
|
-
hash: -
|
|
406
|
+
hash: -3713911084599963434
|
|
407
407
|
requirements: []
|
|
408
408
|
rubyforge_project:
|
|
409
409
|
rubygems_version: 1.8.24
|