dynamic_scaffold 0.10.0 → 0.10.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/helpers/dynamic_scaffold_helper.rb +1 -0
- data/lib/dynamic_scaffold/config.rb +4 -0
- data/lib/dynamic_scaffold/controller_utilities.rb +5 -0
- data/lib/dynamic_scaffold/form/item/base.rb +5 -0
- data/lib/dynamic_scaffold/form/item/carrier_wave_image.rb +1 -0
- data/lib/dynamic_scaffold/form_builder.rb +1 -0
- data/lib/dynamic_scaffold/version.rb +1 -1
- data/lib/generators/dynamic_scaffold/dynamic_scaffold_generator.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e1bd3db2560f26be70fbc4b28028510b2b4b5e24e645370d405481099ca7db77
|
4
|
+
data.tar.gz: b50b8c72c7095851c449db62759e80eafef7a125a397550c862c16c27d00bb8b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5435007e372185ea6cbc6ed5e60aaca3785eb1e1860dc7060fded062938a1a963dd3f4306363249952a7cd903a593a16e85b327c3eeb097922df394fb9b8dbaa
|
7
|
+
data.tar.gz: 4c742d086ce908abba330de67d90b025f215de6d5ca79623bd333efb3aa0c4fb28c99e658e1559876944e07bed699fa05979802968ae3d7e5a585240f2d926a0
|
@@ -1,6 +1,7 @@
|
|
1
1
|
module DynamicScaffoldHelper
|
2
2
|
def render_form_errors(errors)
|
3
3
|
return '' if errors.blank?
|
4
|
+
|
4
5
|
tag.ul(class: 'list-unstyled ds-error-message') do
|
5
6
|
errors.each do |message|
|
6
7
|
concat tag.li("#{dynamic_scaffold_icon :error} #{message}".html_safe) # rubocop:disable Rails/OutputSafety
|
@@ -31,6 +31,7 @@ module DynamicScaffold
|
|
31
31
|
|
32
32
|
def page_number(page, records)
|
33
33
|
return page unless total_count
|
34
|
+
|
34
35
|
"#{page} / #{records.total_pages}"
|
35
36
|
end
|
36
37
|
|
@@ -142,6 +143,7 @@ module DynamicScaffold
|
|
142
143
|
def vars(name = nil, &block)
|
143
144
|
if block_given?
|
144
145
|
raise ArgumentError, 'Missing var name.' if name.nil?
|
146
|
+
|
145
147
|
@vars._register(name, block)
|
146
148
|
else
|
147
149
|
@vars
|
@@ -165,6 +167,7 @@ module DynamicScaffold
|
|
165
167
|
|
166
168
|
def max_count?(count)
|
167
169
|
return false if max_count.nil?
|
170
|
+
|
168
171
|
count >= max_count
|
169
172
|
end
|
170
173
|
end
|
@@ -231,6 +234,7 @@ module DynamicScaffold
|
|
231
234
|
else
|
232
235
|
record = args[0]
|
233
236
|
return @config.controller.view_context.instance_exec(record, &@title[:block]) if @title[:block]
|
237
|
+
|
234
238
|
record.public_send(@title[:column_name])
|
235
239
|
end
|
236
240
|
end
|
@@ -5,6 +5,7 @@ module DynamicScaffold
|
|
5
5
|
# Get the hash of the key and value specified for the scope.
|
6
6
|
def scope_params
|
7
7
|
return {} if dynamic_scaffold.scope.nil?
|
8
|
+
|
8
9
|
case dynamic_scaffold.scope
|
9
10
|
when Array then
|
10
11
|
dynamic_scaffold.scope.each_with_object({}) do |val, res|
|
@@ -65,6 +66,7 @@ module DynamicScaffold
|
|
65
66
|
# Check if there are inconsistent scopes in update parameters
|
66
67
|
def valid_for_scope?(update_params)
|
67
68
|
return true if dynamic_scaffold.scope_options[:changeable]
|
69
|
+
|
68
70
|
result = true
|
69
71
|
scope_params.each do |key, value|
|
70
72
|
if update_params.key?(key) && update_params[key] != value
|
@@ -96,6 +98,7 @@ module DynamicScaffold
|
|
96
98
|
def find_record(params)
|
97
99
|
rec = dynamic_scaffold.model.find_by(params.merge(scope_params))
|
98
100
|
raise ::ActiveRecord::RecordNotFound if rec.nil?
|
101
|
+
|
99
102
|
rec
|
100
103
|
end
|
101
104
|
|
@@ -127,6 +130,7 @@ module DynamicScaffold
|
|
127
130
|
|
128
131
|
def check_max_count!
|
129
132
|
return if dynamic_scaffold.max_count.nil?
|
133
|
+
|
130
134
|
instance_exec(@record, &dynamic_scaffold.lock_before_count) if dynamic_scaffold.lock_before_count
|
131
135
|
count_query = dynamic_scaffold.list.build_sql(scope_params)
|
132
136
|
count_query = count_query.lock if dynamic_scaffold.max_count_options[:lock]
|
@@ -136,6 +140,7 @@ module DynamicScaffold
|
|
136
140
|
|
137
141
|
def handle_pagination(query)
|
138
142
|
return query unless dynamic_scaffold.list.pagination
|
143
|
+
|
139
144
|
query
|
140
145
|
.page(params[dynamic_scaffold.list.pagination.param_name])
|
141
146
|
.per(dynamic_scaffold.list.pagination.per_page)
|
@@ -88,6 +88,7 @@ module DynamicScaffold
|
|
88
88
|
def label(label = nil, &block)
|
89
89
|
if block_given?
|
90
90
|
raise Error::InvalidParameter, 'Only the block type accepts block.' unless type? :block
|
91
|
+
|
91
92
|
@block = block
|
92
93
|
end
|
93
94
|
if label
|
@@ -95,6 +96,7 @@ module DynamicScaffold
|
|
95
96
|
self
|
96
97
|
else
|
97
98
|
return @label if @label
|
99
|
+
|
98
100
|
@config.model.human_attribute_name @name
|
99
101
|
end
|
100
102
|
end
|
@@ -130,8 +132,10 @@ module DynamicScaffold
|
|
130
132
|
|
131
133
|
def proxy_field
|
132
134
|
return self unless @proxy
|
135
|
+
|
133
136
|
proxy_target = @config.form.items.select {|f| f.name == @proxy }
|
134
137
|
raise DynamicScaffold::Error::InvalidParameter, "Missing proxy target element: #{@proxy}" if proxy_target.empty?
|
138
|
+
|
135
139
|
proxy_target.first
|
136
140
|
end
|
137
141
|
|
@@ -145,6 +149,7 @@ module DynamicScaffold
|
|
145
149
|
|
146
150
|
def default_value(view)
|
147
151
|
return view.instance_exec(&@default) if @default.is_a? Proc
|
152
|
+
|
148
153
|
@default
|
149
154
|
end
|
150
155
|
|
@@ -10,7 +10,7 @@ class DynamicScaffoldGenerator < Rails::Generators::Base
|
|
10
10
|
@namespases = path.split('/')
|
11
11
|
@plural_model_name = @namespases.pop.camelize
|
12
12
|
@class_scope = @namespases.map(&:camelize).join('::')
|
13
|
-
@model_name = model
|
13
|
+
@model_name = model || @plural_model_name.singularize
|
14
14
|
@model_name = @model_name.camelize
|
15
15
|
@model = @model_name.constantize
|
16
16
|
@content_for = options['content_for']
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dynamic_scaffold
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.10.
|
4
|
+
version: 0.10.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Masamoto Miyata
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2019-01-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: classnames-rails-view
|