simple_active_link_to 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4427909ec1eefd905a39cd23945f33ae5b999cbc19cb919eecf9e25ef4cf5e37
-  data.tar.gz: 84a29b27108c169427b4791a4c36ff2c141027604ebc6a62cd3372fa64362bb3
+  metadata.gz: 5196cc1a406bf131cfb61681ae45e7864728268c133c2119ae40c4a216cb72b3
+  data.tar.gz: 55f77caa6c4affa3eb4c27b64d85310e81e8f99b950bd2e06a820b89e35ae7fa
 SHA512:
-  metadata.gz: f96594d2e4acf09083588e821e49636f633710eba41f59fe452e6268600eaa2449fe14c4bee126a19ab4618ae09ef863a7f9d6af9436804bd21ec6d5952c9537
-  data.tar.gz: af11845584d76188f7061228f0fb91db1b6a89a6c1c9c1837efdee20968fefda8cbd551fe68cdb83bfbe8278ff1d6fd560f7a3534c18d2a17cd7a4f8b6345ec2
+  metadata.gz: b286eceb0d2524868adc437ed090fa796f6698cd1da59d112336bfd4ebbe6fbc989642264ea6f8802e6100f90321a944a8e3b1d9193413cbf0702b0477113cc3
+  data.tar.gz: ac412b3ee3c47d1554aec4bb55015eae311b7a2824a2f14eed01d4821038462dcdde9dc023899b8b17be4a2ac621358fd5c6775a01f9b0579a42e9d05451752f

data/Gemfile

@@ -1,10 +1,3 @@
 source 'http://rubygems.org'
 
 gemspec
-
-group :test do
-  gem 'minitest'
-  gem 'rake'
-  gem 'rack-test'
-  gem 'nokogiri'
-end

data/README.md

@@ -1,6 +1,6 @@
 # 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), but with active state by adding an extra css class `active` by default.
+`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 project is fork of [active_link_to](https://github.com/comfy/active_link_to), but without wrap tag, and some code improvement.
 

data/lib/simple_active_link_to/simple_active_link_to.rb

@@ -20,9 +20,6 @@ module SimpleActiveLinkTo
       html_options = options
       options = name
       name = capture(&block)
-    else
-      html_options = html_options
-      options ||= {}
     end
 
     html_options ||= {}
@@ -42,14 +39,12 @@ module SimpleActiveLinkTo
     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
-
-    if active_options[:active_disable] == true && is_active
-      content_tag(:span, name, link_options)
-    else
-      link_to(name, url, link_options)
+    if is_active_link?(url, active_options[:active])
+      link_options[:'aria-current'] = 'page'
+      return content_tag(:span, name, link_options) if active_options[:active_disable] == true
     end
+
+    link_to(name, url, link_options)
   end
 
   # Returns css class name. Takes the link's URL and its params
@@ -86,12 +81,14 @@ module SimpleActiveLinkTo
         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
+        
+        if url_string == request_uri
+          true
+        elsif condition != :exclusive
           closing = url_string.end_with?('/') ? '' : '/'
-          url_string == request_uri || request_uri.start_with?(url_string + closing)
+          request_uri.start_with?(url_string + closing)
+        else
+          false
         end
       when :exact
         request.original_fullpath == url

data/lib/simple_active_link_to/version.rb

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

data/simple_active_link_to.gemspec

@@ -16,6 +16,10 @@ Gem::Specification.new do |s|
   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'

data/test/gemfiles/5.0.gemfile

@@ -3,10 +3,3 @@ source 'http://rubygems.org'
 gemspec path: "../../"
 
 gem "actionpack", "~> 5.0.0"
-
-group :test do
-  gem 'minitest'
-  gem 'rake'
-  gem 'rack-test'
-  gem 'nokogiri'
-end

data/test/gemfiles/5.1.gemfile

@@ -3,10 +3,3 @@ source 'http://rubygems.org'
 gemspec path: "../../"
 
 gem "actionpack", "~> 5.1.0"
-
-group :test do
-  gem 'minitest'
-  gem 'rake'
-  gem 'rack-test'
-  gem 'nokogiri'
-end

data/test/gemfiles/5.2.gemfile

@@ -3,10 +3,3 @@ source 'http://rubygems.org'
 gemspec path: "../../"
 
 gem "actionpack", "~> 5.2.0"
-
-group :test do
-  gem 'minitest'
-  gem 'rake'
-  gem 'rack-test'
-  gem 'nokogiri'
-end

data/test/gemfiles/6.0.gemfile

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

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: simple_active_link_to
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Fajarullah
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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: nokogiri
+  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: rack-test
+  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: rake
+  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