exvo_helpers 0.0.7 → 0.0.8

data/lib/exvo_helpers/helpers.rb

@@ -8,10 +8,14 @@ module Exvo
       %w(cdn cfs desktop themes blog contacts inbox music pics preview).each do |service|
 
         # def self.cdn_uri
-        #   "http://#{cdn_host}"
+        #   protocol = ["cdn", "cfs", "themes"].include?(service) && env.to_sym == :production ? "//" : "http://"
+        #   protocol + cdn_host
         # end
         define_method "#{service}_uri" do
-          "http://#{ send("#{service}_host") }"
+          # special link starting with '//' in production so that the webserver can choose between HTTP and HTTPS
+          # but only for those apps/services that have proper SSL support (i.e. valid certificates)
+          protocol = ["cdn", "cfs", "themes"].include?(service) && env.to_sym == :production ? "//" : "http://"
+          protocol + send("#{service}_host")
         end
 
         # def self.cdn_host
@@ -77,7 +81,7 @@ module Exvo
     def self.default_opts
       {
         :production => {
-          :cdn_host => 'cdn.exvo.com',
+          :cdn_host => 'd33gjlr95u9pgf.cloudfront.net', # cloudfront.net so we can use https (cdn.exvo.com via https does not work properly)
           :cfs_host => 'cfs.exvo.com',
           :desktop_host => 'www.exvo.com',
           :themes_host => 'themes.exvo.com',
@@ -89,7 +93,7 @@ module Exvo
           :preview_host => 'preview.exvo.com'
         },
         :staging => {
-          :cdn_host => 'staging.cdn.exvo.com',
+          :cdn_host => 'd1by559a994699.cloudfront.net',
           :cfs_host => 'staging.cfs.exvo.com',
           :desktop_host => 'www.exvo.co',
           :themes_host => 'staging.themes.exvo.com',

data/lib/exvo_helpers/version.rb

@@ -1,3 +1,3 @@
 module ExvoHelpers
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/exvo_helpers/view_helpers.rb

@@ -6,13 +6,11 @@ module Exvo
     def javascript_bundle_include_tag(bundle)
       case Exvo::Helpers.env.to_sym
       when :production
-        # FIXME change back to '//' in production so that the webserver can choose between HTTP and HTTPS
-        # note, that it requires a proper SSL certificate installed for cdn.exvo.com domain
-        javascript_include_tag "http://#{ Exvo::Helpers.cdn_host }/javascripts/#{bundle}.js"
+        javascript_include_tag "#{Exvo::Helpers.cdn_uri}/javascripts/#{bundle}.js"
       when :staging
-        javascript_include_tag "http://#{ Exvo::Helpers.cdn_host }/javascripts/#{bundle}.js"
+        javascript_include_tag "#{Exvo::Helpers.cdn_uri}/javascripts/#{bundle}.js"
       else
-        javascript_include_tag "http://#{ Exvo::Helpers.cdn_host }/javascripts/bundles/#{bundle}.js"
+        javascript_include_tag "#{Exvo::Helpers.cdn_uri}/javascripts/bundles/#{bundle}.js"
       end
     end
 

data/spec/exvo_helpers/helpers_spec.rb

@@ -21,7 +21,7 @@ describe Exvo::Helpers do
       Exvo::Helpers.stub(:env).and_return('production')
     end
 
-    specify { Exvo::Helpers.cdn_uri.should match('cdn.exvo.com') }
+    specify { Exvo::Helpers.cdn_uri.should match('d33gjlr95u9pgf.cloudfront.net') }
     specify { Exvo::Helpers.cfs_uri.should match('cfs.exvo.com') }
     specify { Exvo::Helpers.desktop_uri.should match('www.exvo.com') }
     specify { Exvo::Helpers.themes_uri.should match('themes.exvo.com') }
@@ -38,7 +38,7 @@ describe Exvo::Helpers do
       Exvo::Helpers.stub(:env).and_return('production')
     end
 
-    specify { Exvo::Helpers.cdn_host.should eql('cdn.exvo.com') }
+    specify { Exvo::Helpers.cdn_host.should eql('d33gjlr95u9pgf.cloudfront.net') }
     specify { Exvo::Helpers.cfs_host.should eql('cfs.exvo.com') }
     specify { Exvo::Helpers.desktop_host.should eql('www.exvo.com') }
     specify { Exvo::Helpers.themes_host.should eql('themes.exvo.com') }

data/spec/exvo_helpers/view_helpers_spec.rb

@@ -15,17 +15,17 @@ describe Exvo::ViewHelpers do
     end
 
     it "returns a javascript_include_tag based on env" do
-      view_helper.should_receive(:javascript_include_tag).with("http://cdn.exvo.com/javascripts/plugins.js")
+      view_helper.should_receive(:javascript_include_tag).with("//d33gjlr95u9pgf.cloudfront.net/javascripts/plugins.js")
       view_helper.javascript_bundle_include_tag("plugins")
     end
 
     it "returns a stylesheet_link_tag based on env" do
-      view_helper.should_receive(:stylesheet_link_tag).with("http://themes.exvo.com/stylesheets/themes/frost/all.css", { :media => 'all' })
+      view_helper.should_receive(:stylesheet_link_tag).with("//themes.exvo.com/stylesheets/themes/frost/all.css", { :media => 'all' })
       view_helper.themes_stylesheet_link_tag("frost/all", :media => 'all')
     end
 
     it "returns an image_tag based on env" do
-      view_helper.should_receive(:image_tag).with("http://themes.exvo.com/stylesheets/images/icons/exvo.png", { :alt => 'Exvo' })
+      view_helper.should_receive(:image_tag).with("//themes.exvo.com/stylesheets/images/icons/exvo.png", { :alt => 'Exvo' })
       view_helper.themes_image_tag("icons/exvo.png", :alt => 'Exvo')
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exvo_helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000Z
+date: 2011-12-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &83106290 !ruby/object:Gem::Requirement
+  requirement: &76965090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *83106290
+  version_requirements: *76965090
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &83105480 !ruby/object:Gem::Requirement
+  requirement: &76962330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.0
   type: :development
   prerelease: false
-  version_requirements: *83105480
+  version_requirements: *76962330
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &83103730 !ruby/object:Gem::Requirement
+  requirement: &76961760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *83103730
+  version_requirements: *76961760
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &83102830 !ruby/object:Gem::Requirement
+  requirement: &76961230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83102830
+  version_requirements: *76961230
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &83101560 !ruby/object:Gem::Requirement
+  requirement: &76954540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83101560
+  version_requirements: *76954540
 description: Ruby gem providing helper *_uri/*_host methods for Exvo services/apps
   like DESKTOP/CFS/AUTH/THEMES.
 email: