link_preview 0.3.0.pre.1 → 0.3.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 645ac9be334767988dfec1425ef4bd3255fa461e
-  data.tar.gz: ba9301c67a6b3dba2612fac61af20bb0fe60af39
+  metadata.gz: 35f267fb3916535449cc2d8432cfccff9f3f484b
+  data.tar.gz: 1544498d1364a48834d3d512b33e2a8df42315f4
 SHA512:
-  metadata.gz: b2a9a28ce62df205eabced120ebf013b203deceb0baca7682de106d0ab5db23b16ec0ac5d9b50f9842d95e8b5f5e7f2eaad7a4df6c22f198945218705bd1223b
-  data.tar.gz: 1ed6611609f62a4ad1e3a8b9820e6f7cbb98572673b6cbf4eb04d96f1b29563e732d39cf1c26a4f7c40e4b24478cfce98ec774421bfbd79587fb4c8f2152d22f
+  metadata.gz: aed599b2dec22f70af8a9ae6540de40f2e5d7739bbddf03c41737551b4db82c7ec2ee109dad7dd195f002c10d3b39091fdd3a3b13da4cab20713d377f749dea1
+  data.tar.gz: bc31ed8c7469d32dbbd616822e9dde0144b5deb6fc0e4dd29bfc77fbfa2d6b630dd8fe06e4ddef4fc6cee9ad50049fdb5b544e38f4ef66cf20652313e7c8dd73

data/lib/link_preview/content.rb

@@ -312,8 +312,10 @@ module LinkPreview
 
     def content_html_video
       return unless content_url.present?
+      width_attribute = %(width="#{content_width_scaled}") if content_width_scaled > 0
+      height_attribute = %(height="#{content_height_scaled}") if content_height_scaled > 0
       <<-EOF.strip.gsub(/\s+/, ' ').gsub(/>\s+</, '><')
-          <video width="#{content_width_scaled}" height="#{content_height_scaled}">
+          <video #{width_attribute} #{height_attribute} controls>
             <source src="#{content_url}"
                     type="#{content_type}" />
           </video>

data/lib/link_preview/parser.rb

@@ -83,23 +83,27 @@ module LinkPreview
       enum_oembed_link(doc) do |link_rel|
         discovered_uris << LinkPreview::URI.parse(link_rel, @options)
       end
