richer_text 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 587dab9004a19d9fdd0d5d1c191f01f2d128e73f20a4c10b38b1b43fc6206a94
-  data.tar.gz: 60ca0263af5e39723bfab6cb3700623aed408bd34e55d4fc6cd81dbebf0f823b
+  metadata.gz: b0896d20faa3ab1fcf20e72e0be2fe6902bf2831b8f21bc5d006f6bbac0d4aad
+  data.tar.gz: e0b592625c14d7c867087b29129b4bf711e01675eb8e1187a6aa4114fab9eb48
 SHA512:
-  metadata.gz: 7d43de3d31186bf8e5c19b1194d817440c10e05e2b4ebfb689882233a4ac7680fb64761476305535c3a1bc5b7f3896116f87419cb824b174dc2e9c7ef5108222
-  data.tar.gz: 41d039dc8fe7b478d7f106562812c1871c9341438f04441cff205ac6f0df35d7b535571c1e3d6dffd1296c61d369828ab1efcd169b82020a18c65a0f1819184b
+  metadata.gz: 3f386bd1e15a650db59353b2627224d5dbdcbcfdaa28f49fe7fde165266cac6d876d618da844a00c7c1d7457468543060437aff4a7c2d41736f7eaf6152d92dc
+  data.tar.gz: 364abb9092c4f8bb13959c3dc13291a22b485e8360f12219064ec4bcb73deeff965c4942d5b0320e8d3977ad7bc107a78133649f72a2b02264fa3945a07adc06

data/app/models/richer_text/o_embed.rb

@@ -0,0 +1,81 @@
+require "oembed"
+
+module RicherText
+  class OEmbed < ApplicationRecord
+    include RicherText::Embeddable
+
+    PATTERNS = [
+      {source: "^http:\\/\\/([^\\.]+\\.)?flickr\\.com\\/(.*?)", options: ""},
+      {source: "^https:\\/\\/([^\\.]+\\.)?flickr\\.com\\/(.*?)", options: ""},
+      {source: "^http:\\/\\/flic\\.kr\\/(.*?)", options: ""},
+      {source: "^https:\\/\\/flic\\.kr\\/(.*?)", options: ""},
+      {source: "^https:\\/\\/([^\\.]+\\.)?imgur\\.com\\/gallery\\/(.*?)", options: ""},
+      {source: "^http:\\/\\/([^\\.]+\\.)?imgur\\.com\\/gallery\\/(.*?)", options: ""},
+      {source: "^http:\\/\\/instagr\\.am\\/p\\/(.*?)", options: ""},
+      {source: "^http:\\/\\/instagram\\.com\\/p\\/(.*?)", options: ""},
+      {source: "^http:\\/\\/www\\.instagram\\.com\\/p\\/(.*?)", options: ""},
+      {source: "^https:\\/\\/instagr\\.am\\/p\\/(.*?)", options: ""},
+      {source: "^https:\\/\\/instagram\\.com\\/p\\/(.*?)", options: ""},
+      {source: "^https:\\/\\/www\\.instagram\\.com\\/p\\/(.*?)", options: ""},
+      {source: "^http:\\/\\/([^\\.]+\\.)?soundcloud\\.com\\/(.*?)", options: ""},
+      {source: "^https:\\/\\/([^\\.]+\\.)?soundcloud\\.com\\/(.*?)", options: ""},
+      {source: "^http:\\/\\/open\\.spotify\\.com\\/(.*?)", options: ""},
+      {source: "^https:\\/\\/open\\.spotify\\.com\\/(.*?)", options: ""},
+      {source: "^http:\\/\\/play\\.spotify\\.com\\/(.*?)", options: ""},
+      {source: "^https:\\/\\/play\\.spotify\\.com\\/(.*?)", options: ""},
+      {source: "^spotify\\:(.*?)", options: ""},
+      {source: "^https:\\/\\/([^\\.]+\\.)?twitter\\.com\\/(.*?)\\/status\\/(.*?)", options: ""},
+      {source: "^http:\\/\\/([^\\.]+\\.)?vimeo\\.com\\/(.*?)", options: ""},
+      {source: "^https:\\/\\/([^\\.]+\\.)?vimeo\\.com\\/(.*?)", options: ""},
+      {source: "^http:\\/\\/([^\\.]+\\.)?youtube\\.com\\/(.*?)", options: ""},
+      {source: "^https:\\/\\/([^\\.]+\\.)?youtube\\.com\\/(.*?)", options: ""},
+      {source: "^http:\\/\\/([^\\.]+\\.)?youtu\\.be\\/(.*?)", options: ""},
+      {source: "^https:\\/\\/([^\\.]+\\.)?youtu\\.be\\/(.*?)", options: ""}
+    ]
+
+    def self.from_url(url)
+      find_by!(url: url)
+    rescue ActiveRecord::RecordNotFound
+      resource = ::OEmbed::Providers.get(url)
+      create!(url: url, fields: resource.fields)
+    end
+
+    def self.delegate_fields(*keys)
+      keys.each do |key|
+        define_method(key) do
+          fields[key.to_s]
+        end
+      end
+    end
+
+    delegate_fields(
+      :type,
+      :version,
+      :title,
+      :author_name,
+      :author_url,
+      :provider_name,
+      :provider_url,
+      :thumbnail_url,
+      :thumbnail_width,
+      :thumbnail_height,
+      :height,
+      :width,
+      :html
+    )
+
+    %w[link photo rich video].each do |embed_type|
+      define_method "#{embed_type}?" do
+        type == embed_type
+      end
+    end
+
+    def to_embeddable_partial_path
+      "richer_text/o_embeds/embed"
+    end
+
+    def to_richer_text_editor_partial_path
+      "richer_text/o_embeds/richer_text_editor_embed"
+    end
+  end
+end

