tabulous 2.1.0 → 2.1.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 2.1.1 (May 28, 2014)
+* Added support for Rails 4.1 and Ruby 2.1.
+
 ### 2.1.0 (Nov 9, 2013)
 * Added http_verb tab declaration to support non-GET actions, like sign out links.
 * Added renderer that generates HTML compatible with Bootstrap 3's navbar.

data/CONTRIBUTING.md

@@ -8,7 +8,7 @@ Pull requests are welcome.  If you want your pull request to be more than a disc
 
 * your code should be well-written and follow the style of the rest of the tabulous code
 * you should write new specs for your code if existing specs do not offer good coverage
-* you should make sure the specs pass in all versions of Rails 3.0 or later and Ruby 1.9 and 2.0
+* you should make sure the specs pass in all versions of Rails 3.0 or later and Ruby 2.0 and 2.1
 
 ## Running Specs
 

data/README.md

@@ -6,7 +6,7 @@ Tabulous provides an easy way to add tabs to your Rails application.
 
 ## Requirements
 
-Tabulous works with Rails 3.0, 3.1, 3.2 and 4.0.  It has been tested on MRI Ruby 1.9.3 and 2.0.0.  It does not work with Ruby 1.8.
+Tabulous works with Rails 3.0, 3.1, 3.2, 4.0 and 4.1.  It has been tested on MRI Ruby 1.9.3, 2.0.0 and 2.1.1.  It does not work with Ruby 1.8.
 
 ## Getting Started
 

data/REFERENCE.md

