tabit 0.2.0 → 0.2.1

data/lib/tabit/item.rb

@@ -9,29 +9,17 @@ module Tabit
     attr_accessor :name
     attr_accessor :url
     attr_accessor :options
+    attr_accessor :active
 
     def initialize(name, url = nil, options = {})
       @name, @url, @options = name, url, options
-      
+
       @active = @options.delete(:active) || configuration.active_detect
       @type = @options.delete(:type) || :default
-
       @children = []
 
       @options[:inner] ||= {}
       @options[:outer] ||= {}
-
-      clazz = template.active_link_to_class(
-        url,
-        {
-          active: @active,
-          class_active: configuration.active_class
-        }
-      )
-
-      @options[:outer][:class] = '' if @options[:outer][:class].nil?
-      @options[:outer][:class] << " #{clazz}"
-      @options[:outer][:class].strip!
     end
 
     def add(name, url = nil, options = {})
@@ -42,6 +30,16 @@ module Tabit
     end
 
     def to_s
+      clazz = if active?
+        configuration.active_class
+      else
+        ''
+      end
+      
+      options[:outer][:class] = '' if @options[:outer][:class].nil?
+      options[:outer][:class] << " #{clazz}"
+      options[:outer][:class].strip!
+
       case @type
         when :dropdown
           options[:outer][:class] = '' if @options[:outer][:class].nil?
@@ -75,6 +73,20 @@ module Tabit
       end
     end
 
+    def active?
+      if template.is_active_link? url, active
+        true
+      else
+        children.each do |child|
+          if child.active?
+            return true
+          end
+        end
+
+        false
+      end
+    end
+
     protected
       def output
         if children.empty? 

data/lib/tabit/version.rb

@@ -2,7 +2,7 @@ module Tabit
   module Version
     MAJOR = 0
     MINOR = 2
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/tabit.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "tabit"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Boerger", "Tim Rudat"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -786843556050653153
+      hash: -4368168093489379260
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: