infopark_fiona_connector 7.0.0 → 7.0.1.5.2.3.rc6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (66) hide show
  1. checksums.yaml +5 -5
  2. data/app/controllers/cms_controller.rb +1 -1
  3. data/app/controllers/rails_connector/default_cms_controller.rb +4 -6
  4. data/app/helpers/cms_helper.rb +1 -1
  5. data/app/helpers/cms_routing_helper.rb +1 -1
  6. data/app/helpers/rails_connector/cms_asset_helper.rb +4 -5
  7. data/app/helpers/rails_connector/cms_tag_helper.rb +0 -3
  8. data/app/helpers/rails_connector/default_cms_helper.rb +0 -2
  9. data/app/helpers/rails_connector/default_cms_routing_helper.rb +15 -16
  10. data/app/helpers/rails_connector/display_helper.rb +31 -33
  11. data/app/helpers/rails_connector/editing_helper.rb +2 -8
  12. data/app/helpers/rails_connector/layout_helper.rb +2 -5
  13. data/app/helpers/rails_connector/marker_helper.rb +63 -64
  14. data/app/helpers/rails_connector/table_of_contents_helper.rb +1 -3
  15. data/config/cms_routes.rb +15 -15
  16. data/lib/gem_dependencies.rb +8 -7
  17. data/lib/generators/rails_connector/install/install_generator.rb +6 -6
  18. data/lib/generators/rails_connector/install/templates/initializers/rails_connector.rb +1 -1
  19. data/lib/infopark_fiona_connector.rb +7 -6
  20. data/lib/meta_eager_loader.rb +1 -0
  21. data/lib/rails_connector/attr_dict.rb +54 -31
  22. data/lib/rails_connector/attribute.rb +93 -0
  23. data/lib/rails_connector/authenticable.rb +12 -5
  24. data/lib/rails_connector/basic_obj.rb +126 -132
  25. data/lib/rails_connector/blob.rb +4 -5
  26. data/lib/rails_connector/blob_mapping.rb +15 -0
  27. data/lib/rails_connector/blob_mysql.rb +3 -5
  28. data/lib/rails_connector/blob_oracle.rb +5 -7
  29. data/lib/rails_connector/channel.rb +18 -0
  30. data/lib/rails_connector/cms_accessible.rb +21 -24
  31. data/lib/rails_connector/cms_base_model.rb +11 -4
  32. data/lib/rails_connector/cms_dispatch_controller.rb +9 -12
  33. data/lib/rails_connector/cms_env.rb +4 -7
  34. data/lib/rails_connector/cms_test_request.rb +1 -16
  35. data/lib/rails_connector/configuration.rb +14 -16
  36. data/lib/rails_connector/content.rb +7 -0
  37. data/lib/rails_connector/core_extensions/time.rb +3 -4
  38. data/lib/rails_connector/date_attribute.rb +2 -4
  39. data/lib/rails_connector/default_search_request.rb +1 -1
  40. data/lib/rails_connector/engine.rb +18 -17
  41. data/lib/rails_connector/errors.rb +2 -5
  42. data/lib/rails_connector/fiona_datetime.rb +14 -0
  43. data/lib/rails_connector/fiona_engine.rb +3 -4
  44. data/lib/rails_connector/html_string.rb +0 -2
  45. data/lib/rails_connector/job.rb +10 -0
  46. data/lib/rails_connector/link.rb +7 -4
  47. data/lib/rails_connector/link_list.rb +1 -5
  48. data/lib/rails_connector/link_resolvable.rb +1 -5
  49. data/lib/rails_connector/lucene_search_request.rb +20 -24
  50. data/lib/rails_connector/markdown_string.rb +0 -2
  51. data/lib/rails_connector/meta.rb +143 -0
  52. data/lib/rails_connector/meta/eager_loader.rb +84 -0
  53. data/lib/rails_connector/named_link.rb +25 -14
  54. data/lib/rails_connector/news.rb +8 -4
  55. data/lib/rails_connector/obj_class.rb +138 -0
  56. data/lib/rails_connector/obj_class_attr.rb +5 -0
  57. data/lib/rails_connector/object_with_meta_data.rb +13 -0
  58. data/lib/rails_connector/permission.rb +2 -6
  59. data/lib/rails_connector/rack_middlewares.rb +1 -2
  60. data/lib/rails_connector/ses.rb +3 -8
  61. data/lib/rails_connector/ses/verity_accessor.rb +43 -46
  62. data/lib/rails_connector/string_tagging.rb +0 -3
  63. data/lib/rails_connector/verity_search_request.rb +6 -9
  64. data/lib/search_request.rb +1 -1
  65. data/lib/version.rb +1 -1
  66. metadata +44 -38
