polymer-rails 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39009e09a451db6b696b64d747b85eabe02ae38b
-  data.tar.gz: 2f05a0e70596c06e796cd2070940e691a4d38293
+  metadata.gz: 4ccbca115d533cf6aa8769934efda7779e1c420b
+  data.tar.gz: 927f6f95af53a59e42436cec30a1916911eb68ca
 SHA512:
-  metadata.gz: ec975c0220275695ad07be0c423d728e2d1971780e5c7150c7974d934eb9fd15725f10b1d06df29c0e64ed0b41ec6db58294a48eb5c79527afe8a165d067b4de
-  data.tar.gz: 22fe13f96a2eecfe72ab794a012656eb3d65cfa5653830edb82135a51dcbf86ad81eb767629cc426dcd28ef14fc6cbd8859dc88ae3420c6b0d91bc9848f73987
+  metadata.gz: b870fe572b064787015fc7041b321facf6c356d46bae30b816310711be9498bf8c377e35a3a26d641822a76a2dc48ae54b051ece3b7551396c4eaf2e751a02c5
+  data.tar.gz: d557945c318a077454f4e05698b4e962280e6fb422023249f9794e2d89cf344a6137b9973d4cf6d5cd542c860edfb99f443c19071c4c1c20b29c418586f41082

data/Rakefile

@@ -1 +1,19 @@
 require "bundler/gem_tasks"
+
+task :default
+
+if RUBY_PLATFORM =~ /java/
+  require 'maven/ruby/maven'
+  require 'jar_installer'
+
+  desc 'setup jar dependencies to be used for "testing" and generates lib/example_jars.rb'
+  task :setup do
+      Jars::JarInstaller.install_jars
+  end
+
+  desc 'compile src/main/java/** into lib/example.jar'
+  task :jar do
+      Maven::Ruby::Maven.new.exec 'prepare-package'
+  end
+
+end

data/app/assets/javascripts/polymer/polymer-micro.html

@@ -217,6 +217,9 @@ Polymer.telemetry.instanceCount = 0;
 (function () {
 var modules = {};
 var lcModules = {};
+var findModule = function (id) {
+return modules[id] || lcModules[id.toLowerCase()];
+};
 var DomModule = function () {
 return document.createElement('dom-module');
 };
@@ -235,10 +238,10 @@ lcModules[id.toLowerCase()] = this;
 }
 },
 import: function (id, selector) {
-var m = modules[id] || lcModules[id.toLowerCase()];
+var m = findModule(id);
 if (!m) {
 forceDocumentUpgrade();
-m = modules[id];
+m = findModule(id);
 }
 if (m && selector) {
 m = m.querySelector(selector);
@@ -558,7 +561,7 @@ debouncer.stop();
 }
 }
 });
