gloo-web 1.1 → 1.2
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 +4 -4
- data/lib/web_svr/asset.rb +13 -13
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 15a8ed82554f9691848a3595dc35c1514be0993e332050e6743009f46d3f777b
|
|
4
|
+
data.tar.gz: 0b353704a315cb1e9204deb0f8017f323008e9a65190bf38eb1094ce8eb15345
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 778d8d07bc02f32c5810f02ada22eba83d81adb4494f4da094b6a264f6ea381767a074d0cb30f01a2e4fd4381846829d205f8135ab64c58eb69e988cf6512e87
|
|
7
|
+
data.tar.gz: 36c5287f9c031223729550df5c545c54e746a71ab79fcc6fd3309dc31893fdafffea9a55c8e6b041cbd747d0c3f64d78b06adc2bc3023e99fe5ef72d6069609b
|
data/lib/web_svr/asset.rb
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
module WebSvr
|
|
8
8
|
class Asset
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
COMMON_FOLDER = 'common'.freeze
|
|
11
11
|
ASSET_FOLDER = 'asset'.freeze
|
|
12
12
|
IMAGE_FOLDER = 'image'.freeze
|
|
13
13
|
STYLESHEET_FOLDER = 'stylesheet'.freeze
|
|
@@ -43,8 +43,8 @@ module WebSvr
|
|
|
43
43
|
# Get the asset folder in the User's lib.
|
|
44
44
|
# Returns nil if it does not exist.
|
|
45
45
|
#
|
|
46
|
-
def
|
|
47
|
-
dir = File.join( @engine.settings.user_root,
|
|
46
|
+
def common_asset_folder
|
|
47
|
+
dir = File.join( @engine.settings.user_root, COMMON_FOLDER, ASSET_FOLDER )
|
|
48
48
|
return dir if Dir.exist?( dir )
|
|
49
49
|
|
|
50
50
|
return nil
|
|
@@ -54,8 +54,8 @@ module WebSvr
|
|
|
54
54
|
# Get the stylesheets folder in the User's lib.
|
|
55
55
|
# Returns nil if it does not exist.
|
|
56
56
|
#
|
|
57
|
-
def
|
|
58
|
-
dir = File.join(
|
|
57
|
+
def common_stylesheet_folder
|
|
58
|
+
dir = File.join( common_asset_folder, STYLESHEET_FOLDER )
|
|
59
59
|
return dir if Dir.exist?( dir )
|
|
60
60
|
|
|
61
61
|
return nil
|
|
@@ -65,8 +65,8 @@ module WebSvr
|
|
|
65
65
|
# Get the javascript folder in the User's lib.
|
|
66
66
|
# Returns nil if it does not exist.
|
|
67
67
|
#
|
|
68
|
-
def
|
|
69
|
-
dir = File.join(
|
|
68
|
+
def common_javascript_folder
|
|
69
|
+
dir = File.join( common_asset_folder, JAVASCRIPT_FOLDER )
|
|
70
70
|
return dir if Dir.exist?( dir )
|
|
71
71
|
|
|
72
72
|
return nil
|
|
@@ -76,8 +76,8 @@ module WebSvr
|
|
|
76
76
|
# Get the images folder in the User's lib.
|
|
77
77
|
# Returns nil if it does not exist.
|
|
78
78
|
#
|
|
79
|
-
def
|
|
80
|
-
dir = File.join(
|
|
79
|
+
def common_image_folder
|
|
80
|
+
dir = File.join( common_asset_folder, IMAGE_FOLDER )
|
|
81
81
|
return dir if Dir.exist?( dir )
|
|
82
82
|
|
|
83
83
|
return nil
|
|
@@ -130,7 +130,7 @@ module WebSvr
|
|
|
130
130
|
|
|
131
131
|
# Try the lib assets if not found
|
|
132
132
|
unless File.exist? pn
|
|
133
|
-
lib =
|
|
133
|
+
lib = common_asset_folder
|
|
134
134
|
pn = File.join( lib, file.value ) if lib
|
|
135
135
|
end
|
|
136
136
|
|
|
@@ -269,7 +269,7 @@ module WebSvr
|
|
|
269
269
|
def add_images
|
|
270
270
|
@log.debug 'Adding image asset routes to web server…'
|
|
271
271
|
|
|
272
|
-
lib =
|
|
272
|
+
lib = common_image_folder
|
|
273
273
|
if lib
|
|
274
274
|
add_files_in_folder( lib, @images, IMAGE_FOLDER )
|
|
275
275
|
end
|
|
@@ -287,7 +287,7 @@ module WebSvr
|
|
|
287
287
|
def add_stylesheets
|
|
288
288
|
@log.debug 'Adding stylesheet asset routes to web server…'
|
|
289
289
|
|
|
290
|
-
lib =
|
|
290
|
+
lib = common_stylesheet_folder
|
|
291
291
|
if lib
|
|
292
292
|
add_files_in_folder( lib, @stylesheets, STYLESHEET_FOLDER )
|
|
293
293
|
end
|
|
@@ -310,7 +310,7 @@ module WebSvr
|
|
|
310
310
|
def add_javascript
|
|
311
311
|
@log.debug 'Adding javascript asset routes to web server…'
|
|
312
312
|
|
|
313
|
-
lib =
|
|
313
|
+
lib = common_javascript_folder
|
|
314
314
|
if lib
|
|
315
315
|
add_files_in_folder( lib, @javascript, JAVASCRIPT_FOLDER )
|
|
316
316
|
end
|