caboose-cms 0.9.75 → 0.9.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49412491ddf5c193f965625c32b1167873404f55
-  data.tar.gz: 5bedcc9cb7a2c100d72fedad93645388b13be5d1
+  metadata.gz: 609a44de81243d561064f99d93f9f7ff113f5d82
+  data.tar.gz: c4213dc5352d3fd9bf30e66ba8216035e5ee76c2
 SHA512:
-  metadata.gz: 5944ae55cff565f6084159f53cca38e516bd3112a79854250336b88a6125f6f8747116210b277fa8c752e6154e141b886ad3098bac0cdfbc7318d1f6729a9bf2
-  data.tar.gz: e078b698da3047596d8f9976cade911de0eebbdce29b9565a9f4ca7fcbbdc515d8914788e90caf36aac1638f75cf406ab16915f83b0ce69e15eb2d829027c678
+  metadata.gz: 58aa3be8111218acdd34d8dfd852589a0108fa2804e7076d6bc4d1dfd1a21d8d15a90f17c1c622c526bb94b379a093cd0c0252fbd78313f98908d6795b021482
+  data.tar.gz: a962f4a914ef23b7866e53fcca0f31147c9e664360d6bbd99b578e6eebf9bbb471956fc6ad7a74eff20607c471061cd8fadccd2ce45ef38027182183425a47ff

data/app/models/caboose/site.rb

@@ -96,19 +96,19 @@ class Caboose::Site < ActiveRecord::Base
   end
   
   def custom_js_url
-    url = "http://#{Caboose::cdn_domain}/assets/#{self.name}/js/custom.js"
+    url = "//#{Caboose::cdn_domain}/assets/#{self.name}/js/custom.js"
     url << "?#{self.date_js_updated.strftime('%Y%m%d%H%M%S')}" if self.date_js_updated
     return url
   end
   
   def custom_css_url
-    url = "http://#{Caboose::cdn_domain}/assets/#{self.name}/css/custom.css"
+    url = "//#{Caboose::cdn_domain}/assets/#{self.name}/css/custom.css"
     url << "?#{self.date_css_updated.strftime('%Y%m%d%H%M%S')}" if self.date_css_updated
     return url
   end
     
-  def custom_js              
-    resp = HTTParty.get(self.custom_js_url)
+  def custom_js
+    resp = HTTParty.get('https:' + self.custom_js_url)
     if resp.nil? || resp.code.to_i == 403
       self.custom_js = ""
       return ""            
@@ -117,7 +117,7 @@ class Caboose::Site < ActiveRecord::Base
   end
   
   def custom_css    
-    resp = HTTParty.get(self.custom_css_url)
+    resp = HTTParty.get('https:' + self.custom_css_url)
     if resp.nil? || resp.code.to_i == 403
       self.custom_css = ""
       return ""            

data/app/views/layouts/caboose/application.html.erb

@@ -17,7 +17,7 @@
 <%= gzip_stylesheet_link_tag @site.name == 'application' ? 'application' : "#{@site.name}/css/application" %>
 <% Caboose::stylesheets.each do |css| %><%= gzip_stylesheet_link_tag(css) %><% end %>
 <% @page.linked_resources_map[:css].each do |r| %><%= gzip_stylesheet_link_tag r %><% end %>
-<% if @site.date_css_updated %><link rel='stylesheet' type='text/css' url="<%= raw @site.custom_css_url %>" /><% end %>
+<% if @site.date_css_updated %><link rel='stylesheet' type='text/css' href="<%= raw @site.custom_css_url %>" /><% end %>
 <% if @page.custom_css_files && @page.custom_css_files.strip.length > 0 %>
   <% @page.custom_css_files.split("\n").each do |url| %><link rel="stylesheet" type='text/css' href="<%= raw url %>" /><% end %>
 <% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.75'
+  VERSION = '0.9.76'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.75
+  version: 0.9.76
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg