bettertabs 1.3.5 → 1.3.6

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+# 1.3.6
+
+* Adds support for Rails 3.2, https://github.com/agoragames/bettertabs/pull/3. Thanks (@jlee42).

data/Gemfile

@@ -1,9 +1,9 @@
 source "http://rubygems.org"
 
-# Declare your gem's dependencies in engine-test.gemspec.
+# Declare your gem's dependencies in bettertabs.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
-gemspec
+#gemspec
 
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or
@@ -11,4 +11,10 @@ gemspec
 # your gem to rubygems.org.
 
 # To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
+# gem 'ruby-debug19', :require => 'ruby-debug'
+
+# The dummy app runs in production mode, in bettertabs-demo.heroku
+gem "rails", ">= 3.1.0"
+gem "jquery-rails"
+gem "haml-rails"
+gem "rspec-rails"

data/Gemfile.lock

@@ -1,48 +1,38 @@
-PATH
-  remote: .
-  specs:
-    bettertabs (1.3.5)
-      jquery-rails
-      rails (~> 3.1.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0)
-      actionpack (= 3.1.0)
-      mail (~> 2.3.0)
-    actionpack (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
+    actionmailer (3.2.2)
+      actionpack (= 3.2.2)
+      mail (~> 2.4.0)
+    actionpack (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.0.3)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.0)
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-    activesupport (3.1.0)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
-    bcrypt-ruby (3.0.0)
+    arel (3.0.2)
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    haml (3.1.3)
+    haml (3.1.4)
     haml-rails (0.3.4)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
@@ -50,56 +40,57 @@ GEM
       railties (~> 3.0)
     hike (1.2.1)
     i18n (0.6.0)
-    jquery-rails (1.0.14)
-      railties (~> 3.0)
+    journey (1.0.3)
+    jquery-rails (2.0.1)
+      railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    mail (2.3.0)
+    json (1.6.5)
+    mail (2.4.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    multi_json (1.0.3)
-    polyglot (0.3.2)
-    rack (1.3.2)
-    rack-cache (1.0.3)
+    mime-types (1.17.2)
+    multi_json (1.1.0)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0)
-      actionmailer (= 3.1.0)
-      actionpack (= 3.1.0)
-      activerecord (= 3.1.0)
-      activeresource (= 3.1.0)
-      activesupport (= 3.1.0)
+    rails (3.2.2)
+      actionmailer (= 3.2.2)
+      actionpack (= 3.2.2)
+      activerecord (= 3.2.2)
+      activeresource (= 3.2.2)
+      activesupport (= 3.2.2)
       bundler (~> 1.0)
-      railties (= 3.1.0)
-    railties (3.1.0)
-      actionpack (= 3.1.0)
-      activesupport (= 3.1.0)
+      railties (= 3.2.2)
+    railties (3.2.2)
+      actionpack (= 3.2.2)
+      activesupport (= 3.2.2)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2)
-    rdoc (3.9.4)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rspec-rails (2.6.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.6.0)
-    sprockets (2.0.0)
+    rspec-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -108,12 +99,13 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.32)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bettertabs!
   haml-rails
+  jquery-rails
+  rails (>= 3.1.0)
   rspec-rails

data/README.md

@@ -3,31 +3,37 @@ Bettertabs for Rails
 
 We know that splitting content into several tabs is easy, but doing well, clean, DRY, accessible, usable, fast and testable is not so simple after all.
 
-Bettertabs is a simple engine for Rails that includes a helper and a jquery plugin to render the needed markup and javascript for a section with tabs in a easy and declarative way, forcing you to keep things simple and ensuring accessibility and usability, no matter if the content is loaded statically or via ajax.
-
-Easy for beginners, complete for experts.
+Bettertabs is a simple `Rails 3.1+ Engine` that includes a **helper** and a **jquery plugin** to render the needed markup and javascript for a section with tabs in a easy and declarative way, forcing you to keep things simple and ensuring accessibility and usability, no matter if the content is loaded statically or via ajax.
 
 
 ## Features ##
 
