closure 1.4.2 → 1.4.3

data/closure-templates/soyutils_usegoog.js

@@ -38,6 +38,11 @@
 goog.provide('soy');
 goog.provide('soy.StringBuilder');
 goog.provide('soy.esc');
+goog.provide('soydata');
+goog.provide('soydata.SanitizedHtml');
+goog.provide('soydata.SanitizedHtmlAttribute');
+goog.provide('soydata.SanitizedJsStrChars');
+goog.provide('soydata.SanitizedUri');
 
 goog.require('goog.asserts');
 goog.require('goog.dom.DomHelper');
@@ -47,7 +52,6 @@ goog.require('goog.i18n.bidi');
 goog.require('goog.soy');
 goog.require('goog.string');
 goog.require('goog.string.StringBuffer');
-goog.require('soydata');
 
 
 // -----------------------------------------------------------------------------
@@ -66,6 +70,140 @@ goog.require('soydata');
 soy.StringBuilder = goog.string.StringBuffer;
 
 
+// -----------------------------------------------------------------------------
+// soydata: Defines typed strings, e.g. an HTML string {@code "a<b>c"} is
+// semantically distinct from the plain text string {@code "a<b>c"} and smart
+// templates can take that distinction into account.
+
+/**
+ * A type of textual content.
+ * @enum {number}
+ */
+soydata.SanitizedContentKind = {
+
+  /**
+   * A snippet of HTML that does not start or end inside a tag, comment, entity,
+   * or DOCTYPE; and that does not contain any executable code
+   * (JS, {@code <object>}s, etc.) from a different trust domain.
+   */
+  HTML: 0,
+
+  /**
+   * A sequence of code units that can appear between quotes (either kind) in a
+   * JS program without causing a parse error, and without causing any side
+   * effects.
+   * <p>
+   * The content should not contain unescaped quotes, newlines, or anything else
+   * that would cause parsing to fail or to cause a JS parser to finish the
+   * string its parsing inside the content.
+   * <p>
+   * The content must also not end inside an escape sequence ; no partial octal
+   * escape sequences or odd number of '{@code \}'s at the end.
+   */
+  JS_STR_CHARS: 1,
+
+  /** A properly encoded portion of a URI. */
+  URI: 2,
+
+  /** An attribute name and value such as {@code dir="ltr"}. */
+  HTML_ATTRIBUTE: 3
+};
+
+
+/**
+ * A string-like object that carries a content-type.
+ * @param {string} content
+ * @constructor
+ * @private
+ */
+soydata.SanitizedContent = function(content) {
+  /**
+   * The textual content.
+   * @type {string}
+   */
+  this.content = content;
+};
+
+/** @type {soydata.SanitizedContentKind} */
+soydata.SanitizedContent.prototype.contentKind;
+
+/** @override */
+soydata.SanitizedContent.prototype.toString = function() {
+  return this.content;
+};
+
+
+/**
+ * Content of type {@link soydata.SanitizedContentKind.HTML}.
+ * @param {string} content A string of HTML that can safely be embedded in
+ *     a PCDATA context in your app.  If you would be surprised to find that an
+ *     HTML sanitizer produced {@code s} (e.g. it runs code or fetches bad URLs)
+ *     and you wouldn't write a template that produces {@code s} on security or
+ *     privacy grounds, then don't pass {@code s} here.
+ * @constructor
+ * @extends {soydata.SanitizedContent}
+ */
+soydata.SanitizedHtml = function(content) {
+  soydata.SanitizedContent.call(this, content);
+};
+goog.inherits(soydata.SanitizedHtml, soydata.SanitizedContent);
+
+/** @override */
+soydata.SanitizedHtml.prototype.contentKind = soydata.SanitizedContentKind.HTML;
+
+
+/**
+ * Content of type {@link soydata.SanitizedContentKind.JS_STR_CHARS}.
+ * @param {string} content A string of JS that when evaled, produces a
+ *     value that does not depend on any sensitive data and has no side effects
+ *     <b>OR</b> a string of JS that does not reference any variables or have
+ *     any side effects not known statically to the app authors.
+ * @constructor
+ * @extends {soydata.SanitizedContent}
+ */
+soydata.SanitizedJsStrChars = function(content) {
+  soydata.SanitizedContent.call(this, content);
+};
+goog.inherits(soydata.SanitizedJsStrChars, soydata.SanitizedContent);
+
+/** @override */
+soydata.SanitizedJsStrChars.prototype.contentKind =
+    soydata.SanitizedContentKind.JS_STR_CHARS;
+
+
+/**
+ * Content of type {@link soydata.SanitizedContentKind.URI}.
+ * @param {string} content A chunk of URI that the caller knows is safe to
+ *     emit in a template.
+ * @constructor
+ * @extends {soydata.SanitizedContent}
+ */
+soydata.SanitizedUri = function(content) {
+  soydata.SanitizedContent.call(this, content);
+};
+goog.inherits(soydata.SanitizedUri, soydata.SanitizedContent);
+
+/** @override */
+soydata.SanitizedUri.prototype.contentKind = soydata.SanitizedContentKind.URI;
+
+
+/**
+ * Content of type {@link soydata.SanitizedContentKind.HTML_ATTRIBUTE}.
+ * @param {string} content An attribute name and value, such as
+ *     {@code dir="ltr"}.
+ * @constructor
+ * @extends {soydata.SanitizedContent}
+ */
+soydata.SanitizedHtmlAttribute = function(content) {
+  soydata.SanitizedContent.call(this, content);
+};
+goog.inherits(soydata.SanitizedHtmlAttribute, soydata.SanitizedContent);
+
+/** @override */
+soydata.SanitizedHtmlAttribute.prototype.contentKind =
+    soydata.SanitizedContentKind.HTML_ATTRIBUTE;
+
+
 // -----------------------------------------------------------------------------
 // Public utilities.
 
