foundation-rails 6.1.1.0 → 6.1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 184fa4cda534faaff0ed4cb7eef5eac3ec9c8c96
-  data.tar.gz: acfa709e896c85af7e044fc9dd518a94666070bd
+  metadata.gz: dd443f4e1ba793e2319dc38153c0902decb48ba6
+  data.tar.gz: a7067499ad0b516977c2a07c34674fc45c962c8a
 SHA512:
-  metadata.gz: b4635bea8262a3e46084e37ed344b43bfe70d2c3923d92c94a43f5ac03e396acc0bb5010db75f64e63fd900f450d22eb36ac017f4dd97c48189c97dd966c64dc
-  data.tar.gz: 5460f6676a961f4476047c23c1664d3c32777cb30f72ebb26465478cae88e2aa4f61bbf0c183d2d3293303d73b244fe21ace923c807de4dfd9ce97326122ca33
+  metadata.gz: b4618cc5d4da3fe059b93b500a0e7b8dbf26112e4c853362710a0a408937d555d3e522953bd714c50689b50a1a049b5e7c76deaaa7fb79d2ceb710919bb4bcc8
+  data.tar.gz: cd5982ef40eab86284abdd907900165a7509eb69c3d029a75e4ee7a7a18352ae2bac04e7eb393ee30777c2b1c3703820a8c3cfc5c6c7eb7a78cd67f23259bc13

data/.travis.yml

@@ -7,3 +7,4 @@ before_install:
 install: bundle install
 notifications:
   email: false
+  

data/README.md

@@ -1,6 +1,8 @@
 # Foundation::Rails
 
