infopark_fiona_connector 7.0.1.beta2 → 7.0.1.5.2.3.rc7

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 +12 -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 +42 -30
@@ -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.1.beta2'
4
+ "7.0.1.5.2.3.rc7"
5
5
  end
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: infopark_fiona_connector
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.0.1.beta2
4
+ version: 7.0.1.5.2.3.rc7
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-06-15 00:00:00.000000000 Z
11
+ date: 2020-07-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -16,126 +16,126 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '4.2'
19
+ version: '5.0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '4.2'
26
+ version: '5.0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: activerecord
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">"
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '0'
33
+ version: '5.0'
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
- version: '0'
40
+ version: '5.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rake
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 10.3.2
47
+ version: '12.3'
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
- version: 10.3.2
54
+ version: '12.3'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: json
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.8.1
61
+ version: '2.3'
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
- version: 1.8.1
68
+ version: '2.3'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: maruku
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 0.7.1
75
+ version: '0.7'
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
- version: 0.7.1
82
+ version: '0.7'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: jquery-rails
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 3.1.0
89
+ version: '4.3'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 3.1.0
96
+ version: '4.3'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: mime-types
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: '1.16'
103
+ version: '3.1'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: '1.16'
110
+ version: '3.1'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: mysql_blob_streaming
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 2.2.0
117
+ version: '2.3'
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 2.2.0
124
+ version: '2.3'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rsolr
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.0.10
131
+ version: 2.1.0s
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 1.0.10
138
+ version: 2.1.0s
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: helpful_configuration
141
141
  requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,7 @@ dependencies:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
152
  version: 0.1.0
153
- 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,
154
154
  dynamic web applications using Ruby on Rails and at the same time display CMS managed
155
155
  content.
156
156
  email: info@infopark.de
@@ -199,38 +199,50 @@ files:
199
199
  - lib/generators/rails_connector/install/templates/initializers/rails_connector.rb
200
200
  - lib/generators/rails_connector/install/templates/local/configuration.rb
201
201
  - lib/infopark_fiona_connector.rb
202
+ - lib/meta_eager_loader.rb
202
203
  - lib/obj.rb
203
204
  - lib/rails_connector/attr_dict.rb
204
205
  - lib/rails_connector/attr_value_provider.bundle
205
206
  - lib/rails_connector/attr_value_provider.so
206
207
  - lib/rails_connector/attr_value_provider64.so
208
+ - lib/rails_connector/attribute.rb
207
209
  - lib/rails_connector/authenticable.rb
208
210
  - lib/rails_connector/basic_obj.rb
209
211
  - lib/rails_connector/blob.rb
212
+ - lib/rails_connector/blob_mapping.rb
210
213
  - lib/rails_connector/blob_mysql.rb
211
214
  - lib/rails_connector/blob_oracle.rb
212
215
  - lib/rails_connector/cache_middleware.rb
216
+ - lib/rails_connector/channel.rb
213
217
  - lib/rails_connector/cms_accessible.rb
214
218
  - lib/rails_connector/cms_base_model.rb
215
219
  - lib/rails_connector/cms_dispatch_controller.rb
216
220
  - lib/rails_connector/cms_env.rb
217
221
  - lib/rails_connector/cms_test_request.rb
218
222
  - lib/rails_connector/configuration.rb
223
+ - lib/rails_connector/content.rb
219
224
  - lib/rails_connector/core_extensions.rb
220
225
  - lib/rails_connector/core_extensions/time.rb
221
226
  - lib/rails_connector/date_attribute.rb
222
227
  - lib/rails_connector/default_search_request.rb
223
228
  - lib/rails_connector/engine.rb
224
229
  - lib/rails_connector/errors.rb
230
+ - lib/rails_connector/fiona_datetime.rb
225
231
  - lib/rails_connector/fiona_engine.rb
226
232
  - lib/rails_connector/html_string.rb
233
+ - lib/rails_connector/job.rb
227
234
  - lib/rails_connector/link.rb
228
235
  - lib/rails_connector/link_list.rb
229
236
  - lib/rails_connector/link_resolvable.rb
230
237
  - lib/rails_connector/lucene_search_request.rb
231
238
  - lib/rails_connector/markdown_string.rb
239
+ - lib/rails_connector/meta.rb
240
+ - lib/rails_connector/meta/eager_loader.rb
232
241
  - lib/rails_connector/named_link.rb
233
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
234
246
  - lib/rails_connector/permission.rb
235
247
  - lib/rails_connector/rack_middlewares.rb
236
248
  - lib/rails_connector/ses.rb
@@ -240,7 +252,8 @@ files:
240
252
  - lib/search_request.rb
241
253
  - lib/version.rb
242
254
  homepage: http://www.infopark.de
243
- licenses: []
255
+ licenses:
256
+ - LGPL-3.0
244
257
  metadata: {}
245
258
  post_install_message:
246
259
  rdoc_options: []
@@ -257,8 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
257
270
  - !ruby/object:Gem::Version
258
271
  version: 1.3.5
259
272
  requirements: []
260
- rubyforge_project:
261
- rubygems_version: 2.2.2
273
+ rubygems_version: 3.0.3
262
274
  signing_key:
263
275
  specification_version: 4
264
276
  summary: Infopark Fiona Connector