data/app/views/richer_text/o_embeds/_embed.html.erb

@@ -0,0 +1,11 @@
+<% if o_embed.thumbnail_url && !o_embed.html %>
+  <div class="embed">
+    <%= image_tag o_embed.thumbnail_url %>
+  </div>
+<% elsif o_embed.html %>
+  <div class="embed">
+    <%= o_embed.html.html_safe %>
+  </div>
+<% elsif o_embed.provider_name %>
+  <%= link_to o_embed.provider_name, o_embed.url %>
+<% end %>

data/app/views/richer_text/o_embeds/_richer_text_editor_embed.html.erb

@@ -0,0 +1,11 @@
+<% if o_embed.thumbnail_url %>
+  <div class="embed">
+    <%= image_tag o_embed.thumbnail_url %>
+  </div>
+<% elsif o_embed.html %>
+  <div class="embed">
+    <%= o_embed.html.html_safe %>
+  </div>
+<% elsif o_embed.provider_name %>
+  <%= link_to o_embed.provider_name, o_embed.url %>
+<% end %>

data/db/migrate/20230926034114_create_richer_text_o_embeds.rb

@@ -0,0 +1,10 @@
+class CreateRicherTextOEmbeds < ActiveRecord::Migration[7.0]
+  def change
+    create_table :richer_text_o_embeds do |t|
+      t.jsonb :fields
+      t.string :url
+
+      t.timestamps
+    end
+  end
+end

data/lib/richer_text/embed.rb

@@ -17,11 +17,11 @@ module RicherText
       @embed
     end
 
-    delegate :to_embeddable_partial_path, to: :@embed
+    delegate :to_richer_text_editor_partial_path, to: :@embed
     delegate :model_name, to: :@embed
 
     def html
-      render partial: to_embeddable_partial_path, object: object, as: model_name.element
+      render partial: to_richer_text_editor_partial_path, object: object, as: model_name.element
     end
   end
 end

data/lib/richer_text/embeddable.rb

@@ -10,6 +10,10 @@ module RicherText
       def to_embeddable_partial_path
         to_partial_path
       end
+
+      def to_richer_text_editor_partial_path
+        to_partial_path
+      end
     end
   end
 end

data/lib/richer_text/engine.rb

@@ -1,4 +1,5 @@
 require "rails"
+require "oembed"
 
 module RicherText
   class Engine < ::Rails::Engine
@@ -15,5 +16,13 @@ module RicherText
         helper RicherText::TagHelper
       end
     end
+
+    config.after_initialize do
+      ::OEmbed::Providers.register_all
+      ::OEmbed::Providers.register_fallback(
+        ::OEmbed::ProviderDiscovery,
+        ::OEmbed::Providers::Noembed
+      )
+    end
   end
 end

data/lib/richer_text/html_visitor.rb

@@ -82,7 +82,7 @@ module RicherText
     end
 
     def visit_image(node)
-      "<img src='#{node.src}' />"
+      "<img src='#{node.src}' width='#{node.width}' />"
     end
 
     def visit_text(node, marks)

data/lib/richer_text/nodes/image.rb

@@ -8,6 +8,10 @@ module RicherText
       def signed_id
         @signed_id = attrs['signedId']
       end
+
+      def width
+        attrs['width']
+      end
     end
   end
 end

data/lib/richer_text/nodes/richer_text_embed.rb

@@ -7,7 +7,7 @@ module RicherText
 
       def html
         render partial: embeddable.to_embeddable_partial_path, object: embeddable, as: embeddable.model_name.element
-      rescue ActiveRecord::RecordNotFound
+      rescue ActiveRecord::RecordNotFound, NoMethodError
         "" # TODO: handle this better
       end
 

data/lib/richer_text/version.rb

@@ -1,3 +1,3 @@
 module RicherText
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: richer_text
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Andrea Fomera
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-24 00:00:00.000000000 Z
+date: 2023-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 7.0.0
+- !ruby/object:Gem::Dependency
+  name: ruby-oembed
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - afomera@hey.com
@@ -44,12 +58,16 @@ files:
 - app/mailers/richer_text/application_mailer.rb
 - app/models/richer_text/application_record.rb
 - app/models/richer_text/json_text.rb
+- app/models/richer_text/o_embed.rb
 - app/models/richer_text/rich_text.rb
 - app/views/layouts/richer_text/application.html.erb
 - app/views/richer_text/contents/_content.html.erb
+- app/views/richer_text/o_embeds/_embed.html.erb
+- app/views/richer_text/o_embeds/_richer_text_editor_embed.html.erb
 - config/routes.rb
 - db/migrate/20230107020316_create_richer_text_rich_texts.rb
 - db/migrate/20230916224959_create_richer_text_json_texts.rb
+- db/migrate/20230926034114_create_richer_text_o_embeds.rb
 - lib/generators/richer_text/install/install_generator.rb
 - lib/richer_text.rb
 - lib/richer_text/attribute.rb