jap_mag 1.3.2 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad7860047ecbc2f0eb308c5c14e8e07f9de20953f5dd711c2f8e1814e7cadeca
-  data.tar.gz: 434a1f22e88e06163adc8e203b1ea5ae59ca097feed8b2a86e339b0bd1540a6d
+  metadata.gz: 6a65ff965780098ac76734497dee642f07790f98115a9d84e2dfb29b1960b6a5
+  data.tar.gz: 202a22e1358394c15bfc8e64f19ea6f655466adf01f1ed6385af892eec328a2e
 SHA512:
-  metadata.gz: 23c4a705759b652492b56e1f3570f166707bddf2e74a4c42f52224e020c2696657d2a705d421177015586a22d23d7bc4ccc8b8525d9560db6c5e5bd6b03d55d2
-  data.tar.gz: 15074ed2ba030db699231549944d3108bb37c116ee971df6102f8abfa940af4d424c2e7a4e0ca0a54d8ec2bd56a4c4a4cbfb5afe7ca0e8502b15edab6ab1e518
+  metadata.gz: f4c962c085d78a3837788b98ef79dca79cffe5cc671de5dfbe6176b30bde0fe84faff6454dfd5935497f41196bcf3690fc42f0eb5336664be4366606b6d676f3
+  data.tar.gz: 856b253088bd36722764e0080d49a25b4896e0a8342c25e809d302dbb92671288d8d1b22822a961d07366f3b3396bbbf33c8dadf2ff1726ed561a40d475902bc

data/app/helpers/jap_mag_widgets_helper.rb

@@ -24,13 +24,16 @@ module JapMagWidgetsHelper
   end
 
   def title *titles
-    seperator = " - "
+    default_options = {
+      sitename: I18n.t("logo"),
+      seperator: ' - '
+    }
 
-    default_options = {sitename: _("/logo")}
     options = titles.last.is_a?(Hash) ? titles.pop : {}
     options = default_options.merge(options)
-    page_title = page_title_for_return = titles.join(seperator)
-    page_title = options[:sitename] + seperator + page_title_for_return if not options[:sitename].blank?
+
+    page_title = page_title_for_return = titles.join(options[:seperator])
+    page_title = options[:sitename] + options[:seperator] + page_title_for_return if not options[:sitename].blank?
 
     content_for :title, page_title
 

data/lib/jap_mag/version.rb

@@ -1,3 +1,3 @@
 module JapMag
-  VERSION = "1.3.2"
+  VERSION = "1.3.5"
 end

data/lib/jap_mag.rb

@@ -43,29 +43,15 @@ module JapMag
   # multiple arguments: "page#index", "page#intro"
   #
   def current_controller_action_in?(*args)
-    controller = params["controller"]
-    action = params["action"]
+    controller = params[:controller]
+    action = params[:action]
+    #raise args.inspect if args != 'homepage/page#index'
 
-    if args.size == 1
-      if args.first.is_a?(Array)
-        arguments = args.first.split(" ").first
-      elsif args.first.is_a?(String)
-        if args.first.split(" ").size > 1
-          arguments = args.first.split(" ")
-        else
-          arguments = args
-        end
-      end
-    else
-      arguments = args
-    end
-
-    #raise arguments.inspect
+    args = args.first if args.size == 1 && args.first.is_a?(Array)
 
-    arguments.each do |element|
-      if element.include?("#")
-        array = element.match(/([a-z\-\_\/]*)#([a-z\-\_]*)/).to_a
-        c, a = array[1], array[2]
+    args.each do |element|
+      if element.to_s.include?("#")
+        c, a = element.split('#')
         return true if controller == c && action == a
       else
         return true if controller == element

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jap_mag
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.5
 platform: ruby
 authors:
 - DING Yu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2022-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: jap_mag-