bhf 0.10.17 → 1.0.0.beta1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 08eead651a138cdfc4ecd590e8755d9fdff027fd
4
- data.tar.gz: 08a6ac0773eb814c72aa85375a9c05af691be6a4
3
+ metadata.gz: 58cca62c73e242a691fdc129cf8ddd75c78fb5a6
4
+ data.tar.gz: 7ae89be3bfafb736e0052991a9b5b7e6f3cc8e41
5
5
  SHA512:
6
- metadata.gz: 01cf9f7ab6ab354564792b5cfb31bd2346387140d97fd1f925ca9e0e80a1ecde7a748b6e2b99c7242e37715a2133e10c3fc4de7edf90c934eee2262f5fcd1023
7
- data.tar.gz: 5cb614a0515200c9f335db872fcb09e30695c0bde71eafcc5aab8df092b89620815162eeb41b707868fa8c902bdcaf40eea275bc2ddf713fcf9b7f82081a84c4
6
+ metadata.gz: 6407f2347061b4e646de0396fd602a8816ddabbc1a277186d33646f67a681c3c3213fdb6902f6202e3af4eb30463de5aa6175af53ca27bfc62dcf72c5ef0b052
7
+ data.tar.gz: b4c3b237ae23371ee24e2b98954c0c179d7837685ffca9e9d8ff7a584e02201e26157eee21c1992684d6dd46d575d2962f06a2d4e528f7c5d618956dca46365d
data/Gemfile CHANGED
@@ -1,16 +1,16 @@
1
1
  source 'http://rubygems.org'
2
2
 
3
3
  gem 'rails', '>= 4.2'
4
- gem 'turbolinks', '~> 2'
5
- gem 'kaminari', '~> 0'
6
- gem 'haml-rails', '~> 0'
7
- gem 'sass-rails', '~> 5'
4
+ gem 'turbolinks', '>= 2'
5
+ gem 'kaminari', '>= 0'
6
+ gem 'haml-rails', '>= 0'
7
+ gem 'sass-rails', '>= 5'
8
8
 
9
9
 
10
10
  group :development do
11
- gem 'shoulda', '~> 3'
12
- gem 'rdoc', '~> 3'
13
- gem 'bundler', '~> 1'
14
- gem 'jeweler', '~> 2'
15
- gem 'simplecov', '~> 0'
11
+ gem 'shoulda', '>= 3'
12
+ gem 'rdoc', '>= 3'
13
+ gem 'bundler', '>= 1'
14
+ gem 'jeweler', '>= 2'
15
+ gem 'simplecov', '>= 0'
16
16
  end
@@ -1,197 +1,231 @@
1
1
  GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
- actionmailer (4.2.0)
5
- actionpack (= 4.2.0)
6
- actionview (= 4.2.0)
7
- activejob (= 4.2.0)
4
+ actioncable (5.2.0)
5
+ actionpack (= 5.2.0)
6
+ nio4r (~> 2.0)
7
+ websocket-driver (>= 0.6.1)
8
+ actionmailer (5.2.0)
9
+ actionpack (= 5.2.0)
10
+ actionview (= 5.2.0)
11
+ activejob (= 5.2.0)
8
12
  mail (~> 2.5, >= 2.5.4)
9
- rails-dom-testing (~> 1.0, >= 1.0.5)
10
- actionpack (4.2.0)
11
- actionview (= 4.2.0)
12
- activesupport (= 4.2.0)
13
- rack (~> 1.6.0)
14
- rack-test (~> 0.6.2)
15
- rails-dom-testing (~> 1.0, >= 1.0.5)
16
- rails-html-sanitizer (~> 1.0, >= 1.0.1)
17
- actionview (4.2.0)
18
- activesupport (= 4.2.0)
13
+ rails-dom-testing (~> 2.0)
14
+ actionpack (5.2.0)
15
+ actionview (= 5.2.0)
16
+ activesupport (= 5.2.0)
17
+ rack (~> 2.0)
18
+ rack-test (>= 0.6.3)
19
+ rails-dom-testing (~> 2.0)
20
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
21
+ actionview (5.2.0)
22
+ activesupport (= 5.2.0)
19
23
  builder (~> 3.1)
