richer_text 0.10.0 → 0.12.0
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/models/richer_text/o_embed.rb +81 -0
- data/app/views/richer_text/o_embeds/_embed.html.erb +11 -0
- data/app/views/richer_text/o_embeds/_richer_text_editor_embed.html.erb +11 -0
- data/db/migrate/20230926034114_create_richer_text_o_embeds.rb +10 -0
- data/lib/richer_text/embed.rb +2 -2
- data/lib/richer_text/embeddable.rb +4 -0
- data/lib/richer_text/engine.rb +9 -0
- data/lib/richer_text/html_visitor.rb +15 -2
- data/lib/richer_text/node.rb +1 -1
- data/lib/richer_text/nodes/image.rb +4 -0
- data/lib/richer_text/nodes/richer_text_embed.rb +1 -1
- data/lib/richer_text/version.rb +1 -1
- metadata +20 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e5520f0457b69a555273d7a738f5257a0951eef4d65153ad783cd2f31246daad
|
4
|
+
data.tar.gz: d4978b9880b46a6af9a91868cdbf40ae8306d3dd749c6ec94631e6999820af89
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: faca362e8db800731ec19ade535551664f5bcc2f379e80283229f536a8b06608a6601d50c4672e02394c650f178ec5697244e14adfca4f0a701ec4bba1ca4846
|
7
|
+
data.tar.gz: 4662002c357fee3d91db0b96236c2d314c0551ecbc916a41f6e1c3dea63a5a5d30ab3208045160936b312500a72295d26aed2b59b2c487855431c69f5bf5da6a
|
@@ -0,0 +1,81 @@
|
|
1
|
+
require "oembed"
|
2
|
+
|
3
|
+
module RicherText
|
4
|
+
class OEmbed < ApplicationRecord
|
5
|
+
include RicherText::Embeddable
|
6
|
+
|
7
|
+
PATTERNS = [
|
8
|
+
{source: "^http:\\/\\/([^\\.]+\\.)?flickr\\.com\\/(.*?)", options: ""},
|
9
|
+
{source: "^https:\\/\\/([^\\.]+\\.)?flickr\\.com\\/(.*?)", options: ""},
|
10
|
+
{source: "^http:\\/\\/flic\\.kr\\/(.*?)", options: ""},
|
11
|
+
{source: "^https:\\/\\/flic\\.kr\\/(.*?)", options: ""},
|
12
|
+
{source: "^https:\\/\\/([^\\.]+\\.)?imgur\\.com\\/gallery\\/(.*?)", options: ""},
|
13
|
+
{source: "^http:\\/\\/([^\\.]+\\.)?imgur\\.com\\/gallery\\/(.*?)", options: ""},
|
14
|
+
{source: "^http:\\/\\/instagr\\.am\\/p\\/(.*?)", options: ""},
|
15
|
+
{source: "^http:\\/\\/instagram\\.com\\/p\\/(.*?)", options: ""},
|
16
|
+
{source: "^http:\\/\\/www\\.instagram\\.com\\/p\\/(.*?)", options: ""},
|
17
|
+
{source: "^https:\\/\\/instagr\\.am\\/p\\/(.*?)", options: ""},
|
18
|
+
{source: "^https:\\/\\/instagram\\.com\\/p\\/(.*?)", options: ""},
|
19
|
+
{source: "^https:\\/\\/www\\.instagram\\.com\\/p\\/(.*?)", options: ""},
|
20
|
+
{source: "^http:\\/\\/([^\\.]+\\.)?soundcloud\\.com\\/(.*?)", options: ""},
|
21
|
+
{source: "^https:\\/\\/([^\\.]+\\.)?soundcloud\\.com\\/(.*?)", options: ""},
|
22
|
+
{source: "^http:\\/\\/open\\.spotify\\.com\\/(.*?)", options: ""},
|
23
|
+
{source: "^https:\\/\\/open\\.spotify\\.com\\/(.*?)", options: ""},
|
24
|
+
{source: "^http:\\/\\/play\\.spotify\\.com\\/(.*?)", options: ""},
|
25
|
+
{source: "^https:\\/\\/play\\.spotify\\.com\\/(.*?)", options: ""},
|
26
|
+
{source: "^spotify\\:(.*?)", options: ""},
|
27
|
+
{source: "^https:\\/\\/([^\\.]+\\.)?twitter\\.com\\/(.*?)\\/status\\/(.*?)", options: ""},
|
28
|
+
{source: "^http:\\/\\/([^\\.]+\\.)?vimeo\\.com\\/(.*?)", options: ""},
|
29
|
+
{source: "^https:\\/\\/([^\\.]+\\.)?vimeo\\.com\\/(.*?)", options: ""},
|
30
|
+
{source: "^http:\\/\\/([^\\.]+\\.)?youtube\\.com\\/(.*?)", options: ""},
|
31
|
+
{source: "^https:\\/\\/([^\\.]+\\.)?youtube\\.com\\/(.*?)", options: ""},
|
32
|
+
{source: "^http:\\/\\/([^\\.]+\\.)?youtu\\.be\\/(.*?)", options: ""},
|
33
|
+
{source: "^https:\\/\\/([^\\.]+\\.)?youtu\\.be\\/(.*?)", options: ""}
|
34
|
+
]
|
35
|
+
|
36
|
+
def self.from_url(url)
|
37
|
+
find_by!(url: url)
|
38
|
+
rescue ActiveRecord::RecordNotFound
|
39
|
+
resource = ::OEmbed::Providers.get(url)
|
40
|
+
create!(url: url, fields: resource.fields)
|
41
|
+
end
|
42
|
+
|
43
|
+
def self.delegate_fields(*keys)
|
44
|
+
keys.each do |key|
|
45
|
+
define_method(key) do
|
46
|
+
fields[key.to_s]
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
50
|
+
|
51
|
+
delegate_fields(
|
52
|
+
:type,
|
53
|
+
:version,
|
54
|
+
:title,
|
55
|
+
:author_name,
|
56
|
+
:author_url,
|
57
|
+
:provider_name,
|
58
|
+
:provider_url,
|
59
|
+
:thumbnail_url,
|
60
|
+
:thumbnail_width,
|
61
|
+
:thumbnail_height,
|
62
|
+
:height,
|
63
|
+
:width,
|
64
|
+
:html
|
65
|
+
)
|
66
|
+
|
67
|
+
%w[link photo rich video].each do |embed_type|
|
68
|
+
define_method "#{embed_type}?" do
|
69
|
+
type == embed_type
|
70
|
+
end
|
71
|
+
end
|
72
|
+
|
73
|
+
def to_embeddable_partial_path
|
74
|
+
"richer_text/o_embeds/embed"
|
75
|
+
end
|
76
|
+
|
77
|
+
def to_richer_text_editor_partial_path
|
78
|
+
"richer_text/o_embeds/richer_text_editor_embed"
|
79
|
+
end
|
80
|
+
end
|
81
|
+
end
|
@@ -0,0 +1,11 @@
|
|
1
|
+
<% if o_embed.thumbnail_url && !o_embed.html %>
|
2
|
+
<div class="embed">
|
3
|
+
<%= image_tag o_embed.thumbnail_url %>
|
4
|
+
</div>
|
5
|
+
<% elsif o_embed.html %>
|
6
|
+
<div class="embed">
|
7
|
+
<%= o_embed.html.html_safe %>
|
8
|
+
</div>
|
9
|
+
<% elsif o_embed.provider_name %>
|
10
|
+
<%= link_to o_embed.provider_name, o_embed.url %>
|
11
|
+
<% end %>
|
@@ -0,0 +1,11 @@
|
|
1
|
+
<% if o_embed.thumbnail_url %>
|
2
|
+
<div class="embed">
|
3
|
+
<%= image_tag o_embed.thumbnail_url %>
|
4
|
+
</div>
|
5
|
+
<% elsif o_embed.html %>
|
6
|
+
<div class="embed">
|
7
|
+
<%= o_embed.html.html_safe %>
|
8
|
+
</div>
|
9
|
+
<% elsif o_embed.provider_name %>
|
10
|
+
<%= link_to o_embed.provider_name, o_embed.url %>
|
11
|
+
<% end %>
|
data/lib/richer_text/embed.rb
CHANGED
@@ -17,11 +17,11 @@ module RicherText
|
|
17
17
|
@embed
|
18
18
|
end
|
19
19
|
|
20
|
-
delegate :
|
20
|
+
delegate :to_richer_text_editor_partial_path, to: :@embed
|
21
21
|
delegate :model_name, to: :@embed
|
22
22
|
|
23
23
|
def html
|
24
|
-
render partial:
|
24
|
+
render partial: to_richer_text_editor_partial_path, object: object, as: model_name.element
|
25
25
|
end
|
26
26
|
end
|
27
27
|
end
|
data/lib/richer_text/engine.rb
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
require "rails"
|
2
|
+
require "oembed"
|
2
3
|
|
3
4
|
module RicherText
|
4
5
|
class Engine < ::Rails::Engine
|
@@ -15,5 +16,13 @@ module RicherText
|
|
15
16
|
helper RicherText::TagHelper
|
16
17
|
end
|
17
18
|
end
|
19
|
+
|
20
|
+
config.after_initialize do
|
21
|
+
::OEmbed::Providers.register_all
|
22
|
+
::OEmbed::Providers.register_fallback(
|
23
|
+
::OEmbed::ProviderDiscovery,
|
24
|
+
::OEmbed::Providers::Noembed
|
25
|
+
)
|
26
|
+
end
|
18
27
|
end
|
19
28
|
end
|
@@ -82,14 +82,14 @@ module RicherText
|
|
82
82
|
end
|
83
83
|
|
84
84
|
def visit_image(node)
|
85
|
-
"<img src='#{node.src}' />"
|
85
|
+
"<img src='#{node.src}' width='#{node.width}' />"
|
86
86
|
end
|
87
87
|
|
88
88
|
def visit_text(node, marks)
|
89
89
|
if marks.empty?
|
90
90
|
node.text
|
91
91
|
else
|
92
|
-
content_tag(marks[0].tag, visit_text(node, marks[1..]), marks[0]
|
92
|
+
content_tag(marks[0].tag, visit_text(node, marks[1..]), parse_mark_attrs(marks[0]))
|
93
93
|
end
|
94
94
|
end
|
95
95
|
|
@@ -118,5 +118,18 @@ module RicherText
|
|
118
118
|
def node_previewable?(node)
|
119
119
|
node.attrs["contentType"].match(previewable_regex)
|
120
120
|
end
|
121
|
+
|
122
|
+
def parse_mark_attrs(mark)
|
123
|
+
attrs = mark.attrs
|
124
|
+
tag = mark.tag
|
125
|
+
|
126
|
+
if attrs.dig("color").present? && tag == "mark"
|
127
|
+
attrs.merge(style: "background-color: #{attrs["color"]};")
|
128
|
+
elsif attrs.dig("color").present? && tag == "span"
|
129
|
+
attrs.merge(style: "color: #{attrs["color"]};")
|
130
|
+
else
|
131
|
+
attrs
|
132
|
+
end
|
133
|
+
end
|
121
134
|
end
|
122
135
|
end
|
data/lib/richer_text/node.rb
CHANGED
@@ -7,7 +7,7 @@ module RicherText
|
|
7
7
|
|
8
8
|
def html
|
9
9
|
render partial: embeddable.to_embeddable_partial_path, object: embeddable, as: embeddable.model_name.element
|
10
|
-
rescue ActiveRecord::RecordNotFound
|
10
|
+
rescue ActiveRecord::RecordNotFound, NoMethodError
|
11
11
|
"" # TODO: handle this better
|
12
12
|
end
|
13
13
|
|
data/lib/richer_text/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: richer_text
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.12.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Andrea Fomera
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-10-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -24,6 +24,20 @@ dependencies:
|
|
24
24
|
- - ">"
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: 7.0.0
|
27
|
+
- !ruby/object:Gem::Dependency
|
28
|
+
name: ruby-oembed
|
29
|
+
requirement: !ruby/object:Gem::Requirement
|
30
|
+
requirements:
|
31
|
+
- - ">="
|
32
|
+
- !ruby/object:Gem::Version
|
33
|
+
version: '0'
|
34
|
+
type: :runtime
|
35
|
+
prerelease: false
|
36
|
+
version_requirements: !ruby/object:Gem::Requirement
|
37
|
+
requirements:
|
38
|
+
- - ">="
|
39
|
+
- !ruby/object:Gem::Version
|
40
|
+
version: '0'
|
27
41
|
description:
|
28
42
|
email:
|
29
43
|
- afomera@hey.com
|
@@ -44,12 +58,16 @@ files:
|
|
44
58
|
- app/mailers/richer_text/application_mailer.rb
|
45
59
|
- app/models/richer_text/application_record.rb
|
46
60
|
- app/models/richer_text/json_text.rb
|
61
|
+
- app/models/richer_text/o_embed.rb
|
47
62
|
- app/models/richer_text/rich_text.rb
|
48
63
|
- app/views/layouts/richer_text/application.html.erb
|
49
64
|
- app/views/richer_text/contents/_content.html.erb
|
65
|
+
- app/views/richer_text/o_embeds/_embed.html.erb
|
66
|
+
- app/views/richer_text/o_embeds/_richer_text_editor_embed.html.erb
|
50
67
|
- config/routes.rb
|
51
68
|
- db/migrate/20230107020316_create_richer_text_rich_texts.rb
|
52
69
|
- db/migrate/20230916224959_create_richer_text_json_texts.rb
|
70
|
+
- db/migrate/20230926034114_create_richer_text_o_embeds.rb
|
53
71
|
- lib/generators/richer_text/install/install_generator.rb
|
54
72
|
- lib/richer_text.rb
|
55
73
|
- lib/richer_text/attribute.rb
|