-Foundation::Rails is a gem to make it super easy to use Foundation in your upcoming Rails project. You can start using Foundation::Rails in your projects by following the instructions below.
+[![Gem Version](https://badge.fury.io/rb/foundation-rails.svg)](https://badge.fury.io/rb/foundation-rails)
+
+Foundation::Rails is a gem that makes it super easy to use Foundation in your upcoming Rails project. You can start using Foundation::Rails in your projects by following the instructions below.
 
 ## Installation
 
@@ -28,7 +30,7 @@ You can run the following command to add Foundation:
 
 Append the following line to your `app/assets/stylesheets/application.css` file:
 
-    /*= require foundation */
+    /*= require foundation
 
 If you're planning on using Sass, then you'll want to rename `application.css` to `application.scss`. That file should then look like:
 

data/lib/foundation/rails/engine.rb

@@ -1,10 +1,9 @@
+require 'rails'
+
 module Foundation
   module Rails
     class Engine < ::Rails::Engine
       isolate_namespace Foundation::Rails
-      initializer "foundation-rails.assets.precompile" do |app|
-        app.config.assets.precompile += %w( vendor/modernizr.js )
-      end
     end
   end
 end

data/lib/foundation/rails/version.rb

@@ -1,5 +1,5 @@
 module Foundation
   module Rails
-    VERSION = "6.1.1.0"
+    VERSION = "6.1.1.1"
   end
 end

data/lib/generators/foundation/install_generator.rb

@@ -19,26 +19,33 @@ module Foundation
       end
 
       def detect_js_format
-        return ['.coffee', '#=', "\n() ->\n  $(document).foundation()\n"] if File.exist?(File.join(javascripts_base_dir, 'application.coffee'))
-        return ['.coffee.erb', '#=', "\n() ->\n  $(document).foundation()\n"] if File.exist?(File.join(javascripts_base_dir, 'application.coffee.erb'))
-        return ['.js.coffee', '#=', "\n() ->\n  $(document).foundation()\n"] if File.exist?(File.join(javascripts_base_dir, 'application.js.coffee'))
-        return ['.js.coffee.erb', '#=', "\n() ->\n  $(document).foundation()\n"] if File.exist?(File.join(javascripts_base_dir, 'application.js.coffee.erb'))
-        return ['.js', '//=', "\n$(function(){ $(document).foundation(); });\n"] if File.exist?(File.join(javascripts_base_dir, 'application.js'))
-        return ['.js.erb', '//=', "\n$(function(){ $(document).foundation(); });\n"] if File.exist?(File.join(javascripts_base_dir, 'application.js.erb'))
+        %w(.coffee .coffee.erb .js.coffee .js.coffee.erb .js .js.erb).each do |ext|
+          if File.exist?(File.join(javascripts_base_dir, "application#{ext}"))
+            if ext.include?(".coffee")
+              return [ext, "#=", "\n() ->\n  $(document).foundation()\n"]
+            else
+              return [ext, "//=", "\n$(function(){ $(document).foundation(); });\n"]
+            end
+          end
+        end
       end
 
       def detect_css_format
-        return ['.css', ' *='] if File.exist?(File.join(stylesheets_base_dir, 'application.css'))
-        return ['.css.sass', ' //='] if File.exist?(File.join(stylesheets_base_dir, 'application.css.sass'))
-        return ['.sass', ' //='] if File.exist?(File.join(stylesheets_base_dir, 'application.sass'))
-        return ['.css.scss', ' //='] if File.exist?(File.join(stylesheets_base_dir, 'application.css.scss'))
-        return ['.scss', ' //='] if File.exist?(File.join(stylesheets_base_dir, 'application.scss'))
+        %w(.css .css.sass .sass .css.scss .scss).each do |ext|
+          if File.exist?(File.join(stylesheets_base_dir, "application#{ext}"))
+            if ext.include?(".sass") || ext.include?(".scss")
+              return [ext, "//="]
+            else
+              return [ext, " *="]
+            end
+          end
+        end
       end
 
       def create_layout
-        if options.haml?||(defined?(Haml) && options.haml?)
+        if options.haml? || (defined?(Haml) && options.haml?)
           template 'application.html.haml', File.join(layouts_base_dir, "#{file_name}.html.haml")
-        elsif options.slim?||(defined?(Slim) && options.slim?)
+        elsif options.slim? || (defined?(Slim) && options.slim?)
           template 'application.html.slim', File.join(layouts_base_dir, "#{file_name}.html.slim")
         else
           template 'application.html.erb', File.join(layouts_base_dir, "#{file_name}.html.erb")

data/lib/generators/foundation/templates/application.html.erb

@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-    <title><%%= content_for?(:title) ? yield(:title) : "foundation-rails" %></title>
+    <title><%%= content_for?(:title) ? yield(:title) : "Untitled" %></title>
 
     <%%= stylesheet_link_tag    "application" %>
     <%%= javascript_include_tag "application", 'data-turbolinks-track' => true %>

data/lib/generators/foundation/templates/application.html.haml

@@ -1,5 +1,5 @@
 !!! 5
-%html{ :lang => "en"}
+%html{ :lang => "en" }
   %head
     %meta{ :charset => "utf-8" }
 
@@ -8,7 +8,7 @@
     %title= content_for?(:title) ? yield(:title) : "Untitled"
 
     = stylesheet_link_tag "application"
-    = javascript_include_tag "application", 'data-turbolinks-track' => true
+    = javascript_include_tag "application", "data-turbolinks-track" => true
     = csrf_meta_tag
 
   %body

data/lib/generators/foundation/templates/application.html.slim

@@ -7,7 +7,7 @@ html lang="en"
     title == content_for?(:title) ? yield(:title) : "Untitled"
 
     = stylesheet_link_tag "application"
-    = javascript_include_tag "application", 'data-turbolinks-track' => true
+    = javascript_include_tag "application", "data-turbolinks-track" => true
     = csrf_meta_tag
 
   body

data/spec/features/generator_spec.rb

@@ -19,7 +19,6 @@ feature 'Foundation install succeeds' do
     layout_file = IO.read("#{dummy_app_path}/app/views/layouts/application.html.erb")
 
     expect(layout_file).to match(/stylesheet_link_tag    "application"/)
-    expect(layout_file).to match(/javascript_include_tag "vendor\/modernizr"/)
     expect(layout_file).to match(/javascript_include_tag "application/)
   end
 end

data/spec/support/helpers.rb

@@ -1,7 +1,13 @@
 module FoundationRailsTestHelpers
   def create_dummy_app
     FileUtils.cd(tmp_path) do
-      %x(rails new dummy --skip-active-record --skip-test-unit --skip-spring)
+      %x(rails new dummy --skip-active-record --skip-test-unit --skip-spring --skip-bundle)
+      File.open(dummy_app_path + '/Gemfile', 'a') do |f|
+        f.puts "gem 'foundation-rails', path: '#{File.join(File.dirname(__FILE__), '..', '..')}'"
+      end
+    end
+    FileUtils.cd(dummy_app_path) do
+      %x(bundle install)
     end
   end
 

data/vendor/assets/js/foundation.js

@@ -1,7 +1,7 @@
+//= require foundation.core
 //= require foundation.abide
 //= require foundation.accordion
 //= require foundation.accordionMenu
-//= require foundation.core
 //= require foundation.drilldown
 //= require foundation.dropdown
 //= require foundation.dropdownMenu
@@ -25,4 +25,4 @@
 //= require foundation.util.nest
 //= require foundation.util.timerAndImageLoader
 //= require foundation.util.touch
-//= require foundation.util.triggers
+//= require foundation.util.triggers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foundation-rails
 version: !ruby/object:Gem::Version
-  version: 6.1.1.0
+  version: 6.1.1.1
 platform: ruby
 authors:
 - ZURB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass