asset.rb in actv-2.10.6

- old
+ new

@@ -46,10 +46,15 @@
     alias currency_code currencyCd
     alias minimum_age regReqMinAge
     alias maximum_age regReqMaxAge
     alias required_gender regReqGenderCd
 
+    def initialize options={}
+      super
+      options[:logoUrlAdr]= replace_http_to_https options[:logoUrlAdr]
+    end
+
     def self.inherited base
       @types << base
     end
 
     def self.types
@@ -94,10 +99,11 @@
       @asset_version ||= @attrs[:assetVersion] unless @attrs[:assetVersion].nil?
     end
 
     def descriptions
       @descriptions ||= Array(@attrs[:assetDescriptions]).map do |description|
+        description[:description] = convert_all_resource_to_https(description[:description])
         ACTV::AssetDescription.new(description)
       end
     end
     alias asset_descriptions descriptions
     alias assetDescriptions descriptions
@@ -126,10 +132,12 @@
     alias asset_channels channels
     alias assetChannels channels
 
     def images
       @images ||= Array(@attrs[:assetImages]).map do |img|
+        img[:imageUrlAdr] = replace_http_to_https img[:imageUrlAdr]
+        img[:linkUrl] = replace_http_to_https img[:linkUrl]
         ACTV::AssetImage.new(img)
       end
     end
     alias asset_images images
     alias assetImages images
@@ -170,10 +178,11 @@
     alias asset_topics topics
     alias assetTopics topics
 
     def seo_urls
       @seo_urls ||= Array(@attrs[:assetSeoUrls]).map do |seo_url|
+        seo_url[:urlAdr] = replace_http_to_https seo_url[:urlAdr]
         ACTV::AssetSeoUrl.new(seo_url)
       end
     end
     alias asset_seo_urls seo_urls
     alias assetSeoUrls seo_urls
@@ -318,11 +327,11 @@
         image_path
       end
     end
 
     def image_path
-      default_image = 'http://www.active.com/images/events/hotrace.gif'
+      default_image = 'https://www.active.com/images/events/hotrace.gif'
       image = image_without_placeholder.imageUrlAdr rescue ""
 
       if image.empty? and (logoUrlAdr && logoUrlAdr != default_image && !(logoUrlAdr =~ URI::regexp).nil?)
         image = logoUrlAdr
       end
@@ -371,11 +380,11 @@
                           []
                         end
     end
 
     def image_without_placeholder
-      default_image = 'http://www.active.com/images/events/hotrace.gif'
+      default_image = 'https://www.active.com/images/events/hotrace.gif'
       current_image = nil
 
       asset_images.each do |i|
         if i.imageUrlAdr.downcase != default_image
           current_image = i
@@ -414,8 +423,19 @@
 
     def sponsored_date_available?
       start_time = Time.parse(sponsoredContent[:startDate])
       end_time = Time.parse(sponsoredContent[:endDate])
       Time.now.between?(start_time, end_time)
+    end
+
+    def convert_all_resource_to_https content
+      content.gsub!(/src=[\'|\"](http:\/\/)/, "src='http://" => "src='https://", 'src="http://' => 'src="https://')
+      content
+    end
+
+    def replace_http_to_https content
+      content = content.to_s
+      content.gsub! 'http://', 'https://'
+      content
     end
   end
 end