sessionm-vast 1.0.5 → 1.0.6

data/lib/vast/ad.rb

@@ -32,10 +32,6 @@ module VAST
     def id
       source_node[:id]
     end
-
-    def sequence
-      source_node[:sequence]
-    end
     
     # Returns name of source ad server
     def ad_system
@@ -50,7 +46,7 @@ module VAST
     # Returns URI to request if ad does not play due to error.
     def error_url
       error_url_node = source_node.at("Error")
-      URI.parse(URI.escape(error_url_node.content.strip)) if error_url_node
+      URI.parse(error_url_node.content.strip) if error_url_node
     end
     
     # Returns an array containing all linear creatives.
@@ -82,14 +78,14 @@ module VAST
     
     # Each Ad must contain at least one impression.
     def impression
-      URI.parse(URI.escape(source_node.at('Impression').content.strip))
+      URI.parse(source_node.at('Impression').content.strip)
     end
     
     # Array of all impressions available for this ad, excluding those specific
     # to a particular creative.
     def impressions
       source_node.xpath('.//Impression').to_a.collect do |node|
-        URI.parse(URI.escape(node.content.strip))
+        URI.parse(node.content.strip)
       end
     end
     
@@ -100,4 +96,4 @@ module VAST
       end
     end
   end
-end
+end

data/lib/vast/companion_creative.rb

@@ -34,7 +34,7 @@ module VAST
     
     # URI to open as destination page when user clicks on the video
     def click_through_url
-      URI.parse URI.escape(source_node.at('CompanionClickThrough').content.strip)
+      URI.parse source_node.at('CompanionClickThrough').content.strip
     end
     
     # Alternate text to be displayed when companion is rendered in HTML environment.
@@ -65,9 +65,9 @@ module VAST
     def resource_url
       case resource_type
       when :static
-        URI.parse URI.escape(source_node.at('StaticResource').content.strip)
+        URI.parse source_node.at('StaticResource').content.strip
       when :iframe
-        URI.parse URI.escape(source_node.at('IFrameResource').content.strip)
+        URI.parse source_node.at('IFrameResource').content.strip
       end
     end
     

data/lib/vast/creative.rb

@@ -35,9 +35,9 @@ module VAST
       source_node.xpath('.//Tracking').to_a.collect do |node|
         underscored_name = underscore(node[:event])
         if tracking_urls[underscored_name.to_sym]
-           tracking_urls[underscored_name.to_sym] << URI.parse(URI.escape(node.content.strip))
+           tracking_urls[underscored_name.to_sym] << URI.parse(node.content.strip)
         else
-           tracking_urls[underscored_name.to_sym] = [URI.parse(URI.escape(node.content.strip))]
+           tracking_urls[underscored_name.to_sym] = [URI.parse(node.content.strip)]
         end
       end
       tracking_urls
@@ -59,4 +59,4 @@ module VAST
       source_node.ancestors('Creative').first
     end
   end
-end
+end

data/lib/vast/document.rb

@@ -1,17 +1,9 @@
 module VAST
   # A complete VAST document
   class Document < Nokogiri::XML::Document
-    @macros = ["ERRORCODE", "CONTENTPLAYHEAD", "CACHEBUSTING", "ASSETURI"]
-
-    def self.eval_macro(xml_string)
-    end
-
+    
     # Parse a VAST XML document
     def self.parse(*args)
-      # VAST 3 support macro, need to uri escape all macros
-      if (args[0].is_a? String)
-        @macros.each{|x|  args[0].gsub!("[#{x}]", "%5B#{x}%5D")}
-      end
       super(*args)
     end
     
@@ -25,17 +17,7 @@ module VAST
     # Checks whether document conforms to the VAST XML Schema Definitions, accessible at
     # http://www.iab.net/iab_products_and_industry_services/508676/digitalvideo/vast
     def valid?
-      version_node = self.xpath('/VAST/@version').first
-      major_version = version_node ? version_node.value.to_i : 0
-      case major_version
-      when 2
-        xsd_file = VAST_SCHEMA_XSD_FILE
-      when 3
-        xsd_file = VAST3_SCHEMA_XSD_FILE
-      else
-        return false
-      end
-      xsd = Nokogiri::XML::Schema(File.read(xsd_file))
+      xsd = Nokogiri::XML::Schema(File.read(VAST_SCHEMA_XSD_FILE))
       xsd.valid?(self)
     end
     
@@ -54,14 +36,6 @@ module VAST
     def inline_ads
       ads.select{ |ad| ad.kind_of?(VAST::InlineAd) }
     end
-
-    def ad_pod_ads
-      ads.select{ |ad| ad.sequence.is_a? Numeric }.sort{|x, y| x.sequence <=> y.sequence }
-    end
-
-    def stand_alone_ads
-      ads.select{ |ad| !ad.sequence.is_a?(Numeric) }
-    end
     
     # All wrapper ads
     def wrapper_ads

