concerto_frontend 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a5adb1892b3d9eb81fc06cdf4193a289be02c0e
-  data.tar.gz: 70f239f1ef20f54af9235b7136923aef9ce233c7
+  metadata.gz: 85eed53786694c839ee00381dd02ee8864a11871
+  data.tar.gz: 8f253dfda5a8ef3b25e5408dcf6438d73f69737f
 SHA512:
-  metadata.gz: 054b35afaab35486551fe6a6d8db53b787f019c0dcfe95bdbddeaa79b4f09d28a12c7f86bbccd30b15ccdcee709949474d3be7bc673a1609c68afca26d785799
-  data.tar.gz: b13eeb0c98d416ecb9c7e8e15712eff21d536df91a666af21ab305b2d90b63bdeecc353812d7465af273c76e6906db7a9fefd6ff54a85d07ef7b7b3727bbe3b1
+  metadata.gz: ab7831b55811a95a744678102776ac87aa8ea498ebe432a08ff4b8f68dc87e8a39706c7a49283a4bc39ce340c6981a23b147331b970f4a58d62953b2d5f0220c
+  data.tar.gz: ee78eaa4cd50e3d55d867a980380e99374ccdf0e36597f05af453f9f1a0c8e9871a505b9ef85840def58bd65ada709803de0a42367f6b706892a49f90b2186ec

data/app/assets/html/concerto_frontend/concerto-frontend.html

@@ -8379,6 +8379,22 @@ if (!window.Promise) {
       return base + url;
     },
 
+    /**
+     * Prepends a base to a path if not already prefixed with it
+     *
+     * Does not care about absolute URLs.
+     */
+    prefixWithBase: function(path, base) {
+      bl = base.length;
+      pl = path.length;
+      if (pl > bl && bl != 0 && path.substring(0, bl) == base)
+      {
+        return path;
+      }
+      return base + path;
+    },
+
+
     /**
      * Use iterative binary search to find optimal content font size given 
      * the element's dimensions as constraints.
@@ -8645,7 +8661,7 @@ if (!window.Promise) {
       },
 
       _graphicSrc: function(baseUrl, path) {
-        this.$.graphic.src = baseUrl + path;
+        this.$.graphic.src = this.prefixWithBase(path, baseUrl);
       },
 
       created: function (){
@@ -9280,7 +9296,7 @@ if (!window.Promise) {
 
       backgroundImage: function(path) {
         /* background-image style for annotated attribute binding */
-        var url = this.resolveURL(path, this.baseUrl);
+        var url = this.prefixWithBase(path, this.baseUrl);
         return "background-image: url('" + url + "');";
       },
 
@@ -9298,9 +9314,8 @@ if (!window.Promise) {
         this.template = data.template;
         this.timezone = data.time_zone;
 
-        var key = response.xhr.getResponseHeader('etag');
-        if (key != null) {
-          key = key.replace(/"/g, '');
+        var key = response.xhr.getResponseHeader('X-Concerto-Frontend-Setup-Key');
+        if (key) {
           this.cacheKey = key;
         }
 
@@ -9309,7 +9324,7 @@ if (!window.Promise) {
           var css_link = document.createElement("link");
           css_link.type = "text/css";
           css_link.rel = "stylesheet";
-          css_link.href = this.resolveURL(this.template.css_path, this.baseUrl);
+          css_link.href = this.prefixWithBase(this.template.css_path, this.baseUrl);
           document.head.appendChild(css_link);
         }
       },

data/app/views/concerto_frontend/_frontend.html

@@ -7,5 +7,5 @@
 <% end %>
 
   <!-- from concerto-frontend -->
-  <concerto-screen screen-id="<%= params[:id] %>" preview="<%= @preview %>"></concerto-screen>
+  <concerto-screen screen-id="<%= params[:id] %>" preview="<%= @preview %>" base-url="<%= Rails.application.config.relative_url_root %>"></concerto-screen>
   <!-- end from concerto-frontend -->

data/lib/concerto_frontend/version.rb

@@ -1,3 +1,3 @@
 module ConcertoFrontend
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_frontend
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Gabriel Perez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Concerto Frontend