simple_active_link_to 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c76b72044a585437ad07175a7aa395a970e25b8e402f04c5f1d585095060bc0d
-  data.tar.gz: 6495b87a880ac9bd383fac9c9db1f9a334468d1c5d37367689ced0890c644f46
+  metadata.gz: b562f2384f992bd5a60fe58b437dadb2f2913a3c6086fd4d7299081fb1577d38
+  data.tar.gz: f858baef43ba051f5ed83930ea79879b7ef1f58f0550caf7822b5fb36b0fe21c
 SHA512:
-  metadata.gz: bd65c905895aeabfbcbcecc6ad22cb091f164ae294d9801f91d2361f8f5b4f6b4898bcebb29ab6adc1cfcfc6ed29bc7d8de83144165d3b22f698dcb8fd08b316
-  data.tar.gz: a8b95ad3bed8c8892523c46df3f66fee9738e3709c4ecbe9f7478f358b9e34db2de1eee2dd58e227b781b7ed0a27a1c09d2bf55922583af2e5b5ade9cf951359
+  metadata.gz: f9d17ac58827a31b29f574686e4899046bb58a6008e13c1ff1cd8981421a75ab5a0df58b185ba130bf33de60bce2ea7d73f7d2237e6a76396abd7cbea684cd72
+  data.tar.gz: a40af6bcf2e777900cfb19ea93c4f6757fc1a6022b9c07f5c579fa2f2a46cabae592f4e08ca00537f5f0c71586b5c1721821914ef5c435177170d2dc8da819be

data/README.md

