From d7eae4eef6d2d7c5689fdf2d205be2f11f771ed2 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Tue, 22 Jan 2013 18:42:20 -0500
Subject: [PATCH] ensure install generator references right rails constant and
 get tests running on modern ruby

---
 Gemfile                                       |  4 ++-
 Gemfile.lock                                  | 29 ++++++++++---------
 flowplayer.gemspec                            |  3 +-
 .../railties/generator/install_generator.rb   |  2 +-
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/Gemfile b/Gemfile
index 901f575..a1b93f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1 +1,3 @@
-gemspec
\ No newline at end of file
+source :rubygems
+
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
index 8bba146..292cc3d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    flowplayer (0.0.6)
+    flowplayer (0.1.1)
       json
 
 GEM
+  remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
-    json (1.5.1)
+    diff-lcs (1.1.3)
+    json (1.7.6)
     mocha (0.9.12)
     nokogiri (1.4.4)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
+    rake (10.0.3)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
 
 PLATFORMS
   ruby
@@ -29,4 +29,5 @@ DEPENDENCIES
   flowplayer!
   mocha
   nokogiri
-  rspec (~> 2.0.0)
+  rake
+  rspec (~> 2.4.0)
diff --git a/flowplayer.gemspec b/flowplayer.gemspec
index 35cc185..2777473 100644
--- a/flowplayer.gemspec
+++ b/flowplayer.gemspec
@@ -20,9 +20,10 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   
   s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "rspec", "~> 2.0.0"
+  s.add_development_dependency "rspec", "~> 2.4.0"
   s.add_development_dependency "nokogiri"
   s.add_development_dependency "mocha"
+  s.add_development_dependency "rake"
   s.add_dependency "json"
 
 end
diff --git a/lib/flowplayer/railties/generator/install_generator.rb b/lib/flowplayer/railties/generator/install_generator.rb
index c52e711..84f0851 100644
--- a/lib/flowplayer/railties/generator/install_generator.rb
+++ b/lib/flowplayer/railties/generator/install_generator.rb
@@ -1,5 +1,5 @@
 module Flowplayer::Generator
-  class InstallGenerator < Rails::Generators::Base
+  class InstallGenerator < ::Rails::Generators::Base
     namespace 'flowplayer'
     source_root File.expand_path("../../../../../vendor/assets/", __FILE__)
     argument :install_type, :type => :string, :banner => "commercial", :required => false, :default => ''