jap_mag 1.3.5 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a65ff965780098ac76734497dee642f07790f98115a9d84e2dfb29b1960b6a5
-  data.tar.gz: 202a22e1358394c15bfc8e64f19ea6f655466adf01f1ed6385af892eec328a2e
+  metadata.gz: f935d63a9bee80b8fb48337976b552478f1ba382c95e825a544880b1b38d9b29
+  data.tar.gz: 5605139d72747e7a967d4e75bf98355f3d47952c9492b739f34e1218e6183dbc
 SHA512:
-  metadata.gz: f4c962c085d78a3837788b98ef79dca79cffe5cc671de5dfbe6176b30bde0fe84faff6454dfd5935497f41196bcf3690fc42f0eb5336664be4366606b6d676f3
-  data.tar.gz: 856b253088bd36722764e0080d49a25b4896e0a8342c25e809d302dbb92671288d8d1b22822a961d07366f3b3396bbbf33c8dadf2ff1726ed561a40d475902bc
+  metadata.gz: e5bafdff72acdb6d593a1633cd18314d6bb54f6433c87566c974c1289d70a345d5b601aebb9adeda136d2f799d3bf0ebe1f644847e41c2691a10f53c48b5f504
+  data.tar.gz: 0c308548e44afa4a64347d2014fb06c9b7cf4b71af31d42b5ffd3aa31c7630e7794c792f79b346a10b0947f874b69dd7d04845b37e72f48313d00348a1916c7f

data/Gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: .
+  specs:
+    jap_mag (1.4.1)
+      will_paginate
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.5.0)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    will_paginate (3.3.1)
+
+PLATFORMS
+  aarch64-linux-musl
+
+DEPENDENCIES
+  jap_mag!
+  rspec
+
+BUNDLED WITH
+   2.3.7

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/docker-compose.yml

@@ -0,0 +1,9 @@
+version: "3.8"
+
+services:
+  ruby:
+    image: 'ruby:3.1.2-alpine'
+    working_dir: /app/
+    volumes:
+      - .:/app:cached
+    command: sh -c "bundle && bundle exec rspec"

data/jap_mag.gemspec

@@ -8,7 +8,8 @@ Gem::Specification.new do |gem|
   gem.summary       = "jap_mag-#{gem.version}"
   gem.homepage      = "https://github.com/felixding/JapMag"
 
-  gem.files         = `git ls-files`.split($\)
+  #gem.files         = `git ls-files`.split($\)
+  gem.files = Dir['**/*'].keep_if { |file| File.file?(file) }
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "jap_mag"
@@ -16,4 +17,5 @@ Gem::Specification.new do |gem|
   gem.version       = JapMag::VERSION
 
   gem.add_runtime_dependency :will_paginate
+  gem.add_development_dependency "rspec"
 end

data/lib/jap_mag/version.rb

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

data/lib/jap_mag.rb

@@ -38,23 +38,26 @@ module JapMag
   #
   # the args can be one of the following:
   #
-  # String: "page#index"
+  # String: "page#index page#intro"
   # Array: %w(page#index page#intro)
   # multiple arguments: "page#index", "page#intro"
   #
   def current_controller_action_in?(*args)
-    controller = params[:controller]
-    action = params[:action]
-    #raise args.inspect if args != 'homepage/page#index'
-
-    args = args.first if args.size == 1 && args.first.is_a?(Array)
+    if args.size == 1
+      case args.first.class.to_s
+      when 'Array'
+        args = args.first
+      when 'String'
+        args = args.first.split(' ')
+      end
+    end
 
     args.each do |element|
       if element.to_s.include?("#")
         c, a = element.split('#')
-        return true if controller == c && action == a
+        return true if params[:controller] == c && params[:action] == a
       else
-        return true if controller == element
+        return true if params[:controller] == element
       end
     end
 

data/spec/jap_mag.rb

@@ -0,0 +1,4 @@
+module JapMag
+  def self.included base
+  end
+end