20
- erubis (~> 2.7.0)
21
- rails-dom-testing (~> 1.0, >= 1.0.5)
22
- rails-html-sanitizer (~> 1.0, >= 1.0.1)
23
- activejob (4.2.0)
24
- activesupport (= 4.2.0)
25
- globalid (>= 0.3.0)
26
- activemodel (4.2.0)
27
- activesupport (= 4.2.0)
28
- builder (~> 3.1)
29
- activerecord (4.2.0)
30
- activemodel (= 4.2.0)
31
- activesupport (= 4.2.0)
32
- arel (~> 6.0)
33
- activesupport (4.2.0)
34
- i18n (~> 0.7)
35
- json (~> 1.7, >= 1.7.7)
24
+ erubi (~> 1.4)
25
+ rails-dom-testing (~> 2.0)
26
+ rails-html-sanitizer (~> 1.0, >= 1.0.3)
27
+ activejob (5.2.0)
28
+ activesupport (= 5.2.0)
29
+ globalid (>= 0.3.6)
30
+ activemodel (5.2.0)
31
+ activesupport (= 5.2.0)
32
+ activerecord (5.2.0)
33
+ activemodel (= 5.2.0)
34
+ activesupport (= 5.2.0)
35
+ arel (>= 9.0)
36
+ activestorage (5.2.0)
37
+ actionpack (= 5.2.0)
38
+ activerecord (= 5.2.0)
39
+ marcel (~> 0.3.1)
40
+ activesupport (5.2.0)
41
+ concurrent-ruby (~> 1.0, >= 1.0.2)
42
+ i18n (>= 0.7, < 2)
36
43
  minitest (~> 5.1)
37
- thread_safe (~> 0.3, >= 0.3.4)
38
44
  tzinfo (~> 1.1)
39
- addressable (2.3.7)
40
- arel (6.0.0)
41
- builder (3.2.2)
42
- coffee-rails (4.1.0)
43
- coffee-script (>= 2.2.0)
44
- railties (>= 4.0.0, < 5.0)
45
- coffee-script (2.3.0)
46
- coffee-script-source
47
- execjs
48
- coffee-script-source (1.9.1)
45
+ addressable (2.4.0)
46
+ arel (9.0.0)
47
+ builder (3.2.3)
48
+ concurrent-ruby (1.0.5)
49
+ crass (1.0.4)
49
50
  descendants_tracker (0.0.4)
50
51
  thread_safe (~> 0.3, >= 0.3.1)
51
- docile (1.1.5)
52
+ docile (1.3.0)
53
+ erubi (1.7.1)
52
54
  erubis (2.7.0)
53
- execjs (2.3.0)
54
- faraday (0.9.1)
55
+ faraday (0.9.2)
55
56
  multipart-post (>= 1.2, < 3)
56
- git (1.2.9.1)
57
- github_api (0.12.3)
58
- addressable (~> 2.3)
57
+ ffi (1.9.23)
58
+ git (1.3.0)
59
+ github_api (0.16.0)
60
+ addressable (~> 2.4.0)
59
61
  descendants_tracker (~> 0.0.4)
60
62
  faraday (~> 0.8, < 0.10)
61
- hashie (>= 3.3)
62
- multi_json (>= 1.7.5, < 2.0)
63
- nokogiri (~> 1.6.3)
64
- oauth2
65
- globalid (0.3.3)
66
- activesupport (>= 4.1.0)
67
- haml (4.0.6)
63
+ hashie (>= 3.4)
64
+ mime-types (>= 1.16, < 3.0)
65
+ oauth2 (~> 1.0)
66
+ globalid (0.4.1)
67
+ activesupport (>= 4.2.0)
68
+ haml (5.0.4)
69
+ temple (>= 0.8.0)
68
70
  tilt