@@ -1,10 +1,10 @@
-# simple_active_link_to ![Build](https://github.com/frullah/simple_active_link_to/workflows/Build/badge.svg) [![Gem Version](https://img.shields.io/gem/v/simple_active_link_to.svg?style=flat)](http://rubygems.org/gems/simple_active_link_to)
+# simple_active_link_to [![Build Rails < 7](https://github.com/frullah/simple_active_link_to/actions/workflows/test-rails-below-7.yml/badge.svg?branch=master)](https://github.com/frullah/simple_active_link_to/actions/workflows/test-rails-below-7.yml) [![Build Rails >= 7](https://github.com/frullah/simple_active_link_to/actions/workflows/test-rails-7.yml/badge.svg?branch=master)](https://github.com/frullah/simple_active_link_to/actions/workflows/test-rails-7.yml) [![Gem Version](https://img.shields.io/gem/v/simple_active_link_to.svg?style=flat)](http://rubygems.org/gems/simple_active_link_to)
 
 `simple_active_link_to` is a wrapper for [link_to](http://api.rubyonrails.org/classes/ActionView/Helpers/UrlHelper.html#method-i-link_to), with active state by adding an extra css class `active` by default.
 
 This gem works like [active_link_to](https://github.com/comfy/active_link_to), but with additional ```active_disable``` option and without wrap tag.
 
-Tested with ruby 2.5 to 3.0 and rails 5.0 to 6.1
+Tested with ruby 2.5 to 3.0 and rails 5.0 to 6.1, and rails 7.0
 
 ## Installation
 add `gem 'simple_active_link_to'` to Gemfile and run `bundle install`.
@@ -145,3 +145,7 @@ is_active_link?(users_path, :inclusive)
 active_link_to_class(users_path, active: :inclusive)
 # => 'active'
 ```
+
+## Contributing
+
+Bug reports and pull requests are welcome.

data/lib/simple_active_link_to/simple_active_link_to.rb

@@ -15,31 +15,32 @@ module SimpleActiveLinkTo
   #   :active_disable => Boolean | :hash
   # Example usage:
   #   simple_active_link_to('/users', class_active: 'enabled')
-  def simple_active_link_to(name = nil, options = nil, html_options = nil, &block)
+  def simple_active_link_to(name = nil, url_options = nil, html_options = nil, &block)
     if block_given?
-      html_options = options
-      options = name
+      html_options = url_options
+      url_options = name
       name = capture(&block)
     end
 
-    html_options ||= {}
     link_options = {}
     active_options = {}
-    html_options.each do |k, v|
-      if ACTIVE_OPTIONS.include?(k)
-        active_options[k] = v
-      else
-        link_options[k] = v
+    if html_options.is_a?(Hash)
+      html_options.each do |k, v|
+        if ACTIVE_OPTIONS.include?(k)
+          active_options[k] = v
+        else
+          link_options[k] = v
+        end
       end
     end
 
-    url = url_for(options)
+    url = url_for(url_options)
 
-    css_class = link_options[:class]
-    active_class = active_link_to_class(url, active_options)
-    link_options[:class] = "#{css_class} #{active_class}".strip
+    activated = is_active_link?(url, active_options[:active])
+    state_class = link_state_class(activated, active_options)
+    link_options[:class] = "#{link_options[:class]} #{state_class}".strip
 
-    if is_active_link?(url, active_options[:active])
+    if activated
       link_options[:'aria-current'] = 'page'
       case active_options[:active_disable]
       when true
@@ -57,7 +58,11 @@ module SimpleActiveLinkTo
   #   active_link_to_class('/root', class_active: 'on', class_inactive: 'off')
   #
   def active_link_to_class(url, options = {})
-    if is_active_link?(url, options[:active])
+    link_state_class(is_active_link?(url, options[:active]), options)
+  end
+
+  private def link_state_class(activated, options = {})
+    if activated
       options[:class_active] || 'active'
     else
       options[:class_inactive] || ''
@@ -80,7 +85,8 @@ module SimpleActiveLinkTo
   #
   def is_active_link?(url, condition = nil)
     @is_active_link ||= {}
-    @is_active_link[[url, condition]] ||= begin
+    @is_active_link[url] ||= {}
+    @is_active_link[url][condition] ||= begin
       case condition
       when :exclusive, :inclusive, nil
         url_path = url.split('#').first.split('?').first

data/lib/simple_active_link_to/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleActiveLinkTo
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/simple_active_link_to.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/uri'
 require 'simple_active_link_to/simple_active_link_to'
 require 'simple_active_link_to/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_active_link_to
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Fajarullah
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -103,23 +131,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/build.yml"
-- ".gitignore"
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - lib/simple_active_link_to.rb
 - lib/simple_active_link_to/simple_active_link_to.rb
 - lib/simple_active_link_to/version.rb
-- simple_active_link_to.gemspec
-- test/gemfiles/5.0.gemfile
-- test/gemfiles/5.1.gemfile
-- test/gemfiles/5.2.gemfile
-- test/gemfiles/6.0.gemfile
-- test/gemfiles/6.1.gemfile
-- test/simple_active_link_to_test.rb
-- test/test_helper.rb
 homepage: http://github.com/frullah/simple_active_link_to
 licenses:
 - MIT
@@ -139,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: ActionView helper to render currently active links

data/.github/workflows/build.yml

@@ -1,33 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches: [ master, dev ]
-    paths-ignore:
-      - "**/README.md"
-      - lib/simple_active_link_to/version.rb
-  pull_request:
-    branches: [ master, dev ]
-    paths-ignore:
-      - "**/README.md"
-      - lib/simple_active_link_to/version.rb
-
-jobs:
-  tests:
-    name: Tests
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [2.5, 2.6, 2.7, 3.0]
-        rails: ['5.0', '5.1', '5.2', '6.0', '6.1']
-    env:
-      BUNDLE_PATH: vendor/bundle
-      BUNDLE_GEMFILE: test/gemfiles/${{ matrix.rails }}.gemfile
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - run: bundle exec rake

data/.gitignore

@@ -1,6 +0,0 @@
-.bundle
-
-.DS_Store
-Gemfile.lock
-
-test/gemfiles/*.gemfile.lock

data/Gemfile

@@ -1,3 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec

data/Rakefile

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubygems'
-require 'rake/testtask'
-require 'bundler/setup'
-
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
-
-task default: :test

data/simple_active_link_to.gemspec

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-$:.unshift File.expand_path('lib', __dir__)
-require 'simple_active_link_to/version'
-
-Gem::Specification.new do |s|
-  s.name          = 'simple_active_link_to'
-  s.version       = SimpleActiveLinkTo::VERSION
-  s.authors       = ['Fajarullah']
-  s.email         = ['frullah12@gmail.com']
-  s.homepage      = 'http://github.com/frullah/simple_active_link_to'
-  s.summary       = 'ActionView helper to render currently active links'
-  s.description   = 'Helpful method when you need to add some logic that figures out if the link (or more often navigation item) is selected based on the current page or other arbitrary condition'
-  s.license       = 'MIT'
-
-  s.files         = `git ls-files`.split("\n")
-
-  s.required_ruby_version = '>= 2.4.0'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'nokogiri'
-  s.add_development_dependency 'rack-test'
-  s.add_development_dependency 'rake'
-
-  s.add_dependency 'actionpack', '>= 5.0'
-  s.add_dependency 'activesupport', '>= 5.0'
-end

data/test/gemfiles/5.0.gemfile

@@ -1,5 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec path: "../../"
-
-gem "actionpack", "~> 5.0.0"

data/test/gemfiles/5.1.gemfile

@@ -1,5 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec path: "../../"
-
-gem "actionpack", "~> 5.1.0"

data/test/gemfiles/5.2.gemfile

@@ -1,5 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec path: "../../"
-
-gem "actionpack", "~> 5.2.0"

data/test/gemfiles/6.0.gemfile

@@ -1,5 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec path: "../../"
-
-gem "actionpack", "~> 6.0.0"

data/test/gemfiles/6.1.gemfile

@@ -1,5 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec path: "../../"
-
-gem "actionpack", "~> 6.1.0"

data/test/simple_active_link_to_test.rb

@@ -1,230 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'test_helper'
-
-class SimpleActiveLinkToTest < MiniTest::Test
-
-  def test_is_active_link_booleans_test
-    assert is_active_link?('/', true)
-    refute is_active_link?('/', false)
-  end
-
-  def test_is_active_link_handle_empty_string
-    assert is_active_link?('', true)
-  end
-
-  def test_is_active_link_symbol_inclusive
-    set_path('/root')
-    assert is_active_link?('/root', :inclusive)
-
-    set_path('/root?param=test')
-    assert is_active_link?('/root', :inclusive)
-
-    set_path('/root/child/sub-child')
-    assert is_active_link?('/root', :inclusive)
-
-    set_path('/other')
-    refute is_active_link?('/root', :inclusive)
-  end
-
-  def test_is_active_link_symbol_inclusive_implied
-    set_path('/root/child/sub-child')
-    assert is_active_link?('/root')
-  end
-
-  def test_is_active_link_symbol_inclusive_similar_path
-    set_path('/root/abc')
-    refute is_active_link?('/root/a', :inclusive)
-  end
-
-  def test_is_active_link_symbol_inclusive_with_last_slash
-    set_path('/root/abc')
-    assert is_active_link?('/root/')
-  end
-
-  def test_is_active_link_symbol_inclusive_with_last_slash_and_similar_path
-    set_path('/root_path')
-    refute is_active_link?('/root/')
-  end
-
-  def test_is_active_link_symbol_inclusive_with_link_params
-    set_path('/root?param=test')
-    assert is_active_link?('/root?attr=example')
-  end
-
-  def test_is_active_link_symbol_exclusive
-    set_path('/root')
-    assert is_active_link?('/root', :exclusive)
-
-    set_path('/root?param=test')
-    assert is_active_link?('/root', :exclusive)
-
-    set_path('/root/child')
-    refute is_active_link?('/root', :exclusive)
-  end
-
-  def test_is_active_link_symbol_exclusive_with_link_params
-    set_path('/root?param=test')
-    assert is_active_link?('/root?attr=example', :exclusive)
-  end
-
-  def test_is_active_link_symbol_exact
-    set_path('/root?param=test')
-    assert is_active_link?('/root?param=test', :exact)
-
-    set_path('/root?param=test')
-    refute is_active_link?('/root?param=exact', :exact)
-
-    set_path('/root')
-    refute is_active_link?('/root?param=test', :exact)
-
-    set_path('/root?param=test')
-    refute is_active_link?('/root', :exact)
-  end
-
-  def test_is_active_link_regex
-    set_path('/root')
-    assert is_active_link?('/', /^\/root/)
-
-    set_path('/root/child')
-    assert is_active_link?('/', /^\/r/)
-
-    set_path('/other')
-    refute is_active_link?('/', /^\/r/)
-  end
-
-  def test_is_active_link_array
-    params[:controller], params[:action] = 'controller', 'action'
-
-    assert is_active_link?('/', [['controller'], ['action']])
-    assert is_active_link?('/', [['controller'], ['action', 'action_b']])
-    assert is_active_link?('/', [['controller', 'controller_b'], ['action']])
-    assert is_active_link?('/', [['controller', 'controller_b'], ['action', 'action_b']])
-    assert is_active_link?('/', ['controller', 'action'])
-    assert is_active_link?('/', ['controller', ['action', 'action_b']])
-    assert is_active_link?('/', [['controller', 'controller_b'], 'action'])
-
-    refute is_active_link?('/', ['controller_a', 'action'])
-    refute is_active_link?('/', ['controller', 'action_a'])
-  end
-
-  def test_is_active_link_array_with_hash
-    params[:controller], params[:action] = 'controller', 'action'
-
-    assert is_active_link?('/', [controller: :action])
-    assert is_active_link?('/', ['controller' => 'action'])
-
-    refute is_active_link?('/', [controller_b: :action])
-    refute is_active_link?('/', [controller: :action_b])
-    refute is_active_link?('/', [controller_b: :action_b])
-
-    params[:controller], params[:action] = 'controller_b', 'action_b'
-
-    assert is_active_link?('/', [controller: :action, controller_b: :action_b])
-  end
-
-  def test_is_active_link_hash
-    params[:a] = 1
-
-    assert is_active_link?('/', {a: 1})
-    assert is_active_link?('/', {a: 1, b: nil})
-
-    refute is_active_link?('/', {a: 1, b: 2})
-    refute is_active_link?('/', {a: 2})
-
-    params[:b] = 2
-
-    assert is_active_link?('/', {a: 1, b: 2})
-    assert is_active_link?('/', {a: 1, b: 2, c: nil})
-
-    assert is_active_link?('/', {a: 1})
-    assert is_active_link?('/', {b: 2})
-  end
-
-  def test_is_active_link_with_anchor
-    set_path('/foo')
-    assert is_active_link?('/foo#anchor', :exclusive)
-  end
-
-  def test_is_active_link_with_memoization
-    set_path('/')
-    assert is_active_link?('/', :exclusive)
-
-    set_path('/other', false)
-    assert is_active_link?('/', :exclusive)
-  end
-
-  def test_active_link_to_class
-    set_path('/root')
-    assert_equal 'active', active_link_to_class('/root')
-    assert_equal 'on', active_link_to_class('/root', class_active: 'on')
-
-    assert_equal '', active_link_to_class('/other')
-    assert_equal 'off', active_link_to_class('/other', class_inactive: 'off')
-  end
-
-  def test_active_link_to
-    set_path('/root')
-    link = simple_active_link_to('label', '/root')
-    assert_html link, 'a.active[href="/root"]', 'label'
-
-    link = simple_active_link_to('label', '/other')
-    assert_html link, 'a[href="/other"]', 'label'
-  end
-
-  def test_active_link_to_with_existing_class
-    set_path('/root')
-    link = simple_active_link_to('label', '/root', class: 'current')
-    assert_html link, 'a.current.active[href="/root"]', 'label'
-
-    link = simple_active_link_to('label', '/other', class: 'current')
-    assert_html link, 'a.current[href="/other"]', 'label'
-  end
-
-  def test_active_link_to_with_custom_classes
-    set_path('/root')
-    link = simple_active_link_to('label', '/root', class_active: 'on')
-    assert_html link, 'a.on[href="/root"]', 'label'
-
-    link = simple_active_link_to('label', '/other', class_inactive: 'off')
-    assert_html link, 'a.off[href="/other"]', 'label'
-  end
-
-  def test_active_link_to_with_active_disable_as_true
-    set_path('/root')
-    link = simple_active_link_to('label', '/root', active_disable: true)
-    assert_html link, 'span.active', 'label'
-  end
-
-  def test_active_link_to_with_active_disable_as_hash
-    set_path('/root')
-    link = simple_active_link_to('label', '/root', active_disable: :hash)
-    assert_html link, 'a.active[href="/root#"]', 'label'
-  end
-
-  def test_should_not_modify_passed_params
-    set_path('/root')
-    params = {class: 'testing', active: :inclusive}
-    out = simple_active_link_to 'label', '/root', params
-    assert_html out, 'a.testing.active[href="/root"]', 'label'
-    assert_equal ({class: 'testing', active: :inclusive }), params
-  end
-
-  def test_active_link_to_with_aria
-    set_path('/root')
-    link = simple_active_link_to('label', '/root')
-    assert_html link, 'a.active[href="/root"][aria-current="page"]', 'label'
-  end
-
-  def test_active_link_to_with_utf8
-    set_path('/äöü')
-    link = simple_active_link_to('label', '/äöü')
-    assert_html link, 'a.active[href="/äöü"]', 'label'
-  end
-
-  def test_active_link_to_with_block
-    set_path('/root')
-    link = simple_active_link_to('/root') { 'label' }
-    assert_html link, 'a.active[href="/root"]', 'label'
-  end
-end

data/test/test_helper.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'minitest/autorun'
-require 'uri'
-require 'action_view'
-require 'simple_active_link_to'
-
-class MiniTest::Test
-  # need this to simulate requests that drive active_link_helper
-  module FakeRequest
-    class Request
-      attr_accessor :original_fullpath
-
-      def path
-        return original_fullpath unless original_fullpath&.include?('?')
-
-        @path ||= original_fullpath.split('?').first
-      end
-    end
-
-    def request
-      @request ||= Request.new
-    end
-
-    def params
-      @params ||= {}
-    end
-  end
-
-  module FakeCapture
-    def capture
-      yield
-    end
-  end
-
-  SimpleActiveLinkTo.include FakeRequest
-  SimpleActiveLinkTo.include FakeCapture
-
-  include ActionView::Helpers::UrlHelper
-  include ActionView::Helpers::TagHelper
-  include SimpleActiveLinkTo
-
-  def set_path(path, purge_cache = true)
-    request.original_fullpath = path
-    remove_instance_variable(:@is_active_link) if purge_cache && defined?(@is_active_link)
-  end
-
-  def assert_html(html, selector, value = nil)
-    doc = Nokogiri::HTML(html)
-    element = doc.at_css(selector)
-    assert element, "No element found at: `#{selector}`"
-    assert_equal value, element.text if value
-  end
-end