-  * Rails Engine that includes:
-    * helper to easily generate tabs and content markup
-    * jQuery plugin to handle the JavaScript behavior
-  * Simplicity: Easy to install, easy to use, easy to update
-  * Flexible and customizable
-  * Forces you to DRY-up your views for your tabbed content
-  * Forces you to make it very accessible and usable:
-    * Designed to work with and without JavaScript
-    * When click on a tab, the address bar url is changed (only in HTML5 browsers), so:
-      * The browser's back and reload buttons will still work as expected
-      * All tabbed sections can be permalinked, keeping the selected tab
-  * Makes testing views simple. Because its easy to make it working without javascript, you can test view components with the rails built-in functional and integration tests
-  * The CSS styles are up to you, although we include some [reference CSS](https://github.com/agoragames/bettertabs/blob/master/doc/STYLESHEETS-GUIDE.md) to start with
+Having to worry only on a few aspects like putting the content in the right site, you will have a site with tabs that:
+
+  * Works with tabs for static, links or ajax loaded content
+  * Works without javascript, so you can click on a tab before the whole page was loaded and it will work. Also it's usually much more easy to test.
+  * It changes the URL (in HTML5 browsers, using [history.replaceState()](https://developer.mozilla.org/en/DOM/Manipulating_the_browser_history)), so when you use the browser's back button, you'll land in the last selected tab. Also selected tabs can be permalinked.
+  * Declarative code, that helps you to have your view code more readable and DRY
+  * It has some basic error handling (like for example if the ajax loaded content returns an error, it redirects to the error page)
+  * If you need more control in the javascript behavior, you can use some predefined jQuery events (for example: `$('#tabs').bind('bettertabs-before-ajax-loading', show_loading_clock);`)
+  * The gem does not include any stylesheet, because each project has a different way of showing the tabs styles. Anyway the generated HTML is easy to style (see the [CSS Reference Guide](https://github.com/agoragames/bettertabs/blob/master/doc/STYLESHEETS-GUIDE.md))
+
+## Try it out ##
+
+The bettertabs gem includes a dummy test app, that is used for development (to execute rspec tests) and that can be easily launched to play with.
+
+  * [Try online the demo app](http://bettertabs-demo.herokuapp.com)
+  * Or to run it on your machine:
+        
+        $ git clone git://github.com/agoragames/bettertabs.git
+        $ cd bettertabs
+        /bettertabs$ bundle install
+        /bettertabs$ bundle exec rackup config.ru
 
 
 ## Requirements: ##
   * Ruby 1.9.2
-  * Rails 3.1
+  * Rails 3.1+
   * [jquery-rails](https://github.com/rails/jquery-rails) with jQuery 1.3 or higher
 
 Anyway you can use bettertabs without javascript (or use your own javascript handler) since the bettertabs helper only generates the appropriate markup.
@@ -35,7 +41,7 @@ Anyway you can use bettertabs without javascript (or use your own javascript han
 
 ## Install ##
 
-Gem dependency. Add bettertabs to your gem file and run `bundle install`.
+Add bettertabs gem to your Gemfile and run `bundle install`.
 
     gem 'bettertabs'
 
@@ -60,7 +66,7 @@ Bettertabs supports three kinds of tabs:
 
 An usage example should be self explanatory (using HAML, but it also works with ERB and other template systems):
 
-    = bettertabs :profile_tabs do |tab|
+    = bettertabs :profile_tabs, :selected_tab => :friends do |tab|
       = tab.static :general, 'My Profile' do
         %h2 General Info
         = show_user_general_info(@user)
@@ -68,7 +74,11 @@ An usage example should be self explanatory (using HAML, but it also works with
       = tab.ajax :friends, :partial => 'shared/friends'
       
       = tab.link :groups do
-        =  render :partial => 'groups/user_groups', :locals => { :user => @user }
+        = render :partial => 'groups/user_groups', :locals => { :user => @user }
+
+This will show three tabs: 'My Profile' (static, that will be preloaded and show when click in the tab), 'Friends' (ajax, that will load and show the content when click in the tab) and 'Groups' (link, that will reload the whole page).
+
+The option `:selected_tab` specifies the default selected tab, when the page is loaded. It only defines which tab is selected when no `{bettertabs_id}_selected_tab` param is present.
 
 ### More examples and documentation: ###
 

data/app/assets/javascripts/jquery.bettertabs.js

@@ -1,7 +1,7 @@
 (function() {
   /*!
    jQuery Bettertabs Plugin
-   version: 1.3.5 (Sep-13-2011)
+   version: 1.3.6 (Mar-12-2012)
    @requires jQuery v1.3 or later
    
    Examples and documentation at: https://github.com/agoragames/bettertabs

data/app/assets/javascripts/jquery.bettertabs.js.coffee

@@ -1,6 +1,6 @@
 ###!
  jQuery Bettertabs Plugin
- version: 1.3.5 (Sep-13-2011)
+ version: 1.3.6 (Mar-12-2012)
  @requires jQuery v1.3 or later
  
  Examples and documentation at: https://github.com/agoragames/bettertabs

data/app/assets/javascripts/jquery.bettertabs.min.js

@@ -1,7 +1,7 @@
 (function(){
 /*!
    jQuery Bettertabs Plugin
-   version: 1.3.5 (Sep-13-2011)
+   version: 1.3.6 (Mar-12-2012)
    @requires jQuery v1.3 or later
 
    Examples and documentation at: https://github.com/agoragames/bettertabs

data/bettertabs.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
   s.email       = ["tothemario@gmail.com"]
   s.homepage    = "https://github.com/agoragames/bettertabs"
   s.summary     = %q{Just a simple, accessible, usable, flexible and fast way to split view content in tabs in a rails application.}
-  s.description = %q{Bettertabs is a Rails 3.1 engine that adds a helper and jQuery plugin to define the markup and behavior for a tabbed area in a easy and declarative way, using the appropiate JavaScript but ensuring accessibility and usability, no matter if the content is loaded statically, via ajax or just with links. }
+  s.description = %q{Bettertabs is a Rails 3.1+ engine that adds a helper and jQuery plugin to define the markup and behavior for a tabbed area in a easy and declarative way, using the appropiate JavaScript but ensuring accessibility and usability, no matter if the content is loaded statically, via ajax or just with links. }
 
   s.files = `git ls-files`.split("\n")
   
-  s.add_dependency "rails", "~> 3.1.0"
+  s.add_dependency "rails", ">= 3.1.0"
   s.add_dependency "jquery-rails"
   
   s.add_development_dependency 'rspec-rails'

data/config.ru

@@ -0,0 +1,3 @@
+# This file is used by Rack-based servers to start the application.
+require ::File.expand_path('../spec/dummy/config/environment',  __FILE__)
+run Dummy::Application

data/lib/bettertabs/version.rb

@@ -1,3 +1,3 @@
 module Bettertabs
-  VERSION = "1.3.5"
+  VERSION = "1.3.6"
 end

data/spec/dummy/app/assets/stylesheets/application.css

@@ -7,9 +7,10 @@
 */
 body {
   background-color: white;
-  margin: 10px;
+  margin: 15px;
   font-size: 12px;
   font-family: Arial, Helvetica Neue, Helvetica, sans-serif;
+  width: 524px;
 }
-div.nav { margin: 10px 0 20px 24px; padding: 0; }
+div.nav { margin: 1em 1em 2em; }
 div.nav a { padding: 0 5px 0 6px; }

data/spec/dummy/app/controllers/bettertabs_controller.rb

@@ -10,7 +10,6 @@ class BettertabsController < ApplicationController
   end
   
   def ajax
-    sleep 1 # to better feel the loading time
     render partial: 'ajax' and return if request.xhr?
   end
   

data/spec/dummy/app/views/layouts/application.html.erb

@@ -8,7 +8,14 @@
 </head>
 <body>
 
-<h1>Bettertabs Dummy App</h1>
+<h1>Bettertabs Test App</h1>
+<p>
+  This is the dummy app used for test the bettertabs engine (spec/dummy)
+  <%= link_to 'see code in Github', 'http://github.com/agoragames/bettertabs/tree/master/spec/dummy' %></br>
+  For this demo, the hidden content is shown inside a dashed border to see what is loaded when you click a tab,</br>
+  click on the links below to see different types of tabs (static, link or ajax).
+  
+</p>
 <div class="nav">
   <%= link_to 'static', { action: 'static'}, title: 'Using only static tabs' %> | 
   <%= link_to 'link', { action: 'link_tab_1'}, title: 'Using only link tabs' %> | 

data/spec/dummy/config/environments/production.rb

@@ -12,14 +12,17 @@ Dummy::Application.configure do
   config.serve_static_assets = false
 
   # Compress JavaScripts and CSS
-  config.assets.compress = true
+  config.assets.compress = false
 
   # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = false
+  config.assets.compile = true
 
   # Generate digests for assets URLs
   config.assets.digest = true
-
+  
+  # Expands the lines which load the assets
+  config.assets.debug = true
+  
   # Defaults to Rails.root.join("public/assets")
   # config.assets.manifest = YOUR_PATH
 

data/spec/dummy/config/routes.rb

@@ -1,5 +1,6 @@
 Dummy::Application.routes.draw do
   root :to => "bettertabs#static"
 
+  match 'bettertabs/ajax(/:ajax_selected_tab)' => 'bettertabs#ajax'
   match 'bettertabs/:action(.:format)', controller: 'bettertabs'
 end

data/spec/requests/bettertabs_spec.rb

@@ -82,7 +82,7 @@ describe "Bettertabs requests" do
     end
     
     it "should include the default ajax=true extra param in the data-ajax-url" do
-      response.body.should include("data-ajax-url=\"/bettertabs/ajax?ajax_selected_tab=ajax_tab_2&ajax=true\"")
+      response.body.should include("data-ajax-url=\"/bettertabs/ajax/ajax_tab_2?ajax=true\"")
     end
     
     it "should render only the selected tab content" do

metadata

@@ -1,74 +1,75 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bettertabs
-version: !ruby/object:Gem::Version
-  version: 1.3.5
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 1.3.6
 platform: ruby
-authors:
+authors: 
 - Mario Izquierdo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-13 00:00:00.000000000 +02:00
-default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-12 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &2156435120 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156435120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: jquery-rails
-  requirement: &2156434520 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2156434520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec-rails
-  requirement: &2156433360 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2156433360
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: haml-rails
-  requirement: &2156432760 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2156432760
-description: ! 'Bettertabs is a Rails 3.1 engine that adds a helper and jQuery plugin
-  to define the markup and behavior for a tabbed area in a easy and declarative way,
-  using the appropiate JavaScript but ensuring accessibility and usability, no matter
-  if the content is loaded statically, via ajax or just with links. '
-email:
+  version_requirements: *id004
+description: "Bettertabs is a Rails 3.1+ engine that adds a helper and jQuery plugin to define the markup and behavior for a tabbed area in a easy and declarative way, using the appropiate JavaScript but ensuring accessibility and usability, no matter if the content is loaded statically, via ajax or just with links. "
+email: 
 - tothemario@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .rvmrc
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -79,6 +80,7 @@ files:
 - app/assets/javascripts/jquery.bettertabs.min.js
 - app/helpers/bettertabs_helper.rb
 - bettertabs.gemspec
+- config.ru
 - doc/CHANGELOG.md
 - doc/EXAMPLES.md
 - doc/JAVASCRIPTS-DEV-GUIDE.md
@@ -87,7 +89,6 @@ files:
 - lib/bettertabs/bettertabs_builder.rb
 - lib/bettertabs/engine.rb
 - lib/bettertabs/version.rb
-- script/rails
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -130,36 +131,35 @@ files:
 - spec/dummy/script/rails
 - spec/requests/bettertabs_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/agoragames/bettertabs
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -701328950284259198
+      segments: 
       - 0
-      hash: -1078283048097430699
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1078283048097430699
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Just a simple, accessible, usable, flexible and fast way to split view content
-  in tabs in a rails application.
+summary: Just a simple, accessible, usable, flexible and fast way to split view content in tabs in a rails application.
 test_files: []
+

data/script/rails

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-ENGINE_PATH = File.expand_path('../..',  __FILE__)
-load File.expand_path('../../spec/dummy/script/rails',  __FILE__)