video_info 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64fbda9846def2092874a10b4eeca13e05b9f007
-  data.tar.gz: ff9bd825e8c2430ba2b11f582653f1a651db653a
+  metadata.gz: d7056b4b9244e1aa2f8978a96b5887ef218f0383
+  data.tar.gz: ed2c2485d1f4ebb86384f174dc25fd939a672db2
 SHA512:
-  metadata.gz: 4ced72da987c5be066ff9eb2c748ac03e84fcd2e19bb00ea8edb23c1aecb0563a27e05491cd29154fb5a8ac4aa49b8a379be9c2918edc9d99a7c4fd373600c3c
-  data.tar.gz: b538194b9db7043ba9777ba03bebd5e38c07d0dc42a57e0c8f52812ca67b352aac5daf374c514f660535983ca1d0a9908cf59677adf87422c25e85c58f7d2132
+  metadata.gz: f08606831ea05ba23c64e01d82a6baf73c2bf214d7c684dd132a28bfdb31ff10848bfed8b76806a3a4aa36f86c99f84d58d6749bf09cc79e6b39fcce6388bfdf
+  data.tar.gz: 7ad2a13d1f48702155894e9ef1c9e21991ccbb730a74f3096ba4788c40f7cc37120d7a881ed0298b98c4b26518d56b4174477467e5634ee6c8e7718148dba56e

data/README.md

@@ -66,13 +66,18 @@ User-Agent when empty defaults to "VideoInfo/VERSION" - where version is current
 
 It supports all openURI header fields (options), for more information see: [openURI DOCS](http://www.ruby-doc.org/stdlib-1.9.3/libdoc/open-uri/rdoc/OpenURI.html)
 
-You can also include an `iframe_attributes` hash to include arbitrary attributes in the iframe embed code:
+You can also include an `iframe_attributes` or `url_attributes` hash to the `embed_code` method to include arbitrary attributes in the iframe embed code or as additional URL params:
 
 ``` ruby
-VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4", :iframe_attributes => { :width => 800, :height => 600, "data-key" => "value" } ).embed_code
-=> '<iframe src="http://www.youtube.com/embed/mZqGqE0D0n4" frameborder="0" allowfullscreen="allowfullscreen" width="800" height="600" data-key="value"></iframe>'
+VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4").embed_code(:iframe_attributes => { :width => 800, :height => 600, "data-key" => "value" })
+=> '<iframe src="http://www.youtube.com/embed/mZqGqE0D0n4" frameborder="0" allowfullscreen="allowfullscreen" width="800" height="600" data-key="value"></iframe>
+
+'VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4").embed_code(:url_attributes => { :autoplay => 1 })
+=> '<iframe src="http://www.youtube.com/embed/mZqGqE0D0n4?autoplay=1" frameborder="0" allowfullscreen="allowfullscreen"></iframe>'
 ```
 
+
+
 Author
 ------
 

data/lib/video_info/provider.rb

@@ -1,14 +1,15 @@
+require "addressable/uri"
+
 module VideoInfo
   class Provider
 
     attr_accessor :url, :options, :iframe_attributes, :video_id
-    attr_accessor :embed_url, :embed_code, :provider, :title, :description, :keywords,
-                  :duration, :date, :width, :height,
-                  :thumbnail_small, :thumbnail_medium, :thumbnail_large,
-                  :view_count
+    attr_accessor :embed_url, :provider, :title, :description, :keywords,
+      :duration, :date, :width, :height,
+      :thumbnail_small, :thumbnail_medium, :thumbnail_large,
+      :view_count
 
-    def initialize(url, options = {}, iframe_attributes = nil)
-      @iframe_attributes = _hash_to_attributes(options.delete(:iframe_attributes))
+    def initialize(url, options = {})
       @options = _clean_options(options)
       @url = url
       _set_video_id_from_url
@@ -19,6 +20,21 @@ module VideoInfo
       raise NotImplementedError.new('Provider class must implement .usable? public method')
     end
 
+    def embed_code(options = {})
+      url_attributes = options.fetch(:url_attributes, {})
+      url_attrs = default_url_attributes.merge(url_attributes)
+
+      url = embed_url
+      url += "?#{_hash_to_params(url_attrs)}" unless url_attrs.empty?
+
+      iframe_attrs = ["src=\"#{url}\"", "frameborder=\"0\""]
+
+      iframe_attributes = options.fetch(:iframe_attributes, {})
+      iframe_attrs << _hash_to_attributes(default_iframe_attributes.merge(iframe_attributes))
+
+      "<iframe #{iframe_attrs.reject(&:empty?).join(" ")}></iframe>"
+    end
+
     private
 
     def _set_video_id_from_url
@@ -49,10 +65,14 @@ module VideoInfo
     end
 
     def _hash_to_attributes(hash)
-      if hash.is_a?(Hash)
-        s = hash.map{|k,v| "#{k}=\"#{v}\""}.join(' ')
-        " #{s}"
-      end
+      return unless hash.is_a?(Hash)
+      hash.map{|k,v| "#{k}=\"#{v}\""}.join(' ')
+    end
+
+    def _hash_to_params(hash)
+      uri = Addressable::URI.new
+      uri.query_values = hash
+      uri.query
     end
   end
 end

data/lib/video_info/providers/vimeo.rb

@@ -9,6 +9,17 @@ module VideoInfo
         url =~ /vimeo\.com/
       end
 
+      def default_iframe_attributes
+        {}
+      end
+
+      def default_url_attributes
+        { :title => 0,
+          :byline => 0,
+          :portrait => 0,
+          :autoplay => 0 }
+      end
+
       private
 
       def _url_regex
@@ -18,10 +29,10 @@ module VideoInfo
       def _set_info_from_api
         uri   = open("http://vimeo.com/api/v2/video/#{video_id}.json", options)
         video = MultiJson.load(uri.read).first
+
         @provider         = "Vimeo"
         @url              = video['url']
         @embed_url        = "http://player.vimeo.com/video/#{video_id}"
-        @embed_code       = "<iframe src=\"#{embed_url}?title=0&amp;byline=0&amp;portrait=0&amp;autoplay=0\" frameborder=\"0\"#{iframe_attributes}></iframe>"
         @title            = video['title']
         @description      = video['description']
         @keywords         = video['tags']

data/lib/video_info/providers/youtube.rb

@@ -9,6 +9,14 @@ module VideoInfo
         url =~ /(youtube\.com)|(youtu\.be)/
       end
 
+      def default_iframe_attributes
+        { :allowfullscreen => "allowfullscreen" }
+      end
+
+      def default_url_attributes
+        {}
+      end
+
       private
 
       def _url_regex
@@ -21,7 +29,6 @@ module VideoInfo
         @provider         = "YouTube"
         @url              = url
         @embed_url        = "http://www.youtube.com/embed/#{video_id}"
-        @embed_code       = "<iframe src=\"#{embed_url}\" frameborder=\"0\" allowfullscreen=\"allowfullscreen\"#{iframe_attributes}></iframe>"
         video['entry'].tap do |entry|
           @title            = entry['title']['$t']
           @description      = entry['media$group']['media$description']['$t']

data/lib/video_info/version.rb

@@ -1,3 +1,3 @@
 module VideoInfo
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: video_info
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement