Merge branch 'master' of github.com:zurb/foundation-rails

# By Arthur (2) and others
# Via Mehdi Lahmam (3) and Arthur (2)
* 'master' of github.com:zurb/foundation-rails:
  Bumping Version # for Assets
  Updatin version
  Make generator compatible with .erb js files
  Update sass dependency to >= 3.3.0, < 3.5
  Minor typo fix: Follow up to pull request #93 -> adding comma
  Fix reference to ApplicationController that doesn't always exist

app/controllers/foundation/rails/styleguide_controller.rb

@@ -1,6 +1,6 @@
 module Foundation
   module Rails
-    class StyleguideController < ApplicationController
+    class StyleguideController < ::ActionController::Base
       layout false
       def show
 

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "foundation-rails",
-  "version": "5.5.0.0",
+  "version": "5.5.1.1",
   "dependencies": {
-    "foundation": "5.5.0"
+    "foundation": "5.5.1"
   }
 }

foundation-rails.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_dependency "sass", [">= 3.2.0", "< 3.4"]
+  spec.add_dependency "sass", [">= 3.3.0", "< 3.5"]
   spec.add_dependency "railties", [">= 3.1.0"]
   spec.add_development_dependency "rake"
 end

lib/foundation/rails/generators/install_generator.rb

@@ -23,8 +23,11 @@ def add_assets
 
         def detect_js_format
           return ['.coffee', '#=', "\n() ->\n  $(document).foundation()\n"] if File.exist?('app/assets/javascripts/application.coffee')
+          return ['.coffee.erb', '#=', "\n() ->\n  $(document).foundation()\n"] if File.exist?('app/assets/javascripts/application.coffee.erb')
           return ['.js.coffee', '#=', "\n() ->\n  $(document).foundation()\n"] if File.exist?('app/assets/javascripts/application.js.coffee')
+          return ['.js.coffee.erb', '#=', "\n() ->\n  $(document).foundation()\n"] if File.exist?('app/assets/javascripts/application.js.coffee.erb')
           return ['.js', '//=', "\n$(function(){ $(document).foundation(); });\n"] if File.exist?('app/assets/javascripts/application.js')
+          return ['.js.erb', '//=', "\n$(function(){ $(document).foundation(); });\n"] if File.exist?('app/assets/javascripts/application.js.erb')
         end
 
         def detect_css_format

lib/foundation/rails/templates/application.html.erb

@@ -8,7 +8,7 @@
 
     <%%= stylesheet_link_tag    "application" %>
     <%%= javascript_include_tag "vendor/modernizr" %>
-    <%%= javascript_include_tag "application" 'data-turbolinks-track' => true %>
+    <%%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
     <%%= csrf_meta_tags %>
   </head>
 

lib/foundation/rails/version.rb

@@ -1,5 +1,5 @@
 module Foundation
   module Rails
-    VERSION = "5.5.0.0"
+    VERSION = "5.5.1.0"
   end
 end