data/lib/vast/inline_ad.rb

@@ -4,12 +4,7 @@ module VAST
     
     # URI of request to survey vendor
     def survey_url
-      URI.parse URI.escape(source_node.at('Survey').content.strip)
-    end
-
-    # Common name of ad
-    def ad_system
-      source_node.at('AdSystem').content
+      URI.parse source_node.at('Survey').content.strip
     end
     
     # Common name of ad

data/lib/vast/linear_creative.rb

@@ -8,20 +8,15 @@ module VAST
       source_node.at('Duration').content
     end
     
-    # VAST 3
-    def skipoffset
-      source_node[:skipoffset]
-    end
-    
     # URI to open as destination page when user clicks on the video
     def click_through_url
-      URI.parse URI.escape(source_node.at('ClickThrough').content.strip)
+      URI.parse source_node.at('ClickThrough').content.strip
     end
     
     # An array of URIs to request for tracking purposes when user clicks on the video
     def click_tracking_urls
       source_node.xpath('.//ClickTracking').to_a.collect do |node|
-        URI.parse URI.escape(node.content.strip)
+        URI.parse node.content.strip
       end
     end
     
@@ -32,7 +27,7 @@ module VAST
       custom_click_urls = {}
       source_node.xpath('.//CustomClick').to_a.collect do |node|
         key = underscore(node[:id]).to_sym
-        custom_click_urls[key] = URI.parse(URI.escape(node.content.strip))
+        custom_click_urls[key] = URI.parse(node.content.strip)
       end
       custom_click_urls
     end
@@ -46,12 +41,5 @@ module VAST
         Mediafile.new(node)
       end
     end
-
-    def icons
-      source_node.xpath('.//Icon').to_a.collect do |node|
-        Icon.new(node)
-      end
-    end
-    
   end
-end
+end

data/lib/vast/mediafile.rb

@@ -5,7 +5,7 @@ module VAST
     
     # Location of linear file
     def url
-      URI.parse URI.escape(source_node.content.strip)
+      URI.parse source_node.content.strip
     end
     
     def id
@@ -53,4 +53,4 @@ module VAST
       source_node[:maintainAspectRatio]=="true"
     end
   end
-end
+end

data/lib/vast/non_linear_creative.rb

@@ -34,11 +34,7 @@ module VAST
     
     # URI to open as destination page when user clicks on creative
     def click_through_url
-      URI.parse URI.escape(source_node.at('NonLinearClickThrough').content.strip)
-    end
-
-    def click_tracking_url
-      URI.parse URI.escape(source_node.at('NonLinearClickTracking').content.strip)
+      URI.parse source_node.at('NonLinearClickThrough').content.strip
     end
     
     # Whether it is acceptable to scale the mediafile.
@@ -80,9 +76,9 @@ module VAST
     def resource_url
       case resource_type
       when :static
-        URI.parse URI.escape(source_node.at('StaticResource').content.strip)
+        URI.parse source_node.at('StaticResource').content.strip
       when :iframe
-        URI.parse URI.escape(source_node.at('IFrameResource').content.strip)
+        URI.parse source_node.at('IFrameResource').content.strip
       end
     end
     
@@ -94,4 +90,4 @@ module VAST
     end
     
   end
-end
+end

data/lib/vast/wrapper_ad.rb

@@ -12,8 +12,8 @@ module VAST
     
     # URI of ad tag of downstream Secondary Ad Server
     def ad_tag_url
-      URI.parse URI.escape(source_node.at('VASTAdTagURI').content.strip)
+      URI.parse source_node.at('VASTAdTagURI').content.strip
     end
     
   end
-end
+end

data/lib/vast.rb

@@ -8,7 +8,6 @@ require 'vast/wrapper_ad'
 require 'vast/creative'
 require 'vast/linear_creative'
 require 'vast/mediafile'
-require 'vast/icon'
 require 'vast/companion_creative'
 require 'vast/non_linear_creative'
 require 'vast/extension'
@@ -17,8 +16,7 @@ require 'vast/extension'
 module VAST
   VAST_VERSION = 2.0
   VAST_SCHEMA_XSD_FILE = File.expand_path(File.join(File.dirname(__FILE__), 'vast_2.0.1.xsd'))
-  VAST3_SCHEMA_XSD_FILE = File.expand_path(File.join(File.dirname(__FILE__), 'vast3_draft.xsd'))
-
+  
   class VASTError < StandardError; end
   
   # Raised when parsing a VAST document that does not conform to the VAST spec XSD

data/test/ad_test.rb

@@ -46,7 +46,7 @@ class AdTest < Test::Unit::TestCase
     
     assert_equal "601364", ad.id
     assert_equal "Acudeo Compatible", ad.ad_system
