vae 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39924c8d796d9a87ad852d2ee481a202700072c2
-  data.tar.gz: 9fc626218a52979e7bb0201022d0f1c4fbe8afc4
+  metadata.gz: 761457171c2221f8f3f9b9fcdfd6da2a939d662f
+  data.tar.gz: 1a5571a6c4fb9786ef729f44f7299858262a7495
 SHA512:
-  metadata.gz: dffb28f5f715e02402c63ea45908dd1a4ca9e282be6314487e07b51182eb61135c958c39294d01835379950f9c1a0fd2e1e2e57e2aa06533a264b37dddb20f37
-  data.tar.gz: 03e23527502a066b8bc8f04ced5b03d5a10abcb6031c0d9d235562716aa3f6ea80c2265f6a4ec99f90324d2cf23f4c1e880e2d721f763705d9b619c63018c340
+  metadata.gz: db78d7bbbd4f60af90212f6466f812b57b0c7bdc72228bd1400d538364bee92edcd205b0be34f0aabbaeaa4f523d1d2f5410528bf36cf2c51cece797dd4d6868
+  data.tar.gz: 0171b03a0a6d04991e7ec9441c90ba76171dbf29c441ab54f10fbc36e3d94a689738b4c1231c1fc78ecc75a613a54b2e508d9e81431172f76ce2745a25f056bf

data/lib/full_stack.rb

@@ -80,7 +80,7 @@ class FullStack
     }
     @pids << fork {
       Dir.chdir(serve_root)
-      ENV['VAE_LOCAL_BACKSTAGE'] = @site.subdomain + ".vaeplatform." + (ENV['VAEPLATFORM_LOCAL'] ? "dev" : "com")
+      ENV['VAE_LOCAL_BACKSTAGE'] = @site.subdomain_base + ".vaeplatform." + (ENV['VAEPLATFORM_LOCAL'] ? "dev" : "com")
       ENV['VAE_LOCAL_SECRET_KEY'] = @site.secret_key
       ENV['VAE_LOCAL_DATA_PATH'] = @site.data_path
       if options[:php_runtime] == "hhvm"

data/lib/site.rb

@@ -13,9 +13,14 @@ class Site
     @data = login_to_server
   end
 
+  def domain
+    subdomain =~ /\./ ? subdomain : "#{subdomain}.vaesite.com"
+  end
+
   def fetch_from_server(req)
-    http = Net::HTTP.new("#{subdomain}.vaesite.com")
+    http = Net::HTTP.new(domain, 443)
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    http.use_ssl = true
     http.start { |http|
       http.read_timeout = 120
       http.request(req)
@@ -47,4 +52,8 @@ class Site
   rescue JSON::ParserError
     raise VaeError, "An unknown error occurred signing into Vae Platform.  Please email support for help."
   end
+
+  def subdomain_base
+    subdomain.split(".").first
+  end
 end

data/lib/vae_local.rb

@@ -1,9 +1,9 @@
 class VaeLocal
   BANNER = "Vae local preview server, version #{VER}"
 
-  def self.fetch_from_vaeplatform(site, req)
+  def self.fetch_from_vaeplatform(subdomain, req)
     local = ENV['VAEPLATFORM_LOCAL']
-    http = Net::HTTP.new(vaeplatform_host(site), (local ? 80 : 443))
+    http = Net::HTTP.new(vaeplatform_host(subdomain), (local ? 80 : 443))
     http.use_ssl = true unless local
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     http.start { |http|
@@ -16,12 +16,12 @@ class VaeLocal
     !system("lsof -i:#{port}", out: '/dev/null')
   end
 
-  def self.vaeplatform_host(site)
-    "#{site}." + (ENV['VAEPLATFORM_LOCAL'] ? "vaeplatform.test" : "vaeplatform.com")
+  def self.vaeplatform_host(subdomain)
+    "#{subdomain.split(".").first}." + (ENV['VAEPLATFORM_LOCAL'] ? "vaeplatform.test" : "vaeplatform.com")
   end
 
-  def self.vaeplatform_url(site)
-    "http#{ENV['VAEPLATFORM_LOCAL'] ? '' : 's'}://#{vaeplatform_host(site)}"
+  def self.vaeplatform_url(subdomain)
+    "http#{ENV['VAEPLATFORM_LOCAL'] ? '' : 's'}://#{vaeplatform_host(subdomain)}"
   end
 
   def self.read_auth_keys

data/lib/vae_site_servlet.rb

@@ -182,7 +182,7 @@ class VaeSiteServlet < Servlet
       end
     else
       if req.params["REQUEST_URI"] =~ /^\/__data\// or req.params["REQUEST_URI"] =~ /^\/__assets\//
-        from_vae = { 'location' => "http://#{@site.subdomain}.vaesite.com#{req.params["REQUEST_URI"]}"}
+        from_vae = { 'location' => "http://#{@site.domain}#{req.params["REQUEST_URI"]}"}
         puts "#{req.params["REQUEST_URI"]} static asset"
       else
         from_vae = fetch_from_vae_and_include_source_of_current_page(req, req.params["REQUEST_METHOD"])

data/lib/version.rb

@@ -1 +1 @@
-VER = "0.8.7"
+VER = "0.8.8"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vae
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Action Verb, LLC
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png