+
+      opengraph_image_array_first_elem = find_meta_property_array(doc, 'og:image').first
+      opengraph_video_array_first_elem = find_meta_property_array(doc, 'og:video').first
+
       {
         opengraph: {
           title: find_meta_property(doc, 'og:title'),
           description: find_meta_property(doc, 'og:description'),
-          image_secure_url: find_meta_property(doc, 'og:image:secure_url'),
-          image: find_meta_property(doc, 'og:image'),
-          image_url: find_meta_property(doc, 'og:image:url'),
+          image_secure_url: opengraph_image_array_first_elem['og:image:secure_url'],
+          image: opengraph_image_array_first_elem['og:image'],
+          image_url: opengraph_image_array_first_elem['og:image:url'],
           tag: find_meta_property(doc, 'og:tag'),
           url: find_meta_property(doc, 'og:url'),
           type: find_meta_property(doc, 'og:type'),
           site_name: find_meta_property(doc, 'og:site_name'),
-          video_secure_url: find_meta_property(doc, 'og:video:secure_url'),
-          video: find_meta_property(doc, 'og:video'),
-          video_url: find_meta_property(doc, 'og:video:url'),
-          video_type: find_meta_property(doc, 'og:video:type'),
-          video_width: find_meta_property(doc, 'og:video:width'),
-          video_height: find_meta_property(doc, 'og:video:height')
+          video_secure_url: opengraph_video_array_first_elem['og:video:secure_url'],
+          video: opengraph_video_array_first_elem['og:video'],
+          video_url: opengraph_video_array_first_elem['og:video:url'],
+          video_type: opengraph_video_array_first_elem['og:video:type'],
+          video_width: opengraph_video_array_first_elem['og:video:width'],
+          video_height: opengraph_video_array_first_elem['og:video:height']
         },
         html: {
           title: find_title(doc),
@@ -159,7 +163,7 @@ module LinkPreview
       Enumerator.new do |e|
         doc.search('head/meta').each do |node|
           next unless matching_meta_pair?(node, key, value)
-          e.yield node.attributes['content'].value
+          e.yield OpenStruct.new(key: node.attributes['property'].value, value: node.attributes['content'].value)
         end
       end
     end
@@ -168,10 +172,19 @@ module LinkPreview
       return false unless valid_meta_node?(node)
       return false unless node.attributes[key]
       return false unless node.attributes[key].value
-      return false unless node.attributes[key].value.casecmp(value.downcase).zero?
+      return false unless matching_meta_value?(node, key, value)
       true
     end
 
+    def matching_meta_value?(node, key, value)
+      case value
+      when String
+        node.attributes[key].value.casecmp(value.downcase).zero?
+      when Regexp
+        node.attributes[key].value =~ value
+      end
+    end
+
     def valid_meta_node?(node)
       return false unless node
       return false unless node.respond_to?(:attributes)
@@ -181,11 +194,34 @@ module LinkPreview
     end
 
     def find_meta_description(doc)
-      enum_meta_pair(doc, 'name', 'description').detect(&:present?)
+      Enumerator.new do |e|
+        doc.search('head/meta[name=description]').each do |node|
+          next unless matching_meta_pair?(node, 'name', 'description')
+          e.yield node.attributes['content'].value
+        end
+      end.first
     end
 
     def find_meta_property(doc, property)
-      enum_meta_pair(doc, 'property', property).detect(&:present?)
+      enum_meta_pair(doc, 'property', property).first.try(:value)
+    end
+
+    def find_meta_property_array(doc, property)
+      [].tap do |property_array|
+        property_group = {}
+        enum_meta_pair(doc, 'property', /\A#{Regexp.escape(property)}/).each do |pair|
+          if property_array_delimiter?(property, pair) && property_group.any?
+            property_array.push(property_group.dup)
+            property_group.clear
+          end
+          property_group.merge!(pair.key => pair.value)
+        end
+        property_array.push(property_group)
+      end
+    end
+
+    def property_array_delimiter?(property, pair)
+      pair.key == property || pair.key == "#{property}:url"
     end
   end
 end

data/lib/link_preview/version.rb

@@ -19,5 +19,5 @@
 # SOFTWARE.
 
 module LinkPreview
-  VERSION = '0.3.0-1'.freeze
+  VERSION = '0.3.0-2'.freeze
 end

data/spec/files/requests/kalture_html5.yml

@@ -20,10 +20,12 @@ http_interactions:
     headers:
       Server:
       - Apache/2.4.7 (Ubuntu)
+      Etag:
+      - '"2419-52c939f3d9ad5"'
+      X-N:
+      - S
       Last-Modified:
       - Thu, 25 Feb 2016 08:03:46 GMT
-      Etag:
-      - '"2419-52c939f3d9ad5-gzip"'
       Access-Control-Allow-Origin:
       - "*"
       Content-Type:
@@ -31,11 +33,11 @@ http_interactions:
       Vary:
       - Accept-Encoding
       Cache-Control:
-      - max-age=590
+      - max-age=148
       Expires:
-      - Thu, 25 Feb 2016 18:54:31 GMT
+      - Fri, 26 Feb 2016 01:43:39 GMT
       Date:
-      - Thu, 25 Feb 2016 18:44:41 GMT
+      - Fri, 26 Feb 2016 01:41:11 GMT
       Content-Length:
       - '9241'
       Connection:
@@ -250,7 +252,7 @@ http_interactions:
         dCZxdW90OyBjb250ZW50PSZxdW90OzM3MCZxdW90OyAvJmd0OwkKPC9wcmU+
         CjwvYm9keT4KPC9odG1sPg==
     http_version: 
-  recorded_at: Thu, 25 Feb 2016 18:44:41 GMT
+  recorded_at: Fri, 26 Feb 2016 01:41:11 GMT
 - request:
     method: get
     uri: http://cdnbakmi.kaltura.com/p/243342/sp/24334200/thumbnail/entry_id/1_sf5ovm7u/version/100003/width/400
@@ -271,38 +273,40 @@ http_interactions:
     headers:
       Server:
       - nginx/1.8.0
+      Vary:
+      - Accept-Encoding
+      X-Vod-Me:
+      - pa-front-origin102
+      X-Vod-Session:
+      - '380955972'
+      Last-Modified:
+      - Sun, 19 Nov 2000 08:52:00 GMT
+      Etag:
+      - '"11092ea89-1e4f-0"'
       Content-Type:
       - image/jpeg
       Content-Length:
       - '7759'
       X-Me:
-      - pa-front-thumb2
+      - pa-front-thumb1
       X-Kaltura-Session:
-      - '890700395'
+      - '991505528'
       Pragma:
       - ''
       X-Kaltura:
       - cached-thumb-exists,19a8ef605b30ba4ada8be6b8a425ea6e
-      Last-Modified:
-      - Sun, 19 Nov 2000 08:52:00 GMT
       Accept-Ranges:
       - bytes
       Access-Control-Allow-Origin:
       - "*"
       X-Kaltura-Sendfile:
       - ''
-      Etag:
-      - '"11092ea89-1e4f-0"'
-      X-Vod-Me:
-      - pa-front-origin104
-      X-Vod-Session:
-      - '2120171211'
       Cache-Control:
-      - public, max-age=3526
+      - public, max-age=488
       Expires:
-      - Thu, 25 Feb 2016 19:43:27 GMT
+      - Fri, 26 Feb 2016 01:49:19 GMT
       Date:
-      - Thu, 25 Feb 2016 18:44:41 GMT
+      - Fri, 26 Feb 2016 01:41:11 GMT
       Connection:
       - keep-alive
     body:
@@ -482,5 +486,5 @@ http_interactions:
         chCCPWlQhCCOxQhCCD2qp3IQgqqFCEFHblQoQgW5JchCBTkp25CECXpTt6EI
         FpbtyEIKlVduQhBUb1JQhB//2Q==
     http_version: 
-  recorded_at: Thu, 25 Feb 2016 18:44:41 GMT
+  recorded_at: Fri, 26 Feb 2016 01:41:11 GMT
 recorded_with: VCR 3.0.1

data/spec/link_preview_spec.rb

@@ -745,9 +745,9 @@ describe LinkPreview do
           description: %(Kaltura Player: Share plugin demonstrates the ease of which social share can be configured with the kaltura player toolkit.),
           type: 'video',
           thumbnail_url: 'http://cdnbakmi.kaltura.com/p/243342/sp/24334200/thumbnail/entry_id/1_sf5ovm7u/version/100003/width/400',
-          html: %(<video width="560" height="395"><source src="https://cdnapisec.kaltura.com/p/243342/sp/24334200/embedIframeJs/uiconf_id/28685261/partner_id/243342?iframeembed=true&playerId=kaltura_player&entry_id=1_sf5ovm7u" type="video/mp4" /></video>),
-          width: 560,
-          height: 395
+          html: %(<video controls><source src="https://cdnapisec.kaltura.com/p/243342/sp/24334200/playManifest/entryId/1_sf5ovm7u/flavorId/1_d2uwy7vv/format/url/protocol/http/a.mp4" type="video/mp4" /></video>),
+          width: 0,
+          height: 0
         }
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: link_preview
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.1
+  version: 0.3.0.pre.2
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-oembed