-    assert_equal URI.parse(URI.escape('http://myErrorURL/error')), ad.error_url
+    assert_equal URI.parse('http://myErrorURL/error'), ad.error_url
   end
   
   def test_ad_should_know_linear_creatives
@@ -119,4 +119,4 @@ class AdTest < Test::Unit::TestCase
       assert extension.kind_of?(VAST::Extension)
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-vast
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70239459430660 !ruby/object:Gem::Requirement
+  requirement: &70174552626880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 1.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *70239459430660
+  version_requirements: *70174552626880
 description: 
 email:
 - chrisgdinn@gmail.com
@@ -30,7 +30,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/vast.rb
-- lib/vast3_draft.xsd
 - lib/vast_2.0.1.xsd
 - lib/vast/ad.rb
 - lib/vast/companion_creative.rb
@@ -38,7 +37,6 @@ files:
 - lib/vast/document.rb
 - lib/vast/element.rb
 - lib/vast/extension.rb
-- lib/vast/icon.rb
 - lib/vast/inline_ad.rb
 - lib/vast/linear_creative.rb
 - lib/vast/mediafile.rb
@@ -54,7 +52,6 @@ files:
 - test/mediafile_test.rb
 - test/non_linear_creative_test.rb
 - test/test_helper.rb
-- test/vast3_inline_ad_test.rb
 - test/wrapper_ad_test.rb
 - test/examples/document_with_no_ads.xml
 - test/examples/document_with_one_inline_ad.xml
@@ -64,12 +61,8 @@ files:
 - test/examples/invalid_document.xml
 - test/examples/invalid_document_with_missing_ad_type.xml
 - test/examples/invalid_document_with_missing_creative_type.xml
-- test/examples/vast3_inline.xml
 - LICENSE
 - README.rdoc
-- Gemfile
-- Pathfile
-- Rakefile
 homepage: http://github.com/chrisdinn/vast
 licenses: []
 post_install_message: 

data/Gemfile

@@ -1,9 +0,0 @@
-source :gemcutter
-
-gem 'nokogiri', "~>1.5.5"
-gem 'pathological'
-gem 'rake'
-
-group :test do
- gem 'turn', :require => false
-end

data/Pathfile

@@ -1,2 +0,0 @@
-.
-

data/Rakefile

@@ -1,8 +0,0 @@
-require "pathological"
-require 'rake/testtask'
-Rake::TestTask.new('test') do |t|
-    t.libs << 'test'
-	  t.pattern = 'test/*_test.rb'
-	  t.verbose = true
-	  t.warning = false
-end

data/lib/vast/icon.rb

@@ -1,87 +0,0 @@
-module VAST
-  # Any number of Mediafile objects can be provided for a single Ad, but it is assumed that all Mediafiles belongs
-  # to a single Ad object represent the same creative unit with the same  duration, Ad-ID (ISCI code), etc.
-  class Icon < Element
-    
-    def program
-      source_node[:program]
-    end
-    
-    def width
-      source_node[:width].to_i
-    end
-
-    def height
-      source_node[:height].to_i
-    end
-    
-    def xPosition
-      source_node[:xPosition].to_i
-    end
-
-    def yPosition
-      source_node[:yPosition].to_i
-    end
-    
-    def duration
-      source_node[:duration].to_i
-    end
-
-    def offset
-      source_node[:offset].to_i
-    end
-    
-    # Defines the method to use for communication with the companion
-    def api_framework
-      source_node[:apiFramework]
-    end
-
-    def resource_type
-      if source_node.at('StaticResource')
-        :static
-      elsif source_node.at('IFrameResource')
-        :iframe
-      elsif source_node.at('HTMLResource')
-        :html
-      end
-    end
-    
-    # Returns MIME type of static creative
-    def creative_type
-      if resource_type == :static
-        source_node.at('StaticResource')[:creativeType]
-      end
-    end
-
-    # Returns URI for static or iframe resource
-    def resource_url
-      case resource_type
-      when :static
-        URI.parse URI.escape(source_node.at('StaticResource').content.strip)
-      when :iframe
-        URI.parse URI.escape(source_node.at('IFrameResource').content.strip)
-      end
-    end
-    
-    # Returns HTML text for html resource
-    def resource_html
-      if resource_type == :html
-        source_node.at('HTMLResource').content
-      end
-    end
-
-    def click_through_url
-      URI.parse URI.escape(source_node.at('IconClickThrough').content.strip)
-    end
-
-    def click_tracking_url
-      URI.parse URI.escape(source_node.at('IconClickTracking').content.strip)
-    end
-
-    def view_tracking_url
-      URI.parse URI.escape(source_node.at('IconViewTracking').content.strip)
-    end
-    
-    # end of class
-  end
-end