69
- haml-rails (0.8.2)
71
+ haml-rails (1.0.0)
70
72
  actionpack (>= 4.0.1)
71
73
  activesupport (>= 4.0.1)
72
- haml (>= 3.1, < 5.0)
74
+ haml (>= 4.0.6, < 6.0)
73
75
  html2haml (>= 1.0.1)
74
76
  railties (>= 4.0.1)
75
- hashie (3.4.0)
76
- highline (1.7.1)
77
- hike (1.2.3)
78
- html2haml (2.0.0)
77
+ hashie (3.5.7)
78
+ highline (1.7.10)
79
+ html2haml (2.2.0)
79
80
  erubis (~> 2.7.0)
80
- haml (~> 4.0.0)
81
- nokogiri (~> 1.6.0)
81
+ haml (>= 4.0, < 6)
82
+ nokogiri (>= 1.6.0)
82
83
  ruby_parser (~> 3.5)
83
- i18n (0.7.0)
84
- jeweler (2.0.1)
84
+ i18n (1.0.1)
85
+ concurrent-ruby (~> 1.0)
86
+ jeweler (2.3.9)
85
87
  builder
86
- bundler (>= 1.0)
88
+ bundler
87
89
  git (>= 1.2.5)
88
- github_api
90
+ github_api (~> 0.16.0)
89
91
  highline (>= 1.6.15)
90
92
  nokogiri (>= 1.5.10)
93
+ psych
91
94
  rake
92
95
  rdoc
93
- json (1.8.2)
94
- jwt (1.3.0)
95
- kaminari (0.16.3)
96
- actionpack (>= 3.0.0)
97
- activesupport (>= 3.0.0)
98
- loofah (2.0.1)
96
+ semver2
97
+ json (2.1.0)
98
+ jwt (1.5.6)
99
+ kaminari (1.1.1)
100
+ activesupport (>= 4.1.0)
101
+ kaminari-actionview (= 1.1.1)
102
+ kaminari-activerecord (= 1.1.1)
103
+ kaminari-core (= 1.1.1)
104
+ kaminari-actionview (1.1.1)
105
+ actionview
106
+ kaminari-core (= 1.1.1)
107
+ kaminari-activerecord (1.1.1)
108
+ activerecord
109
+ kaminari-core (= 1.1.1)
110
+ kaminari-core (1.1.1)
111
+ loofah (2.2.2)
112
+ crass (~> 1.0.2)
99
113
  nokogiri (>= 1.5.9)
100
- mail (2.6.3)
101
- mime-types (>= 1.16, < 3)
102
- mime-types (2.4.3)
103
- mini_portile (0.6.2)
104
- minitest (5.5.1)
105
- multi_json (1.10.1)
106
- multi_xml (0.5.5)
114
+ mail (2.7.0)
115
+ mini_mime (>= 0.1.1)
116
+ marcel (0.3.2)
117
+ mimemagic (~> 0.3.2)
118
+ method_source (0.9.0)
119
+ mime-types (2.99.3)
120
+ mimemagic (0.3.2)
121
+ mini_mime (1.0.0)
122
+ mini_portile2 (2.3.0)
123
+ minitest (5.11.3)
124
+ multi_json (1.13.1)
125
+ multi_xml (0.6.0)
107
126
  multipart-post (2.0.0)
108
- nokogiri (1.6.6.2)
109
- mini_portile (~> 0.6.0)
110
- oauth2 (1.0.0)
111
- faraday (>= 0.8, < 0.10)
127
+ nio4r (2.3.1)
128
+ nokogiri (1.8.2)
129
+ mini_portile2 (~> 2.3.0)
130
+ oauth2 (1.4.0)
131
+ faraday (>= 0.8, < 0.13)
112
132
  jwt (~> 1.0)
113
133
  multi_json (~> 1.3)
114
134
  multi_xml (~> 0.5)
