swf_ditty 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/sinatra/swf_ditty.rb

@@ -32,7 +32,16 @@ module Sinatra
     
       # Yank create_dom_container option out of the hash, if it exists
       # Create DOM container if option is set to something other than false or nil
-      out << content_tag(:div, "", :id => dom_id) if options.delete(:create_dom_container)
+      if options.delete(:create_dom_container)
+        # Set the div's dimensions right away so the page doesn't jolt into
+        # the proper dimensions when the swf loads.
+        w = options[:width].to_s
+        h = options[:height].to_s
+        w += "px" unless w.include? "%"
+        h += "px" unless h.include? "%"
+        style = "width:#{w};height:#{h}"
+        out << content_tag(:div, "", :id => dom_id, :style => style)
+      end
     
       # Turn flashvars hash into a flashvars-style formatted string
       options[:flashvars] = "{" + hash_to_key_value_string(options[:flashvars]) + "}" if options[:flashvars]
@@ -68,9 +77,10 @@ module Sinatra
     end
   
     # Sinatra doesn't have this method, but Rails does..
+    # options are sorted alphabetically for predicatability
     unless method_defined?(:content_tag)
       def content_tag(name,content,options={})
-        options = options.map{ |k,v| "#{k}='#{v}'" }.join(" ")
+        options = options.map{ |k,v| "#{k}='#{v}'" }.sort.join(" ")
         "<#{name} #{options}>#{content}</#{name}>"
       end
     end

data/swf_ditty.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{swf_ditty}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zeke Sikelianos"]
-  s.date = %q{2009-11-04}
+  s.date = %q{2009-11-10}
   s.description = %q{A simple and flexible Sinatra helper for embedding SWFs in your views. Depends on jQuery and jQuery SWFObject}
   s.email = %q{zeke@sikelianos.com}
   s.extra_rdoc_files = [

data/test/sinatra_app.rb

@@ -22,7 +22,7 @@ end
 get "/swf_with_flashvars" do
   content_type "text/plain"
   <<"EOD"
-#{swf("foo.swf", :height => 50, :flashvars => {:a => 1, :b => 'two'})}
+#{swf("foo.swf", :height => 50, :width => 600, :flashvars => {:a => 1, :b => 'two'})}
 EOD
 end
 

data/test/test_swf_ditty.rb

@@ -16,8 +16,8 @@ class TestSwfDitty < Test::Unit::TestCase
     get '/swf_plain'
     assert last_response.ok?
     assert_equal last_response.body,  <<EOD
-<script type='text/javascript' charset='utf-8'>$(document).ready(function(){$('#foo_swf').flash({allowScriptAccess:'sameDomain', height:'100%', name:'foo_swf', swf:'swf/foo.swf', width:'100%', wmode:'opaque'});});</script>
-<div id='foo_swf'></div>
+<script charset='utf-8' type='text/javascript'>$(document).ready(function(){$('#foo_swf').flash({allowScriptAccess:'sameDomain', height:'100%', name:'foo_swf', swf:'swf/foo.swf', width:'100%', wmode:'opaque'});});</script>
+<div id='foo_swf' style='width:100%;height:100%'></div>
 EOD
   end
 
@@ -25,7 +25,7 @@ EOD
     get '/swf_with_custom_dom_id'
     assert last_response.ok?
     assert_equal last_response.body,  <<EOD
-<script type='text/javascript' charset='utf-8'>$(document).ready(function(){$('#dombo').flash({allowScriptAccess:'sameDomain', height:'100%', name:'foo_swf', swf:'swf/foo.swf', width:'100%', wmode:'opaque'});});</script>
+<script charset='utf-8' type='text/javascript'>$(document).ready(function(){$('#dombo').flash({allowScriptAccess:'sameDomain', height:'100%', name:'foo_swf', swf:'swf/foo.swf', width:'100%', wmode:'opaque'});});</script>
 EOD
   end
 
@@ -33,8 +33,8 @@ EOD
     get '/swf_with_flashvars'
     assert last_response.ok?
     assert_equal last_response.body,  <<EOD
-<script type='text/javascript' charset='utf-8'>$(document).ready(function(){$('#foo_swf').flash({allowScriptAccess:'sameDomain', flashvars:{a:1, b:'two'}, height:50, name:'foo_swf', swf:'foo.swf', width:'100%', wmode:'opaque'});});</script>
-<div id='foo_swf'></div>
+<script charset='utf-8' type='text/javascript'>$(document).ready(function(){$('#foo_swf').flash({allowScriptAccess:'sameDomain', flashvars:{a:1, b:'two'}, height:50, name:'foo_swf', swf:'foo.swf', width:600, wmode:'opaque'});});</script>
+<div id='foo_swf' style='width:600px;height:50px'></div>
 EOD
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: swf_ditty
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Zeke Sikelianos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 -08:00
+date: 2009-11-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency