simple_active_link_to 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1daf4ee0af356ebe31c54f1a18911f6b0b94228b9a3703cbdc064785595cb44
-  data.tar.gz: d740a7746f0327c55fd576abf6107fa9bb3fc5893c5cc1e10dab0dc18da53944
+  metadata.gz: 4427909ec1eefd905a39cd23945f33ae5b999cbc19cb919eecf9e25ef4cf5e37
+  data.tar.gz: 84a29b27108c169427b4791a4c36ff2c141027604ebc6a62cd3372fa64362bb3
 SHA512:
-  metadata.gz: df30e6aef083dfd01c8b282256d3de83a063aead51f2c3112a927941c57fa7c1ac32a11eda07b46f18f025df5c1ebfbe037ff20720d421b623c9f2b4b6c47934
-  data.tar.gz: b97fb762f8f26339e58d5b84cdbf1c4f71e364cb06fc315951841341e429a213c9cdf09ecbca7ec247323655c8dcded6a06c76a7c644e9f494a60b0abb4cbaef
+  metadata.gz: f96594d2e4acf09083588e821e49636f633710eba41f59fe452e6268600eaa2449fe14c4bee126a19ab4618ae09ef863a7f9d6af9436804bd21ec6d5952c9537
+  data.tar.gz: af11845584d76188f7061228f0fb91db1b6a89a6c1c9c1837efdee20968fefda8cbd551fe68cdb83bfbe8278ff1d6fd560f7a3534c18d2a17cd7a4f8b6345ec2

data/.github/workflows/gem.yml

@@ -7,18 +7,22 @@ on:
     branches: [ master ]
 
 jobs:
-  build:
-    name: Test + Build
+  tests:
+    name: Tests
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        ruby: [2.5, 2.6, 2.7]
+        rails: ['5.0', '5.1', '5.2', '6.0']
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Ruby 2.4
-      uses: actions/setup-ruby@v1
+    - name: Set up Ruby 2.5
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.4.x
-        
-    - name: Install bundle gems
+        ruby-version: ${{ matrix.ruby }}
+    - name: Bundle install
       run: bundle install
-    - name: Test
-      run: bundle exec rake
+      env:
+        BUNDLE_GEMFILE: "test/gemfiles/${{ matrix.rails }}.gemfile"
+    - run: bundle exec rake
+

data/README.md

