easy_youtube 0.0.1 → 1.0.0

data/lib/easy_youtube.rb

@@ -1,63 +1,70 @@
 require "net/http"
 class EasyYouTube
-    URL_FORMATS = {
-        :regular => /^(https?:\/\/)?(www\.)?youtube.com\/watch\?(.*\&)?v=(?<id>[^&]+)/,
-        :shortened => /^(https?:\/\/)?(www\.)?youtu.be\/(?<id>[^&]+)/,
-        :embed => /^(https?:\/\/)?(www\.)?youtube.com\/embed\/(?<id>[^&]+)/,
-        :embed_as3 => /^(https?:\/\/)?(www\.)?youtube.com\/v\/(?<id>[^?]+)/,
-        :chromeless_as3 => /^(https?:\/\/)?(www\.)?youtube.com\/apiplayer\?video_id=(?<id>[^&]+)/
-    }
+  URL_FORMATS = {
+    :regular => /^(https?:\/\/)?(www\.)?youtube.com\/watch\?(.*\&)?v=(?<id>[^&]+)/,
+    :shortened => /^(https?:\/\/)?(www\.)?youtu.be\/(?<id>[^&]+)/,
+    :embed => /^(https?:\/\/)?(www\.)?youtube.com\/embed\/(?<id>[^&]+)/,
+    :embed_as3 => /^(https?:\/\/)?(www\.)?youtube.com\/v\/(?<id>[^?]+)/,
+    :chromeless_as3 => /^(https?:\/\/)?(www\.)?youtube.com\/apiplayer\?video_id=(?<id>[^&]+)/
+  }
         
-        INVALID_CHARS = /[^a-zA-Z0-9\:\/\?\=\&\$\-\_\.\+\!\*\'\(\)\,]/
-
-        def self.extract_video_id(youtube_url)
-                return nil if has_invalid_chars?(youtube_url)
-                URL_FORMATS.values.each do |format_regex|
-                        match = format_regex.match(youtube_url)
-                    return match[:id] if match
-                end
-                return nil
-        end
-
-        def self.has_invalid_chars?(youtube_url)
-                !INVALID_CHARS.match(youtube_url).nil?
-        end
-
-           def self.youtube_embed_url(youtube_url, width = 420, height = 315)
-            video_id = extract_video_id(youtube_url)
-            %(<iframe width="#{width}" height="#{height}" src="http://www.youtube.com/embed/#{video_id}" frameborder="0" allowfullscreen></iframe>)
-           end
-
-           def self.youtube_regular_url(youtube_url)
-            video_id = extract_video_id(youtube_url)
-            "http://www.youtube.com/watch?v=#{ video_id }"
-          end
-
-          def self.youtube_shortened_url(youtube_url)
-            video_id = extract_video_id(youtube_url)
-            "http://youtu.be/#{ video_id }"
-          end
-        
-        def self.valid_id?(id)
-                if id
-                    response = Net::HTTP.get("gdata.youtube.com", "/feeds/api/videos/#{id}")
-                    if ["Invalid id", "Video not found"].include? response
-                              false
-                    else
-                              true
-                    end
-                else
-                        false
-                end
-        end        
-
-          def self.valid_youtube_link?(youtube_url)
-                  if has_invalid_chars?(youtube_url)
-                          false
-                  else
-                    video_id = extract_video_id(youtube_url)
-                          valid_id?(id)
-                  end
-          end
+  INVALID_CHARS = /[^a-zA-Z0-9\:\/\?\=\&\$\-\_\.\+\!\*\'\(\)\,]/
+
+  def self.extract_video_id(youtube_url)
+    return nil if has_invalid_chars?(youtube_url)
+    URL_FORMATS.values.each do |format_regex|
+      match = format_regex.match(youtube_url)
+      return match[:id] if match
+    end
+    return nil
+  end
+
+  def self.has_invalid_chars?(youtube_url)
+    !INVALID_CHARS.match(youtube_url).nil?
+  end
+
+  def self.youtube_embed_url(youtube_url, width = 420, height = 315)
+    create_embeded_url(extract_video_id(youtube_url), width, height)
+  end
+
+  def self.create_embeded_url(video_id, width = 420, height = 315)
+    %(<iframe width="#{width}" height="#{height}" src="http://www.youtube.com/embed/#{video_id}" frameborder="0" allowfullscreen></iframe>)
+  end
+
+  def self.youtube_regular_url(youtube_url)
+    create_regular_url(extract_video_id(youtube_url))
+  end
+
+  def self.create_regular_url(video_id)
+    "http://www.youtube.com/watch?v=#{video_id}"
+  end
+
+  def self.youtube_shortened_url(youtube_url)
+    create_shortened_url(extract_video_id(youtube_url))
+  end
+
+  def self.create_shortened_url(video_id)
+    "http://youtu.be/#{ video_id }"      
+  end
+
+  def self.valid_id?(id)
+    if id
+      response = Net::HTTP.get("gdata.youtube.com", "/feeds/api/videos/#{id}")
+      if ["Invalid id", "Video not found"].include? response
+        false
+      else
+        true
+      end
+    else
+      false
+    end
+  end        
 
+  def self.valid_youtube_url?(youtube_url)
+    if has_invalid_chars?(youtube_url)
+      false
+    else
+      valid_id?(extract_video_id(youtube_url))
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_youtube
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors: