moving away from Rails 3.0

gertig · Jul 8, 2013 · 7370582 · 7370582
1 parent 24150ea
commit 7370582
Show file tree

Hide file tree

Showing 21 changed files with 5 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.ruby-gemset b/.ruby-gemset
@@ -0,0 +1 @@
+andrewgertig
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+ruby-2.0.0-p195
diff --git a/.rvmrc b/.rvmrc
diff --git a/Gemfile b/Gemfile
diff --git a/README.md b/README.md
diff --git a/Rakefile b/Rakefile
diff --git a/backbonejs-rails.gemspec b/backbonejs-rails.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["andrew.gertig@gmail.com"]
   s.homepage    = ""
   s.summary     = %q{Provide files needed for using Backbone.js}
-  s.description = %q{This gem is noth Rails 3.1+ and Rails 3.0.x compatible. It creates the following files in public/javasripts: backbone.js, underscore.js, json2.js, and optionally icanhaz.js for templates. It also creates an initializer that fixes the way Rails returns JSON to Backbone.js}
+  s.description = %q{This gem is both Rails 3.1+ and Rails 3.0.x compatible. It creates the following files in public/javasripts: backbone.js, underscore.js, json2.js, and optionally icanhaz.js for templates. It also creates an initializer that fixes the way Rails returns JSON to Backbone.js}
 
   s.rubyforge_project = "backbonejs-rails"
 

diff --git a/lib/backbonejs-rails.rb b/lib/backbonejs-rails.rb
@@ -2,11 +2,7 @@
 
 module Backbonejs
   module Rails #Generators
-    if ::Rails.version < "3.1"
-      require 'backbonejs-rails/railtie'
-    else
-      require 'backbonejs-rails/engine'
-    end
+    require 'backbonejs-rails/engine'
     require 'backbonejs-rails/version'
   end
 end
diff --git a/lib/backbonejs-rails/engine.rb b/lib/backbonejs-rails/engine.rb
diff --git a/lib/backbonejs-rails/railtie.rb b/lib/backbonejs-rails/railtie.rb
diff --git a/lib/backbonejs-rails/version.rb b/lib/backbonejs-rails/version.rb
@@ -1,5 +1,5 @@
 module Backbonejs
   module Rails
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end
diff --git a/lib/generators/backbonejs/install/install_generator.rb b/lib/generators/backbonejs/install/install_generator.rb
diff --git a/lib/generators/backbonejs/uninstall/uninstall_generator.rb b/lib/generators/backbonejs/uninstall/uninstall_generator.rb
diff --git a/vendor/assets/javascripts/backbone.js b/vendor/assets/javascripts/backbone.js
diff --git a/vendor/assets/javascripts/backbone.min.js b/vendor/assets/javascripts/backbone.min.js
diff --git a/vendor/assets/javascripts/icanhaz.js b/vendor/assets/javascripts/icanhaz.js
diff --git a/vendor/assets/javascripts/icanhaz.min.js b/vendor/assets/javascripts/icanhaz.min.js
diff --git a/vendor/assets/javascripts/json2.js b/vendor/assets/javascripts/json2.js
diff --git a/vendor/assets/javascripts/underscore.js b/vendor/assets/javascripts/underscore.js
diff --git a/vendor/assets/javascripts/underscore.min.js b/vendor/assets/javascripts/underscore.min.js