foundation-rails 5.5.0.0 → 5.5.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/app/controllers/foundation/rails/styleguide_controller.rb +1 -1
  2. data/foundation-rails.gemspec +1 -1
  3. data/lib/foundation/rails/generators/install_generator.rb +3 -0
  4. data/lib/foundation/rails/templates/application.html.erb +1 -1
  5. data/lib/foundation/rails/version.rb +1 -1
  6. metadata +6 -6
data/app/controllers/foundation/rails/styleguide_controller.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Foundation
2
2
  module Rails
3
- class StyleguideController < ApplicationController
3
+ class StyleguideController < ::ActionController::Base
4
4
  layout false
5
5
  def show
6
6
 
data/foundation-rails.gemspec CHANGED
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
19
19
  spec.require_paths = ["lib"]
20
20
 
21
21
  spec.add_development_dependency "bundler", "~> 1.3"
22
- spec.add_dependency "sass", [">= 3.2.0", "< 3.4"]
22
+ spec.add_dependency "sass", [">= 3.3.0", "< 3.5"]
23
23
  spec.add_dependency "railties", [">= 3.1.0"]
24
24
  spec.add_development_dependency "rake"
25
25
  end
data/lib/foundation/rails/generators/install_generator.rb CHANGED
@@ -23,8 +23,11 @@ module Foundation
23
23
 
24
24
  def detect_js_format
25
25
  return ['.coffee', '#=', "\n() ->\n $(document).foundation()\n"] if File.exist?('app/assets/javascripts/application.coffee')
26
+ return ['.coffee.erb', '#=', "\n() ->\n $(document).foundation()\n"] if File.exist?('app/assets/javascripts/application.coffee.erb')
26
27
  return ['.js.coffee', '#=', "\n() ->\n $(document).foundation()\n"] if File.exist?('app/assets/javascripts/application.js.coffee')
28
+ return ['.js.coffee.erb', '#=', "\n() ->\n $(document).foundation()\n"] if File.exist?('app/assets/javascripts/application.js.coffee.erb')
27
29
  return ['.js', '//=', "\n$(function(){ $(document).foundation(); });\n"] if File.exist?('app/assets/javascripts/application.js')
30
+ return ['.js.erb', '//=', "\n$(function(){ $(document).foundation(); });\n"] if File.exist?('app/assets/javascripts/application.js.erb')
28
31
  end
29
32
 
30
33
  def detect_css_format
data/lib/foundation/rails/templates/application.html.erb CHANGED
@@ -8,7 +8,7 @@
8
8
 
9
9
  <%%= stylesheet_link_tag "application" %>
10
10
  <%%= javascript_include_tag "vendor/modernizr" %>
11
- <%%= javascript_include_tag "application" 'data-turbolinks-track' => true %>
11
+ <%%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
12
12
  <%%= csrf_meta_tags %>
13
13
  </head>
14
14
 
data/lib/foundation/rails/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Foundation
2
2
  module Rails
3
- VERSION = "5.5.0.0"
3
+ VERSION = "5.5.1.0"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foundation-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.5.0.0
4
+ version: 5.5.1.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-12-18 00:00:00.000000000 Z
12
+ date: 2015-02-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -34,10 +34,10 @@ dependencies:
34
34
  requirements:
35
35
  - - ! '>='
36
36
  - !ruby/object:Gem::Version
37
- version: 3.2.0
37
+ version: 3.3.0
38
38
  - - <
39
39
  - !ruby/object:Gem::Version
40
- version: '3.4'
40
+ version: '3.5'
41
41
  type: :runtime
42
42
  prerelease: false
43
43
  version_requirements: !ruby/object:Gem::Requirement
@@ -45,10 +45,10 @@ dependencies:
45
45
  requirements:
46
46
  - - ! '>='
47
47
  - !ruby/object:Gem::Version
48
- version: 3.2.0
48
+ version: 3.3.0
49
49
  - - <
50
50
  - !ruby/object:Gem::Version
51
- version: '3.4'
51
+ version: '3.5'
52
52
  - !ruby/object:Gem::Dependency
53
53
  name: railties
54
54
  requirement: !ruby/object:Gem::Requirement