requirejs_optimizer 0.1.0 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
data/CHANGELOG ADDED
@@ -0,0 +1,2 @@
1
+ 0.1.0: Upgrades r.js from 1.0.7 to 2.0.6
2
+ 0.2.0: Adds Rhino support for R.js optimization (was just Node previously)
data/README.md CHANGED
@@ -3,7 +3,7 @@
3
3
  [![Build Status](https://secure.travis-ci.org/jtrim/requirejs_optimizer.png?branch=master)](http://travis-ci.org/jtrim/requirejs_optimizer)
4
4
 
5
5
  R.js optimization to go with your require.js modules, all under the asset
6
- pipeline.
6
+ pipeline.
7
7
 
8
8
  This lib is an extention to the functionality already provided by the asset pipeline. It takes the result of a full `assets:precompile` and applies the peformance benefits of optimization through R.js.
9
9
 
@@ -34,7 +34,7 @@ Once you've ran the install generator, you'll have the following directory/file
34
34
  ↳ assets
35
35
  ↳ javascripts
36
36
  ↳ modules # new
37
- ↳ README # new
37
+ ↳ README # new
38
38
  ↳ main.js.coffee # new
39
39
  ↳ require.build.js # new
40
40
 
@@ -83,6 +83,11 @@ You should have two modules:
83
83
 
84
84
  After running `rake assets:precompile`, modules `foo` and `bar` will be compiled into `main.js`
85
85
 
86
+ #### Javascript runtime
87
+
88
+ The rake task will use either node or rhino during optimization. By default, node will be used if found followed by rhino if java is available.
89
+
90
+ If you have a preference, set Rails.configuration.requirejs_optimizer_runtime to either `:node` or `:rhino`
86
91
 
87
92
  ## Contributing
88
93
 
@@ -101,35 +106,38 @@ After running `rake assets:precompile`, modules `foo` and `bar` will be compiled
101
106
 
102
107
  This lib does a few things to the environment on initialize:
103
108
 
104
- - It adds *all* files under `app/assets/javascripts/modules` to
109
+ - It adds *all* files under `app/assets/javascripts/modules` to
105
110
  `config.assets.precompile`. The result is each file under this
106
111
  directory is compiled individually. This is done because R.js
107
112
  needs these files for dependency tracing on build layers.
108
113
  - It turns off Sprockets' js and css compression via
109
114
  `config.assets.compress = false` in favor of letting R.js run
110
115
  the assets through the compression mechanism defined in your
111
- build file (uglify by default, see
116
+ build file (uglify by default, see
112
117
  [here](https://github.com/jrburke/r.js/blob/master/build/example.build.js))
113
118
  - It makes available a few rake tasks:
114
-
119
+
115
120
  rake requirejs # copy `public/assets` to `tmp` and perform the build,
116
121
  # then copy the build result back to `public/assets`
117
-
122
+
118
123
  rake requirejs:clean # remove the `tmp` build directory (`tmp/assets` by default)
119
-
124
+
120
125
  rake requirejs:nocopy # runs `requirejs`, just without the final
121
126
  # => `public/assets` step
122
-
127
+
123
128
  - It extends `assets:precompile` by appending the actions of the
124
- `requirejs` rake task to `assets:precompile:nondigest`.
125
-
129
+ `requirejs` rake task to `assets:precompile:nondigest`.
130
+
126
131
  **Details...**
127
-
132
+
128
133
  Overriding `assets:precompile:nondigest` in stead of `assets:precompile`
129
134
  allows asset precompilation to happen on Heroku. It's not entirely
130
135
  clear why the former works and the latter doesn't.
131
-
136
+
132
137
  Also, if you want to run the vanilla `assets:precompile` without R.js
133
138
  optimization, this should do the trick:
134
-
135
- NO_RJS=true rake assets:precompile
139
+
140
+ NO_RJS=true rake assets:precompile
141
+
142
+ Thanks to [hawknewton](https://github.com/hawknewton) and [leachryanb](https://github.com/leachryanb) for adding Rhino support for optimizing
143
+ with R.js
@@ -0,0 +1,202 @@
1
+
2
+ Apache License
3
+ Version 2.0, January 2004
4
+ http://www.apache.org/licenses/
5
+
6
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7
+
8
+ 1. Definitions.
9
+
10
+ "License" shall mean the terms and conditions for use, reproduction,
11
+ and distribution as defined by Sections 1 through 9 of this document.
12
+
13
+ "Licensor" shall mean the copyright owner or entity authorized by
14
+ the copyright owner that is granting the License.
15
+
16
+ "Legal Entity" shall mean the union of the acting entity and all
17
+ other entities that control, are controlled by, or are under common
18
+ control with that entity. For the purposes of this definition,
19
+ "control" means (i) the power, direct or indirect, to cause the
20
+ direction or management of such entity, whether by contract or
21
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
+ outstanding shares, or (iii) beneficial ownership of such entity.
23
+
24
+ "You" (or "Your") shall mean an individual or Legal Entity
25
+ exercising permissions granted by this License.
26
+
27
+ "Source" form shall mean the preferred form for making modifications,
28
+ including but not limited to software source code, documentation
29
+ source, and configuration files.
30
+
31
+ "Object" form shall mean any form resulting from mechanical
32
+ transformation or translation of a Source form, including but
33
+ not limited to compiled object code, generated documentation,
34
+ and conversions to other media types.
35
+
36
+ "Work" shall mean the work of authorship, whether in Source or
37
+ Object form, made available under the License, as indicated by a
38
+ copyright notice that is included in or attached to the work
39
+ (an example is provided in the Appendix below).
40
+
41
+ "Derivative Works" shall mean any work, whether in Source or Object
42
+ form, that is based on (or derived from) the Work and for which the
43
+ editorial revisions, annotations, elaborations, or other modifications
44
+ represent, as a whole, an original work of authorship. For the purposes
45
+ of this License, Derivative Works shall not include works that remain
46
+ separable from, or merely link (or bind by name) to the interfaces of,
47
+ the Work and Derivative Works thereof.
48
+
49
+ "Contribution" shall mean any work of authorship, including
50
+ the original version of the Work and any modifications or additions
51
+ to that Work or Derivative Works thereof, that is intentionally
52
+ submitted to Licensor for inclusion in the Work by the copyright owner
53
+ or by an individual or Legal Entity authorized to submit on behalf of
54
+ the copyright owner. For the purposes of this definition, "submitted"
55
+ means any form of electronic, verbal, or written communication sent
56
+ to the Licensor or its representatives, including but not limited to
57
+ communication on electronic mailing lists, source code control systems,
58
+ and issue tracking systems that are managed by, or on behalf of, the
59
+ Licensor for the purpose of discussing and improving the Work, but
60
+ excluding communication that is conspicuously marked or otherwise
61
+ designated in writing by the copyright owner as "Not a Contribution."
62
+
63
+ "Contributor" shall mean Licensor and any individual or Legal Entity
64
+ on behalf of whom a Contribution has been received by Licensor and
65
+ subsequently incorporated within the Work.
66
+
67
+ 2. Grant of Copyright License. Subject to the terms and conditions of
68
+ this License, each Contributor hereby grants to You a perpetual,
69
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
+ copyright license to reproduce, prepare Derivative Works of,
71
+ publicly display, publicly perform, sublicense, and distribute the
72
+ Work and such Derivative Works in Source or Object form.
73
+
74
+ 3. Grant of Patent License. Subject to the terms and conditions of
75
+ this License, each Contributor hereby grants to You a perpetual,
76
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
+ (except as stated in this section) patent license to make, have made,
78
+ use, offer to sell, sell, import, and otherwise transfer the Work,
79
+ where such license applies only to those patent claims licensable
80
+ by such Contributor that are necessarily infringed by their
81
+ Contribution(s) alone or by combination of their Contribution(s)
82
+ with the Work to which such Contribution(s) was submitted. If You
83
+ institute patent litigation against any entity (including a
84
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
85
+ or a Contribution incorporated within the Work constitutes direct
86
+ or contributory patent infringement, then any patent licenses
87
+ granted to You under this License for that Work shall terminate
88
+ as of the date such litigation is filed.
89
+
90
+ 4. Redistribution. You may reproduce and distribute copies of the
91
+ Work or Derivative Works thereof in any medium, with or without
92
+ modifications, and in Source or Object form, provided that You
93
+ meet the following conditions:
94
+
95
+ (a) You must give any other recipients of the Work or
96
+ Derivative Works a copy of this License; and
97
+
98
+ (b) You must cause any modified files to carry prominent notices
99
+ stating that You changed the files; and
100
+
101
+ (c) You must retain, in the Source form of any Derivative Works
102
+ that You distribute, all copyright, patent, trademark, and
103
+ attribution notices from the Source form of the Work,
104
+ excluding those notices that do not pertain to any part of
105
+ the Derivative Works; and
106
+
107
+ (d) If the Work includes a "NOTICE" text file as part of its
108
+ distribution, then any Derivative Works that You distribute must
109
+ include a readable copy of the attribution notices contained
110
+ within such NOTICE file, excluding those notices that do not
111
+ pertain to any part of the Derivative Works, in at least one
112
+ of the following places: within a NOTICE text file distributed
113
+ as part of the Derivative Works; within the Source form or
114
+ documentation, if provided along with the Derivative Works; or,
115
+ within a display generated by the Derivative Works, if and
116
+ wherever such third-party notices normally appear. The contents
117
+ of the NOTICE file are for informational purposes only and
118
+ do not modify the License. You may add Your own attribution
119
+ notices within Derivative Works that You distribute, alongside
120
+ or as an addendum to the NOTICE text from the Work, provided
121
+ that such additional attribution notices cannot be construed
122
+ as modifying the License.
123
+
124
+ You may add Your own copyright statement to Your modifications and
125
+ may provide additional or different license terms and conditions
126
+ for use, reproduction, or distribution of Your modifications, or
127
+ for any such Derivative Works as a whole, provided Your use,
128
+ reproduction, and distribution of the Work otherwise complies with
129
+ the conditions stated in this License.
130
+
131
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
132
+ any Contribution intentionally submitted for inclusion in the Work
133
+ by You to the Licensor shall be under the terms and conditions of
134
+ this License, without any additional terms or conditions.
135
+ Notwithstanding the above, nothing herein shall supersede or modify
136
+ the terms of any separate license agreement you may have executed
137
+ with Licensor regarding such Contributions.
138
+
139
+ 6. Trademarks. This License does not grant permission to use the trade
140
+ names, trademarks, service marks, or product names of the Licensor,
141
+ except as required for reasonable and customary use in describing the
142
+ origin of the Work and reproducing the content of the NOTICE file.
143
+
144
+ 7. Disclaimer of Warranty. Unless required by applicable law or
145
+ agreed to in writing, Licensor provides the Work (and each
146
+ Contributor provides its Contributions) on an "AS IS" BASIS,
147
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
+ implied, including, without limitation, any warranties or conditions
149
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
+ PARTICULAR PURPOSE. You are solely responsible for determining the
151
+ appropriateness of using or redistributing the Work and assume any
152
+ risks associated with Your exercise of permissions under this License.
153
+
154
+ 8. Limitation of Liability. In no event and under no legal theory,
155
+ whether in tort (including negligence), contract, or otherwise,
156
+ unless required by applicable law (such as deliberate and grossly
157
+ negligent acts) or agreed to in writing, shall any Contributor be
158
+ liable to You for damages, including any direct, indirect, special,
159
+ incidental, or consequential damages of any character arising as a
160
+ result of this License or out of the use or inability to use the
161
+ Work (including but not limited to damages for loss of goodwill,
162
+ work stoppage, computer failure or malfunction, or any and all
163
+ other commercial damages or losses), even if such Contributor
164
+ has been advised of the possibility of such damages.
165
+
166
+ 9. Accepting Warranty or Additional Liability. While redistributing
167
+ the Work or Derivative Works thereof, You may choose to offer,
168
+ and charge a fee for, acceptance of support, warranty, indemnity,
169
+ or other liability obligations and/or rights consistent with this
170
+ License. However, in accepting such obligations, You may act only
171
+ on Your own behalf and on Your sole responsibility, not on behalf
172
+ of any other Contributor, and only if You agree to indemnify,
173
+ defend, and hold each Contributor harmless for any liability
174
+ incurred by, or claims asserted against, such Contributor by reason
175
+ of your accepting any such warranty or additional liability.
176
+
177
+ END OF TERMS AND CONDITIONS
178
+
179
+ APPENDIX: How to apply the Apache License to your work.
180
+
181
+ To apply the Apache License to your work, attach the following
182
+ boilerplate notice, with the fields enclosed by brackets "[]"
183
+ replaced with your own identifying information. (Don't include
184
+ the brackets!) The text should be enclosed in the appropriate
185
+ comment syntax for the file format. We also recommend that a
186
+ file or class name and description of purpose be included on the
187
+ same "printed page" as the copyright notice for easier
188
+ identification within third-party archives.
189
+
190
+ Copyright [yyyy] [name of copyright owner]
191
+
192
+ Licensed under the Apache License, Version 2.0 (the "License");
193
+ you may not use this file except in compliance with the License.
194
+ You may obtain a copy of the License at
195
+
196
+ http://www.apache.org/licenses/LICENSE-2.0
197
+
198
+ Unless required by applicable law or agreed to in writing, software
199
+ distributed under the License is distributed on an "AS IS" BASIS,
200
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
+ See the License for the specific language governing permissions and
202
+ limitations under the License.
@@ -0,0 +1,292 @@
1
+ /*
2
+ * Copyright 2009 The Closure Compiler Authors.
3
+ *
4
+ * Licensed under the Apache License, Version 2.0 (the "License");
5
+ * you may not use this file except in compliance with the License.
6
+ * You may obtain a copy of the License at
7
+ *
8
+ * http://www.apache.org/licenses/LICENSE-2.0
9
+ *
10
+ * Unless required by applicable law or agreed to in writing, software
11
+ * distributed under the License is distributed on an "AS IS" BASIS,
12
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ * See the License for the specific language governing permissions and
14
+ * limitations under the License.
15
+ */
16
+
17
+ //
18
+ // Contents
19
+ //
20
+
21
+ The Closure Compiler performs checking, instrumentation, and
22
+ optimizations on JavaScript code. The purpose of this README is to
23
+ explain how to build and run the Closure Compiler.
24
+
25
+ The Closure Compiler requires Java 6 or higher.
26
+ http://www.java.com/
27
+
28
+
29
+ //
30
+ // Building The Closure Compiler
31
+ //
32
+
33
+ There are three ways to get a Closure Compiler executable.
34
+
35
+ 1) Use one we built for you.
36
+
37
+ Pre-built Closure binaries can be found at
38
+ http://code.google.com/p/closure-compiler/downloads/list
39
+
40
+
41
+ 2) Check out the source and build it with Apache Ant.
42
+
43
+ First, check out the full source tree of the Closure Compiler. There
44
+ are instructions on how to do this at the project site.
45
+ http://code.google.com/p/closure-compiler/source/checkout
46
+
47
+ Apache Ant is a cross-platform build tool.
48
+ http://ant.apache.org/
49
+
50
+ At the root of the source tree, there is an Ant file named
51
+ build.xml. To use it, navigate to the same directory and type the
52
+ command
53
+
54
+ ant jar
55
+
56
+ This will produce a jar file called "build/compiler.jar".
57
+
58
+
59
+ 3) Check out the source and build it with Eclipse.
60
+
61
+ Eclipse is a cross-platform IDE.
62
+ http://www.eclipse.org/
63
+
64
+ Under Eclipse's File menu, click "New > Project ..." and create a
65
+ "Java Project." You will see an options screen. Give the project a
66
+ name, select "Create project from existing source," and choose the
67
+ root of the checked-out source tree as the existing directory. Verify
68
+ that you are using JRE version 6 or higher.
69
+
70
+ Eclipse can use the build.xml file to discover rules. When you
71
+ navigate to the build.xml file, you will see all the build rules in
72
+ the "Outline" pane. Run the "jar" rule to build the compiler in
73
+ build/compiler.jar.
74
+
75
+
76
+ //
77
+ // Running The Closure Compiler
78
+ //
79
+
80
+ Once you have the jar binary, running the Closure Compiler is straightforward.
81
+
82
+ On the command line, type
83
+
84
+ java -jar compiler.jar
85
+
86
+ This starts the compiler in interactive mode. Type
87
+
88
+ var x = 17 + 25;
89
+
90
+ then hit "Enter", then hit "Ctrl-Z" (on Windows) or "Ctrl-D" (on Mac or Linux)
91
+ and "Enter" again. The Compiler will respond:
92
+
93
+ var x=42;
94
+
95
+ The Closure Compiler has many options for reading input from a file,
96
+ writing output to a file, checking your code, and running
97
+ optimizations. To learn more, type
98
+
99
+ java -jar compiler.jar --help
100
+
101
+ You can read more detailed documentation about the many flags at
102
+ http://code.google.com/closure/compiler/docs/gettingstarted_app.html
103
+
104
+
105
+ //
106
+ // Compiling Multiple Scripts
107
+ //
108
+
109
+ If you have multiple scripts, you should compile them all together with
110
+ one compile command.
111
+
112
+ java -jar compiler.jar --js=in1.js --js=in2.js ... --js_output_file=out.js
113
+
114
+ The Closure Compiler will concatenate the files in the order they're
115
+ passed at the command line.
116
+
117
+ If you need to compile many, many scripts together, you may start to
118
+ run into problems with managing dependencies between scripts. You
119
+ should check out the Closure Library. It contains functions for
120
+ enforcing dependencies between scripts, and a tool called calcdeps.py
121
+ that knows how to give scripts to the Closure Compiler in the right
122
+ order.
123
+
124
+ http://code.google.com/p/closure-library/
125
+
126
+ //
127
+ // Licensing
128
+ //
129
+
130
+ Unless otherwise stated, all source files are licensed under
131
+ the Apache License, Version 2.0.
132
+
133
+
134
+ -----
135
+ Code under:
136
+ src/com/google/javascript/rhino
137
+ test/com/google/javascript/rhino
138
+
139
+ URL: http://www.mozilla.org/rhino
140
+ Version: 1.5R3, with heavy modifications
141
+ License: Netscape Public License and MPL / GPL dual license
142
+
143
+ Description: A partial copy of Mozilla Rhino. Mozilla Rhino is an
144
+ implementation of JavaScript for the JVM. The JavaScript parser and
145
+ the parse tree data structures were extracted and modified
146
+ significantly for use by Google's JavaScript compiler.
147
+
148
+ Local Modifications: The packages have been renamespaced. All code not
149
+ relavant to parsing has been removed. A JSDoc parser and static typing
150
+ system have been added.
151
+
152
+
153
+ -----
154
+ Code in:
155
+ lib/rhino
156
+
157
+ Rhino
158
+ URL: http://www.mozilla.org/rhino
159
+ Version: Trunk
160
+ License: Netscape Public License and MPL / GPL dual license
161
+
162
+ Description: Mozilla Rhino is an implementation of JavaScript for the JVM.
163
+
164
+ Local Modifications: Minor changes to parsing JSDoc that usually get pushed
165
+ up-stream to Rhino trunk.
166
+
167
+
168
+ -----
169
+ Code in:
170
+ lib/args4j.jar
171
+
172
+ Args4j
173
+ URL: https://args4j.dev.java.net/
174
+ Version: 2.0.12
175
+ License: MIT
176
+
177
+ Description:
178
+ args4j is a small Java class library that makes it easy to parse command line
179
+ options/arguments in your CUI application.
180
+
181
+ Local Modifications: None.
182
+
183
+
184
+ -----
185
+ Code in:
186
+ lib/guava.jar
187
+
188
+ Guava Libraries
189
+ URL: http://code.google.com/p/guava-libraries/
190
+ Version: r08
191
+ License: Apache License 2.0
192
+
193
+ Description: Google's core Java libraries.
194
+
195
+ Local Modifications: None.
196
+
197
+
198
+ -----
199
+ Code in:
200
+ lib/jsr305.jar
201
+
202
+ Annotations for software defect detection
203
+ URL: http://code.google.com/p/jsr-305/
204
+ Version: svn revision 47
205
+ License: BSD License
206
+
207
+ Description: Annotations for software defect detection.
208
+
209
+ Local Modifications: None.
210
+
211
+
212
+ -----
213
+ Code in:
214
+ lib/jarjar.jar
215
+
216
+ Jar Jar Links
217
+ URL: http://jarjar.googlecode.com/
218
+ Version: 1.1
219
+ License: Apache License 2.0
220
+
221
+ Description:
222
+ A utility for repackaging Java libraries.
223
+
224
+ Local Modifications: None.
225
+
226
+
227
+ ----
228
+ Code in:
229
+ lib/junit.jar
230
+
231
+ JUnit
232
+ URL: http://sourceforge.net/projects/junit/
233
+ Version: 4.8.2
234
+ License: Common Public License 1.0
235
+
236
+ Description: A framework for writing and running automated tests in Java.
237
+
238
+ Local Modifications: None.
239
+
240
+
241
+ ---
242
+ Code in:
243
+ lib/protobuf-java.jar
244
+
245
+ Protocol Buffers
246
+ URL: http://code.google.com/p/protobuf/
247
+ Version: 2.3.0
248
+ License: New BSD License
249
+
250
+ Description: Supporting libraries for protocol buffers,
251
+ an encoding of structured data.
252
+
253
+ Local Modifications: None
254
+
255
+
256
+ ---
257
+ Code in:
258
+ lib/ant.jar
259
+ lib/ant-launcher.jar
260
+
261
+ URL: http://ant.apache.org/bindownload.cgi
262
+ Version: 1.8.1
263
+ License: Apache License 2.0
264
+ Description:
265
+ Ant is a Java based build tool. In theory it is kind of like "make"
266
+ without make's wrinkles and with the full portability of pure java code.
267
+
268
+ Local Modifications: None
269
+
270
+
271
+ ---
272
+ Code in:
273
+ lib/json.jar
274
+ URL: http://json.org/java/index.html
275
+ Version: JSON version 20090211
276
+ License: MIT license
277
+ Description:
278
+ JSON is a set of java files for use in transmitting data in JSON format.
279
+
280
+ Local Modifications: None
281
+
282
+ ---
283
+ Code in:
284
+ tools/maven-ant-tasks-2.1.1.jar
285
+ URL: http://maven.apache.org
286
+ Version 2.1.1
287
+ License: Apache License 2.0
288
+ Description:
289
+ Maven Ant tasks are used to manage dependencies and to install/deploy to
290
+ maven repositories.
291
+
292
+ Local Modifications: None
Binary file
@@ -4,9 +4,19 @@ module RequirejsOptimizer
4
4
 
5
5
  # Raised if the node.js executable is unavailable
6
6
  #
7
- class NodeUnavailable < RuntimeError
7
+ class JavaScriptRuntimeUnavailable < RuntimeError
8
8
  def message
9
- "Node wasn't found. Make sure the node executable is available somewhere in PATH"
9
+ "Node or Java wasn't found. Make sure the node or java executable is available somewhere in PATH"
10
+ end
11
+ end
12
+
13
+ class UnknownJavaScriptRuntime < RuntimeError
14
+ def initialize(runtime)
15
+ @runtime = runtime
16
+ end
17
+
18
+ def message
19
+ "Unknown runtime: #{@runtime}. Available runtimes: 'node' or 'rhino'"
10
20
  end
11
21
  end
12
22
 
@@ -21,7 +21,7 @@ module RequirejsOptimizer
21
21
  end
22
22
 
23
23
  def write_manifest(contents)
24
- open(RequirejsOptimizer.target_dir.join("manifest.yml"), "w") { |f| f.write contents }
24
+ open("#{RequirejsOptimizer.target_dir.to_s}/manifest.yml", "w") { |f| f.write contents }
25
25
  end
26
26
 
27
27
  end
@@ -5,20 +5,64 @@ module RequirejsOptimizer
5
5
  class Optimize < Base
6
6
 
7
7
  def perform(*)
8
- raise RequirejsOptimizer::Errors::NodeUnavailable unless node_exists?
9
8
  raise RequirejsOptimizer::Errors::RjsOptimizationFailed unless optimize
10
9
  end
11
10
 
12
11
  private
13
12
 
14
13
  def optimize
15
- system("node #{RequirejsOptimizer.root.join 'bin', 'r.js'} -o app/assets/javascripts/modules/require.build.js")
14
+ optimize_command = "#{runtime_cmdline} #{RequirejsOptimizer.root.join 'bin', 'r.js'} -o app/assets/javascripts/modules/require.build.js"
15
+ puts optimize_command
16
+ puts "\n"
17
+ system(optimize_command)
18
+ end
19
+
20
+ def runtime_cmdline
21
+ runtime = rails_runtime if defined? Rails
22
+
23
+ if runtime.nil?
24
+ if node_exists?
25
+ runtime = :node
26
+ elsif java_exists?
27
+ runtime = :rhino
28
+ else
29
+ raise RequirejsOptimizer::Errors::JavaScriptRuntimeUnavailable
30
+ end
31
+ end
32
+
33
+ puts "\nOptimizing with #{runtime} using:"
34
+
35
+ if runtime == :node
36
+ "node"
37
+ else
38
+ js = RequirejsOptimizer.root.join 'lib', 'rhino', 'js.jar'
39
+ compiler = RequirejsOptimizer.root.join 'lib', 'closure', 'compiler.jar'
40
+
41
+ "java -classpath #{js}:#{compiler} org.mozilla.javascript.tools.shell.Main"
42
+ end
43
+
16
44
  end
17
45
 
18
46
  def node_exists?
19
47
  system("which node 2>&1 > /dev/null")
20
48
  end
21
49
 
50
+ def java_exists?
51
+ system("which java 2>&1 > /dev/null")
52
+ end
53
+
54
+ def rails_runtime
55
+ if Rails.configuration.respond_to? :requirejs_optimizer_runtime
56
+ runtime = Rails.configuration.requirejs_optimizer_runtime.to_sym
57
+
58
+ if ([:rhino, :node] & [runtime]).none?
59
+ raise RequirejsOptimizer::Errors::UnknownJavaScriptRuntime.new runtime
60
+ end
61
+ end
62
+
63
+ runtime
64
+ end
65
+
22
66
  end
23
67
 
24
68
  end
@@ -1,3 +1,3 @@
1
1
  module RequirejsOptimizer
2
- VERSION = "0.1.0"
2
+ VERSION = "0.2.0"
3
3
  end
data/lib/rhino/LICENSE ADDED
@@ -0,0 +1,4 @@
1
+ Mozilla Rhino (js.jar from http://www.mozilla.org/rhino/) was
2
+ initially developed by Netscape Communications Corporation and is
3
+ provided by the Dojo Foundation "as is" under the MPL 1.1 license,
4
+ available at http://www.mozilla.org/MPL
data/lib/rhino/js.jar ADDED
Binary file
@@ -10,11 +10,51 @@ module RequirejsOptimizer
10
10
 
11
11
  before { subject.stub(:node_exists).and_return(true) }
12
12
 
13
- it "raises an error if node is missing" do
13
+ it "raises an error if no javascript runtime is available" do
14
14
  subject.stub(:node_exists?).and_return(false)
15
+ subject.stub(:java_exists?).and_return(false)
15
16
  expect {
16
17
  subject.perform
17
- }.to raise_error RequirejsOptimizer::Errors::NodeUnavailable
18
+ }.to raise_error RequirejsOptimizer::Errors::JavaScriptRuntimeUnavailable
19
+ end
20
+
21
+
22
+ it "defaults to node if node is avilable" do
23
+ subject.stub(:node_exists?).and_return(true)
24
+ subject.stub(:java_exists?).and_return(true)
25
+
26
+ subject.should_receive(:system).with(/^node/).and_return(true)
27
+ subject.perform
28
+ end
29
+
30
+ it "uses rhino if rhino if available and node is not" do
31
+ subject.stub(:node_exists?).and_return(false)
32
+ subject.stub(:java_exists?).and_return(true)
33
+
34
+ subject.should_receive(:system).with(/^java/).and_return(true)
35
+ subject.perform
36
+ end
37
+
38
+ it "uses node if configured to do so" do
39
+ Rails.configuration.stub(:requirejs_optimizer_runtime).and_return(:node)
40
+ subject.should_receive(:system).with(/^node/).and_return(true)
41
+
42
+ subject.perform
43
+ end
44
+
45
+ it "uses rhino if configured to do so" do
46
+ Rails.configuration.stub(:requirejs_optimizer_runtime).and_return(:rhino)
47
+ subject.should_receive(:system).with(/^java/).and_return(true)
48
+
49
+ subject.perform
50
+ end
51
+
52
+ it "raises an error if misconfigured" do
53
+ Rails.configuration.stub(:requirejs_optimizer_runtime).and_return(:asdfasdf)
54
+
55
+ expect {
56
+ subject.perform
57
+ }.to raise_error RequirejsOptimizer::Errors::UnknownJavaScriptRuntime
18
58
  end
19
59
 
20
60
  describe "optimization" do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: requirejs_optimizer
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.2.0
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: 2012-09-04 00:00:00.000000000 Z
12
+ date: 2012-09-21 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -54,11 +54,15 @@ files:
54
54
  - .gitignore
55
55
  - .rspec
56
56
  - .travis.yml
57
+ - CHANGELOG
57
58
  - Gemfile
58
59
  - LICENSE
59
60
  - README.md
60
61
  - Rakefile
61
62
  - bin/r.js
63
+ - lib/closure/COPYING
64
+ - lib/closure/README
65
+ - lib/closure/compiler.jar
62
66
  - lib/generators/install_generator.rb
63
67
  - lib/generators/templates/README
64
68
  - lib/generators/templates/main.js.coffee
@@ -78,6 +82,8 @@ files:
78
82
  - lib/requirejs_optimizer/step/optimize.rb
79
83
  - lib/requirejs_optimizer/step/prepare.rb
80
84
  - lib/requirejs_optimizer/version.rb
85
+ - lib/rhino/LICENSE
86
+ - lib/rhino/js.jar
81
87
  - requirejs_optimizer.gemspec
82
88
  - spec/integrations/rake_task_spec.rb
83
89
  - spec/lib/requirejs_optimizer/rake/task_spec.rb
@@ -155,18 +161,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
155
161
  - - ! '>='
156
162
  - !ruby/object:Gem::Version
157
163
  version: '0'
158
- segments:
159
- - 0
160
- hash: -3064274237348196487
161
164
  required_rubygems_version: !ruby/object:Gem::Requirement
162
165
  none: false
163
166
  requirements:
164
167
  - - ! '>='
165
168
  - !ruby/object:Gem::Version
166
169
  version: '0'
167
- segments:
168
- - 0
169
- hash: -3064274237348196487
170
170
  requirements: []
171
171
  rubyforge_project:
172
172
  rubygems_version: 1.8.24