reddavis-embedit 0.0.7 → 0.0.8

data/lib/embedit.rb

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

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

@@ -1,14 +1,21 @@
-# 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
-  
+    
+    FLASH_PLAYER = File.expand_path('..', __FILE__) + '/../../player/player.swf'
+    SWF_OBJECT = File.expand_path('..', __FILE__) + '/../../player/swfobject.js'
+#    MEDIA_PATH = File.dirname(__FILE__) + '/../../'
+    
     attr_reader :title, :url, :format
     
     def initialize(url)
-      @url = url
+      self.url = url
     end
-            
+    
+    def url=(path)
+      @url = File.expand_path(path)
+    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?
@@ -17,11 +24,19 @@ module Embedit
     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" />)
+      @html = %{
+        <div id='preview'></div>
+        <script type='text/javascript' src='#{SWF_OBJECT}'></script>
+        <script type='text/javascript'>
+        var s1 = new SWFObject('#{FLASH_PLAYER}','player','400','300','9');
+        s1.addParam('allowfullscreen','true');
+        s1.addParam('allowscriptaccess','always');
+        s1.addParam('flashvars','file=#{url}');
+        s1.write('preview');
+        </script>
+        }
     end
     
   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) || (File.extname(@url) != "" || nil && check_url_supported)    #We first check that the url is one actually supported by Embedit
+    if check_url_supported == true && check_response == true   #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) != "" || nil
+    elsif File.extname(@url).match(/\.flv/)
       return true
     end
     return false                                              #Return false if all else fail

data/lib/player/swfobject.js