@@ -1,8 +1,6 @@
1
1
  module RailsConnector
2
-
3
2
  # adds flavour to strings
4
3
  module StringTagging
5
-
6
4
  # html flavour
7
5
  def self.tag_as_html(string, source)
8
6
  unless string.blank?
@@ -25,5 +23,4 @@ module RailsConnector
25
23
  string
26
24
  end
27
25
  end
28
-
29
26
  end
@@ -1,6 +1,4 @@
1
- # encoding: utf-8
2
1
  module RailsConnector
3
-
4
2
  # This class provides an implementation for accessing the Verity based search server.
5
3
  # It should be customized by subclassing.
6
4
  # @api public
@@ -24,7 +22,7 @@ module RailsConnector
24
22
  # <tt>:collections</tt>:: The collections to be searched, default: <tt>['cm-contents']</tt>
25
23
  # <tt>:base_query</tt>:: The VQL base query, default: <tt>nil</tt>
26
24
  # @api public
27
- def initialize(query_string, options=nil)
25
+ def initialize(query_string, options = nil)
28
26
  @query_string = self.class.sanitize(query_string)
29
27
  @options = Configuration.search_options.merge(options || {})
30
28
  end
@@ -34,15 +32,15 @@ module RailsConnector
34
32
  # Uses the #base_query and +options+ given in #new.
35
33
  # @api public
36
34
  def fetch_hits
37
- SES::VerityAccessor.new(vql_query_for(@query_string), {:base_query => base_query}.merge(@options)).search
35
+ SES::VerityAccessor.new(vql_query_for(@query_string), { base_query: base_query }.merge(@options)).search
38
36
  end
39
37
 
40
38
  # Removes unwanted characters from +text+.
41
39
  def self.sanitize(text)