115
- rack (~> 1.2)
116
- rack (1.6.0)
117
- rack-test (0.6.3)
118
- rack (>= 1.0)
119
- rails (4.2.0)
120
- actionmailer (= 4.2.0)
121
- actionpack (= 4.2.0)
122
- actionview (= 4.2.0)
123
- activejob (= 4.2.0)
124
- activemodel (= 4.2.0)
125
- activerecord (= 4.2.0)
126
- activesupport (= 4.2.0)
127
- bundler (>= 1.3.0, < 2.0)
128
- railties (= 4.2.0)
129
- sprockets-rails
130
- rails-deprecated_sanitizer (1.0.3)
131
- activesupport (>= 4.2.0.alpha)
132
- rails-dom-testing (1.0.5)
133
- activesupport (>= 4.2.0.beta, < 5.0)
134
- nokogiri (~> 1.6.0)
135
- rails-deprecated_sanitizer (>= 1.0.1)
136
- rails-html-sanitizer (1.0.1)
137
- loofah (~> 2.0)
138
- railties (4.2.0)
139
- actionpack (= 4.2.0)
140
- activesupport (= 4.2.0)
135
+ rack (>= 1.2, < 3)
136
+ psych (3.0.2)
137
+ rack (2.0.5)
138
+ rack-test (1.0.0)
139
+ rack (>= 1.0, < 3)
140
+ rails (5.2.0)
141
+ actioncable (= 5.2.0)
142
+ actionmailer (= 5.2.0)
143
+ actionpack (= 5.2.0)
144
+ actionview (= 5.2.0)
145
+ activejob (= 5.2.0)
146
+ activemodel (= 5.2.0)
147
+ activerecord (= 5.2.0)
148
+ activestorage (= 5.2.0)
149
+ activesupport (= 5.2.0)
150
+ bundler (>= 1.3.0)
151
+ railties (= 5.2.0)
152
+ sprockets-rails (>= 2.0.0)
153
+ rails-dom-testing (2.0.3)
154
+ activesupport (>= 4.2.0)
155
+ nokogiri (>= 1.6)
156
+ rails-html-sanitizer (1.0.4)
157
+ loofah (~> 2.2, >= 2.2.2)
158
+ railties (5.2.0)
159
+ actionpack (= 5.2.0)
160
+ activesupport (= 5.2.0)
161
+ method_source
141
162
  rake (>= 0.8.7)
142
163
  thor (>= 0.18.1, < 2.0)
143
- rake (10.4.2)
144
- rdoc (3.12.2)
145
- json (~> 1.4)
146
- ruby_parser (3.6.4)
147
- sexp_processor (~> 4.1)
148
- sass (3.4.12)
149
- sass-rails (5.0.1)
150
- railties (>= 4.0.0, < 5.0)
164
+ rake (12.3.1)
165
+ rb-fsevent (0.10.3)
166
+ rb-inotify (0.9.10)
167
+ ffi (>= 0.5.0, < 2)
168
+ rdoc (6.0.4)
169
+ ruby_parser (3.11.0)
170
+ sexp_processor (~> 4.9)
171
+ sass (3.5.6)
172
+ sass-listen (~> 4.0.0)
173
+ sass-listen (4.0.0)
174
+ rb-fsevent (~> 0.9, >= 0.9.4)
175
+ rb-inotify (~> 0.9, >= 0.9.7)
176
+ sass-rails (5.0.7)
177
+ railties (>= 4.0.0, < 6)
151
178
  sass (~> 3.1)
152
179
  sprockets (>= 2.8, < 4.0)
153
180
  sprockets-rails (>= 2.0, < 4.0)
154
- tilt (~> 1.1)
155
- sexp_processor (4.4.5)
181
+ tilt (>= 1.1, < 3)
182
+ semver2 (3.4.2)
183
+ sexp_processor (4.11.0)
156
184
  shoulda (3.5.0)
157
185
  shoulda-context (~> 1.0, >= 1.0.1)
158
186
  shoulda-matchers (>= 1.4.1, < 3.0)
159
- shoulda-context (1.2.1)
187
+ shoulda-context (1.2.2)
160
188
  shoulda-matchers (2.8.0)
