jap_mag 1.3.4 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e28dda46d885cb454f61326fc907e27931c9cf7cdad5e189597692ce364141c5
-  data.tar.gz: 47babaf33cba04d636228888e5f11045be461a0d2253e1740c3c6ed8790c5fdb
+  metadata.gz: da4291c0e51485cbd7930abcb87681d0199e9d6c9b29bc018c0106e2a139d1ad
+  data.tar.gz: 5a4221ac9985205c43e3bf865a69479caedc39585cc2a1e8b5821c7e8f8f3313
 SHA512:
-  metadata.gz: 96d782db55135d0eed4615174d6f92802d7b7c3dbd5a5f0cf347d8a77c6237fc4b3a77ff9405fee0d04a7250ac4879f3fa0539d35d5ca9d667760ea794c18bac
-  data.tar.gz: 238aa199bc5dc8bc35336f698281b2ea3660f9b85200aa7ba0dda0936f169174beec901891f6b69fcae265762bfa73cc5d1e179fe891812477cb2df819a1b0e1
+  metadata.gz: c8b2ebc29ed3f0608c5999734d19acf75d569556c108ea51c8e862385feaf1ee88102b7f51110d6b415a7c96ad1974bd02667a01f457b722043fc3579692c8ad
+  data.tar.gz: 349e465646d784975897c80ceca45098fa2f754ad68db13cbe5652a85495b8a316b40b201a060febee70627955d5f668f3f5295664a50666d1ddaef582760d30

data/.ruby-version

@@ -0,0 +1 @@
+ruby-3.1.2

data/README.md

@@ -2,7 +2,7 @@
 
 JapMag is a collection of frequently-used Rails controller methods, helpers, Javascript functions and SASS mixins. It helps quickly bootstrap a Rails app.
 
-For example, [current_controller_action_in?](https://github.com/felixding/JapMag/blob/master/lib/jap_mag.rb#L38) is a helper that checks if current request.controller and request.action match with a set of given rules. You can then for example show or hide certain things on your app depending if it matches or not. 
+For example, [current_controller_action_in?](https://github.com/felixding/JapMag/blob/master/lib/jap_mag.rb#L38) is a helper that checks if current request.controller and request.action match with a set of given rules. You can then for example show or hide certain things on your app depending if it matches or not.
 
 Another example is [retina_image_tag](https://github.com/felixding/JapMag/blob/master/app/helpers/jap_mag_widgets_helper.rb#L164) which can easily generate HTML `img` tags for Retina/Non-retina screens. It also helps you deal with localized images.
 
@@ -10,7 +10,7 @@ This project was first created in 2012.
 
 ## Installation & Usage
 
-Please note JapMag only supports Rails 3+.
+Please note JapMag only supports Rails 3+. And starting from v1.4.0, Ruby 3.0+ is required.
 
 Add this line to your application's Gemfile:
 

data/app/helpers/jap_mag_widgets_helper.rb

@@ -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.4"
+  VERSION = "1.4.1"
 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.4
+  version: 1.4.1
 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
@@ -33,6 +33,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - README.md
 - Rakefile
@@ -57,7 +58,7 @@ files:
 homepage: https://github.com/felixding/JapMag
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -72,8 +73,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: []