@@ -0,0 +1,8 @@
+/**
+ * SWFObject v1.5: Flash Player detection and embed - http://blog.deconcept.com/swfobject/
+ *
+ * SWFObject is (c) 2007 Geoff Stearns and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ */
+if(typeof deconcept=="undefined"){var deconcept=new Object();}if(typeof deconcept.util=="undefined"){deconcept.util=new Object();}if(typeof deconcept.SWFObjectUtil=="undefined"){deconcept.SWFObjectUtil=new Object();}deconcept.SWFObject=function(_1,id,w,h,_5,c,_7,_8,_9,_a){if(!document.getElementById){return;}this.DETECT_KEY=_a?_a:"detectflash";this.skipDetect=deconcept.util.getRequestParameter(this.DETECT_KEY);this.params=new Object();this.variables=new Object();this.attributes=new Array();if(_1){this.setAttribute("swf",_1);}if(id){this.setAttribute("id",id);}if(w){this.setAttribute("width",w);}if(h){this.setAttribute("height",h);}if(_5){this.setAttribute("version",new deconcept.PlayerVersion(_5.toString().split(".")));}this.installedVer=deconcept.SWFObjectUtil.getPlayerVersion();if(!window.opera&&document.all&&this.installedVer.major>7){deconcept.SWFObject.doPrepUnload=true;}if(c){this.addParam("bgcolor",c);}var q=_7?_7:"high";this.addParam("quality",q);this.setAttribute("useExpressInstall",false);this.setAttribute("doExpressInstall",false);var _c=(_8)?_8:window.location;this.setAttribute("xiRedirectUrl",_c);this.setAttribute("redirectUrl","");if(_9){this.setAttribute("redirectUrl",_9);}};deconcept.SWFObject.prototype={useExpressInstall:function(_d){this.xiSWFPath=!_d?"expressinstall.swf":_d;this.setAttribute("useExpressInstall",true);},setAttribute:function(_e,_f){this.attributes[_e]=_f;},getAttribute:function(_10){return this.attributes[_10];},addParam:function(_11,_12){this.params[_11]=_12;},getParams:function(){return this.params;},addVariable:function(_13,_14){this.variables[_13]=_14;},getVariable:function(_15){return this.variables[_15];},getVariables:function(){return this.variables;},getVariablePairs:function(){var _16=new Array();var key;var _18=this.getVariables();for(key in _18){_16[_16.length]=key+"="+_18[key];}return _16;},getSWFHTML:function(){var _19="";if(navigator.plugins&&navigator.mimeTypes&&navigator.mimeTypes.length){if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","PlugIn");this.setAttribute("swf",this.xiSWFPath);}_19="<embed type=\"application/x-shockwave-flash\" src=\""+this.getAttribute("swf")+"\" width=\""+this.getAttribute("width")+"\" height=\""+this.getAttribute("height")+"\" style=\""+this.getAttribute("style")+"\"";_19+=" id=\""+this.getAttribute("id")+"\" name=\""+this.getAttribute("id")+"\" ";var _1a=this.getParams();for(var key in _1a){_19+=[key]+"=\""+_1a[key]+"\" ";}var _1c=this.getVariablePairs().join("&");if(_1c.length>0){_19+="flashvars=\""+_1c+"\"";}_19+="/>";}else{if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","ActiveX");this.setAttribute("swf",this.xiSWFPath);}_19="<object id=\""+this.getAttribute("id")+"\" classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" width=\""+this.getAttribute("width")+"\" height=\""+this.getAttribute("height")+"\" style=\""+this.getAttribute("style")+"\">";_19+="<param name=\"movie\" value=\""+this.getAttribute("swf")+"\" />";var _1d=this.getParams();for(var key in _1d){_19+="<param name=\""+key+"\" value=\""+_1d[key]+"\" />";}var _1f=this.getVariablePairs().join("&");if(_1f.length>0){_19+="<param name=\"flashvars\" value=\""+_1f+"\" />";}_19+="</object>";}return _19;},write:function(_20){if(this.getAttribute("useExpressInstall")){var _21=new deconcept.PlayerVersion([6,0,65]);if(this.installedVer.versionIsValid(_21)&&!this.installedVer.versionIsValid(this.getAttribute("version"))){this.setAttribute("doExpressInstall",true);this.addVariable("MMredirectURL",escape(this.getAttribute("xiRedirectUrl")));document.title=document.title.slice(0,47)+" - Flash Player Installation";this.addVariable("MMdoctitle",document.title);}}if(this.skipDetect||this.getAttribute("doExpressInstall")||this.installedVer.versionIsValid(this.getAttribute("version"))){var n=(typeof _20=="string")?document.getElementById(_20):_20;n.innerHTML=this.getSWFHTML();return true;}else{if(this.getAttribute("redirectUrl")!=""){document.location.replace(this.getAttribute("redirectUrl"));}}return false;}};deconcept.SWFObjectUtil.getPlayerVersion=function(){var _23=new deconcept.PlayerVersion([0,0,0]);if(navigator.plugins&&navigator.mimeTypes.length){var x=navigator.plugins["Shockwave Flash"];if(x&&x.description){_23=new deconcept.PlayerVersion(x.description.replace(/([a-zA-Z]|\s)+/,"").replace(/(\s+r|\s+b[0-9]+)/,".").split("."));}}else{if(navigator.userAgent&&navigator.userAgent.indexOf("Windows CE")>=0){var axo=1;var _26=3;while(axo){try{_26++;axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash."+_26);_23=new deconcept.PlayerVersion([_26,0,0]);}catch(e){axo=null;}}}else{try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");}catch(e){try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");_23=new deconcept.PlayerVersion([6,0,21]);axo.AllowScriptAccess="always";}catch(e){if(_23.major==6){return _23;}}try{axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");}catch(e){}}if(axo!=null){_23=new deconcept.PlayerVersion(axo.GetVariable("$version").split(" ")[1].split(","));}}}return _23;};deconcept.PlayerVersion=function(_29){this.major=_29[0]!=null?parseInt(_29[0]):0;this.minor=_29[1]!=null?parseInt(_29[1]):0;this.rev=_29[2]!=null?parseInt(_29[2]):0;};deconcept.PlayerVersion.prototype.versionIsValid=function(fv){if(this.major<fv.major){return false;}if(this.major>fv.major){return true;}if(this.minor<fv.minor){return false;}if(this.minor>fv.minor){return true;}if(this.rev<fv.rev){return false;}return true;};deconcept.util={getRequestParameter:function(_2b){var q=document.location.search||document.location.hash;if(_2b==null){return q;}if(q){var _2d=q.substring(1).split("&");for(var i=0;i<_2d.length;i++){if(_2d[i].substring(0,_2d[i].indexOf("="))==_2b){return _2d[i].substring((_2d[i].indexOf("=")+1));}}}return "";}};deconcept.SWFObjectUtil.cleanupSWFs=function(){var _2f=document.getElementsByTagName("OBJECT");for(var i=_2f.length-1;i>=0;i--){_2f[i].style.display="none";for(var x in _2f[i]){if(typeof _2f[i][x]=="function"){_2f[i][x]=function(){};}}}};if(deconcept.SWFObject.doPrepUnload){if(!deconcept.unloadSet){deconcept.SWFObjectUtil.prepUnload=function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){};window.attachEvent("onunload",deconcept.SWFObjectUtil.cleanupSWFs);};window.attachEvent("onbeforeunload",deconcept.SWFObjectUtil.prepUnload);deconcept.unloadSet=true;}}if(!document.getElementById&&document.all){document.getElementById=function(id){return document.all[id];};}var getQueryParamValue=deconcept.util.getRequestParameter;var FlashObject=deconcept.SWFObject;var SWFObject=deconcept.SWFObject;

metadata

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