161
189
  activesupport (>= 3.0.0)
162
- simplecov (0.9.2)
163
- docile (~> 1.1.0)
164
- multi_json (~> 1.0)
165
- simplecov-html (~> 0.9.0)
166
- simplecov-html (0.9.0)
167
- sprockets (2.12.3)
168
- hike (~> 1.2)
169
- multi_json (~> 1.0)
170
- rack (~> 1.0)
171
- tilt (~> 1.1, != 1.3.0)
172
- sprockets-rails (2.2.4)
173
- actionpack (>= 3.0)
174
- activesupport (>= 3.0)
175
- sprockets (>= 2.8, < 4.0)
176
- thor (0.19.1)
177
- thread_safe (0.3.4)
178
- tilt (1.4.1)
179
- turbolinks (2.5.3)
180
- coffee-rails
181
- tzinfo (1.2.2)
190
+ simplecov (0.16.1)
191
+ docile (~> 1.1)
192
+ json (>= 1.8, < 3)
193
+ simplecov-html (~> 0.10.0)
194
+ simplecov-html (0.10.2)
195
+ sprockets (3.7.1)
196
+ concurrent-ruby (~> 1.0)
197
+ rack (> 1, < 3)
198
+ sprockets-rails (3.2.1)
199
+ actionpack (>= 4.0)
200
+ activesupport (>= 4.0)
201
+ sprockets (>= 3.0.0)
202
+ temple (0.8.0)
203
+ thor (0.20.0)
204
+ thread_safe (0.3.6)
205
+ tilt (2.0.8)
206
+ turbolinks (5.1.1)
207
+ turbolinks-source (~> 5.1)
208
+ turbolinks-source (5.1.0)
209
+ tzinfo (1.2.5)
182
210
  thread_safe (~> 0.1)
211
+ websocket-driver (0.7.0)
212
+ websocket-extensions (>= 0.1.0)
213
+ websocket-extensions (0.1.3)
183
214
 
184
215
  PLATFORMS
185
216
  ruby
186
217
 
187
218
  DEPENDENCIES
188
- bundler (~> 1)
189
- haml-rails (~> 0)
190
- jeweler (~> 2)
191
- kaminari (~> 0)
219
+ bundler (>= 1)
220
+ haml-rails
221
+ jeweler (>= 2)
222
+ kaminari
192
223
  rails (>= 4.2)
193
- rdoc (~> 3)
194
- sass-rails (~> 5)
195
- shoulda (~> 3)
196
- simplecov (~> 0)
197
- turbolinks (~> 2)
224
+ rdoc (>= 3)
225
+ sass-rails (>= 5)
226
+ shoulda (>= 3)
227
+ simplecov
228
+ turbolinks (>= 2)
229
+
230
+ BUNDLED WITH
231
+ 1.16.0
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.10.17
1
+ 1.0.0.beta1
@@ -1,7 +1,7 @@
1
1
  class Bhf::EntriesController < Bhf::ApplicationController
2
- before_filter :load_platform, :load_model, :set_page, :set_quick_edit
3
- before_filter :load_object, except: [:create, :new, :sort]
4
- before_filter :load_new_object, only: [:create, :new]
2
+ before_action :load_platform, :load_model, :set_page, :set_quick_edit
3
+ before_action :load_object, except: [:create, :new, :sort]
4
+ before_action :load_new_object, only: [:create, :new]
5
5
 
6
6
  def new
7
7
  @form_url = entries_path(@platform.name)
@@ -1,5 +1,5 @@
1
1
  class Bhf::PagesController < Bhf::ApplicationController
2
- before_filter :set_page
2
+ before_action :set_page
3
3
 
4
4
  def show
5
5
  @edit_params = {}
@@ -35,13 +35,5 @@ module Bhf
35
35
  Bhf.configuration.paperclip_image_types.include?(type)
36
36
  end
37
37
 
