actv 2.10.5 → 2.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4acedae60694fd977cd213ec94152f2d3a2a5df1
-  data.tar.gz: 114d23c0c8243189517c7278321b10c26c1d588a
+  metadata.gz: 2c8962be8f84d61a6bec5ddd0330e948469f8ea9
+  data.tar.gz: 73dd3d5bf2832ddac42468eda20ff6e7ce2dad89
 SHA512:
-  metadata.gz: 44dd52836d871b2f2a7b3346baced7c754ebf79391834bba2b926c2f2528104da78335e20dd8fab0f71084f263855aa0eaf39a9d19d89a9b7f2e3de998293691
-  data.tar.gz: 923310e35af621dcb87436a464babf9896af461ba79fcf575720436b75ce342f405766719e216039f4a014552a35132107fd8269dd76006ddf075f111ca265f6
+  metadata.gz: 73045b2b84bab15dc927568badecb9cd742c944e233b54c31508921df49318686edc21c2ddd383cb7d8fd087bab5537184ab565a01917d38fd8b2c98b61d20b3
+  data.tar.gz: 6ca18df1625df56305d802e4227e0afee2aefa256806938161c21a459604a9cc6d6f8671289c66955e0b2e3f23d0b37f56c3cef0c5b3ac5b04e246bc4e5841eb

data/lib/actv/asset.rb

@@ -48,6 +48,11 @@ module ACTV
     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
@@ -96,6 +101,7 @@ module ACTV
 
     def descriptions
       @descriptions ||= Array(@attrs[:assetDescriptions]).map do |description|
+        description[:description] = convert_all_resource_to_https(description[:description])
         ACTV::AssetDescription.new(description)
       end
     end
@@ -128,6 +134,8 @@ module ACTV
 
     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
@@ -172,6 +180,7 @@ module ACTV
 
     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
@@ -320,7 +329,7 @@ module ACTV
     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?)
@@ -373,7 +382,7 @@ module ACTV
     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|
@@ -417,5 +426,16 @@ module ACTV
       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

data/lib/actv/author.rb

@@ -38,7 +38,7 @@ module ACTV
 
     def image_url
       if photo.url && photo.url.start_with?("/")
-        "http://www.active.com#{photo.url}"
+        "https://www.active.com#{photo.url}"
       else
         photo.url
       end

data/lib/actv/event.rb

@@ -129,7 +129,7 @@ module ACTV
     end
 
     def image_url
-      defaultImage = 'http://www.active.com/images/events/hotrace.gif'
+      defaultImage = 'https://www.active.com/images/events/hotrace.gif'
       image = ''
 
       self.assetImages.each do |i|

data/lib/actv/version.rb

@@ -1,3 +1,3 @@
 module ACTV
-  VERSION = "2.10.5"
+  VERSION = "2.10.6"
 end

data/lib/actv/video.rb

@@ -4,7 +4,6 @@ module ACTV
   class Video < Asset
     attr_reader :sorCreateDtm, :urlAdr
     alias publish_date sorCreateDtm
-    alias source urlAdr
     alias channel sub_topic
 
     def self.valid? response
@@ -59,5 +58,10 @@ module ACTV
       true
     end
 
+    def source
+      urlAdr.to_s.sub! /http:\/\/rodale.videodownload.worldnow.com/i, 'https://rodale.videodownload.worldnow.com'
+      urlAdr
+    end
+
   end
 end

data/spec/actv/asset_spec.rb

@@ -3,6 +3,33 @@ require 'timecop'
 
 describe ACTV::Asset do
 
+  describe '#initialize' do
+    it 'returns link with HTTPS protocol for www.active.com assets' do
+      asset  = ACTV::Asset.new(assetGuid: 1, assetName: 'Asset #1', logoUrlAdr: 'http://www.active.com/images/logo.jpg')
+      expect(asset.logoUrlAdr).to eq 'https://www.active.com/images/logo.jpg'
+      end
+
+    it 'returns link with HTTPS protocol for content.active.com' do
+      asset  = ACTV::Asset.new(assetGuid: 1, assetName: 'Asset #1', logoUrlAdr: 'http://content.active.com/images/logo.jpg')
+      expect(asset.logoUrlAdr).to eq 'https://content.active.com/images/logo.jpg'
+    end
+
+    it 'returns link with HTTPS protocol for photos-images.active.com' do
+      asset  = ACTV::Asset.new(assetGuid: 1, assetName: 'Asset #1', logoUrlAdr: 'http://photos-images.active.com/images/logo.jpg')
+      expect(asset.logoUrlAdr).to eq 'https://photos-images.active.com/images/logo.jpg'
+    end
+
+    it 'returns link with HTTPS protocol for rodale.images.worldnow.com' do
+      asset  = ACTV::Asset.new(assetGuid: 1, assetName: 'Asset #1', logoUrlAdr: 'http://rodale.images.worldnow.com/images/logo.jpg')
+      expect(asset.logoUrlAdr).to eq 'https://rodale.images.worldnow.com/images/logo.jpg'
+    end
+
+    it 'returns link with HTTPS protocol for rodale.videodownload.worldnow.com' do
+      asset  = ACTV::Asset.new(assetGuid: 1, assetName: 'Asset #1', logoUrlAdr: 'http://rodale.videodownload.worldnow.com/images/logo.jpg')
+      expect(asset.logoUrlAdr).to eq 'https://rodale.videodownload.worldnow.com/images/logo.jpg'
+    end
+  end
+
   describe '#organization' do
     subject(:asset) { ACTV::Asset.new assetGuid: 'assetguid' }
 