-Polymer.version = '1.1.0';
+Polymer.version = '1.1.1';
 Polymer.Base._addFeature({
 _registerFeatures: function () {
 this._prepIs();

data/app/assets/javascripts/polymer/polymer-mini.html

@@ -457,47 +457,43 @@ Polymer.dom.addDebouncer(host.debounce('_distribute', host._distributeContent));
 }
 },
 appendChild: function (node) {
-var handled;
-this._ensureContentLogicalInfo(node);
-this._removeNodeFromHost(node, true);
-if (this._nodeIsInLogicalTree(this.node)) {
-this._addLogicalInfo(node, this.node);
-this._addNodeToHost(node);
-handled = this._maybeDistribute(node, this.node);
-} else {
-this._addNodeToHost(node);
-}
-if (!handled && !this._tryRemoveUndistributedNode(node)) {
-var container = this.node._isShadyRoot ? this.node.host : this.node;
-addToComposedParent(container, node);
-nativeAppendChild.call(container, node);
-}
-return node;
+return this._addNode(node);
 },
 insertBefore: function (node, ref_node) {
-if (!ref_node) {
-return this.appendChild(node);
-}
-var handled;
-this._ensureContentLogicalInfo(node);
+return this._addNode(node, ref_node);
+},
+_addNode: function (node, ref_node) {
 this._removeNodeFromHost(node, true);
-if (this._nodeIsInLogicalTree(this.node)) {
+var addedInsertionPoint;
+var root = this.getOwnerRoot();
+if (root) {
+addedInsertionPoint = this._maybeAddInsertionPoint(node, this.node);
+}
+if (this._nodeHasLogicalChildren(this.node)) {
+if (ref_node) {
 var children = this.childNodes;
 var index = children.indexOf(ref_node);
 if (index < 0) {
 throw Error('The ref_node to be inserted before is not a child ' + 'of this node');
 }
+}
 this._addLogicalInfo(node, this.node, index);
-this._addNodeToHost(node);
-handled = this._maybeDistribute(node, this.node);
-} else {
-this._addNodeToHost(node);
 }
-if (!handled && !this._tryRemoveUndistributedNode(node)) {
+this._addNodeToHost(node);
+if (!this._maybeDistribute(node, this.node) && !this._tryRemoveUndistributedNode(node)) {
+if (ref_node) {
 ref_node = ref_node.localName === CONTENT ? this._firstComposedNode(ref_node) : ref_node;
+}
 var container = this.node._isShadyRoot ? this.node.host : this.node;
 addToComposedParent(container, node, ref_node);
+if (ref_node) {
 nativeInsertBefore.call(container, node, ref_node);
+} else {
+nativeAppendChild.call(container, node);
+}
+}
+if (addedInsertionPoint) {
+this._updateInsertionPoints(root.host);
 }
 return node;
 },
@@ -505,14 +501,8 @@ removeChild: function (node) {
 if (factory(node).parentNode !== this.node) {
 console.warn('The node to be removed is not a child of this node', node);
 }
-var handled;
-if (this._nodeIsInLogicalTree(this.node)) {
-this._removeNodeFromHost(node);
-handled = this._maybeDistribute(node, this.node);
-} else {
 this._removeNodeFromHost(node);
-}
-if (!handled) {
+if (!this._maybeDistribute(node, this.node)) {
 var container = this.node._isShadyRoot ? this.node.host : this.node;
 if (container === node.parentNode) {
 removeFromComposedParent(container, node);
@@ -560,7 +550,6 @@ if (hasContent) {
 var root = this._ownerShadyRootForNode(parent);
 if (root) {
 var host = root.host;
-this._updateInsertionPoints(host);
 this._lazyDistribute(host);
 }
 }
@@ -570,6 +559,25 @@ this._lazyDistribute(parent);
 }
 return parentNeedsDist || hasContent && !wrappedContent;
 },
+_maybeAddInsertionPoint: function (node, parent) {
+var added;
+if (node.nodeType === Node.DOCUMENT_FRAGMENT_NODE && !node.__noContent) {
+var c$ = factory(node).querySelectorAll(CONTENT);
+for (var i = 0, n, np, na; i < c$.length && (n = c$[i]); i++) {
+np = factory(n).parentNode;
+if (np === node) {
+np = parent;
+}
+na = this._maybeAddInsertionPoint(n, np);
+added = added || na;
+}
+} else if (node.localName === CONTENT) {
+saveLightChildrenIfNeeded(parent);
+saveLightChildrenIfNeeded(node);
+added = true;
+}
+return added;
+},
 _tryRemoveUndistributedNode: function (node) {
 if (this.node.shadyRoot) {
 if (node._composedParent) {
@@ -586,20 +594,8 @@ saveLightChildrenIfNeeded(c);
 saveLightChildrenIfNeeded(factory(c).parentNode);
 }
 },
-_nodeIsInLogicalTree: function (node) {
-return Boolean(node._lightParent !== undefined || node._isShadyRoot || node.shadyRoot);
-},
-_ensureContentLogicalInfo: function (node) {
-if (node.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
-saveLightChildrenIfNeeded(this.node);
-var c$ = Array.prototype.slice.call(node.childNodes);
-for (var i = 0, n; i < c$.length && (n = c$[i]); i++) {
-this._ensureContentLogicalInfo(n);
-}
-} else if (node.localName === CONTENT) {
-saveLightChildrenIfNeeded(this.node);
-saveLightChildrenIfNeeded(node);
-}
+_nodeHasLogicalChildren: function (node) {
+return Boolean(node._lightChildren !== undefined);
 },
 _parentNeedsDistribution: function (parent) {
 return parent && parent.shadyRoot && hasInsertionPoint(parent.shadyRoot);
@@ -609,6 +605,7 @@ var hostNeedsDist;
 var root;
 var parent = node._lightParent;
 if (parent) {
+factory(node)._distributeParent();
 root = this._ownerShadyRootForNode(node);
 if (root) {
 root.host._elementRemove(node);
@@ -621,7 +618,7 @@ if (root && hostNeedsDist) {
 this._updateInsertionPoints(root.host);
 this._lazyDistribute(root.host);
 } else if (ensureComposedRemoval) {
-removeFromComposedParent(parent || node.parentNode, node);
+removeFromComposedParent(node._composedParent, node);
 }
 },
 _removeDistributedChildren: function (root, container) {
@@ -1147,7 +1144,7 @@ node._lightChildren = c$;
 }
 }
 function hasInsertionPoint(root) {
-return Boolean(root._insertionPoints.length);
+return Boolean(root && root._insertionPoints.length);
 }
 var p = Element.prototype;
 var matchesSelector = p.matches || p.matchesSelector || p.mozMatchesSelector || p.msMatchesSelector || p.oMatchesSelector || p.webkitMatchesSelector;

data/app/assets/javascripts/polymer/polymer.html

@@ -1656,6 +1656,9 @@ name: arg,
 model: this._modelForPath(arg)
 };
 var fc = arg[0];
+if (fc === '-') {
+fc = arg[1];
+}
 if (fc >= '0' && fc <= '9') {
 fc = '#';
 }
@@ -2276,30 +2279,24 @@ return m && m._cssText || '';
 _cssFromElement: function (element) {
 var cssText = '';
 var content = element.content || element;
-var sourceDoc = element.ownerDocument;
 var e$ = Array.prototype.slice.call(content.querySelectorAll(this.MODULE_STYLES_SELECTOR));
-for (var i = 0, e, resolveDoc, addModule; i < e$.length; i++) {
+for (var i = 0, e; i < e$.length; i++) {
 e = e$[i];
-resolveDoc = sourceDoc;
-addModule = null;
 if (e.localName === 'template') {
 cssText += this._cssFromElement(e);
 } else {
 if (e.localName === 'style') {
-addModule = e.getAttribute(this.INCLUDE_ATTR);
+var include = e.getAttribute(this.INCLUDE_ATTR);
 e = e.__appliedElement || e;
 e.parentNode.removeChild(e);
-} else {
-e = e.import && e.import.body;
-resolveDoc = e.ownerDocument;
+cssText += this.resolveCss(e.textContent, element.ownerDocument);
+if (include) {
+cssText += this.cssFromModules(include);
 }
-if (e) {
-cssText += this.resolveCss(e.textContent, resolveDoc);
+} else if (e.import && e.import.body) {
+cssText += this.resolveCss(e.import.body.textContent, e.import);
 }
 }
-if (addModule) {
-cssText += this.cssFromModules(addModule);
-}
 }
 return cssText;
 },
@@ -3234,16 +3231,18 @@ var e = this.__appliedElement || this;
 if (this.include) {
 e.textContent += styleUtil.cssFromModules(this.include);
 }
+var rules = styleUtil.rulesForStyle(e);
+styleUtil.forEachStyleRule(rules, function (rule) {
+styleTransformer.documentRule(rule);
+});
 this._computeStyleProperties();
 var props = this._styleProperties;
-var self = this;
-e.textContent = styleUtil.toCssText(styleUtil.rulesForStyle(e), function (rule) {
+e.textContent = styleUtil.toCssText(rules, function (rule) {
 var css = rule.cssText = rule.parsedCssText;
 if (rule.propertyInfo && rule.propertyInfo.cssText) {
 css = cssParse.removeCustomPropAssignment(css);
 rule.cssText = propertyUtils.valueForProperties(css, props);
 }
-styleTransformer.documentRule(rule);
 });
 }
 });
@@ -3799,6 +3798,9 @@ this._instances.splice(keys.length, this._instances.length - keys.length);
 _keySort: function (a, b) {
 return this.collection.getKey(a) - this.collection.getKey(b);
 },
+_numericSort: function (a, b) {
+return a - b;
+},
 _applySplicesUserSort: function (splices) {
 var c = this.collection;
 var instances = this._instances;
@@ -3826,7 +3828,7 @@ addedKeys.push(key);
 }
 }
 if (removedIdxs.length) {
-removedIdxs.sort();
+removedIdxs.sort(this._numericSort);
 for (var i = removedIdxs.length - 1; i >= 0; i--) {
 var idx = removedIdxs[i];
 if (idx !== undefined) {
@@ -4009,6 +4011,10 @@ selected: {
 type: Object,
 notify: true
 },
+selectedItem: {
+type: Object,
+notify: true
+},
 toggle: {
 type: Boolean,
 value: false
@@ -4031,6 +4037,7 @@ this._selectedColl = Polymer.Collection.get(this.selected);
 this.selected = null;
 this._selectedColl = null;
 }
+this.selectedItem = null;
 },
 isSelected: function (item) {
 if (this.multi) {
@@ -4048,7 +4055,9 @@ this.unlinkPaths('selected.' + skey);
 }
 } else {
 this.selected = null;
+this.selectedItem = null;
 this.unlinkPaths('selected');
+this.unlinkPaths('selectedItem');
 }
 },
 select: function (item) {
@@ -4068,8 +4077,10 @@ this.linkPaths('selected.' + skey, 'items.' + key);
 if (this.toggle && item == this.selected) {
 this.deselect();
 } else {
-this.linkPaths('selected', 'items.' + key);
 this.selected = item;
+this.selectedItem = item;
+this.linkPaths('selected', 'items.' + key);
+this.linkPaths('selectedItem', 'items.' + key);
 }
 }
 }

data/app/assets/javascripts/webcomponentsjs/webcomponents-lite.js

@@ -7,7 +7,7 @@
  * Code distributed by Google as part of the polymer project is also
  * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
-// @version 0.7.11
+// @version 0.7.12
 window.WebComponents = window.WebComponents || {};
 
 (function(scope) {
@@ -909,7 +909,7 @@ if (typeof WeakMap === "undefined") {
   };
   global.JsMutationObserver = JsMutationObserver;
   if (!global.MutationObserver) global.MutationObserver = JsMutationObserver;
-})(this);
+})(window);
 
 window.HTMLImports = window.HTMLImports || {
   flags: {}
@@ -1675,6 +1675,7 @@ window.CustomElements = window.CustomElements || {
   scope.addModule = addModule;
   scope.initializeModules = initializeModules;
   scope.hasNative = Boolean(document.registerElement);
+  scope.isIE = /Trident/.test(navigator.userAgent);
   scope.useNative = !flags.register && scope.hasNative && !window.ShadowDOMPolyfill && (!window.HTMLImports || window.HTMLImports.useNative);
 })(window.CustomElements);
 
@@ -1983,7 +1984,7 @@ window.CustomElements.addModule(function(scope) {
 });
 
 window.CustomElements.addModule(function(scope) {
-  var isIE11OrOlder = scope.isIE11OrOlder;
+  var isIE = scope.isIE;
   var upgradeDocumentTree = scope.upgradeDocumentTree;
   var upgradeAll = scope.upgradeAll;
   var upgradeWithDefinition = scope.upgradeWithDefinition;
@@ -2179,7 +2180,7 @@ window.CustomElements.addModule(function(scope) {
   }
   wrapDomMethodToForceUpgrade(Node.prototype, "cloneNode");
   wrapDomMethodToForceUpgrade(document, "importNode");
-  if (isIE11OrOlder) {
+  if (isIE) {
     (function() {
       var importNode = document.importNode;
       document.importNode = function() {
@@ -2207,7 +2208,7 @@ window.CustomElements.addModule(function(scope) {
 (function(scope) {
   var useNative = scope.useNative;
   var initializeModules = scope.initializeModules;
-  var isIE11OrOlder = /Trident/.test(navigator.userAgent);
+  var isIE = scope.isIE;
   if (useNative) {
     var nop = function() {};
     scope.watchShadow = nop;
@@ -2244,6 +2245,9 @@ window.CustomElements.addModule(function(scope) {
   function bootstrap() {
     upgradeDocumentTree(window.wrap(document));
     window.CustomElements.ready = true;
+    var requestAnimationFrame = window.requestAnimationFrame || function(f) {
+      setTimeout(f, 16);
+    };
     requestAnimationFrame(function() {
       setTimeout(function() {
         window.CustomElements.readyTime = Date.now();
@@ -2256,7 +2260,7 @@ window.CustomElements.addModule(function(scope) {
       });
     });
   }
-  if (isIE11OrOlder && typeof window.CustomEvent !== "function") {
+  if (isIE && typeof window.CustomEvent !== "function") {
     window.CustomEvent = function(inType, params) {
       params = params || {};
       var e = document.createEvent("CustomEvent");
@@ -2280,7 +2284,6 @@ window.CustomElements.addModule(function(scope) {
     var loadEvent = window.HTMLImports && !window.HTMLImports.ready ? "HTMLImportsLoaded" : "DOMContentLoaded";
     window.addEventListener(loadEvent, bootstrap);
   }
-  scope.isIE11OrOlder = isIE11OrOlder;
 })(window.CustomElements);
 
 if (typeof HTMLTemplateElement === "undefined") {

data/app/assets/javascripts/webcomponentsjs/webcomponents.js

@@ -7,7 +7,7 @@
  * Code distributed by Google as part of the polymer project is also
  * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
-// @version 0.7.11
+// @version 0.7.12
 window.WebComponents = window.WebComponents || {};
 
 (function(scope) {
@@ -1781,8 +1781,8 @@ if (WebComponents.flags.shadow) {
     var originalInsertBefore = OriginalNode.prototype.insertBefore;
     var originalRemoveChild = OriginalNode.prototype.removeChild;
     var originalReplaceChild = OriginalNode.prototype.replaceChild;
-    var isIe = /Trident|Edge/.test(navigator.userAgent);
-    var removeChildOriginalHelper = isIe ? function(parent, child) {
+    var isIEOrEdge = /Trident|Edge/.test(navigator.userAgent);
+    var removeChildOriginalHelper = isIEOrEdge ? function(parent, child) {
       try {
         originalRemoveChild.call(parent, child);
       } catch (ex) {
@@ -5678,7 +5678,7 @@ if (WebComponents.flags.shadow) {
   };
   global.JsMutationObserver = JsMutationObserver;
   if (!global.MutationObserver) global.MutationObserver = JsMutationObserver;
-})(this);
+})(window);
 
 window.HTMLImports = window.HTMLImports || {
   flags: {}
@@ -6444,6 +6444,7 @@ window.CustomElements = window.CustomElements || {
   scope.addModule = addModule;
   scope.initializeModules = initializeModules;
   scope.hasNative = Boolean(document.registerElement);
+  scope.isIE = /Trident/.test(navigator.userAgent);
   scope.useNative = !flags.register && scope.hasNative && !window.ShadowDOMPolyfill && (!window.HTMLImports || window.HTMLImports.useNative);
 })(window.CustomElements);
 
@@ -6752,7 +6753,7 @@ window.CustomElements.addModule(function(scope) {
 });
 
 window.CustomElements.addModule(function(scope) {
-  var isIE11OrOlder = scope.isIE11OrOlder;
+  var isIE = scope.isIE;
   var upgradeDocumentTree = scope.upgradeDocumentTree;
   var upgradeAll = scope.upgradeAll;
   var upgradeWithDefinition = scope.upgradeWithDefinition;
@@ -6948,7 +6949,7 @@ window.CustomElements.addModule(function(scope) {
   }
   wrapDomMethodToForceUpgrade(Node.prototype, "cloneNode");
   wrapDomMethodToForceUpgrade(document, "importNode");
-  if (isIE11OrOlder) {
+  if (isIE) {
     (function() {
       var importNode = document.importNode;
       document.importNode = function() {
@@ -6976,7 +6977,7 @@ window.CustomElements.addModule(function(scope) {
 (function(scope) {
   var useNative = scope.useNative;
   var initializeModules = scope.initializeModules;
-  var isIE11OrOlder = /Trident/.test(navigator.userAgent);
+  var isIE = scope.isIE;
   if (useNative) {
     var nop = function() {};
     scope.watchShadow = nop;
@@ -7013,6 +7014,9 @@ window.CustomElements.addModule(function(scope) {
   function bootstrap() {
     upgradeDocumentTree(window.wrap(document));
     window.CustomElements.ready = true;
+    var requestAnimationFrame = window.requestAnimationFrame || function(f) {
+      setTimeout(f, 16);
+    };
     requestAnimationFrame(function() {
       setTimeout(function() {
         window.CustomElements.readyTime = Date.now();
@@ -7025,7 +7029,7 @@ window.CustomElements.addModule(function(scope) {
       });
     });
   }
-  if (isIE11OrOlder && typeof window.CustomEvent !== "function") {
+  if (isIE && typeof window.CustomEvent !== "function") {
     window.CustomEvent = function(inType, params) {
       params = params || {};
       var e = document.createEvent("CustomEvent");
@@ -7049,7 +7053,6 @@ window.CustomElements.addModule(function(scope) {
     var loadEvent = window.HTMLImports && !window.HTMLImports.ready ? "HTMLImportsLoaded" : "DOMContentLoaded";
     window.addEventListener(loadEvent, bootstrap);
   }
-  scope.isIE11OrOlder = isIE11OrOlder;
 })(window.CustomElements);
 
 (function(scope) {

data/lib/polymer-rails.rb

@@ -6,12 +6,9 @@ end
 
 require "sprockets"
 require "polymer-rails/version"
-require "polymer-rails/processors/directive_processor"
-if Polymer::Rails::LEGACY_SPROCKETS
-  require "polymer-rails/processors/components_processor_v2"
-else
-  require "polymer-rails/processors/components_processor_v3"
-end
+require "polymer-rails/xml_adapters/base"
+require "polymer-rails/processors/directive"
+require "polymer-rails/processors/component"
 require "polymer-rails/helpers/asset_tag_helper"
 require "polymer-rails/engine" if defined?(::Rails)
 require "polymer-rails/railtie" if defined?(::Rails)

data/lib/polymer-rails/component.rb

@@ -1,18 +1,9 @@
-require 'nokogumbo'
+require 'uri'
 
 module Polymer
   module Rails
     class Component
 
-      # HTML Encoding
-      ENCODING = 'UTF-8'
-
-      # Nodes that should be parsed as XML nodes
-      XML_NODES = ['*[selected]', '*[checked]', '*[src]:not(script)']
-
-      # XML options for to_xml method
-      XML_OPTIONS = { save_with: Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS }
-
       # Selectors for component resources
       SELECTORS = {
         html:       "link[rel='import']:not([type='css'])",
@@ -21,49 +12,34 @@ module Polymer
       }
 
       def initialize(data)
-        @doc = ::Nokogiri::HTML5("<body>#{data}</body>")
+        @adapter = XmlAdapters::Base.factory
+        @doc = @adapter.parse_document(data)
       end
 
       def stringify
-        xml_nodes.reduce(to_html) do |output, node|
-          output.gsub(node.to_html, node.to_xml(XML_OPTIONS)).encode(ENCODING)
-        end
+        @adapter.stringify(@doc)
       end
 
       def replace_node(node, name, content)
-        node.replace create_node(name, content)
+        @adapter.replace_node node, @adapter.create_node(@doc, name, content)
       end
 
       def stylesheets
-        @doc.css(SELECTORS[:stylesheet]).reject{|tag| is_external? tag.attributes['href'].value}
+        @adapter.css_select(@doc, SELECTORS[:stylesheet]).reject{|tag| is_external? tag.attributes['href'].value}
       end
 
       def javascripts
-        @doc.css(SELECTORS[:javascript]).reject do |tag|
+        @adapter.css_select(@doc, SELECTORS[:javascript]).reject do |tag|
           is_external? tag.attributes['src'].value
         end
       end
 
       def html_imports
-        @doc.css(SELECTORS[:html])
+        @adapter.css_select(@doc, SELECTORS[:html])
       end
 
     private
 
-      def create_node(name, content)
-        node = ::Nokogiri::XML::Node.new(name, @doc)
-        node.content = content
-        node
-      end
-
-      def to_html
-        @doc.css("body").children.to_html(encoding: ENCODING).lstrip
-      end
-
-      def xml_nodes
-        @doc.css(XML_NODES.join(','))
-      end
-
       def is_external?(source)
         !URI(source).host.nil?
       end

data/lib/polymer-rails/processors/component.rb

@@ -0,0 +1,68 @@
+require 'polymer-rails/component'
+if Polymer::Rails::LEGACY_SPROCKETS
+  require 'polymer-rails/processors/sprockets_v2_processor'
+else
+   require "polymer-rails/processors/sprockets_v3_processor"
+end
+
+module Polymer
+  module Rails
+    module Processors
+      class Component < Polymer::Rails::SprocketsProcessor
+
+        def process
+          inline_styles
+          inline_javascripts
+          require_imports
+          @component.stringify
+        end
+
+      private
+
+        def require_imports
+          @component.html_imports.each do |import|
+            @context.require_asset absolute_asset_path(import.attributes['href'].value)
+            import.remove
+          end
+        end
+
+        def inline_javascripts
+          @component.javascripts.each do |script|
+            @component.replace_node(script, 'script', asset_content(script.attributes['src'].value))
+          end
+        end
+
+        def inline_styles
+          @component.stylesheets.each do |link|
+            @component.replace_node(link, 'style', asset_content(link.attributes['href'].value))
+          end
+        end
+
+        def asset_content(file)
+          asset_path = absolute_asset_path(file)
+          asset      = find_asset(asset_path)
+          unless asset.blank?
+            @context.depend_on_asset asset_path
+            asset.to_s
+          else
+            nil
+          end
+        end
+
+        def absolute_asset_path(file)
+          search_file = file.sub(/^(\.\.\/)+/, '/').sub(/^\/*/, '')
+          ::Rails.application.assets.paths.each do |path|
+            file_list = Dir.glob( "#{File.absolute_path search_file, path }*")
+            return file_list.first unless file_list.blank?
+          end
+          components = Dir.glob("#{File.absolute_path file, File.dirname(@context.pathname)}*")
+          return components.blank? ? nil : components.first
+        end
+
+        def find_asset(asset_path)
+          ::Rails.application.assets.find_asset(asset_path)
+        end
+      end
+    end
+  end
+end

data/lib/polymer-rails/processors/directive.rb

@@ -0,0 +1,8 @@
+module Polymer
+  module Rails
+    module Processors
+      class Directive < Sprockets::DirectiveProcessor
+      end
+    end
+  end
+end

data/lib/polymer-rails/processors/sprockets_v2_processor.rb

@@ -0,0 +1,12 @@
+module Polymer
+  module Rails
+    class SprocketsProcessor < Sprockets::Processor
+
+      def initialize(context, data)
+        @context = context
+        @component = Component.new(data)
+      end
+
+    end
+  end
+end

data/lib/polymer-rails/processors/{components_processor_v3.rb → sprockets_v3_processor.rb}

@@ -1,10 +1,6 @@
-require 'polymer-rails/component'
-require 'polymer-rails/processors/components_processor'
-
 module Polymer
   module Rails
-    class ComponentsProcessorV3
-      include ::Polymer::Rails::ComponentsProcessor
+    class SprocketsProcessor
 
       def self.instance
         @instance ||= new

data/lib/polymer-rails/railtie.rb

@@ -8,36 +8,30 @@ module Polymer
       end
 
       initializer :precompile_polymer do |app|
-        if app.config.respond_to? (:assets)
+        if app.config.respond_to?(:assets)
           app.config.assets.precompile += %w( polymer/polymer.js )
         end
       end
 
       initializer :add_preprocessors do |app|
-        if Polymer::Rails::LEGACY_SPROCKETS
-          add_preprocessors_legacy(app)
-        else
-          add_preprocessors(app)
-        end
+        add_preprocessors(app)
       end
 
       private
 
       def add_preprocessors(app)
-        app.assets.register_mime_type 'text/html', extensions: ['.html']
-        app.assets.register_preprocessor 'text/html', Polymer::Rails::DirectiveProcessor
-        app.assets.register_bundle_processor 'text/html', ::Sprockets::Bundle
-        app.assets.register_postprocessor 'text/html', Polymer::Rails::ComponentsProcessorV3
-      end
-
-      def add_preprocessors_legacy(app)
-        app.assets.register_mime_type "text/html", '.html'
-        app.assets.register_preprocessor "text/html", Polymer::Rails::DirectiveProcessor
-        app.assets.register_postprocessor 'text/html', :web do |context, data|
-          Polymer::Rails::ComponentsProcessorV2.new(context, data).process
+        app.assets.register_preprocessor 'text/html', Polymer::Rails::Processors::Directive
+        if Polymer::Rails::LEGACY_SPROCKETS
+          app.assets.register_mime_type "text/html", '.html'
+          app.assets.register_postprocessor 'text/html', :web do |context, data|
+            Polymer::Rails::Processors::Component.new(context, data).process
+          end
+        else
+          app.assets.register_mime_type 'text/html', extensions: ['.html']
+          app.assets.register_bundle_processor 'text/html', ::Sprockets::Bundle
+          app.assets.register_postprocessor 'text/html', Polymer::Rails::Processors::Component
         end
       end
-
     end
   end
 end

data/lib/polymer-rails/version.rb

@@ -1,5 +1,5 @@
 module Polymer
   module Rails
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/lib/polymer-rails/xml_adapters/base.rb

@@ -0,0 +1,23 @@
+module Polymer
+  module Rails
+    module XmlAdapters
+      class Base
+
+        # HTML Encoding
+        ENCODING = 'UTF-8'
+
+        def self.factory
+          klass = "#{parent}::#{RUBY_PLATFORM =~ /java/ ? 'Jsoup' : 'Nokogiri'}"
+          klass.constantize.new
+        end
+
+      end
+    end
+  end
+end
+
+if RUBY_PLATFORM =~ /java/
+  require "polymer-rails/xml_adapters/jsoup"
+else
+  require "polymer-rails/xml_adapters/nokogiri"
+end

data/lib/polymer-rails/xml_adapters/jsoup.rb

@@ -0,0 +1,48 @@
+require 'ostruct'
+require 'jar_dependencies'
+require_jar 'org.jsoup', 'jsoup', '1.8.3' 
+
+module Polymer
+  module Rails
+    module XmlAdapters
+      class Jsoup < Base
+
+        def parse_document data
+          doc = org.jsoup.Jsoup.parse_body_fragment(data)
+          doc.output_settings.charset(ENCODING)
+          doc
+        end
+
+        def create_node doc, name, content
+          node = doc.create_element(name)
+          datanode = org.jsoup.nodes.DataNode.new(content, doc.base_uri)
+          node.append_child datanode
+          node
+        end
+
+        def stringify doc
+          doc.select('body').html
+        end
+
+        def replace_node old_node, new_node
+          old_node.replace_with new_node
+        end
+
+        def css_select doc, selector
+          doc.select selector.gsub('\'', '')
+        end
+          
+      end
+    end
+  end
+end
+
+Java::OrgJsoupNodes::Attributes.class_eval do
+  def [] name
+    OpenStruct.new value: get(name)
+  end
+end
+
+Java::OrgJsoupNodes::Element.class_eval do
+  alias name nodeName
+end

data/lib/polymer-rails/xml_adapters/nokogiri.rb

@@ -0,0 +1,49 @@
+require 'nokogiri'
+require 'nokogumbo'
+
+module Polymer
+  module Rails
+    module XmlAdapters
+      class Nokogiri < Base
+
+        # XML options for to_xml method
+        XML_OPTIONS = { save_with: ::Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS }
+
+        # Nodes that should be parsed as XML nodes
+        XML_NODES = ['*[selected]', '*[checked]', '*[src]:not(script)']
+
+        def parse_document data
+          ::Nokogiri::HTML5 data
+        end
+
+        def create_node doc, name, content
+          node = ::Nokogiri::XML::Node.new(name, doc)
+          node.content = content
+          node
+        end
+
+        def replace_node old_node, new_node
+          old_node.replace new_node
+        end
+
+        def stringify doc
+          xml_nodes(doc).reduce(to_html(doc)) do |output, node|
+            output.gsub(node.to_html, node.to_xml(XML_OPTIONS)).encode(ENCODING)
+          end
+        end
+
+        def css_select doc, selector
+          doc.css selector
+        end
+
+        private
+        def xml_nodes doc
+          doc.css(XML_NODES.join(','))
+        end
+        def to_html doc
+          doc.css("head,body").children.to_html(encoding: ENCODING).lstrip
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: polymer-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Alex Chaplinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: nokogumbo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: nokogumbo
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use of web components and polymer-project in Ruby on Rails projects
 email:
 - alchapone@yandex.ru
@@ -119,12 +147,15 @@ files:
 - lib/polymer-rails/component.rb
 - lib/polymer-rails/engine.rb
 - lib/polymer-rails/helpers/asset_tag_helper.rb
-- lib/polymer-rails/processors/components_processor.rb
-- lib/polymer-rails/processors/components_processor_v2.rb
-- lib/polymer-rails/processors/components_processor_v3.rb
-- lib/polymer-rails/processors/directive_processor.rb
+- lib/polymer-rails/processors/component.rb
+- lib/polymer-rails/processors/directive.rb
+- lib/polymer-rails/processors/sprockets_v2_processor.rb
+- lib/polymer-rails/processors/sprockets_v3_processor.rb
 - lib/polymer-rails/railtie.rb
 - lib/polymer-rails/version.rb
+- lib/polymer-rails/xml_adapters/base.rb
+- lib/polymer-rails/xml_adapters/jsoup.rb
+- lib/polymer-rails/xml_adapters/nokogiri.rb
 homepage: http://github.com/alchapone/polymer-rails
 licenses:
 - MIT

data/lib/polymer-rails/processors/components_processor.rb

@@ -1,59 +0,0 @@
-module Polymer
-  module Rails
-    module ComponentsProcessor
-
-      def process
-        inline_styles
-        inline_javascripts
-        require_imports
-        @component.stringify
-      end
-
-    private
-
-      def require_imports
-        @component.html_imports.each do |import|
-          @context.require_asset absolute_asset_path(import.attributes['href'].value)
-          import.remove
-        end
-      end
-
-      def inline_javascripts
-        @component.javascripts.each do |script|
-          @component.replace_node(script, 'script', asset_content(script.attributes['src'].value))
-        end
-      end
-
-      def inline_styles
-        @component.stylesheets.each do |link|
-          @component.replace_node(link, 'style', asset_content(link.attributes['href'].value))
-        end
-      end
-
-      def asset_content(file)
-        asset_path = absolute_asset_path(file)
-        asset      = find_asset(asset_path)
-        unless asset.blank?
-          @context.depend_on_asset asset_path
-          asset.to_s
-        else
-          nil
-        end
-      end
-
-      def absolute_asset_path(file)
-        search_file = file.sub(/^(\.\.\/)+/, '/').sub(/^\/*/, '')
-        ::Rails.application.assets.paths.each do |path|
-          file_list = Dir.glob( "#{File.absolute_path search_file, path }*")
-          return file_list.first unless file_list.blank?
-        end
-        components = Dir.glob("#{File.absolute_path file, File.dirname(@context.pathname)}*")
-        return components.blank? ? nil : components.first
-      end
-
-      def find_asset(asset_path)
-        ::Rails.application.assets.find_asset(asset_path)
-      end
-    end
-  end
-end

data/lib/polymer-rails/processors/components_processor_v2.rb

@@ -1,16 +0,0 @@
-require 'polymer-rails/component'
-require 'polymer-rails/processors/components_processor'
-
-module Polymer
-  module Rails
-    class ComponentsProcessorV2 < Sprockets::Processor
-      include ::Polymer::Rails::ComponentsProcessor
-
-      def initialize(context, data)
-        @context = context
-        @component = Component.new(data)
-      end
-
-    end
-  end
-end

data/lib/polymer-rails/processors/directive_processor.rb

@@ -1,6 +0,0 @@
-module Polymer
-  module Rails
-    class DirectiveProcessor < Sprockets::DirectiveProcessor
-    end
-  end
-end