video_info 1.0.1 → 1.1.0

data/lib/providers/vimeo.rb

@@ -16,10 +16,6 @@ module VideoInfo
       get_info unless @video_id == url || @video_id.nil? || @video_id.empty?
     end
 
-    def valid?
-      !@video_id.nil? && !['', nil].include?(@title)
-    end
-
     private
 
     def get_info

data/lib/providers/youtube.rb

@@ -26,10 +26,6 @@ module VideoInfo
       end
     end
 
-    def valid?
-      !@video_id.nil? && !['', nil].include?(@title)
-    end
-
     private
 
     def get_info

data/lib/video_info.rb

@@ -1,11 +1,32 @@
 require 'open-uri'
 require 'multi_json'
-require 'video_info/version'
 require 'providers/vimeo'
 require 'providers/youtube'
 
 module VideoInfo
+
   def self.get(url, options = {})
+    options = clean_options(options)
+    video = get_video(url, options)
+    valid?(video) ? video : nil
+  end
+
+private
+
+  def self.get_video(url, options)
+    case url
+    when /vimeo\.com/
+      Vimeo.new(url, options)
+    when /(youtube\.com)|(youtu\.be)/
+      Youtube.new(url, options)
+    end
+  end
+
+  def self.valid?(video)
+    !video.nil? && !video.video_id.nil? && !['', nil].include?(video.title)
+  end
+
+  def self.clean_options(options)
     options = { "User-Agent" => "VideoInfo/#{VideoInfo::VERSION}" }.merge options
     options.dup.each do |key, value|
       unless OpenURI::Options.keys.include?(key) || options[:iframe_attributes]
@@ -15,17 +36,7 @@ module VideoInfo
         end
       end
     end
-
-    case url
-    when /vimeo\.com/
-      @video = Vimeo.new(url, options)
-    when /(youtube\.com)|(youtu\.be)/
-      @video = Youtube.new(url, options)
-    end
-  end
-
-  def self.method_missing(sym, *args, &block)
-    @video.send sym, *args, &block
+    options
   end
 
   def self.hash_to_attributes(hash)

data/lib/video_info/version.rb

@@ -1,3 +1,3 @@
 module VideoInfo
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video_info
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json