reddavis-embedit 0.0.6 → 0.0.7

data/lib/embedit/media.rb

@@ -6,10 +6,10 @@ module Embedit
     
     def initialize(url)
       @valid = true                                                 #Innocent until proven guilty
-      @oembed_providers = Providers.new.sites 
+      @oembed_providers = Providers.new.sites
       find_provider(url)
-      rescue                                                        #Horrible hack, but flickrs poor status headers == :( 
-        @valid = false                                              #if it breaks, its gotta be invalid, I suggest removing when debugging                                                 
+      #rescue                                                        #Horrible hack, but flickrs poor status headers == :( 
+      #  @valid = false                                              #if it breaks, its gotta be invalid, I suggest removing when debugging                                                 
     end
     
     def title
@@ -38,7 +38,7 @@ module Embedit
   #Find a provider
     def find_provider(url)
       return @valid = false unless Validate.new(url).valid?
-      
+
       @oembed_providers.keys.each do |key|                               #First search oembed providers for a match
         if url.match(/(\.|\/)#{key}\./)                                  #URL can be www.vimeo.com || http://vimeo.com
           return @media_data = Oembed.new(url, key)

data/lib/embedit/player/player.rb

@@ -0,0 +1,27 @@
+# TODO Having problems with using in rails (files not being found), need to look into. But works perfectly find with www.pandastream.com
+module Embedit
+  
+  class Player
+  
+    attr_reader :title, :url, :format
+    
+    def initialize(url)
+      @url = url
+    end
+            
+    def html(size = {})
+      self.html = @url  # Reset measurements, incase if hmtl is called twice on the same object
+      @html.gsub!(/400/, size[:width].to_s) unless size[:width].nil?
+      @html.gsub!(/300/, size[:height].to_s) unless size[:height].nil?
+      @html
+    end
+    
+    def html=(url)
+      @html = %(<embed src="http://s3.amazonaws.com/panda-test/player.swf" width="400" height="300" 
+      allowfullscreen="true" allowscriptaccess="always" 
+      flashvars="&displayheight=300&file=#{url}&width=400&height=300" />)
+    end
+    
+  end
+  
+end

data/lib/embedit/validate.rb

@@ -12,14 +12,14 @@ class Validate
   private
   
   def check_url    
-    if check_url_supported == true && check_response == true   #We first check that the url is one actually supported by Embedit
+    if (check_url_supported == true && check_response == true) || (File.extname(@url) != "" || nil && check_url_supported)    #We first check that the url is one actually supported by Embedit
       return true
     end
   end
   
   def check_response
     true if open(@url)    #Header codes are annoying, just check that the page works, the check with Embed::Media will narrow down more
-    rescue 
+    rescue
       false
   end
   
@@ -35,7 +35,7 @@ class Validate
       return true 
     elsif @url.match(/share\.ovi\.com/)
       return true
-    elsif File.extname(@url).match(/\.flv/)
+    elsif File.extname(@url) != "" || nil
       return true
     end
     return false                                              #Return false if all else fail

data/lib/embedit.rb

@@ -16,8 +16,7 @@ require 'embedit/validate'
 require 'embedit/player/player'
 
 # Oembed
-
-#puts a = Embedit::Media.new('http://www.vimeo.com/1263763').html
+#puts a = Embedit::Media.new('http://www.vimeo.com/1260077').title
 
 #puts b = Embedit::Media.new('http://www.flickr.com/photos/reddavis999/2692043113/').html #valid? #.valid #.html(:height => 200)
 
@@ -31,7 +30,7 @@ require 'embedit/player/player'
 
 # YouTUBE
 
-#puts g = Embedit::Media.new("http://www.youtube.com/watch?v=j3TOT1lnVTA").valid?
+#puts g = Embedit::Media.new("http://www.youtube.com/watch?v=j3TOT1lnVTA").html
 
 # OVI
 
@@ -43,4 +42,6 @@ require 'embedit/player/player'
 
 # Flash Player
 
-#puts a = Embedit::Media.new('../video.flv').html(:height => 900)
+#puts a = Embedit::Media.new('../test.flv').html
+
+#puts File.exists?(File.expand_path('test.flv'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: reddavis-embedit
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Red Davis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-26 04:19:14 -07:00
+date: 2008-09-28 07:15:59 -07:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - lib/embedit/exceptions.rb
 - lib/embedit/validate.rb
 - lib/embedit/ovi/ovi.rb
+- lib/embedit/player/player.rb
 - spec/spec_helper.rb
 - spec/oembed_spec.rb
 - spec/youtube_spec.rb