bizside 2.2.3 → 2.3.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/bizside/job_utils.rb +17 -0
- data/lib/bizside/railtie.rb +4 -2
- data/lib/bizside/user_agent/controller_helper.rb +1 -1
- data/lib/bizside/version.rb +1 -1
- metadata +2 -6
- data/lib/bizside/user_agent/action_view/action_view_4.rb +0 -56
- data/lib/bizside/user_agent/action_view/action_view_6.rb +0 -50
- data/lib/bizside/user_agent/action_view/use_variant.rb +0 -4
- data/lib/bizside/user_agent/action_view.rb +0 -16
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 73d6bdd99194852b77c8285204482659e16d8d69d26c32def33487240c194c41
|
4
|
+
data.tar.gz: 92582addfb2713455658a28a05bb612633c7ff097b023f4d8a918610c18c3b90
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f5e4827bb51b54b538f5a423fb03c6d39b35ad5f9ec15a18aa2aac0d52f1d0913b1b35e236c4a3ca4662de411629ec10f45e0a52665e960001dd1cb8b6d6c3db
|
7
|
+
data.tar.gz: d3f24519450a41cf72e6865bfc89f51eebe40c36306130defe48a2e3018568273878f6fe9e52e82a3abe59058ee5c4c0311d3c9e137c5ea5b32f9ee2d07bbaf3
|
data/lib/bizside/job_utils.rb
CHANGED
@@ -108,6 +108,23 @@ module Bizside
|
|
108
108
|
::Resque.remove_delayed_in_queue(klass, queue, *args)
|
109
109
|
end
|
110
110
|
|
111
|
+
# Resque.delayed? は @queue の定義がない場合に機能しないため、独自に実装
|
112
|
+
def self.delayed?(klass, args, except: [])
|
113
|
+
args_to_check = args.with_indifferent_access.except(*Array(except))
|
114
|
+
|
115
|
+
JobUtils.delayed_queue_peek(0, JobUtils.delayed_queue_schedule_size).each do |timestamp|
|
116
|
+
JobUtils.delayed_timestamp_peek(timestamp, 0, JobUtils.delayed_timestamp_size(timestamp)).each do |job_info|
|
117
|
+
job_args = job_info['args'].first.presence || {}
|
118
|
+
if job_info['class'] == klass.to_s && job_args == args_to_check
|
119
|
+
Rails.logger.info "遅延ジョブに #{job_info} がすでに登録されています。"
|
120
|
+
return true
|
121
|
+
end
|
122
|
+
end
|
123
|
+
end
|
124
|
+
|
125
|
+
false
|
126
|
+
end
|
127
|
+
|
111
128
|
def self.set_job_at(time, klass, *args)
|
112
129
|
if Bizside.rails_env&.test?
|
113
130
|
do_perform_and_hooks_instantly(klass, 'テスト時には遅延ジョブの登録を行わず、即時実行します。', *args)
|
data/lib/bizside/railtie.rb
CHANGED
@@ -33,11 +33,13 @@ module Bizside
|
|
33
33
|
end
|
34
34
|
|
35
35
|
if Bizside.config.user_agent.enabled?
|
36
|
+
if Bizside.config.user_agent.to_h.has_key?('use_variant')
|
37
|
+
raise "ERROR: 'use_variant' is obsolete. Delete it from config/bizside.yml"
|
38
|
+
end
|
39
|
+
|
36
40
|
require_relative 'user_agent'
|
37
41
|
|
38
42
|
initializer 'user_agent' do
|
39
|
-
require_relative 'user_agent/action_view'
|
40
|
-
|
41
43
|
ActiveSupport.on_load(:action_controller) do
|
42
44
|
include Bizside::UserAgent::ControllerHelper
|
43
45
|
end
|
data/lib/bizside/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bizside
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.3.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- bizside-developers
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2023-02-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -442,10 +442,6 @@ files:
|
|
442
442
|
- lib/bizside/uploader/extension_whitelist.rb
|
443
443
|
- lib/bizside/uploader/filename_validator.rb
|
444
444
|
- lib/bizside/user_agent.rb
|
445
|
-
- lib/bizside/user_agent/action_view.rb
|
446
|
-
- lib/bizside/user_agent/action_view/action_view_4.rb
|
447
|
-
- lib/bizside/user_agent/action_view/action_view_6.rb
|
448
|
-
- lib/bizside/user_agent/action_view/use_variant.rb
|
449
445
|
- lib/bizside/user_agent/controller_helper.rb
|
450
446
|
- lib/bizside/validations.rb
|
451
447
|
- lib/bizside/version.rb
|
@@ -1,56 +0,0 @@
|
|
1
|
-
require 'action_view'
|
2
|
-
|
3
|
-
class ActionView::TemplateRenderer
|
4
|
-
|
5
|
-
def render(context, options)
|
6
|
-
@view = context
|
7
|
-
@details = extract_details(options)
|
8
|
-
template = get_template_by_user_agent(context, options)
|
9
|
-
context = @lookup_context
|
10
|
-
|
11
|
-
prepend_formats(template.formats)
|
12
|
-
|
13
|
-
unless context.rendered_format
|
14
|
-
context.rendered_format = template.formats.first || formats.first
|
15
|
-
end
|
16
|
-
|
17
|
-
render_template(template, options[:layout], options[:locals])
|
18
|
-
end
|
19
|
-
|
20
|
-
private
|
21
|
-
|
22
|
-
def get_user_agent(context)
|
23
|
-
if context.respond_to?(:user_agent)
|
24
|
-
if context.respond_to?(:controller)
|
25
|
-
if context.controller.respond_to?(:session)
|
26
|
-
context.user_agent
|
27
|
-
end
|
28
|
-
end
|
29
|
-
end
|
30
|
-
end
|
31
|
-
|
32
|
-
def get_template_by_user_agent(context, options)
|
33
|
-
ret = nil
|
34
|
-
option_for_template = options[:template]
|
35
|
-
|
36
|
-
ua = get_user_agent(context)
|
37
|
-
if ua
|
38
|
-
ua.priorities.each do |priority|
|
39
|
-
begin
|
40
|
-
options[:template] = option_for_template + '.' + priority
|
41
|
-
ret = determine_template(options)
|
42
|
-
break
|
43
|
-
rescue ActionView::MissingTemplate
|
44
|
-
end
|
45
|
-
end
|
46
|
-
end
|
47
|
-
|
48
|
-
unless ret
|
49
|
-
options[:template] = option_for_template
|
50
|
-
ret = determine_template(options)
|
51
|
-
end
|
52
|
-
|
53
|
-
Rails.logger.debug "UserAgent: #{ua ? ua.name : 'unknown'} => #{ret.identifier}"
|
54
|
-
ret
|
55
|
-
end
|
56
|
-
end
|
@@ -1,50 +0,0 @@
|
|
1
|
-
require 'action_view'
|
2
|
-
|
3
|
-
class ActionView::TemplateRenderer
|
4
|
-
|
5
|
-
def render(context, options)
|
6
|
-
@details = extract_details(options)
|
7
|
-
template = get_template_by_user_agent(context, options)
|
8
|
-
|
9
|
-
prepend_formats(template.format)
|
10
|
-
|
11
|
-
render_template(context, template, options[:layout], options[:locals] || {})
|
12
|
-
end
|
13
|
-
|
14
|
-
private
|
15
|
-
|
16
|
-
def get_user_agent(context)
|
17
|
-
if context.respond_to?(:user_agent)
|
18
|
-
if context.respond_to?(:controller)
|
19
|
-
if context.controller.respond_to?(:session)
|
20
|
-
context.user_agent
|
21
|
-
end
|
22
|
-
end
|
23
|
-
end
|
24
|
-
end
|
25
|
-
|
26
|
-
def get_template_by_user_agent(context, options)
|
27
|
-
ret = nil
|
28
|
-
option_for_template = options[:template]
|
29
|
-
|
30
|
-
ua = get_user_agent(context)
|
31
|
-
if ua
|
32
|
-
ua.priorities.each do |priority|
|
33
|
-
begin
|
34
|
-
options[:template] = option_for_template + '.' + priority
|
35
|
-
ret = determine_template(options)
|
36
|
-
break
|
37
|
-
rescue ActionView::MissingTemplate
|
38
|
-
end
|
39
|
-
end
|
40
|
-
end
|
41
|
-
|
42
|
-
unless ret
|
43
|
-
options[:template] = option_for_template
|
44
|
-
ret = determine_template(options)
|
45
|
-
end
|
46
|
-
|
47
|
-
Rails.logger.debug "UserAgent: #{ua ? ua.name : 'unknown'} => #{ret.identifier}"
|
48
|
-
ret
|
49
|
-
end
|
50
|
-
end
|
@@ -1,16 +0,0 @@
|
|
1
|
-
case Rails::VERSION::MAJOR
|
2
|
-
when 5
|
3
|
-
if Bizside.config.user_agent.use_variant?
|
4
|
-
load File.expand_path(File.join('action_view', 'use_variant.rb'), __dir__)
|
5
|
-
else
|
6
|
-
load File.expand_path(File.join('action_view', 'action_view_4.rb'), __dir__)
|
7
|
-
end
|
8
|
-
when 6
|
9
|
-
if Bizside.config.user_agent.use_variant?
|
10
|
-
load File.expand_path(File.join('action_view', 'use_variant.rb'), __dir__)
|
11
|
-
else
|
12
|
-
load File.expand_path(File.join('action_view', 'action_view_6.rb'), __dir__)
|
13
|
-
end
|
14
|
-
else
|
15
|
-
raise "Rails#{Rails::VERSION::MAJOR} はサポートしていません。"
|
16
|
-
end
|