42
- text.strip.gsub(/[<>"'´`,()\[\]{}=!@\\]/, '')
40
+ text.strip.gsub(/[<>"'´`,()\[\]{}=!@\\]/, "")
43
41
  end
44
42
 
45
- def vql_query_for(query_string = '')
43
+ def vql_query_for(query_string = "")
46
44
  words = query_string.split(/\s+/).map do |word|
47
45
  word unless %w(and or not).include?(word.downcase)
48
46
  end.compact.join(", ")
@@ -54,7 +52,7 @@ module RailsConnector
54
52
  # A base query is used to reduce the number of documents before executing the actual query.
55
53
  # By default, all base query conditions must be met, they are combined using the +AND+ operator.
56
54
  def base_query
57
- "<#AND> (#{base_query_conditions.values.compact.join(', ')})"
55
+ "<#AND> (#{base_query_conditions.values.compact.join(", ")})"
58
56
  end
59
57
 
60
58
  # A hash of conditions, combined to a base query by #base_query.
@@ -78,12 +76,11 @@ module RailsConnector
78
76
  conditions[:content] = '("released" <#IN> state)'
79
77
  conditions[:suppressExport] = '("0" <#IN> suppressExport)'
80
78
  conditions[:validFrom] = "(validFrom < #{Time.now.to_iso})"
81
- conditions[:validUntil] = %!<#OR> (
79
+ conditions[:validUntil] = %!<#OR> (
82
80
  (validUntil = ""),
83
81
  (validUntil > #{Time.now.to_iso})
84
82
  )!
85
83
  conditions
86
84
  end
87
85
  end
88
-
89
86
  end
@@ -1,2 +1,2 @@
1
1
  class SearchRequest < RailsConnector::DefaultSearchRequest
2
- end
2
+ end
@@ -1,7 +1,7 @@
1
1
  module RailsConnector
2
2
  module Version
3
3
  def self.get
4
- '7.0.0'
4
+ "7.0.1.5.2.3.rc6"
5
5
  end
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,147 +1,141 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: infopark_fiona_connector
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.0.0
4
+ version: 7.0.1.5.2.3.rc6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Infopark AG
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-31 00:00:00.000000000 Z
11
+ date: 2020-07-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
18
- - !ruby/object:Gem::Version
19
- version: 4.0.11
20
- - - "<"
17
+ - - "~>"
21
18
  - !ruby/object:Gem::Version
22
- version: '4.2'
19
+ version: '5.0'
23
20
  type: :runtime
24
21
  prerelease: false
25
22
  version_requirements: !ruby/object:Gem::Requirement
26
23
  requirements:
27
- - - ">="
28
- - !ruby/object:Gem::Version
29
- version: 4.0.11
30
- - - "<"
24
+ - - "~>"
31
25
  - !ruby/object:Gem::Version
32
- version: '4.2'
26
+ version: '5.0'
33
27
  - !ruby/object:Gem::Dependency
34
28
  name: activerecord
35
29
  requirement: !ruby/object:Gem::Requirement
36
30
  requirements:
37
- - - ">"
31
+ - - "~>"
38
32
  - !ruby/object:Gem::Version
39
- version: '0'
33
+ version: '5.0'
40
34
  type: :runtime
41
35
  prerelease: false
42
36
  version_requirements: !ruby/object:Gem::Requirement
43
37
  requirements:
44
- - - ">"
38
+ - - "~>"
45
39
  - !ruby/object:Gem::Version
46
- version: '0'
40
+ version: '5.0'
47
41
  - !ruby/object:Gem::Dependency
48
42
  name: rake
49
43
  requirement: !ruby/object:Gem::Requirement
50
44
  requirements:
51
- - - ">="
45
+ - - "~>"
52
46
  - !ruby/object:Gem::Version
53
- version: 10.3.2
47
+ version: '12.3'
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
51
  requirements:
58
- - - ">="
52
+ - - "~>"
59
53
  - !ruby/object:Gem::Version
60
- version: 10.3.2
54
+ version: '12.3'
61
55
  - !ruby/object:Gem::Dependency
62
56
  name: json
63
57
  requirement: !ruby/object:Gem::Requirement
64
58
  requirements:
65
- - - ">="
59
+ - - "~>"
66
60
  - !ruby/object:Gem::Version
67
- version: 1.8.1
61
+ version: '2.3'
68
62
  type: :runtime
69
63
  prerelease: false
70
64
  version_requirements: !ruby/object:Gem::Requirement
71
65
  requirements:
72
- - - ">="
66
+ - - "~>"
73
67
  - !ruby/object:Gem::Version
74
- version: 1.8.1
68
+ version: '2.3'
75
69
  - !ruby/object:Gem::Dependency
76
70
  name: maruku
77
71
  requirement: !ruby/object:Gem::Requirement
78
72
  requirements:
79
73
  - - "~>"
80
74
  - !ruby/object:Gem::Version
81
- version: 0.7.1
75
+ version: '0.7'
82
76
  type: :runtime
83
77
  prerelease: false
84
78
  version_requirements: !ruby/object:Gem::Requirement
85
79
  requirements:
86
80
  - - "~>"
87
81
  - !ruby/object:Gem::Version
88
- version: 0.7.1
82
+ version: '0.7'
89
83
  - !ruby/object:Gem::Dependency
90
84
  name: jquery-rails
91
85
  requirement: !ruby/object:Gem::Requirement
92
86
  requirements:
93
87
  - - "~>"
94
88
  - !ruby/object:Gem::Version
95
- version: 3.1.0
89
+ version: '4.3'
96
90
  type: :runtime
97
91
  prerelease: false
98
92
  version_requirements: !ruby/object:Gem::Requirement
99
93
  requirements:
100
94
  - - "~>"
101
95
  - !ruby/object:Gem::Version
102
- version: 3.1.0
96
+ version: '4.3'
103
97
  - !ruby/object:Gem::Dependency
104
98
  name: mime-types
105
99
  requirement: !ruby/object:Gem::Requirement
106
100
  requirements:
107
101
  - - "~>"
108
102
  - !ruby/object:Gem::Version
109
- version: '1.16'
103
+ version: '3.1'
110
104
  type: :runtime
111
105
  prerelease: false
112
106
  version_requirements: !ruby/object:Gem::Requirement
113
107
  requirements:
114
108
  - - "~>"
115
109
  - !ruby/object:Gem::Version
116
- version: '1.16'
110
+ version: '3.1'
117
111
  - !ruby/object:Gem::Dependency
118
112
  name: mysql_blob_streaming
119
113
  requirement: !ruby/object:Gem::Requirement
120
114
  requirements:
121
115
  - - "~>"
122
116
  - !ruby/object:Gem::Version
123
- version: 2.2.0
117
+ version: '2.3'
124
118
  type: :runtime
125
119
  prerelease: false
126
120
  version_requirements: !ruby/object:Gem::Requirement
127
121
  requirements:
128
122
  - - "~>"
129
123
  - !ruby/object:Gem::Version
130
- version: 2.2.0
124
+ version: '2.3'
131
125
  - !ruby/object:Gem::Dependency
132
126
  name: rsolr
133
127
  requirement: !ruby/object:Gem::Requirement
134
128
  requirements:
135
129
  - - "~>"
136
130
  - !ruby/object:Gem::Version
137
- version: 1.0.10
131
+ version: 2.1.0s
138
132
  type: :runtime
139
133
  prerelease: false
140
134
  version_requirements: !ruby/object:Gem::Requirement
141
135
  requirements:
142
136
  - - "~>"
143
137
  - !ruby/object:Gem::Version
144
- version: 1.0.10
138
+ version: 2.1.0s
145
139
  - !ruby/object:Gem::Dependency
146
140
  name: helpful_configuration
147
141
  requirement: !ruby/object:Gem::Requirement
@@ -156,7 +150,7 @@ dependencies:
156
150
  - - "~>"
157
151
  - !ruby/object:Gem::Version
158
152
  version: 0.1.0
159
- description: The Fiona Connector for Infopark CMS Fiona enables you to develop modern,
153
+ description: Fiona Connector for Infopark CMS Fiona enables you to develop modern,
160
154
  dynamic web applications using Ruby on Rails and at the same time display CMS managed
161
155
  content.
162
156
  email: info@infopark.de
@@ -205,38 +199,50 @@ files:
205
199
  - lib/generators/rails_connector/install/templates/initializers/rails_connector.rb
206
200
  - lib/generators/rails_connector/install/templates/local/configuration.rb
207
201
  - lib/infopark_fiona_connector.rb
202
+ - lib/meta_eager_loader.rb
208
203
  - lib/obj.rb
209
204
  - lib/rails_connector/attr_dict.rb
210
205
  - lib/rails_connector/attr_value_provider.bundle
211
206
  - lib/rails_connector/attr_value_provider.so
212
207
  - lib/rails_connector/attr_value_provider64.so
208
+ - lib/rails_connector/attribute.rb
213
209
  - lib/rails_connector/authenticable.rb
214
210
  - lib/rails_connector/basic_obj.rb
215
211
  - lib/rails_connector/blob.rb
212
+ - lib/rails_connector/blob_mapping.rb
216
213
  - lib/rails_connector/blob_mysql.rb
217
214
  - lib/rails_connector/blob_oracle.rb
218
215
  - lib/rails_connector/cache_middleware.rb
216
+ - lib/rails_connector/channel.rb
219
217
  - lib/rails_connector/cms_accessible.rb
220
218
  - lib/rails_connector/cms_base_model.rb
221
219
  - lib/rails_connector/cms_dispatch_controller.rb
222
220
  - lib/rails_connector/cms_env.rb
223
221
  - lib/rails_connector/cms_test_request.rb
224
222
  - lib/rails_connector/configuration.rb
223
+ - lib/rails_connector/content.rb
225
224
  - lib/rails_connector/core_extensions.rb
226
225
  - lib/rails_connector/core_extensions/time.rb
227
226
  - lib/rails_connector/date_attribute.rb
228
227
  - lib/rails_connector/default_search_request.rb
229
228
  - lib/rails_connector/engine.rb
230
229
  - lib/rails_connector/errors.rb
230
+ - lib/rails_connector/fiona_datetime.rb
231
231
  - lib/rails_connector/fiona_engine.rb
232
232
  - lib/rails_connector/html_string.rb
233
+ - lib/rails_connector/job.rb
233
234
  - lib/rails_connector/link.rb
234
235
  - lib/rails_connector/link_list.rb
235
236
  - lib/rails_connector/link_resolvable.rb
236
237
  - lib/rails_connector/lucene_search_request.rb
237
238
  - lib/rails_connector/markdown_string.rb
239
+ - lib/rails_connector/meta.rb
240
+ - lib/rails_connector/meta/eager_loader.rb
238
241
  - lib/rails_connector/named_link.rb
239
242
  - lib/rails_connector/news.rb
243
+ - lib/rails_connector/obj_class.rb
244
+ - lib/rails_connector/obj_class_attr.rb
245
+ - lib/rails_connector/object_with_meta_data.rb
240
246
  - lib/rails_connector/permission.rb
241
247
  - lib/rails_connector/rack_middlewares.rb
242
248
  - lib/rails_connector/ses.rb
@@ -246,7 +252,8 @@ files:
246
252
  - lib/search_request.rb
247
253
  - lib/version.rb
248
254
  homepage: http://www.infopark.de
249
- licenses: []
255
+ licenses:
256
+ - LGPL-3.0
250
257
  metadata: {}
251
258
  post_install_message:
252
259
  rdoc_options: []
@@ -263,8 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
263
270
  - !ruby/object:Gem::Version
264
271
  version: 1.3.5
265
272
  requirements: []
266
- rubyforge_project:
267
- rubygems_version: 2.2.2
273
+ rubygems_version: 3.0.3
268
274
  signing_key:
269
275
  specification_version: 4
270
276
  summary: Infopark Fiona Connector