@@ -7,7 +7,7 @@ This project is fork of [active_link_to](https://github.com/comfy/active_link_to
 [![Gem Version](https://img.shields.io/gem/v/simple_active_link_to.svg?style=flat)](http://rubygems.org/gems/simple_active_link_to)
 [![Gem Downloads](https://img.shields.io/gem/dt/simple_active_link_to.svg?style=flat)](http://rubygems.org/gems/simple_active_link_to)
 
-Require ruby >= 2.4
+Tested with ruby >= 2.5.x <= 2.7.x and rails >= 5.0 <= 6.0
 
 ## Installation
 add `gem 'simple_active_link_to'` to Gemfile and run `bundle install`.

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'rake/testtask'
 require 'bundler/setup'

data/lib/simple_active_link_to.rb

@@ -1,3 +1,5 @@
-require 'addressable/uri'
+# 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'

data/lib/simple_active_link_to/simple_active_link_to.rb

@@ -1,5 +1,12 @@
+# frozen_string_literal: true
+
 module SimpleActiveLinkTo
-  ACTIVE_OPTIONS = %i[active class_active class_inactive active_disable].freeze
+  ACTIVE_OPTIONS = %i[
+    active
+    class_active
+    class_inactive
+    active_disable
+  ].freeze
 
   # Wrapper around link_to. Accepts following params:
   #   :active         => Boolean | Symbol | Regex | Controller/Action Pair
@@ -8,15 +15,32 @@ module SimpleActiveLinkTo
   #   :active_disable => Boolean
   # Example usage:
   #   simple_active_link_to('/users', class_active: 'enabled')
-  def simple_active_link_to(*args, &block)
-    name = block_given? ? capture(&block) : args.shift
-    url = url_for(args.shift)
-    link_options = args.shift&.dup || {}
-    active_options = link_options.extract!(*ACTIVE_OPTIONS)
+  def simple_active_link_to(name = nil, options = nil, html_options = nil, &block)
+    if block_given?
+      html_options = options
+      options = name
+      name = capture(&block)
+    else
+      html_options = html_options
+      options ||= {}
+    end
 
-    css_class = "#{link_options[:class]} #{active_link_to_class(url, active_options)}"
-    css_class.strip!
-    link_options[:class] = css_class if css_class != ''
+    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
+      end
+    end
+
+    url = url_for(options)
+
+    css_class = link_options[:class]
+    active_class = active_link_to_class(url, active_options)
+    link_options[:class] = "#{css_class} #{active_class}".strip
 
     is_active = is_active_link?(url, active_options[:active])
     link_options[:'aria-current'] = 'page' if is_active
@@ -57,18 +81,22 @@ module SimpleActiveLinkTo
   def is_active_link?(url, condition = nil)
     @is_active_link ||= {}
     @is_active_link[[url, condition]] ||= begin
-      original_url = url
-      url = Addressable::URI.parse(url).path
-      path = request.original_fullpath
       case condition
-      when :inclusive, nil
-        path.match?(%r{^#{Regexp.escape(url).chomp('/')}(/.*|\?.*)?$})
-      when :exclusive
-        path.match?(%r{^#{Regexp.escape(url)}/?(\?.*)?$})
+      when :exclusive, :inclusive, nil
+        url_path = url.split('#').first.split('?').first
+        url_string = URI.parser.unescape(url_path).force_encoding(Encoding::BINARY)
+        request_uri = URI.parser.unescape(request.path).force_encoding(Encoding::BINARY)
+
+        if condition == :exclusive
+          url_string == request_uri
+        else
+          closing = url_string.end_with?('/') ? '' : '/'
+          url_string == request_uri || request_uri.start_with?(url_string + closing)
+        end
       when :exact
-        path == original_url
+        request.original_fullpath == url
       when Regexp
-        path.match?(condition)
+        request.original_fullpath.match?(condition)
       when Array
         controllers = Array(condition[0])
         actions     = Array(condition[1])
@@ -77,10 +105,8 @@ module SimpleActiveLinkTo
           controllers.any? do |controller, action|
             params[:controller] == controller.to_s && params[:action] == action.to_s
           end
-      when TrueClass
-        true
-      when FalseClass
-        false
+      when TrueClass, FalseClass
+        condition
       when Hash
         condition.all? do |key, value|
           params[key].to_s == value.to_s

data/lib/simple_active_link_to/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleActiveLinkTo
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/simple_active_link_to.gemspec

@@ -1,22 +1,22 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-$:.unshift File.expand_path('../lib', __FILE__)
+$:.unshift File.expand_path('lib', __dir__)
 require 'simple_active_link_to/version'
 
 Gem::Specification.new do |s|
-  s.name          = "simple_active_link_to"
+  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.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.required_ruby_version = '>= 2.4.0'
 
-  s.add_dependency 'actionpack'
-  s.add_dependency 'addressable'
+  s.add_dependency 'actionpack', '>= 5.0'
+  s.add_dependency 'activesupport', '>= 5.0'
 end

data/test/gemfiles/6.0.gemfile

@@ -0,0 +1,12 @@
+source 'http://rubygems.org'
+
+gemspec path: "../../"
+
+gem "actionpack", "~> 6.0.0"
+
+group :test do
+  gem 'minitest'
+  gem 'rake'
+  gem 'rack-test'
+  gem 'nokogiri'
+end

data/test/simple_active_link_to_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'test_helper'
 
 class SimpleActiveLinkToTest < MiniTest::Test
@@ -209,4 +211,10 @@ class SimpleActiveLinkToTest < MiniTest::Test
     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,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 require 'minitest/autorun'
 require 'uri'
@@ -5,21 +7,35 @@ 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
 
-  SimpleActiveLinkTo.send :include, FakeRequest
+  module FakeCapture
+    def capture
+      yield
+    end
+  end
+
+  SimpleActiveLinkTo.include FakeRequest
+  SimpleActiveLinkTo.include FakeCapture
 
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
@@ -27,9 +43,7 @@ class MiniTest::Test
 
   def set_path(path, purge_cache = true)
     request.original_fullpath = path
-    if purge_cache && defined?(@is_active_link)
-      remove_instance_variable(:@is_active_link)
-    end
+    remove_instance_variable(:@is_active_link) if purge_cache && defined?(@is_active_link)
   end
 
   def assert_html(html, selector, value = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_active_link_to
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Fajarullah
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-20 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 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
@@ -49,7 +49,6 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/gem.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -61,6 +60,7 @@ files:
 - test/gemfiles/5.0.gemfile
 - test/gemfiles/5.1.gemfile
 - test/gemfiles/5.2.gemfile
+- test/gemfiles/6.0.gemfile
 - test/simple_active_link_to_test.rb
 - test/test_helper.rb
 homepage: http://github.com/frullah/simple_active_link_to

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-  - ruby-head
-gemfile:
-  - test/gemfiles/5.0.gemfile
-  - test/gemfiles/5.1.gemfile
-  - test/gemfiles/5.2.gemfile
-before_install:
-  - gem update --system
-  - gem update bundler
-matrix:
-  allow_failures:
-    - rvm: ruby-head