trusty-cms 8.1.0 → 8.2.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.
@@ -90,6 +90,12 @@ RSpec.describe Admin::PagesController, type: :controller do
90
90
 
91
91
  expect(flash[:error]).to be_present
92
92
  end
93
+
94
+ it 'loads the asset search so the re-rendered form can build its search popup' do
95
+ post :create, params: { page: { title: 'Pasted Title', slug: '', breadcrumb: '', parent_id: home.id } }
96
+
97
+ expect(controller.instance_variable_get(:@term)).to be_a(Ransack::Search)
98
+ end
93
99
  end
94
100
 
95
101
  describe 'PUT #update' do
@@ -101,6 +107,15 @@ RSpec.describe Admin::PagesController, type: :controller do
101
107
  expect(response).to be_redirect
102
108
  expect(page.reload.title).to eq('After')
103
109
  end
110
+
111
+ it 'loads the asset search when re-rendering after a validation failure' do
112
+ page = create(:page, title: 'Before', parent: home)
113
+
114
+ put :update, params: { id: page.id, page: { slug: '', breadcrumb: '' } }
115
+
116
+ expect(flash[:error]).to be_present
117
+ expect(controller.instance_variable_get(:@term)).to be_a(Ransack::Search)
118
+ end
104
119
  end
105
120
 
106
121
  describe 'DELETE #destroy' do
@@ -2,7 +2,6 @@ Rails.autoloaders.each do |autoloader|
2
2
  autoloader.inflector.inflect(
3
3
  'clipped_admin_ui' => 'ClippedAdminUI',
4
4
  'admin_ui' => 'AdminUI',
5
- 'ostruct' => 'OpenStruct',
6
5
  # Add more inflections as needed
7
6
  )
8
7
  end
@@ -1,14 +1,7 @@
1
1
  require 'spec_helper'
2
2
  require 'ostruct'
3
3
 
4
- # lib/ostruct.rb reopens OpenStruct (originally patched for a Ruby upgrade) and
5
- # shadows the stdlib version via the load path. This is exactly the kind of
6
- # patch a Ruby/Rails upgrade can break, so pin the behaviour we rely on.
7
- describe 'OpenStruct patch' do
8
- it 'is the project patch, not the stdlib implementation' do
9
- expect(OpenStruct.instance_method(:initialize).source_location.first)
10
- .to eq(File.expand_path('../../lib/ostruct.rb', __dir__))
11
- end
4
+ describe 'OpenStruct' do
12
5
 
13
6
  it 'builds accessors from a hash, symbolizing string keys' do
14
7
  os = OpenStruct.new('a' => 1, :b => 2)
data/trusty_cms.gemspec CHANGED
@@ -21,7 +21,6 @@ a general purpose content management system--not merely a blogging engine.'
21
21
  s.rdoc_options = ['--title', 'TrustyCms -- Content Management You Can Trust', '--line-numbers', '--main', 'README', '--exclude', 'app', '--exclude', 'bin', '--exclude',
22
22
  'config', '--exclude', 'db', '--exclude', 'features', '--exclude', 'lib', '--exclude', 'log', '--exclude', 'pkg', '--exclude', 'public', '--exclude', 'script', '--exclude', 'spec', '--exclude', 'test', '--exclude', 'tmp', '--exclude', 'vendor']
23
23
  s.require_paths = ['lib']
24
- s.rubygems_version = '1.3.7'
25
24
  s.summary = 'A no-fluff content management system designed for small teams.'
26
25
  s.license = 'MIT'
27
26
  s.test_files = Dir['spec/**/*']
@@ -30,14 +29,14 @@ a general purpose content management system--not merely a blogging engine.'
30
29
  s.add_dependency 'acts_as_tree', '~> 2.9.1'
31
30
  s.add_dependency 'base64'
32
31
  s.add_dependency 'bigdecimal'
33
- s.add_dependency 'csso-rails', '~> 0.1'
32
+ s.add_dependency 'csso-rails', '>= 0.1', '< 2.0'
34
33
  s.add_dependency 'delocalize', '>= 0.2', '< 2.0'
35
34
  s.add_dependency 'devise'
36
35
  s.add_dependency 'devise-two-factor'
37
36
  s.add_dependency 'diffy'
38
37
  s.add_dependency 'drb'
39
38
  s.add_dependency 'execjs', '~> 2.7'
40
- s.add_dependency 'haml', '>= 6.3', '< 7.4'
39
+ s.add_dependency 'haml', '>= 6.3', '< 7.6'
41
40
  s.add_dependency 'haml-rails', '>= 2.1', '< 4.0'
42
41
  s.add_dependency 'highline', '>= 1.7.8', '< 3.2.0'
43
42
  s.add_dependency 'image_processing'
@@ -46,15 +45,16 @@ a general purpose content management system--not merely a blogging engine.'
46
45
  s.add_dependency 'mini_racer'
47
46
  s.add_dependency 'mutex_m'
48
47
  s.add_dependency 'mysql2'
48
+ s.add_dependency 'ostruct'
49
49
  s.add_dependency 'paper_trail', '~> 17.0.0'
50
- s.add_dependency 'paper_trail-association_tracking', '>= 2.2.1', '< 2.4.0'
51
- s.add_dependency 'psych', '5.4.0'
52
- s.add_dependency 'rack', '>= 2.0.1', '< 3.2.0'
50
+ s.add_dependency 'paper_trail-association_tracking', '>= 2.2.1', '< 2.5.0'
51
+ s.add_dependency 'psych', '5.5.0'
52
+ s.add_dependency 'rack', '>= 2.0.1', '< 3.3.0'
53
53
  s.add_dependency 'rack-cache', '~> 1.7'
54
54
  s.add_dependency 'radius', '~> 0.8'
55
55
  s.add_dependency 'rails', '~> 8.1.0'
56
56
  s.add_dependency 'rake', '< 14.0'
57
- s.add_dependency 'ransack', '~> 4.2.1'
57
+ s.add_dependency 'ransack', '>= 4.2.1', '< 5.1.0'
58
58
  s.add_dependency 'rdoc', '>= 5.1', '< 9.0'
59
59
  s.add_dependency 'RedCloth', '4.3.4'
60
60
  s.add_dependency 'roadie-rails'