data/spec/actv/author_spec.rb

@@ -11,7 +11,7 @@ describe ACTV::Author do
   context 'when valid author asset is initialized' do
     its(:footer) { should start_with '<div class="article-signature-block">' }
     its(:bio) { should start_with 'Jacquie Cattanach is an avid runner and triathlete' }
-    its('photo.url') {should eq 'http://www.active.com/Assets/Running/Bios/jacquie-cattanach-bio.jpg'}
+    its('photo.url') {should eq 'https://www.active.com/Assets/Running/Bios/jacquie-cattanach-bio.jpg'}
     its(:name_from_footer) { should eq 'Jacquie Cattanach'}
   end
 
@@ -47,7 +47,7 @@ describe ACTV::Author do
   describe '#image_url' do
     context 'when photo url is a fully qualified url' do
       it 'returns the photo url' do
-        expect(author.image_url).to eq 'http://www.active.com/Assets/Running/Bios/jacquie-cattanach-bio.jpg'
+        expect(author.image_url).to eq 'https://www.active.com/Assets/Running/Bios/jacquie-cattanach-bio.jpg'
       end
     end
 
@@ -56,7 +56,7 @@ describe ACTV::Author do
         allow(author.photo).to receive(:url).and_return '/hello'
       end
       it 'returns the url for the active.com domain' do
-        expect(author.image_url).to eq 'http://www.active.com/hello'
+        expect(author.image_url).to eq 'https://www.active.com/hello'
       end
     end
   end

data/spec/actv/client/assets_spec.rb

@@ -64,7 +64,7 @@ describe ACTV::Client do
   describe "#asset_by_path" do
     context "with a valid url passed" do
       before do
-        @seo_url = "http://www.active.com/san-francisco-ca/running/crazy-eight-fall-2013"
+        @seo_url = "https://www.active.com/san-francisco-ca/running/crazy-eight-fall-2013"
         @seo_url_md5 = Digest::MD5.hexdigest(@seo_url )
 
         stub_get("/v2/seourls/#{@seo_url_md5}?load_asset=true").

data/spec/actv/client/videos_spec.rb

@@ -17,7 +17,7 @@ describe ACTV::Client do
       end
 
       it "should return the correct source" do
-        expect(video.source).to eq("http://rodale.videodownload.worldnow.com/RODALE_2505201618134176078AA.mp4")
+        expect(video.source).to eq("https://rodale.videodownload.worldnow.com/RODALE_2505201618134176078AA.mp4")
       end
     end
   end

data/spec/actv/video_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ACTV::Video do
-  let(:asset_images) { [{:imageUrlAdr => "http://RODALE.images.worldnow.com/images/12508455_vtf.jpg", :imageName => "videoImage"}] }
+  let(:asset_images) { [{:imageUrlAdr => "http://rodale.images.worldnow.com/images/12508455_vtf.jpg", :imageName => "videoImage"}] }
   let(:urlAdr) { "http://rodale.videodownload.worldnow.com/RODALE_0906201614333627818AA.mp4" }
   let(:asset_tags) { [{:tag => {:tagId => "1794337", :tagName => "video/mp4", :tagDescription => "type"}},
                       {:tag => {:tagId => "1794525", :tagName => "640", :tagDescription => "width"}},
@@ -115,8 +115,14 @@ describe ACTV::Video do
   describe "#cover" do
     context "when a video image exists" do
       it "should return video cover" do
-        expect(video.cover).to eq("http://RODALE.images.worldnow.com/images/12508455_vtf.jpg")
+        expect(video.cover).to eq("https://rodale.images.worldnow.com/images/12508455_vtf.jpg")
       end
     end
   end
+
+  describe '#source' do
+    it 'starts with https' do
+      expect(video.source).to eq("https://rodale.videodownload.worldnow.com/RODALE_0906201614333627818AA.mp4")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actv
 version: !ruby/object:Gem::Version
-  version: 2.10.5
+  version: 2.10.6
 platform: ruby
 authors:
 - Nathaniel Barnes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday