From 8f6867ca5f38f75a7dbac785231fa8976ff1a008 Mon Sep 17 00:00:00 2001
From: Scott Davis <jetviper21@gmail.com>
Date: Tue, 8 Nov 2011 18:19:40 -0500
Subject: [PATCH] updated for asset pipeline

---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 assets/LICENSE.txt => FLOWPLAYER_LICENSE.txt  |   0
 assets/README.txt => README.txt               |   0
 .../railties/generator/install_generator.rb   |  12 ++++++------
 vendor/.DS_Store                              | Bin 0 -> 6148 bytes
 vendor/assets/.DS_Store                       | Bin 0 -> 6148 bytes
 .../assets/flash}/flowplayer-3.2.5.swf        | Bin
 .../flash}/flowplayer.commercial-3.2.5.swf    | Bin
 .../flash}/flowplayer.controls-3.2.3.swf      | Bin
 .../assets/javascripts}/.DS_Store             | Bin
 .../javascripts}/flowplayer-3.2.4.min.js      |   0
 vendor/assets/javascripts/flowplayer.js       |   1 +
 12 files changed, 7 insertions(+), 6 deletions(-)
 rename assets/LICENSE.txt => FLOWPLAYER_LICENSE.txt (100%)
 rename assets/README.txt => README.txt (100%)
 create mode 100644 vendor/.DS_Store
 create mode 100644 vendor/assets/.DS_Store
 rename {assets => vendor/assets/flash}/flowplayer-3.2.5.swf (100%)
 rename {assets => vendor/assets/flash}/flowplayer.commercial-3.2.5.swf (100%)
 rename {assets => vendor/assets/flash}/flowplayer.controls-3.2.3.swf (100%)
 rename {assets => vendor/assets/javascripts}/.DS_Store (100%)
 rename {assets => vendor/assets/javascripts}/flowplayer-3.2.4.min.js (100%)
 create mode 100644 vendor/assets/javascripts/flowplayer.js

diff --git a/.DS_Store b/.DS_Store
index 085e803667c3180224fc208974add50a9dbc954b..ffbfb50a825d0307a670001f35699823f594ef25 100644
GIT binary patch
delta 95
zcmZoMXfc@JFUrioz`)4BAi%&-!cd%2oSc)CpPw`NBI9yNkPI6`B116{rlQDlGoBD*
dV<-cP<}su&<TDh(^f7L}$jHjJnVsV=KLBgg8Gir(

delta 49
zcmZoMXfc@JFUrWkzyQPo48;XWIr&LI-nyiM$%0JFC#x`?*et^InRQ}=<7Re_zx)6*
C2o4_r

diff --git a/assets/LICENSE.txt b/FLOWPLAYER_LICENSE.txt
similarity index 100%
rename from assets/LICENSE.txt
rename to FLOWPLAYER_LICENSE.txt
diff --git a/assets/README.txt b/README.txt
similarity index 100%
rename from assets/README.txt
rename to README.txt
diff --git a/lib/flowplayer/railties/generator/install_generator.rb b/lib/flowplayer/railties/generator/install_generator.rb
index 639e766..3c902dd 100644
--- a/lib/flowplayer/railties/generator/install_generator.rb
+++ b/lib/flowplayer/railties/generator/install_generator.rb
@@ -2,21 +2,21 @@ module Flowplayer
   module Generator
     class InstallGenerator < Rails::Generators::Base
       namespace 'flowplayer'
-      source_root File.expand_path("../../../../../assets", __FILE__)
+      source_root File.expand_path("../../../../../vendor/assets/", __FILE__)
       argument :install_type, :type => :string, :banner => "commercial", :required => false, :default => ''
       
       def install_flowplayer
-        copy_file 'flowplayer-3.2.4.min.js', Rails.root.join('public', 'javascripts', 'flowplayer.min.js')
+        copy_file 'javascripts/flowplayer-3.2.4.min.js', Rails.root.join('public', 'javascripts', 'flowplayer.min.js')
       end
       
       def install_swfs
         if install_type == 'commercial'
-          copy_file 'flowplayer.commercial-3.2.5.swf', Rails.root.join('public', 'flowplayer.swf')
+          copy_file 'flash/flowplayer.commercial-3.2.5.swf', Rails.root.join('public', 'flowplayer.swf')
         else
-          copy_file 'flowplayer-3.2.5.swf', Rails.root.join('public', 'flowplayer.swf')
-          copy_file 'LICENSE.txt', Rails.root.join('FLOWPLAYER_LICENSE.txt')
+          copy_file 'flash/flowplayer-3.2.5.swf', Rails.root.join('public', 'flowplayer.swf')
+          copy_file '../../FLOWPLAYER_LICENSE.txt', Rails.root.join('FLOWPLAYER_LICENSE.txt')
         end
-        copy_file 'flowplayer.controls-3.2.3.swf', Rails.root.join('public', 'flowplayer.controls.swf')
+        copy_file 'flash/flowplayer.controls-3.2.3.swf', Rails.root.join('public', 'flowplayer.controls.swf')
       end
       
     end
diff --git a/vendor/.DS_Store b/vendor/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c32883842752acf742ff9e4a68f0123bb24f31f0
GIT binary patch
literal 6148
zcmeHKISv9b4733uBpOP}e1RWC2wuPkI6EYYg?=mE#nTuc1!$pz0yJJZlQ^ENc8Yi{
zB09h9XCf038Nm(ZYD3p--@IeJj3^L}GtScNo857HIvqRNuLH&%%0?PIhey6`(5L_v
zpaN8Y3Q&QME0862H2(O>Jdg@dfnQg^?uP<5tch))UmX~{1pp2ZcEj9z31G1RuqL*F
zh`=<cz@Tcj7#eiMOXk(YHZbU-*?efeS+he?e>=`Eo-SGgIZ^>C@T@>TmJ_T0OZc1q
z|Cz)U6`%rtrGO3=tHm6jl(n_<aaL;!d=0mp8{7<Yr(p1M4D@o0g_Yx}Cq-VdIreK}
U8|ZYzoet#BfayY`0^e5P4s{<Dvj6}9

literal 0
HcmV?d00001

diff --git a/vendor/assets/.DS_Store b/vendor/assets/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..9d4bd7bbf372491429037d9889cfc215f6e5a203
GIT binary patch
literal 6148
zcmeHK%WA_w3>>8?1aiqS$Nh!=!4lFh$PctlC`~b>#A(jH^|w2E1Zqsdz4VYspdGJP
z<MqyAWdV@Y=k5Vm0GQDg@ukDibX|R5lZYsaz2j}yZkw0Gq2Y9#Dfb?)Xz+{{J^mc;
z44!RaizD{<zzOZ2w;1;!nUxBp0;xbMkP6(00#T%A^BXyD9y1k41;#6&_d}s8*1*ou
zt_}{?0uZMRoAKFt31ZOzu?BXIjL^iXM5ju$7~*usOXStS&e7=*+nMi)oh3RHvE3Oj
zmJX?oIi>=sKwp77pDwiiKhl5c|NEqzr2?tIRVg6T^=7@|k)pN^4yU!Y(4XiRW3Huh
muu@F4Qp|~#;^mLLqR(8fft{n#88<pHe*{#Qv{c|f6!-=~xEuNa

literal 0
HcmV?d00001

diff --git a/assets/flowplayer-3.2.5.swf b/vendor/assets/flash/flowplayer-3.2.5.swf
similarity index 100%
rename from assets/flowplayer-3.2.5.swf
rename to vendor/assets/flash/flowplayer-3.2.5.swf
diff --git a/assets/flowplayer.commercial-3.2.5.swf b/vendor/assets/flash/flowplayer.commercial-3.2.5.swf
similarity index 100%
rename from assets/flowplayer.commercial-3.2.5.swf
rename to vendor/assets/flash/flowplayer.commercial-3.2.5.swf
diff --git a/assets/flowplayer.controls-3.2.3.swf b/vendor/assets/flash/flowplayer.controls-3.2.3.swf
similarity index 100%
rename from assets/flowplayer.controls-3.2.3.swf
rename to vendor/assets/flash/flowplayer.controls-3.2.3.swf
diff --git a/assets/.DS_Store b/vendor/assets/javascripts/.DS_Store
similarity index 100%
rename from assets/.DS_Store
rename to vendor/assets/javascripts/.DS_Store
diff --git a/assets/flowplayer-3.2.4.min.js b/vendor/assets/javascripts/flowplayer-3.2.4.min.js
similarity index 100%
rename from assets/flowplayer-3.2.4.min.js
rename to vendor/assets/javascripts/flowplayer-3.2.4.min.js
diff --git a/vendor/assets/javascripts/flowplayer.js b/vendor/assets/javascripts/flowplayer.js
new file mode 100644
index 0000000..8730684
--- /dev/null
+++ b/vendor/assets/javascripts/flowplayer.js
@@ -0,0 +1 @@
+//= require flowplayer-3.2.4.min
\ No newline at end of file