tabs_on_rails 2.2.0 → 3.0.0

data/Rakefile

@@ -1,62 +1,12 @@
-require 'rubygems'
-require 'bundler'
+require 'bundler/gem_tasks'
 require 'appraisal'
 
-$:.unshift(File.dirname(__FILE__) + '/lib')
-require 'tabs_on_rails/version'
-
-
-PKG_NAME    = ENV['PKG_NAME']    || "tabs_on_rails"
-PKG_VERSION = ENV['PKG_VERSION'] || TabsOnRails::VERSION
-
-
-# Run test by default.
-task :default => :test
-
-spec = Gem::Specification.new do |s|
-  s.name              = PKG_NAME
-  s.version           = PKG_VERSION
-  s.summary           = "A simple Ruby on Rails plugin for creating tabs and navigation menus."
-  s.description       = "TabsOnRails is a simple Rails plugin for creating tabs and navigation menus."
-
-  s.author            = "Simone Carletti"
-  s.email             = "weppos@weppos.net"
-  s.homepage          = "http://www.simonecarletti.com/code/tabs_on_rails"
-
-  s.files             = `git ls-files`.split("\n")
-  s.test_files        = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_paths     = %w( lib )
-
-  s.add_development_dependency "rails", ">= 3.0"
-  s.add_development_dependency "appraisal"
-  s.add_development_dependency "mocha"
-  s.add_development_dependency "yard"
-end
-
-
-require 'rubygems/package_task'
-
-Gem::PackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Build the gemspec file #{spec.name}.gemspec"
-task :gemspec do
-  file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
-  File.open(file, "w") {|f| f << spec.to_ruby }
-end
-
-desc "Remove any temporary products, including gemspec"
-task :clean => [:clobber] do
-  rm "#{spec.name}.gemspec"
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+  task :default => :appraisal
+else
+  task :default => :test
 end
 
-desc "Remove any generated file"
-task :clobber => [:clobber_rdoc, :clobber_rcov, :clobber_package]
-
-desc "Package the library and generates the gemspec"
-task :package => [:gemspec]
-
 
 require 'rake/testtask'
 
@@ -68,18 +18,10 @@ Rake::TestTask.new do |t|
 end
 
 
-require 'yard'
 require 'yard/rake/yardoc_task'
 
 YARD::Rake::YardocTask.new(:yardoc) do |y|
   y.options = ["--output-dir", "yardoc"]
 end
 
-namespace :yardoc do
-  desc "Remove YARD products"
-  task :clobber do
-    rm_r "yardoc" rescue nil
-  end
-end
-
-task :clobber => "yardoc:clobber"
+CLOBBER.include "yardoc"

data/gemfiles/4.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+
+gemspec :path => "../"

data/gemfiles/5.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0.0"
+
+gemspec :path => "../"

data/lib/tabs_on_rails.rb

@@ -3,7 +3,7 @@
 #
 # A simple Ruby on Rails plugin for creating and managing Tabs.
 #
-# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2017 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/tabs_on_rails/action_controller.rb

@@ -3,7 +3,7 @@
 #
 # A simple Ruby on Rails plugin for creating and managing Tabs.
 #
-# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2017 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -103,7 +103,7 @@ module TabsOnRails
         options = args.extract_options!
         name, namespace = args
 
-        before_filter(options) do |controller|
+        before_action(options) do |controller|
           controller.send(:set_tab, name, namespace)
         end
       end

data/lib/tabs_on_rails/railtie.rb

@@ -3,19 +3,16 @@
 #
 # A simple Ruby on Rails plugin for creating and managing Tabs.
 #
-# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2017 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module TabsOnRails
 
   class Railtie < Rails::Railtie
-    initializer "tabs_on_rails.initialize" do
+    ActiveSupport.on_load(:action_controller) do
+      ::ActionController::Base.send(:include, TabsOnRails::ActionController)
     end
   end
 
 end
-
-ActiveSupport.on_load(:action_controller) do
-  include TabsOnRails::ActionController
-end

data/lib/tabs_on_rails/tabs.rb

@@ -3,7 +3,7 @@
 #
 # A simple Ruby on Rails plugin for creating and managing Tabs.
 #
-# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2017 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -14,9 +14,13 @@ require 'tabs_on_rails/tabs/tabs_builder'
 module TabsOnRails
 
   class Tabs
+    class << self
+      attr_writer :default_builder
 
-    mattr_accessor :default_builder
-    @@default_builder = TabsBuilder
+      def default_builder
+        @default_builder ||= TabsBuilder
+      end
+    end
 
     def initialize(context, options = {})
       @context = context

data/lib/tabs_on_rails/tabs/builder.rb

@@ -3,7 +3,7 @@
 #
 # A simple Ruby on Rails plugin for creating and managing Tabs.
 #
-# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2017 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/tabs_on_rails/tabs/tabs_builder.rb

@@ -3,7 +3,7 @@
 #
 # A simple Ruby on Rails plugin for creating and managing Tabs.
 #
-# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2017 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/tabs_on_rails/version.rb

@@ -3,23 +3,10 @@
 #
 # A simple Ruby on Rails plugin for creating and managing Tabs.
 #
-# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2017 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module TabsOnRails
-
-  # Holds information about library version.
-  module Version
-    MAJOR = 2
-    MINOR = 2
-    PATCH = 0
-    BUILD = nil
-
-    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")
-  end
-
-  # The current library version.
-  VERSION = Version::STRING
-
+  VERSION = "3.0.0"
 end

data/tabs_on_rails.gemspec

@@ -1,39 +1,28 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'tabs_on_rails/version'
 
-Gem::Specification.new do |s|
-  s.name = "tabs_on_rails"
-  s.version = "2.1.1"
+Gem::Specification.new do |spec|
+  spec.name          = "tabs_on_rails"
+  spec.version       = TabsOnRails::VERSION
+  spec.authors       = ["Simone Carletti"]
+  spec.email         = ["weppos@weppos.net"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Simone Carletti"]
-  s.date = "2012-05-25"
-  s.description = "TabsOnRails is a simple Rails plugin for creating tabs and navigation menus."
-  s.email = "weppos@weppos.net"
-  s.files = [".gemtest", ".gitignore", ".travis.yml", "Appraisals", "CHANGELOG.md", "Gemfile", "LICENSE", "README.md", "Rakefile", "gemfiles/3.0.gemfile", "gemfiles/3.0.gemfile.lock", "gemfiles/3.1.gemfile", "gemfiles/3.1.gemfile.lock", "gemfiles/3.2.gemfile", "gemfiles/3.2.gemfile.lock", "init.rb", "lib/tabs_on_rails.rb", "lib/tabs_on_rails/action_controller.rb", "lib/tabs_on_rails/railtie.rb", "lib/tabs_on_rails/tabs.rb", "lib/tabs_on_rails/tabs/builder.rb", "lib/tabs_on_rails/tabs/tabs_builder.rb", "lib/tabs_on_rails/version.rb", "tabs_on_rails.gemspec", "test/dummy.rb", "test/test_helper.rb", "test/unit/action_controller_test.rb", "test/unit/tabs/builder_test.rb", "test/unit/tabs/tabs_builder_test.rb", "test/unit/tabs_test.rb", "test/views/working/default.html.erb", "test/views/working/with_item_block.html.erb", "test/views/working/with_item_options.html.erb", "test/views/working/with_open_close_tabs.html.erb"]
-  s.homepage = "http://www.simonecarletti.com/code/tabs_on_rails"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
-  s.summary = "A simple Ruby on Rails plugin for creating tabs and navigation menus."
-  s.test_files = ["test/dummy.rb", "test/test_helper.rb", "test/unit/action_controller_test.rb", "test/unit/tabs/builder_test.rb", "test/unit/tabs/tabs_builder_test.rb", "test/unit/tabs_test.rb", "test/views/working/default.html.erb", "test/views/working/with_item_block.html.erb", "test/views/working/with_item_options.html.erb", "test/views/working/with_open_close_tabs.html.erb"]
+  spec.summary       = %q{A simple Ruby on Rails plugin for creating tabs and navigation menu}
+  spec.description   = %q{TabsOnRails is a simple Ruby on Rails plugin for creating tabs and navigation menu for a Rails project.}
+  spec.homepage      = "https://simonecarletti.com/code/tabs-on-rails"
+  spec.license       = "MIT"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  spec.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rails>, [">= 3.0"])
-      s.add_development_dependency(%q<appraisal>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, ["~> 0.11.0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-    else
-      s.add_dependency(%q<rails>, [">= 3.0"])
-      s.add_dependency(%q<appraisal>, [">= 0"])
-      s.add_dependency(%q<mocha>, ["~> 0.11.0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rails>, [">= 3.0"])
-    s.add_dependency(%q<appraisal>, [">= 0"])
-    s.add_dependency(%q<mocha>, ["~> 0.11.0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-  end
+  spec.required_ruby_version = ">= 2.2"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "rails", ">= 4.2"
+  spec.add_development_dependency "mocha", ">= 1.0"
+  spec.add_development_dependency "yard"
 end

data/test/dummy.rb

@@ -8,7 +8,7 @@ require "rails/railtie"
 class Dummy
   Routes = ActionDispatch::Routing::RouteSet.new
   Routes.draw do
-    match ':controller(/:action(/:id))'
+    match ':controller(/:action(/:id))', via: [:get]
   end
 end
 
@@ -39,3 +39,8 @@ class ActiveSupport::TestCase
   end
 
 end
+
+# Trigger lazy loading and causes the load_hooks to be executed on
+# ActionController::API. This is important because breacrumbs_on_rails includes
+# BreadcrumbsOnRails::ActionController on any module that executes these hooks
+ActionController::API rescue NameError

data/test/test_helper.rb

@@ -1,10 +1,13 @@
-require 'test/unit'
-require 'mocha'
+require 'minitest/autorun'
+require 'mocha/setup'
 require 'dummy'
 
 $:.unshift File.expand_path('../../lib', __FILE__)
 require 'tabs_on_rails'
 
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
 
 class ActiveSupport::TestCase
   def current_tab(namespace)

data/test/unit/action_controller_test.rb

@@ -228,16 +228,8 @@ class ControllerMixinHelpersTest < ActionView::TestCase
   include ActionView::Helpers::UrlHelper
 
   MockBuilder = Class.new(TabsOnRails::Tabs::Builder) do
-    def initialize_with_mocha(*args)
-      checkpoint
-      initialize_without_mocha(*args)
-    end
-    alias_method_chain :initialize, :mocha
-
-    def checkpoint
-    end
-
     def tab_for(tab, name, *args)
+      "-> #{name}"
     end
   end
 
@@ -263,14 +255,8 @@ class ControllerMixinHelpersTest < ActionView::TestCase
   def test_tabs_tag_should_raise_local_jump_error_without_block
     assert_raise(LocalJumpError) { tabs_tag }
   end
-  
-  def test_tabs_tag_with_builder
-    MockBuilder.any_instance.expects(:checkpoint).once
-    tabs_tag(:builder => MockBuilder) { "" }
-  end
 
   def test_tabs_tag_with_namespace
-    MockBuilder.any_instance.expects(:checkpoint).once
     tabs_tag(:builder => MockBuilder, :namespace => :custom) do |tabs|
       builder = tabs.instance_variable_get(:'@builder')
       assert_equal(:custom, builder.instance_variable_get(:'@namespace'))

data/test/unit/{tabs/builder_test.rb → builder_test.rb}

@@ -65,19 +65,19 @@ class BuilderTest < ActionView::TestCase
 
 
   def test_open_tabs
-    assert_equal nil, @builder.open_tabs
+    assert_nil @builder.open_tabs
   end
 
   def test_open_tabs_with_options
-    assert_equal nil, @builder.open_tabs(:foo => "bar")
+    assert_nil @builder.open_tabs(:foo => "bar")
   end
 
   def test_close_tabs
-    assert_equal nil, @builder.close_tabs
+    assert_nil @builder.close_tabs
   end
 
   def test_close_tabs_with_options
-    assert_equal nil, @builder.close_tabs(:foo => "bar")
+    assert_nil @builder.close_tabs(:foo => "bar")
   end
 
 

metadata

@@ -1,103 +1,118 @@
 --- !ruby/object:Gem::Specification
 name: tabs_on_rails
 version: !ruby/object:Gem::Version
-  version: 2.2.0
-  prerelease: 
+  version: 3.0.0
 platform: ruby
 authors:
 - Simone Carletti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: TabsOnRails is a simple Rails plugin for creating tabs and navigation
-  menus.
-email: weppos@weppos.net
+description: TabsOnRails is a simple Ruby on Rails plugin for creating tabs and navigation
+  menu for a Rails project.
+email:
+- weppos@weppos.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/3.0.gemfile
-- gemfiles/3.0.gemfile.lock
-- gemfiles/3.1.gemfile
-- gemfiles/3.1.gemfile.lock
-- gemfiles/3.2.gemfile
-- gemfiles/3.2.gemfile.lock
-- init.rb
+- gemfiles/4.2.gemfile
+- gemfiles/5.0.gemfile
 - lib/tabs_on_rails.rb
 - lib/tabs_on_rails/action_controller.rb
 - lib/tabs_on_rails/railtie.rb
@@ -109,47 +124,44 @@ files:
 - test/dummy.rb
 - test/test_helper.rb
 - test/unit/action_controller_test.rb
-- test/unit/tabs/builder_test.rb
-- test/unit/tabs/tabs_builder_test.rb
+- test/unit/builder_test.rb
+- test/unit/tabs_builder_test.rb
 - test/unit/tabs_test.rb
 - test/views/working/default.html.erb
 - test/views/working/with_item_block.html.erb
 - test/views/working/with_item_options.html.erb
 - test/views/working/with_open_close_tabs.html.erb
 - test/views/working/with_option_active_class.html.erb
-homepage: http://www.simonecarletti.com/code/tabs_on_rails
-licenses: []
+homepage: https://simonecarletti.com/code/tabs-on-rails
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -246050836927131597
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.5.2
 signing_key: 
-specification_version: 3
-summary: A simple Ruby on Rails plugin for creating tabs and navigation menus.
+specification_version: 4
+summary: A simple Ruby on Rails plugin for creating tabs and navigation menu
 test_files:
 - test/dummy.rb
 - test/test_helper.rb
 - test/unit/action_controller_test.rb
-- test/unit/tabs/builder_test.rb
-- test/unit/tabs/tabs_builder_test.rb
+- test/unit/builder_test.rb
+- test/unit/tabs_builder_test.rb
 - test/unit/tabs_test.rb
 - test/views/working/default.html.erb
 - test/views/working/with_item_block.html.erb