youtube_addy 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e022f0da8711aaa4506f32e4816f5e8c3ca413ac
+  data.tar.gz: b94a2bcf5e378856259b924306e2e9ff0f89f1b4
+SHA512:
+  metadata.gz: 213c42405f2fb5521a828d8b810c10e0b6e9f7a6964d6cfb070870c3c1c91fa264fc2e274660b75cc42154c0bae4e0992272da50869a35224d8afddbae87fd3d
+  data.tar.gz: 7f7b6f9a0ba17a42a68ba0352cd6291e05b0d4a87bd1075a06ac36d5427fa1d83473da39f688dcf528e47280a837274c4be42f02f8d376fd9392c752bb33aa43

data/lib/youtube_addy.rb

@@ -1,28 +1,39 @@
 class YouTubeAddy
-  URL_Formats = {
-      regular: /^(https?:\/\/)?(www\.)?youtube.com\/watch\?(.*\&)?v=([^&]+)/,
-      shortened: /^(https?:\/\/)?(www\.)?youtu.be\/([^&]+)/,
-      invalid_chars: /[^a-zA-Z0-9\:\/\?\=\&\$\-\_\.\+\!\*\'\(\)\,]/
+  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.has_invalid_chars?(youtube_url)
-    !URL_Formats[:invalid_chars].match(youtube_url).nil?
+    !INVALID_CHARS.match(youtube_url).nil?
   end
 
   def self.extract_video_id(youtube_url)
     return nil if has_invalid_chars?(youtube_url)
 
-    if match = URL_Formats[:regular].match(youtube_url)
-      return match[4]
-    elsif match = URL_Formats[:shortened].match(youtube_url)
-      return match[3]
+    URL_FORMATS.values.each do |format_regex|
+      match = format_regex.match(youtube_url)
+      return match[:id] if match
     end
-
-    nil
   end
 
   def self.youtube_embed_url(youtube_url, width = 420, height = 315)
     vid_id = extract_video_id(youtube_url)
     %(<iframe width="#{width}" height="#{height}" src="http://www.youtube.com/embed/#{vid_id}" frameborder="0" allowfullscreen></iframe>)
   end
-end
+
+  def self.youtube_regular_url(youtube_url)
+    vid_id = extract_video_id(youtube_url)
+    "http://www.youtube.com/watch?v=#{ vid_id }"
+  end
+
+  def self.youtube_shortened_url(youtube_url)
+    vid_id = extract_video_id(youtube_url)
+    "http://youtu.be/#{ vid_id }"
+  end
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: youtube_addy
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors:
 - David Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000Z
+date: 2011-11-15 00:00:00.000000000 Z
 dependencies: []
 description: Parse youtube addresses and generate embed html code
 email: davidwright at gmail dot com
@@ -20,26 +19,25 @@ files:
 - lib/youtube_addy.rb
 homepage: https://github.com/hanzq/youtube_addy/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: YouTube address helper
 test_files: []