38
- def asset_exist?(path)
39
- if Rails.configuration.assets.compile
40
- Rails.application.precompiled_assets.include? path
41
- else
42
- Rails.application.assets_manifest.assets[path].present?
43
- end
44
- end
45
-
46
38
  end
47
39
  end
@@ -1,4 +1,5 @@
1
1
  = node f, field do
2
- - list = f.object.class.base_class.descendants.map do |x|
3
- - [x.to_s.sub(f.object.class.base_class.to_s,'').titleize, x.to_s]
2
+ - base = f.object.class.respond_to?(:base_class) ? f.object.class.base_class : f.object.class
3
+ - list = base.descendants.map do |x|
4
+ - [x.to_s.sub(base.to_s,'').titleize, x.to_s]
4
5
  = f.select :type, list
@@ -1,2 +1,3 @@
1
1
  = content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
2
- = column_value.sub(object.class.base_class.to_s, '').titleize
2
+ - base = object.class.respond_to?(:base_class) ? object.class.base_class : object.class
3
+ = column_value.sub(base.to_s, '').titleize
@@ -12,10 +12,10 @@
12
12
  = render partial: 'bhf/helper/flash', locals: {flash: flash}
13
13
  %header
14
14
  %h1
15
- - logo = if params[:bhf_area] && asset_exist?("logo_#{params[:bhf_area]}_bhf.svg")
15
+ - logo = if params[:bhf_area]
16
16
  - "logo_#{params[:bhf_area]}_bhf.svg"
17
17
  - else
18
- - asset_exist?('logo_bhf.png') ? 'logo_bhf.png' : 'logo_bhf.svg'
18
+ - 'logo_bhf.svg'
19
19
 
20
20
  = link_to image_tag(logo), @root_link ? @root_link : main_app.root_url, data: {no_turbolink: true}
21
21
 
@@ -2,18 +2,18 @@
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
3
  # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
- # stub: bhf 0.10.17 ruby lib
5
+ # stub: bhf 1.0.0.beta1 ruby lib
6
6
 
7
7
  Gem::Specification.new do |s|
8
- s.name = "bhf"
9
- s.version = "0.10.17"
8
+ s.name = "bhf".freeze
9
+ s.version = "1.0.0.beta1"
10
10
 
11
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
12
- s.require_paths = ["lib"]
13
- s.authors = ["Anton Pawlik"]
14
- s.date = "2017-01-29"
15
- s.description = "A simple to use Rails-Engine-Gem that offers an admin interface for trusted user. Easy integratable and highly configurable and agnostic. Works with ActiveRecord and Mongoid."
16
- s.email = "anton.pawlik@gmail.com"
11
+ s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
12
+ s.require_paths = ["lib".freeze]
13
+ s.authors = ["Anton Pawlik".freeze]
14
+ s.date = "2018-05-06"
15
+ s.description = "A simple to use Rails-Engine-Gem that offers an admin interface for trusted user. Easy integratable and highly configurable and agnostic. Works with ActiveRecord and Mongoid.".freeze
16
+ s.email = "anton.pawlik@gmail.com".freeze
17
17
  s.extra_rdoc_files = [
18
18
  "LICENSE.txt",
19
19
  "README.md"
@@ -168,48 +168,48 @@ Gem::Specification.new do |s|
168
168
  "test/database.yml",
169
169
  "test/test_helper.rb"
170
170
  ]
171
- s.homepage = "http://antpaw.github.io/bhf"
172
- s.licenses = ["MIT"]
173
- s.rubygems_version = "2.4.8"
174
- s.summary = "A simple to use Rails-Engine-Gem that offers an admin interface for trusted user."
171
+ s.homepage = "http://antpaw.github.io/bhf".freeze
172
+ s.licenses = ["MIT".freeze]
173
+ s.rubygems_version = "2.6.13".freeze
174
+ s.summary = "A simple to use Rails-Engine-Gem that offers an admin interface for trusted user.".freeze
175
175
 
176
176
  if s.respond_to? :specification_version then
177
177
  s.specification_version = 4
178
178
 
179
179
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
180
- s.add_runtime_dependency(%q<rails>, [">= 4.2"])
181
- s.add_runtime_dependency(%q<turbolinks>, ["~> 2"])
182
- s.add_runtime_dependency(%q<kaminari>, ["~> 0"])
183
- s.add_runtime_dependency(%q<haml-rails>, ["~> 0"])
184
- s.add_runtime_dependency(%q<sass-rails>, ["~> 5"])
185
- s.add_development_dependency(%q<shoulda>, ["~> 3"])
186
- s.add_development_dependency(%q<rdoc>, ["~> 3"])
187
- s.add_development_dependency(%q<bundler>, ["~> 1"])
188
- s.add_development_dependency(%q<jeweler>, ["~> 2"])
189
- s.add_development_dependency(%q<simplecov>, ["~> 0"])
180
+ s.add_runtime_dependency(%q<rails>.freeze, [">= 4.2"])
181
+ s.add_runtime_dependency(%q<turbolinks>.freeze, [">= 2"])
182
+ s.add_runtime_dependency(%q<kaminari>.freeze, [">= 0"])
183
+ s.add_runtime_dependency(%q<haml-rails>.freeze, [">= 0"])
184
+ s.add_runtime_dependency(%q<sass-rails>.freeze, [">= 5"])
185
+ s.add_development_dependency(%q<shoulda>.freeze, [">= 3"])
186
+ s.add_development_dependency(%q<rdoc>.freeze, [">= 3"])
187
+ s.add_development_dependency(%q<bundler>.freeze, [">= 1"])
188
+ s.add_development_dependency(%q<jeweler>.freeze, [">= 2"])
189
+ s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
190
190
  else
191
- s.add_dependency(%q<rails>, [">= 4.2"])
192
- s.add_dependency(%q<turbolinks>, ["~> 2"])
193
- s.add_dependency(%q<kaminari>, ["~> 0"])
194
- s.add_dependency(%q<haml-rails>, ["~> 0"])
195
- s.add_dependency(%q<sass-rails>, ["~> 5"])
196
- s.add_dependency(%q<shoulda>, ["~> 3"])
197
- s.add_dependency(%q<rdoc>, ["~> 3"])
198
- s.add_dependency(%q<bundler>, ["~> 1"])
199
- s.add_dependency(%q<jeweler>, ["~> 2"])
200
- s.add_dependency(%q<simplecov>, ["~> 0"])
191
+ s.add_dependency(%q<rails>.freeze, [">= 4.2"])
192
+ s.add_dependency(%q<turbolinks>.freeze, [">= 2"])
193
+ s.add_dependency(%q<kaminari>.freeze, [">= 0"])
194
+ s.add_dependency(%q<haml-rails>.freeze, [">= 0"])
195
+ s.add_dependency(%q<sass-rails>.freeze, [">= 5"])
196
+ s.add_dependency(%q<shoulda>.freeze, [">= 3"])
197
+ s.add_dependency(%q<rdoc>.freeze, [">= 3"])
198
+ s.add_dependency(%q<bundler>.freeze, [">= 1"])
199
+ s.add_dependency(%q<jeweler>.freeze, [">= 2"])
200
+ s.add_dependency(%q<simplecov>.freeze, [">= 0"])
201
201
  end
202
202
  else
