rill 0.1.4 → 0.1.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/rill.rb +16 -14
- metadata +1 -1
data/lib/rill.rb
CHANGED
|
@@ -11,7 +11,7 @@ class Rill
|
|
|
11
11
|
attrs = DEFAULT_CONFIG.merge(attrs || {})
|
|
12
12
|
|
|
13
13
|
@base = attrs[:base]
|
|
14
|
-
@preloads = attrs[:preloads]
|
|
14
|
+
@preloads = attrs[:preloads].is_a?(Array) ? attrs[:preloads] : []
|
|
15
15
|
end
|
|
16
16
|
|
|
17
17
|
def modules
|
|
@@ -35,12 +35,12 @@ class Rill
|
|
|
35
35
|
|
|
36
36
|
mod = parse_module(mod)
|
|
37
37
|
path = File.join(@base, "#{mod}.js")
|
|
38
|
-
code = File.open(path).read
|
|
38
|
+
code = File.open(path).read.lstrip
|
|
39
39
|
|
|
40
|
-
unless code =~ /^
|
|
40
|
+
unless code =~ /^define\(\s*(['"])[^'"]+\1/
|
|
41
41
|
code = polish(mod, code)
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
fio = File.open(path, 'w')
|
|
43
|
+
fio.write(code)
|
|
44
44
|
end
|
|
45
45
|
@codes.unshift(code)
|
|
46
46
|
@modules.unshift(mod)
|
|
@@ -70,12 +70,14 @@ class Rill
|
|
|
70
70
|
def polish(mod, code = nil)
|
|
71
71
|
mod = parse_module(mod)
|
|
72
72
|
|
|
73
|
-
|
|
73
|
+
if !code.nil?
|
|
74
|
+
return polish_code(mod, code.lstrip)
|
|
75
|
+
end
|
|
74
76
|
|
|
75
77
|
path = File.join(@base, "#{mod}.js")
|
|
76
|
-
code = File.open(path).read
|
|
78
|
+
code = File.open(path).read.lstrip
|
|
77
79
|
|
|
78
|
-
unless code =~
|
|
80
|
+
unless code =~ /^define\(\s*(['"])[^'"]+\1/
|
|
79
81
|
code = polish_code(mod, code)
|
|
80
82
|
fio = File.open(path, 'w')
|
|
81
83
|
fio.write(code)
|
|
@@ -88,14 +90,14 @@ class Rill
|
|
|
88
90
|
def polish_code(mod, code)
|
|
89
91
|
mod = parse_module(mod)
|
|
90
92
|
|
|
91
|
-
if code =~
|
|
93
|
+
if code =~ /^define\(\s*function/
|
|
92
94
|
deps = parse_deps(code)
|
|
93
95
|
deps -= @preloads
|
|
94
96
|
deps_str = deps.length > 0 ? "['#{deps.join("', '")}']" : '[]'
|
|
95
97
|
|
|
96
|
-
code.sub!(
|
|
97
|
-
elsif code =~ /^
|
|
98
|
-
code.sub!(
|
|
98
|
+
code.sub!(/^define\(\s*/, "define('#{mod}', #{deps_str}, ")
|
|
99
|
+
elsif code =~ /^define\(\s*[\[\{]/
|
|
100
|
+
code.sub!(/^define\(\s*/, "define('#{mod}', ")
|
|
99
101
|
end
|
|
100
102
|
|
|
101
103
|
code
|
|
@@ -122,7 +124,7 @@ class Rill
|
|
|
122
124
|
end
|
|
123
125
|
|
|
124
126
|
def parse_deps_from_define(code)
|
|
125
|
-
pattern =
|
|
127
|
+
pattern = /^define\(\s*(['"])[^'"]+\1,\s*(\[[^\]]+\])/
|
|
126
128
|
match = pattern.match(code)
|
|
127
129
|
deps = []
|
|
128
130
|
|
|
@@ -133,7 +135,7 @@ class Rill
|
|
|
133
135
|
d.nil? || d =~ /^\s*$/
|
|
134
136
|
end
|
|
135
137
|
else
|
|
136
|
-
pattern =
|
|
138
|
+
pattern = /^define\(\s*(['"])[^'"]+\1,\s*(['"])([^\1]+)\1\.split/
|
|
137
139
|
match = pattern.match(code)
|
|
138
140
|
if match
|
|
139
141
|
deps = match[3].split(/,\s*/)
|