@@ -144,6 +144,8 @@ Each tab has five required declarations (text, link_path, visible_when, enabled_
 
 The text, link_path, visible_when and enabled_when declarations do not need to be given a block.  If given a block, the block will be executed in the context of the layout where the tabs are rendered.
 
+You can place any Ruby code in the tabulous blocks; it will be executed as if it were in a view.
+
 Here is an example of a tab with the five required declarations:
 
     unicorns_tab do
@@ -188,7 +190,11 @@ http_verb is an optional declaration that must be either :get, :post, :put, :pat
 
 ### visible_when
 
-If visible_when evaluates to false (or a falsy value like nil), the HTML for that particular tab will not be generated.
+If visible_when evaluates to false (or a falsy value like nil), the HTML for that particular tab will not be generated. This could be used to hide a tab conditionally, for instance:
+
+    visible_when  { current_user.present? }
+   
+could be used to hide a tab from anonymous users.
 
 ### enabled_when
 

data/Rakefile

@@ -19,13 +19,19 @@ end
 task :test do
   puts
   puts "To run integration specs:"
-  puts "  $ script/for_all_test_apps rake"
+  puts "  $ script/for_all_test_apps bundle exec rake"
+  puts
+  puts "To run integration specs in a Ruby 1.9 environment:"
+  puts "  due to configuration issues, integration specs no longer run for the Ruby 1.9 environment"
   puts
   puts "To run integration specs in a Ruby 2.0 environment:"
-  puts "  $ RUBY_COMPATIBILITY=2.0 script/for_all_test_apps rake"
+  puts "  $ RUBY_COMPATIBILITY=2.0 script/for_all_test_apps bundle exec rake"
+  puts
+  puts "To run integration specs in a Ruby 2.1 environment:"
+  puts "  $ RUBY_COMPATIBILITY=2.1 script/for_all_test_apps bundle exec rake"
   puts
   puts "To run unit specs:"
-  puts "  $ rake spec:units"
+  puts "  $ bundle exec rake spec:units"
   puts
   puts "You may need to run this first before the integration specs will pass:"
   puts "  $ script/for_all_test_apps bundle install"

data/lib/generators/tabs/templates/tabulous.rb

@@ -30,7 +30,7 @@ Tabulous.setup do
   customize do
 
     # which class to use to generate HTML
-    # :default, :html5, :bootstrap, or :bootstrap_pill
+    # :default, :html5, :bootstrap, :bootstrap_pill or :bootstrap_navbar
     # or create your own renderer class and reference it here
     # renderer :default
 

data/lib/tabulous/version.rb

@@ -1,3 +1,3 @@
 module Tabulous
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/script/create_test_app

@@ -30,7 +30,7 @@ app_name = ARGV[0]
 rails_version = ARGV[1]
 
 installed_rails_versions = %x{ gem list rails }
-if installed_rails_versions =~ /rails\s\((.+)\)/
+if installed_rails_versions =~ /^rails\s\((.+)\)$/
   versions = $1.split(',').map(&:strip)
   if !versions.include?(rails_version)
     abort "Rails version '#{rails_version}' is not installed. First install this version of Rails before continuing."

data/script/for_all_test_apps

@@ -16,7 +16,9 @@ include FileUtils
 
 command = ARGV.join(' ')
 
-if ENV['RUBY_COMPATIBILITY'] == '2.0'
+if ENV['RUBY_COMPATIBILITY'] == '2.1'
+  apps_to_test = Dir['spec/applications/*/rails_4*']
+elsif ENV['RUBY_COMPATIBILITY'] == '2.0'
   apps_to_test = Dir['spec/applications/*/rails_3-2*'] + Dir['spec/applications/*/rails_4*']
 else
   apps_to_test = Dir['spec/applications/*/rails*']

data/spec/applications/README.md

@@ -56,15 +56,15 @@ would want run for this kind of test app.
 Let's say Rails 17.0.4 is released and we want to test the "main" test app
 against this.  Run this script:
 
-$ script/create_test_app main 17.0.4
+    $ script/create_test_app main 17.0.4
 
 This will create a Rails app in spec/applications/main/rails_17-0-4.  When it is
 finished generating, we can go into the new Rails app's directory and run tests
 like so:
 
-$ bundle exec rake test
-$ bundle exec rake spec
-$ bundle exec rake
+    $ bundle exec rake test
+    $ bundle exec rake spec
+    $ bundle exec rake
 
 
 

data/spec/applications/bootstrap/application_template.rb

@@ -53,9 +53,7 @@ generate_test_application do
         <div class="navbar-inner">
           <div class="container">
             <a class="brand" href="#">Tabulous Bootstrap Test App</a>
-            <div class="nav-collapse collapse">
-              <%= tabs %>
-            </div>
+            <%= tabs %>
           </div>
         </div>
       </div>

data/spec/applications/bootstrap/rails_3-2-13/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 gem 'tabulous', :path => "../../../.."
-gem 'sqlite3', '>= 1.3.7'
+gem 'sqlite3', '>= 1.3.9'
 group :test, :development do
   gem "rspec-rails"
 end
@@ -11,7 +11,7 @@ end
 gem 'rails', '~> 3.2.0'
 group :assets do
   gem 'sass-rails',   '~> 3.2.3'
-  gem 'bootstrap-sass', '~> 2.3.1.0'
+  gem 'bootstrap-sass', '= 2.3.1.0'
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
 end

data/spec/applications/bootstrap/rails_3-2-13/app/views/layouts/application.html.erb

@@ -13,9 +13,7 @@
     <div class="navbar-inner">
       <div class="container">
         <a class="brand" href="#">Tabulous Bootstrap Test App</a>
-        <div class="nav-collapse collapse">
-          <%= tabs %>
-        </div>
+        <%= tabs %>
       </div>
     </div>
   </div>

data/spec/applications/bootstrap/rails_4-0-5/Gemfile

@@ -0,0 +1,22 @@
+source 'https://rubygems.org'
+gem 'tabulous', :path => "../../../.."
+gem 'sqlite3', '>= 1.3.9'
+group :test, :development do
+  gem "rspec-rails"
+end
+group :test do
+  gem 'capybara', "~> 2.0.2"
+  gem 'launchy'
+end
+gem 'rails', '~> 4.0.5'
+gem 'sass-rails',   '~> 4.0.2'
+gem 'bootstrap-sass', '~> 3.0.2.0'
+gem 'coffee-rails', '~> 4.0.0'
+gem 'uglifier', '>= 1.3.0'
+gem 'jquery-rails'
+gem 'turbolinks'
+gem 'jbuilder', '~> 1.2'
+group :test do
+  gem 'turn', :require => false
+  gem 'minitest'
+end

data/spec/applications/bootstrap/rails_4-0-5/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails405::Application.load_tasks

data/spec/applications/bootstrap/rails_4-0-5/app/views/galaxies/index.json.jbuilder

@@ -0,0 +1,4 @@
+json.array!(@galaxies) do |galaxy|
+  json.extract! galaxy, :id, :name
+  json.url galaxy_url(galaxy, format: :json)
+end

data/spec/applications/bootstrap/rails_4-0-5/app/views/galaxies/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @galaxy, :id, :name, :created_at, :updated_at

data/spec/applications/bootstrap/rails_4-0-5/app/views/layouts/application.html.erb

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Bootstrap</title>
+  <%= csrf_meta_tag %>
+  <%= stylesheet_link_tag 'application' %>
+  <%= javascript_include_tag 'application' %>
+</head>
+<body>
+
+  <div class="navbar navbar-inverse navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container">
+        <a class="brand" href="#">Tabulous Bootstrap Test App</a>
+        <%= tabs %>
+      </div>
+    </div>
+  </div>
+
+  <div id="main_content" class="container">
+    <%= yield %>
+  </div>
+
+</body>
+</html>

data/spec/applications/bootstrap/rails_4-0-5/app/views/planets/index.json.jbuilder

@@ -0,0 +1,4 @@
+json.array!(@planets) do |planet|
+  json.extract! planet, :id, :name
+  json.url planet_url(planet, format: :json)
+end

data/spec/applications/bootstrap/rails_4-0-5/app/views/planets/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @planet, :id, :name, :created_at, :updated_at

data/spec/applications/bootstrap/rails_4-0-5/app/views/stars/index.json.jbuilder

@@ -0,0 +1,4 @@
+json.array!(@stars) do |star|
+  json.extract! star, :id, :name
+  json.url star_url(star, format: :json)
+end

data/spec/applications/bootstrap/rails_4-0-5/app/views/stars/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @star, :id, :name, :created_at, :updated_at

data/spec/applications/bootstrap/rails_4-0-5/config/application.rb

@@ -0,0 +1,23 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module Rails405
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+  end
+end