203
- s.add_dependency(%q<rails>, [">= 4.2"])
204
- s.add_dependency(%q<turbolinks>, ["~> 2"])
205
- s.add_dependency(%q<kaminari>, ["~> 0"])
206
- s.add_dependency(%q<haml-rails>, ["~> 0"])
207
- s.add_dependency(%q<sass-rails>, ["~> 5"])
208
- s.add_dependency(%q<shoulda>, ["~> 3"])
209
- s.add_dependency(%q<rdoc>, ["~> 3"])
210
- s.add_dependency(%q<bundler>, ["~> 1"])
211
- s.add_dependency(%q<jeweler>, ["~> 2"])
212
- s.add_dependency(%q<simplecov>, ["~> 0"])
203
+ s.add_dependency(%q<rails>.freeze, [">= 4.2"])
204
+ s.add_dependency(%q<turbolinks>.freeze, [">= 2"])
205
+ s.add_dependency(%q<kaminari>.freeze, [">= 0"])
206
+ s.add_dependency(%q<haml-rails>.freeze, [">= 0"])
207
+ s.add_dependency(%q<sass-rails>.freeze, [">= 5"])
208
+ s.add_dependency(%q<shoulda>.freeze, [">= 3"])
209
+ s.add_dependency(%q<rdoc>.freeze, [">= 3"])
210
+ s.add_dependency(%q<bundler>.freeze, [">= 1"])
211
+ s.add_dependency(%q<jeweler>.freeze, [">= 2"])
212
+ s.add_dependency(%q<simplecov>.freeze, [">= 0"])
213
213
  end
214
214
  end
215
215
 
@@ -6,8 +6,8 @@ module Bhf
6
6
  included do
7
7
  include Instance
8
8
 
9
- before_filter :init_time
10
- before_filter :check_admin_account, :setup_current_account,
9
+ before_action :init_time
10
+ before_action :check_admin_account, :setup_current_account,
11
11
  :load_settings, :set_title, :set_areas
12
12
 
13
13
  helper_method :current_account
@@ -28,10 +28,10 @@ module Bhf::Platform
28
28
  links = if !(page_links = template.paginate(platform.objects, {
29
29
  theme: 'bhf',
30
30
  param_name: [platform.name, :page],
31
- params: template.params
31
+ params: template.params.permit!
32
32
  })).blank?
33
33
  "#{load_more(platform)} #{page_links}"
34
- elsif platform.objects.num_pages == 1 && platform.objects.size > @offset_to_add
34
+ elsif platform.objects.total_pages == 1 && platform.objects.size > @offset_to_add
35
35
  load_less(platform)
36
36
  end
37
37
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bhf
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.17
4
+ version: 1.0.0.beta1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Anton Pawlik
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-01-29 00:00:00.000000000 Z
11
+ date: 2018-05-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -28,126 +28,126 @@ dependencies:
28
28
  name: turbolinks
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '2'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '2'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: kaminari
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - "~>"
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: haml-rails
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - "~>"
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: sass-rails
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: '5'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '5'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: shoulda
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - "~>"
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
89
  version: '3'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - "~>"
94
+ - - ">="
95
95
  - !ruby/object:Gem::Version
96
96
  version: '3'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rdoc
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - "~>"
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: '3'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - "~>"
108
+ - - ">="
109
109
  - !ruby/object:Gem::Version
110
110
  version: '3'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: bundler
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - "~>"
115
+ - - ">="
116
116
  - !ruby/object:Gem::Version
117
117
  version: '1'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - "~>"
122
+ - - ">="
123
123
  - !ruby/object:Gem::Version
124
124
  version: '1'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: jeweler
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - "~>"
129
+ - - ">="
130
130
  - !ruby/object:Gem::Version
131
131
  version: '2'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - "~>"
136
+ - - ">="
137
137
  - !ruby/object:Gem::Version
138
138
  version: '2'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: simplecov
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - "~>"
143
+ - - ">="
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - "~>"
150
+ - - ">="
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  description: A simple to use Rails-Engine-Gem that offers an admin interface for trusted
@@ -323,12 +323,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
323
323
  version: '0'
324
324
  required_rubygems_version: !ruby/object:Gem::Requirement
325
325
  requirements:
326
- - - ">="
326
+ - - ">"
327
327
  - !ruby/object:Gem::Version
328
- version: '0'
328
+ version: 1.3.1
329
329
  requirements: []
330
330
  rubyforge_project:
331
- rubygems_version: 2.4.8
331
+ rubygems_version: 2.6.13
332
332
  signing_key:
333
333
  specification_version: 4
334
334
  summary: A simple to use Rails-Engine-Gem that offers an admin interface for trusted