data/spec/lib_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+RSpec.describe JapMag do
+  #let(:rails_app) { Class.new { include JapMag } }
+
+  describe 'current_controller_action_in?' do
+    let(:rails_app) { RailsApp.new(controller: 'page', action: 'index') }
+
+    context 'string' do
+      it 'returns true when controller matches' do
+        s = 'page'
+
+        expect(rails_app.current_controller_action_in?(s)).to be(true)
+      end
+
+      it 'returns true when more than one controlers matches' do
+        s = 'page users'
+
+        expect(rails_app.current_controller_action_in?(s)).to be(true)
+      end
+
+      it 'returns true when controller#action matches' do
+        s = 'page#index'
+
+        expect(rails_app.current_controller_action_in?(s)).to be(true)
+      end
+
+      it 'returns true when more than one controler#action matches' do
+        s = 'page#index users#new users#create'
+
+        expect(rails_app.current_controller_action_in?(s)).to be(true)
+      end
+
+      it 'returns true when it is a mix of controller and controler#action' do
+        s = 'page users users#new users#create'
+
+        expect(rails_app.current_controller_action_in?(s)).to be(true)
+      end
+
+      it 'returns false when controller doesnot match' do
+        s = 'page1'
+
+        expect(rails_app.current_controller_action_in?(s)).to be(false)
+      end
+    end
+
+    context 'splat' do
+      it 'returns true when controller matches' do
+        s = *%w(page)
+
+        expect(rails_app.current_controller_action_in?(s)).to be(true)
+      end
+
+      it 'returns true when more than one controlers matches' do
+        s = *%w(page users)
+
+        expect(rails_app.current_controller_action_in?(s)).to be(true)
+      end
+
+      it 'returns true when controller#action matches' do
+        s = *%w(page#index)
+
+        expect(rails_app.current_controller_action_in?(s)).to be(true)
+      end
+
+      it 'returns true when more than one controler#action matches' do
+        s = *%w(page#index users#new users#create)
+
+        expect(rails_app.current_controller_action_in?(s)).to be(true)
+      end
+
+      it 'returns true when it is a mix of controller and controler#action' do
+        s = *%w(page users users#new users#create)
+
+        expect(rails_app.current_controller_action_in?(s)).to be(true)
+      end
+
+      it 'returns false when controller doesnot match' do
+        s = *%w(page1)
+
+        expect(rails_app.current_controller_action_in?(s)).to be(false)
+      end
+    end
+  end
+end

data/spec/rails_app.rb

@@ -0,0 +1,9 @@
+class RailsApp
+  include JapMag
+
+  attr :params, true
+
+  def initialize params
+    @params = params
+  end
+end

data/spec/rails_engine.rb

@@ -0,0 +1,4 @@
+class Rails
+  class Engine
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'bundler/setup'
+Bundler.setup
+
+RSpec.configure do |config|
+end
+
+require 'rails_engine'
+require_relative '../lib/jap_mag'
+require_relative 'jap_mag'
+require 'rails_app'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jap_mag
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.2
 platform: ruby
 authors:
 - DING Yu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-07 00:00:00.000000000 Z
+date: 2022-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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'
 description: JapMag is a collection of frequently-used Rails controller methods and
   helpers.
 email:
@@ -32,8 +46,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - app/assets/javascripts/jap_mag.js
@@ -51,9 +65,15 @@ files:
 - app/views/layouts/_tracking.erb
 - app/views/layouts/application.haml
 - config/locales/en.yml
+- docker-compose.yml
 - jap_mag.gemspec
 - lib/jap_mag.rb
 - lib/jap_mag/version.rb
+- spec/jap_mag.rb
+- spec/lib_spec.rb
+- spec/rails_app.rb
+- spec/rails_engine.rb
+- spec/spec_helper.rb
 homepage: https://github.com/felixding/JapMag
 licenses: []
 metadata: {}
@@ -76,4 +96,9 @@ rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: jap_mag-
-test_files: []
+test_files:
+- spec/jap_mag.rb
+- spec/lib_spec.rb
+- spec/rails_app.rb
+- spec/rails_engine.rb
+- spec/spec_helper.rb

data/.gitignore

@@ -1,18 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.DS_Store