@@ -280,42 +418,6 @@ soy.$$EMPTY_TEMPLATE_FN_ = function(opt_data, opt_sb, opt_ijData) {
 };
 
 
-/**
- * Used for temporary fix. See GenJsCodeVisitor.java.
- * TODO: Remove when i18n plurals team provides a better # processing option.
- * @param {string} str The string to escape.
- * @return {string} The escaped string.
- */
-soy.$$tempHashEscape = function(str) {
-  return str.replace(soy.$$HASH_RE_, '__HashLit__');
-};
-
-/**
- * Used by soy.$$tempHashEscape().
- * @type {RegExp}
- * @private
- */
-soy.$$HASH_RE_ = /#/g;
-
-
-/**
- * Used for temporary fix. See GenJsCodeVisitor.java.
- * TODO: Remove when i18n plurals team provides a better # processing option.
- * @param {string} str The string to unescape.
- * @return {string} The unescaped string.
- */
-soy.$$tempHashUnescape = function(str) {
-  return str.replace(soy.$$HASH_ESCAPED_RE_, '#');
-};
-
-/**
- * Used by soy.$$tempHashUnescape().
- * @type {RegExp}
- * @private
- */
-soy.$$HASH_ESCAPED_RE_ = /__HashLit__/g;
-
-
 // -----------------------------------------------------------------------------
 // Escape/filter/normalize.
 
@@ -740,30 +842,6 @@ soy.$$getBidiFormatterInstance_ = function(bidiGlobalDir) {
 };
 
 
