showcase 0.2.0.rc.3 → 0.2.0.rc.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07623d8209466223ba0fe77ed697c570d44297b6
-  data.tar.gz: fe4e0c8596aa7224abbd3263ebee03b403b60bbd
+  metadata.gz: ea7a961ec1b6c1052fad8382dbac298219823089
+  data.tar.gz: 57e69cf51b6380e1f1e400ccfc7476eded417201
 SHA512:
-  metadata.gz: b9306cd9390ec58281aba58230281d898f2cbdda548a1b17272cdb3d0de904b07c2ab13e3533bcae904eabd850b8776597b8c04970e9521c83e9921a2ffa708d
-  data.tar.gz: 9c2859b89fa7f649d7957ef8394d23b0171a53c0383f2b8404eea83c72117b76e9f58a26acfb7f5783074779d1cb815cde9ffb41f7ead0ee42a3af6606fa75f0
+  metadata.gz: 230965dd32b8151f9ed5f43c72614ad951825f79e1dedea1717300fbb74374b890ae14536d4d9dace620740482b09c972e62d5fbbcf58cae53b1812510288bfc
+  data.tar.gz: 4c07a160bf50ef8ed1cfd512a29c29b6b827722228d3d7ce7469d4766a2de341602ea07bf5af8405f7e4aafc4a1eb9ea15d4a8a7a074ddaf255ce14e2b2b1e35

data/lib/showcase/traits/link_to.rb

@@ -21,9 +21,15 @@ module Showcase
           define_module_method [name, :link] do |*args, &link_block|
             config = Helpers::ConfigObject.new(self, &block).to_struct
 
+            options = args.extract_options!.symbolize_keys
+
+            active_class = if options[:active_class]
+                             options.delete(:active_class)
+                           end
+
             html_options = HtmlOptions.new(config.html_options)
-            html_options.merge_attrs!(args.extract_options!)
-            html_options.add_class!(config.active_class || 'active') if config.active
+            html_options.merge_attrs!(options)
+            html_options.add_class!(active_class || config.active_class || 'active') if config.active
 
             args = Array(config.label) if args.empty? && !link_block
             h.link_to *args, config.url, html_options.to_h, &link_block

data/lib/showcase/version.rb

@@ -1,4 +1,4 @@
 module Showcase
-  VERSION = "0.2.0.rc.3"
+  VERSION = "0.2.0.rc.4"
 end
 

data/spec/traits/link_to_spec.rb

@@ -81,11 +81,17 @@ module Showcase::Traits
             end
           end
 
-          context 'if a different CSS class was specified' do
+          context 'if a different CSS class was specified at DSL level' do
             it 'adds it to the link' do
               expect(subject.foo_link('label')).to have_tag(:a, with: { class: 'current' })
             end
           end
+
+          context 'if a different CSS class was specified at method-call level' do
+            it 'adds it to the link' do
+              expect(subject.link('label', active_class: 'current')).to have_tag(:a, with: { class: 'current' })
+            end
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: showcase
 version: !ruby/object:Gem::Version
-  version: 0.2.0.rc.3
+  version: 0.2.0.rc.4
 platform: ruby
 authors:
 - Stefano Verna