jap_mag 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09b3629c88f5fc728da59580888b7a9a6967f9e442b5e06b220c868d5dce79e3'
-  data.tar.gz: 1463b9de530bb35625296d1e8be894c4753b6f1bf1e436b4979011ea30c8fd67
+  metadata.gz: 938dff20d2cae44134082114f639f023c25e7735b17a5abfe1e28721145f749b
+  data.tar.gz: 399acc810648ab39e2f453795944822e3e7ba98e893d152b4558506ffc828cb2
 SHA512:
-  metadata.gz: e6074495af8e555a18391a86b8a9ed42d0eb4c01d88ba20aee15407420f6346a5cb654575d979fcd12762d41a0b603d9649eb836b586512b257ecf23e085dbac
-  data.tar.gz: 9599345abd03cc7f00e073233bd733198c98388c536f161fd2134d790e5971eeb2017dc1f64ecc2d5213cd225b46c0cd22f4f93e68d9a73d624b6a389d6396be
+  metadata.gz: a3e3772de8b7a118455349f05bdcf47218bed3c2fe1aeea8f4dc3d02ffabe8ffcc75b362434db276084ac1b7f63327e7bf733c8ae1af6147b6bb2a2a52cbe8e5
+  data.tar.gz: 630c92992b9936e7884e70723b3b72fe4f4bb55307e39037320c83df52588fcba6772254ba9c51633aa56c330da7d46041c6102d9ec4780579491494bfa33bb5

data/app/helpers/jap_mag_widgets_helper.rb

@@ -33,7 +33,7 @@ module JapMagWidgetsHelper
     options = default_options.merge(options)
 
     page_title = page_title_for_return = titles.join(options[:seperator])
-    page_title = options[:sitename] + seperator + page_title_for_return if not options[:sitename].blank?
+    page_title = options[:sitename] + options[:seperator] + page_title_for_return if not options[:sitename].blank?
 
     content_for :title, page_title
 
@@ -190,6 +190,20 @@ module JapMagWidgetsHelper
     image_tag name_at_1x, options
   end
 
+  def section_t key, opts = {}
+    I18n.t "#{params[:controller]}.#{params[:action]}.sections.#{key}", opts
+  end
+
+  def render_sections *args, **opts
+    opts = {locals: {}}.merge(opts)
+
+    args.collect do |section|
+      tpl = "#{params[:controller].gsub('#', '/')}/#{params[:action]}/#{section}"
+
+      render partial: tpl, locals: opts[:locals]
+    end.join.html_safe
+  end
+
   protected
 
   def current_template

data/lib/jap_mag/version.rb

@@ -1,3 +1,3 @@
 module JapMag
-  VERSION = "1.3.3"
+  VERSION = "1.4.0"
 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.3
+  version: 1.4.0
 platform: ruby
 authors:
 - DING Yu
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-17 00:00:00.000000000 Z
+date: 2022-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -57,7 +57,7 @@ files:
 homepage: https://github.com/felixding/JapMag
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -72,8 +72,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
-signing_key:
+rubygems_version: 3.3.5
+signing_key: 
 specification_version: 4
 summary: jap_mag-
 test_files: []