bettertabs 1.3 → 1.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bettertabs (1.3)
+    bettertabs (1.3.1)
       jquery-rails
       rails (~> 3.1.0)
 

data/README.md

@@ -10,7 +10,7 @@ Easy for beginners, complete for experts.
 
 ## Features ##
 
-  * Rails 3.1 Engine that includes:
+  * 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
@@ -28,7 +28,7 @@ Easy for beginners, complete for experts.
 ## Requirements: ##
   * Ruby 1.9.2
   * Rails 3.1
-  * [jquery-ujs](https://github.com/rails/jquery-ujs) with jQuery 1.3 or higher
+  * [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.
 
@@ -39,8 +39,8 @@ Gem dependency. Add bettertabs to your gem file and run `bundle install`.
 
     gem 'bettertabs'
 
-To include the [jquery.bettertabs plugin](https://github.com/agoragames/bettertabs/raw/master/app/assets/javascripts/jquery.bettertabs.js.coffee)
-add these line to the top of your `app/assets/javascripts/application.js` file:
+To include the [jquery.bettertabs plugin](https://github.com/agoragames/bettertabs/blob/master/app/assets/javascripts/jquery.bettertabs.js.coffee)
+add these line to the top of your `app/assets/javascripts/application.js` (**after** the *jQuery* library):
 
     //= require jquery.bettertabs
 
@@ -48,8 +48,7 @@ Or if you prefer the compressed version:
 
     //= require jquery.bettertabs.min
 
-This works the same way as [jquery-ujs](https://github.com/rails/jquery-ujs); you don't need to copy-paste the javascript code in your app because it will be served using the Asset Pipeline.
-
+This works the same way as [jquery-rails](https://github.com/rails/jquery-rails); you don't need to copy-paste the javascript code in your app because it will be served using the Asset Pipeline.
 
 ## Usage and examples ##
 
@@ -74,10 +73,9 @@ An usage example should be self explanatory (using HAML, but it also works with
 ### More examples and documentation: ###
 
   * [EXAMPLES document](https://github.com/agoragames/bettertabs/blob/master/doc/EXAMPLES.md)
-  * [Bettertabs Styles reference guide](https://github.com/agoragames/bettertabs/blob/master/doc/STYLESHEETS-GUIDE.md)
+  * [Bettertabs CSS reference guide](https://github.com/agoragames/bettertabs/blob/master/doc/STYLESHEETS-GUIDE.md)
   * [Bettertabs helper](https://github.com/agoragames/bettertabs/blob/master/app/helpers/bettertabs_helper.rb) (params and options)
-  * [Rails3 test demo application](https://github.com/agoragames/bettertabs/tree/master/spec/dummy)
-  * Anyway, don't be afraid and dig into the code!
+  * [Test Dummy Rails 3.1 application](https://github.com/agoragames/bettertabs/tree/master/spec/dummy) that has some usage examples
   
 
 ## Tabs Routes ##
@@ -184,7 +182,7 @@ Perhaps the most important CSS rule here is to define `display: none;` for `div.
 
       div.bettertabs div.content.hidden { display: none; }
 
-Use the [Bettertabs Styles Reference Guide](https://github.com/agoragames/bettertabs/blob/master/doc/STYLESHEETS-GUIDE.md) to get a stylesheet that you can use as a starting point.
+Use the [Bettertabs CSS Guidelines](https://github.com/agoragames/bettertabs/blob/master/doc/STYLESHEETS-GUIDE.md) to get a stylesheet that you can use as a starting point.
 
 
 ## How to help make Bettertabs even Better ##

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

@@ -1,7 +1,7 @@
 (function() {
   /*!
    jQuery Bettertabs Plugin
-   version: 1.2.3 (Jun-2-2011)
+   version: 1.3.1 (Sep-13-2011)
    @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.2.3 (Jun-2-2011)
+ version: 1.3.1 (Sep-13-2011)
  @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.2.3 (Jun-2-2011)
+   version: 1.3.1 (Sep-13-2011)
    @requires jQuery v1.3 or later
 
    Examples and documentation at: https://github.com/agoragames/bettertabs

data/doc/CHANGELOG.md

@@ -1,18 +1,29 @@
 Bettertabs Changelog
 ====================
 
-2011-06-23  Mario Izquierdo Martinez <tothemario@gmail.com>
+2011-09-13  Mario Izquierdo Martinez <mizquierdo@majorleaguegaming.com>
+
+  * Tag v1.3.1
+  * Add 'active' class to the link element inside the active tag as well as the li element (more easy to style)
+
+2011-09-12  Mario Izquierdo Martinez <mizquierdo@majorleaguegaming.com>
+
+  * Tag v1.3
+  * Gem converted into a Rails 3.1 Engine that uses the asset pipeline to serve the jquery.bettertabs plugin
+  * Test dummy app converted to Rails 3.1
+
+2011-06-23  Mario Izquierdo Martinez <mizquierdo@majorleaguegaming.com>
 
   * Tag v1.2.3
   * Tested with Rails 3.0.9 and HAML 3.1.2
   * Bugfix on the bettertabs helper inline script, avoid to add it as an HTML attribute
 
-2011-05-02  Mario Izquierdo Martinez <tothemario@gmail.com>
+2011-05-02  Mario Izquierdo Martinez <mizquierdo@majorleaguegaming.com>
 
   * Tag v1.2.1
   * Bugfix on the bettertabs helper inline script
 
-2011-05-02  Mario Izquierdo Martinez <tothemario@gmail.com>
+2011-05-02  Mario Izquierdo Martinez <mizquierdo@majorleaguegaming.com>
 
   * Tag v1.2
   * Added :attach_jquery_bettertabs_inline option to the helper, defaults to true. If false, do not render the inline script that activates the plugin.
@@ -21,7 +32,7 @@ Bettertabs Changelog
     * Created the jQuery.Bettertabs.select_tab(bettertabs_id, tab_id) method to easily select a tab from other scripts
     * Improved the README.md JavaScript section with more clear examples
 
-2011-04-28  Mario Izquierdo Martinez <tothemario@gmail.com>
+2011-04-28  Mario Izquierdo Martinez <mizquierdo@majorleaguegaming.com>
   
   * Tag v1.1
   * Added :ajax_url option to tab builder, defaults to :url plus the ajax=true param to prevent browser cache issues.
@@ -34,7 +45,7 @@ Bettertabs Changelog
     * Added Routes examples (README.md)
     * Added bettertabs helper documentation (params and options in the method comment)
   
-2011-04-22  Mario Izquierdo Martinez <tothemario@gmail.com>
+2011-04-22  Mario Izquierdo Martinez <mizquierdo@majorleaguegaming.com>
 
   * Tag v1.0
   * bettertabs rails helper, with static, link and ajax tabs
@@ -42,7 +53,7 @@ Bettertabs Changelog
   * README.md documentation improved with examples
   * Rails3 (ruby 1.9.2) test application (in the test folder) with some use cases and some basic rspec tests.
   
-2011-03-31  Mario Izquierdo Martinez <tothemario@gmail.com>
+2011-03-31  Mario Izquierdo Martinez <mizquierdo@majorleaguegaming.com>
 
   * Tag v0.0.1
   * Initial development and structure for the gem

data/doc/STYLESHEETS-GUIDE.md

@@ -19,7 +19,7 @@ will expand in the following markup (html):
     <div id="profile_tabs" data-initial-active-tab-id="profile_tabs_general_tab" class="bettertabs">
       <ul class="tabs">
         <li id="profile_tabs_general_tab" class="active">
-          <a data-tab-type="static" data-show-content-id="profile_tabs" href="/profile/dude/general">General</a>
+          <a class="active" data-tab-type="static" data-show-content-id="profile_tabs" href="/profile/dude/general">General</a>
         </li>
         <li id="profile_tabs_friends_tab">
           <a data-tab-type="ajax" data-show-content-id="profile_tabs" href="/competition/ladder/1234/rules">RULES</a>
@@ -42,17 +42,18 @@ So you can use this structure to access any bettertabs widget element (CSS):
     div.bettertabs ul.tabs li { /* tab item */ }
     div.bettertabs ul.tabs li.active { /* selected tab item */ }
     div.bettertabs ul.tabs li.active a  { /* selected tab link */ }
+    div.bettertabs ul.tabs li a.active  { /* selected tab link */ }
     div.bettertabs ul.tabs li a:link,
     div.bettertabs ul.tabs li a:visited { /* tab link normal state */ }
     div.bettertabs ul.tabs li a:hover {  }
     div.bettertabs ul.tabs li a:active {  }
-    div.bettertabs ul.tabs li a.ajax-loading { /* tab link while ajax loading */ }
+    div.bettertabs ul.tabs li a.ajax-loading { /* tab link while ajax content is loading */ }
 
     div.bettertabs div.content { }
-    div.bettertabs div.content.hidden { /* hidden content. Here you can use the property display: none; */ } 
+    div.bettertabs div.content.hidden { /* hidden content. Here you should set the property display: none; */ } 
     div.bettertabs div.content.active { /* active content */ }
     
-Here you are a simple example of CSS you can use to style up your bettertabs widgets (CSS):
+Here you are a sample of CSS you can use as example to style up your bettertabs widget:
     
     div.bettertabs { margin: 1em; width: 500px; }
 
@@ -66,7 +67,7 @@ Here you are a simple example of CSS you can use to style up your bettertabs wid
       position: relative; top: 1px;
     }
     div.bettertabs ul.tabs li.active { height: 25px; background-color: #eee; border-bottom: none; }
-    div.bettertabs ul.tabs li.active a  { color: black; }
+    div.bettertabs ul.tabs li.active a.active  { color: black; }
 
     div.bettertabs ul.tabs li a { font-size: 80%; text-decoration: none; float: left; }
     div.bettertabs ul.tabs li a:link,
@@ -78,3 +79,58 @@ Here you are a simple example of CSS you can use to style up your bettertabs wid
     div.bettertabs div.content { padding: 1em; border: 1px solid #999; background-color: #eee; clear: left; }
     div.bettertabs div.content.hidden { display: none; }
 
+
+And this is the same example but written in SASS:
+
+    div.bettertabs
+      margin: 1em
+      width: 500px
+
+      ul.tabs
+        margin: 0
+        padding: 0
+        position: relative
+      
+        li
+          background-color: #ccc
+          border: 1px solid #999
+          display: inline
+          float: left
+          height: 24px
+          line-height: 24px
+          list-style: none outside none
+          margin-right: .5em
+          padding-right: .5em
+          padding-left: .5em
+          position: relative
+          top: 1px
+      
+          &.active
+            height: 25px
+            background-color: #eee
+            border-bottom: none
+          
+          a
+            font-size: 80%
+            text-decoration: none
+            float: left
+            &.active
+             color: black
+            &:link, &:visited
+              color: #444
+            &:hover
+              color: #000
+            &:active
+              color: #933
+            &.ajax-loading
+              color: #666
+
+      div.content
+        padding: 1em
+        border: 1px solid #999
+        background-color: #eee
+        clear: left
+      
+        &.hidden
+          display: none
+

data/lib/bettertabs/bettertabs_builder.rb

@@ -1,10 +1,7 @@
 class BettertabsBuilder
   require 'uri' # from standard library
   
-  TAB_TYPE_STATIC = :static
-  TAB_TYPE_LINK = :link
-  TAB_TYPE_AJAX = :ajax
-  TAB_TYPES = [TAB_TYPE_STATIC, TAB_TYPE_LINK, TAB_TYPE_AJAX]
+  TAB_TYPES = [:static, :link, :ajax]
   
   def initialize(bettertabs_id, template, selected_tab_id = nil, options = {})
     @bettertabs_id = bettertabs_id
@@ -19,19 +16,19 @@ class BettertabsBuilder
   
   # Static tabs generator
   def static(tab_id, *args, &block)
-    get_options(args)[:tab_type] = TAB_TYPE_STATIC
+    get_options(args)[:tab_type] = :static
     self.for(tab_id, *args, &block)
   end
   
   # Linked tabs generator
   def link(tab_id, *args, &block)
-    get_options(args)[:tab_type] = TAB_TYPE_LINK
+    get_options(args)[:tab_type] = :link
     self.for(tab_id, *args, &block)
   end
   
   # Ajax tabs generator
   def ajax(tab_id, *args, &block)
-    get_options(args)[:tab_type] = TAB_TYPE_AJAX
+    get_options(args)[:tab_type] = :ajax
     self.for(tab_id, *args, &block)
   end
   
@@ -44,9 +41,9 @@ class BettertabsBuilder
     raise "Bettertabs: #{tab_html_id_for(tab_id)} error. Used :partial option and a block of content at the same time." if block_given? and options[:partial]
     partial = options.delete(:partial) || tab_id.to_s unless block_given?
     url = options.delete(:url) || { :"#{@bettertabs_id}_selected_tab" => tab_id }
-    tab_type = (options.delete(:tab_type) || TAB_TYPE_STATIC).to_sym
+    tab_type = (options.delete(:tab_type) || :static).to_sym
     raise "Bettertabs: #{tab_type.inspect} tab type not supported. Use one of #{TAB_TYPES.inspect} instead." unless TAB_TYPES.include?(tab_type)
-    ajax_url = options.delete(:ajax_url) || url_for_ajax(url) if tab_type == TAB_TYPE_AJAX
+    ajax_url = options.delete(:ajax_url) || url_for_ajax(url) if tab_type == :ajax
     @selected_tab_id ||= tab_id # defaults to first tab
     
     if @render_only_active_content
@@ -60,7 +57,7 @@ class BettertabsBuilder
     
       # Content
       content_html_options = { id: content_html_id_for(tab_id), class: "content #{active?(tab_id) ? 'active' : 'hidden'}" }
-      if active?(tab_id) or tab_type == TAB_TYPE_STATIC # Only render content for selected tab (static content is always rendered).
+      if active?(tab_id) or tab_type == :static # Only render content for selected tab (static content is always rendered).
         content = block_given? ? @template.capture(&block) : @template.render(:partial => partial)
       else
         content = ''
@@ -105,7 +102,9 @@ class BettertabsBuilder
              tag(:li, class: ('active' if tab[:active]), id: tab_html_id_for(tab[:tab_id])) do
                tab[:html_options][:"data-tab-type"] ||= tab[:tab_type] # for javascript: change click behavior depending on type :static, :link or :ajax
                tab[:html_options][:"data-show-content-id"] ||= content_html_id_for(tab[:tab_id]) # for javascript: element id to show when select this tab
-               tab[:html_options][:"data-ajax-url"] ||= tab[:ajax_url] if tab[:tab_type] == TAB_TYPE_AJAX # for javascript: url to make ajax call
+               tab[:html_options][:"data-ajax-url"] ||= tab[:ajax_url] if tab[:tab_type] == :ajax # for javascript: url to make ajax call
+               tab[:html_options][:class] ||= ''
+               tab[:html_options][:class] += 'active' if tab[:active]
                @template.link_to(tab[:text], tab[:url], tab[:html_options])
              end
            end.join.html_safe

data/lib/bettertabs/version.rb

@@ -1,3 +1,3 @@
 module Bettertabs
-  VERSION = "1.3"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bettertabs
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000 +02:00
+date: 2011-09-13 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152819320 !ruby/object:Gem::Requirement
+  requirement: &2156493880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152819320
+  version_requirements: *2156493880
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2152818640 !ruby/object:Gem::Requirement
+  requirement: &2156493160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152818640
+  version_requirements: *2156493160
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2152817880 !ruby/object:Gem::Requirement
+  requirement: &2156492340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152817880
+  version_requirements: *2156492340
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &2152817100 !ruby/object:Gem::Requirement
+  requirement: &2156491380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152817100
+  version_requirements: *2156491380
 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
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2757859858413369337
+      hash: -3213150091351247240
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2757859858413369337
+      hash: -3213150091351247240
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.6.2