-/**
- * Returns the leading horizontal edge, i.e. "left" or "right", depending on
- * bidiGlobalDir.
- * @param {number} bidiGlobalDir The global directionality context: 1 if ltr, -1
- *     if rtl, 0 if unknown.
- * @return {string} "right" for RTL context and "left" otherwise.
- */
-soy.$$bidiStartEdge = function(bidiGlobalDir) {
-  return soy.$$getBidiFormatterInstance_(bidiGlobalDir).startEdge();
-};
-
-
-/**
- * Returns the trailing horizontal edge, i.e. "right" or "left", depending on
- * bidiGlobalDir.
- * @param {number} bidiGlobalDir The global directionality context: 1 if ltr, -1
- *     if rtl, 0 if unknown.
- * @return {string} "left" for RTL context and "right" otherwise.
- */
-soy.$$bidiEndEdge = function(bidiGlobalDir) {
-  return soy.$$getBidiFormatterInstance_(bidiGlobalDir).endEdge();
-};
-
-
 /**
  * Estimate the overall directionality of text. If opt_isHtml, makes sure to
  * ignore the LTR nature of the mark-up and escapes in text, making the logic
@@ -802,19 +880,6 @@ soy.$$bidiDirAttr = function(bidiGlobalDir, text, opt_isHtml) {
 };
 
 
-/**
- * Returns a Unicode BiDi mark matching bidiGlobalDir (LRM or RLM), or an empty
- * string if bidiGlobalDir is 0 (unknown).
- * @param {number} bidiGlobalDir The global directionality context: 1 if ltr, -1
- *     if rtl, 0 if unknown.
- * @return {string} A Unicode bidi mark matching bidiGlobalDir, or the empty
- *     string when bidiGlobalDir is 0 (unknown).
- */
-soy.$$bidiMark = function(bidiGlobalDir) {
-  return soy.$$getBidiFormatterInstance_(bidiGlobalDir).mark();
-};
-
-
 /**
  * Returns a Unicode BiDi mark matching bidiGlobalDir (LRM or RLM) if the
  * directionality or the exit directionality of text are opposite to

data/lib/closure/sources.rb

@@ -228,16 +228,21 @@ class Closure
     protected
 
     
-    # Namespace recursion with circular stop on the filename
-    def calcdeps(ns, namespace, filenames, prev = nil)
+    # Namespace recursion with two-way circular stop
+    def calcdeps(ns, namespace, filenames, prev = [])
       unless source = ns[namespace]
-        msg = "#{prev[:filename]}: " rescue ''
+        msg = "#{prev.last[:filename]}: " rescue ''
         msg += "Namespace #{namespace.dump} not found."
         raise msg
       end
-      return if source == prev or filenames.include? source[:filename]
+      if prev.include? source
+        return
+      else
+        prev.push source
+      end
+      return if filenames.include?(source[:filename])
       source[:require].each do |required|
-        calcdeps ns, required, filenames, source
+        calcdeps ns, required, filenames, prev
       end
       filenames.push source[:filename]
     end

data/lib/closure/version.rb

@@ -14,5 +14,5 @@
 
 
 class Closure
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/lib/closure.rb

@@ -61,6 +61,7 @@ class Closure
       raise "Unknown built-in: #{directory}" unless dir
       directory = dir
     end
+    raise Errno::ENOENT, File.expand_path(directory, Dir.pwd) unless File.directory? directory
     sources.add directory, path
   end
 

metadata

@@ -2,7 +2,7 @@
 name: closure
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors: 
 - David Turnbull
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-25 00:00:00 Z
+date: 2011-12-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -41,7 +41,6 @@ files:
 - closure-compiler/README
 - closure-templates/COPYING
 - closure-templates/README
-- closure-templates/soydata.js
 - closure-templates/SoyToJsSrcCompiler.jar
 - closure-templates/soyutils.js
 - closure-templates/soyutils_usegoog.js
@@ -138,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 471027721912702129
+      hash: -3550757855017757460
       segments: 
       - 0
       version: "0"
@@ -151,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Google Closure Compiler, Library, Script, and Templates.

data/closure-templates/soydata.js

@@ -1,163 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/**
- * @fileoverview
- * Defines typed strings, e.g. an HTML string {@code "a<b>c"} is
- * semantically distinct from the plain text string {@code "a<b>c"} and smart
- * templates can take that distinction into account.
- *
- * @author Mike Samuel
- */
-
-
-goog.provide('soydata');
-goog.provide('soydata.SanitizedHtml');
-goog.provide('soydata.SanitizedHtmlAttribute');
-goog.provide('soydata.SanitizedJsStrChars');
-goog.provide('soydata.SanitizedUri');
-
-
-/**
- * A type of textual content.
- * @enum
- */
-soydata.SanitizedContentKind = {
-
-  /**
-   * A snippet of HTML that does not start or end inside a tag, comment, entity,
-   * or DOCTYPE; and that does not contain any executable code
-   * (JS, {@code <object>}s, etc.) from a different trust domain.
-   */
-  HTML: 0,
-
-  /**
-   * A sequence of code units that can appear between quotes (either kind) in a
-   * JS program without causing a parse error, and without causing any side
-   * effects.
-   * <p>
-   * The content should not contain unescaped quotes, newlines, or anything else
-   * that would cause parsing to fail or to cause a JS parser to finish the
-   * string its parsing inside the content.
-   * <p>
-   * The content must also not end inside an escape sequence ; no partial octal
-   * escape sequences or odd number of '{@code \}'s at the end.
-   */
-  JS_STR_CHARS: 1,
-
-  /** A properly encoded portion of a URI. */
-  URI: 2,
-
-  /** An attribute name and value such as {@code dir="ltr"}. */
-  HTML_ATTRIBUTE: 3
-};
-
-
-/**
- * A string-like object that carries a content-type.
- * @constructor
- * @private
- */
-soydata.SanitizedContent = function() {};
-
-/** The textual content.  @type {string} */
-soydata.SanitizedContent.prototype.content;
-
-/** @type {soydata.SanitizedContentKind} */
-soydata.SanitizedContent.prototype.contentKind;
-
-/**
- * @return {string}
- */
-soydata.SanitizedContent.prototype.toString = function() {
-  return this.content;
-};
-
-
-/**
- * Content of type {@link soydata.SanitizedContentKind.HTML}.
- * @constructor
- * @param {string!} content A string of HTML that can safely be embedded in
- *     a PCDATA context in your app.  If you would be surprised to find that an
- *     HTML sanitizer produced {@code s} (e.g. it runs code or fetches bad URLs)
- *     and you wouldn't write a template that produces {@code s} on security or
- *     privacy grounds, then don't pass {@code s} here.
- */
-soydata.SanitizedHtml = function(content) {
-  this.content = content;
-};
-
-/** @override */
-soydata.SanitizedHtml.prototype = new soydata.SanitizedContent();
-
-/** @override */
-soydata.SanitizedHtml.prototype.contentKind = soydata.SanitizedContentKind.HTML;
-
-
-/**
- * Content of type {@link soydata.SanitizedContentKind.JS_STR_CHARS}.
- * @constructor
- * @param {string!} content A string of JS that when evaled, produces a
- *     value that does not depend on any sensitive data and has no side effects
- *     <b>OR</b> a string of JS that does not reference any variables or have
- *     any side effects not known statically to the app authors.
- */
-soydata.SanitizedJsStrChars = function(content) {
-  this.content = content;
-};
-
-/** @override */
-soydata.SanitizedJsStrChars.prototype = new soydata.SanitizedContent();
-
-/** @override */
-soydata.SanitizedJsStrChars.prototype.contentKind =
-    soydata.SanitizedContentKind.JS_STR_CHARS;
-
-
-/**
- * Content of type {@link soydata.SanitizedContentKind.URI}.
- * @constructor
- * @param {string!} content A chunk of URI that the caller knows is safe to
- *     emit in a template.
- */
-soydata.SanitizedUri = function(content) {
-  this.content = content;
-};
-
-/** @override */
-soydata.SanitizedUri.prototype = new soydata.SanitizedContent();
-
-/** @override */
-soydata.SanitizedUri.prototype.contentKind = soydata.SanitizedContentKind.URI;
-
-
-/**
- * Content of type {@link soydata.SanitizedContentKind.HTML_ATTRIBUTE}.
- * @constructor
- * @param {string!} content An attribute name and value, such as
- *     {@code dir="ltr"}..
- */
-soydata.SanitizedHtmlAttribute = function(content) {
-  this.content = content;
-};
-
-/** @override */
-soydata.SanitizedHtmlAttribute.prototype = new soydata.SanitizedContent();
-
-/** @override */
-soydata.SanitizedHtmlAttribute.prototype.contentKind =
-    soydata.SanitizedContentKind.HTML_ATTRIBUTE;