onebox 1.9.28.1 → 1.9.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc4d1baf17e282cf5f07d077639a7ad8a33ebb548553c4fdda69b0c691218abe
-  data.tar.gz: 4bbfca52e600f49d31945b38ee2f99fdf74f99a85523eb62ca65566d687e2f75
+  metadata.gz: b2bb566d2096445a37f5328daab6bd9750c8fa75ce8740b7f2f858f56c9aa795
+  data.tar.gz: 1f4ce2ee9e5255a0889c3019649a9a34802a3b4d7c7d4494ab3425d98566d471
 SHA512:
-  metadata.gz: 8456164389809bb552d1bba98fd5e8ef04818327aed97d6cc816b4db81ec5c0ce94aab4fed0c503aedde0f5b3dd848e49e92e0d7e6a25e66f8b116b927b27cf4
-  data.tar.gz: 7fb44b1c4cb1b007ca592c7bf96e3e2d6467f6736e1c01b969a6dae1037c6a9644b1027f2a6fac691735305c7b7d64c13cbf2b8f21594f6dd713c96f1923c3c0
+  metadata.gz: 5e48b7a4787c335b9eefba80baa1b49d19e394b3a05ab1c43ed30fc176e5d0021a301ddbedcbf8d5a1e02649fadb41d8cd62d8668b3d0d62e030effffc667453
+  data.tar.gz: 8fbb2770d5ffa95e3efed6fb24c5f15468b659392e40bb5532abe7e7d4a677678dd2705e354efb8f33e4622c7608dac21bd6f446145a342c6683ec47d6cff178

data/.rubocop.yml

@@ -1 +1,2 @@
-inherit_from: https://raw.githubusercontent.com/discourse/discourse/master/.rubocop.yml
+inherit_gem:
+  rubocop-discourse: default.yml

data/lib/onebox/engine/instagram_onebox.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'htmlentities'
-
 module Onebox
   module Engine
     class InstagramOnebox
@@ -9,25 +7,43 @@ module Onebox
       include StandardEmbed
       include LayoutSupport
 
-      matches_regexp(/^https?:\/\/(?:www\.)?(?:instagram\.com|instagr\.am)\/?(?:.*)\/p\//)
+      matches_regexp(/^https?:\/\/(?:www\.)?(?:instagram\.com|instagr\.am)\/?(?:.*)\/p\/[a-zA-Z\d_-]+/)
       always_https
 
-      def data
-        og = get_opengraph
-        title = og.title.split(":")[0].strip.gsub(" on Instagram", "")
-
-        json_data = html_doc.xpath('//script[contains(text(),"window._sharedData")]').text.to_s
-        title = "[Album] #{title}" if json_data =~ /"edge_sidecar_to_children"/
+      def clean_url
+        url.scan(/^https?:\/\/(?:www\.)?(?:instagram\.com|instagr\.am)\/?(?:.*)\/p\/[a-zA-Z\d_-]+/).flatten.first
+      end
 
-        result = { link: og.url,
-                   title: Onebox::Helpers.truncate(title, 80),
-                   description: og.description(250)
+      def data
+        oembed = get_oembed
+        permalink = clean_url.gsub("/#{oembed.author_name}/", "/")
+        description = oembed.title
+        type = if description =~ /^Photos by/
+          "album"
+        elsif description =~ /^Video by/
+          "video"
+        else
+          "photo"
+        end
+        title = if type == "album"
+          "[Album] @#{oembed.author_name}"
+        else
+          "@#{oembed.author_name}"
+        end
+
+        result = { link: permalink,
+                   title: title,
+                   image: "#{permalink}/media/?size=l",
+                   description: Onebox::Helpers.truncate(description, 250)
                   }
+        result[:video_link] = permalink if type == "video"
+        result
+      end
 
-        result[:image] = og.image if !og.image.nil?
-        result[:video_link] = og.url if !og.video_secure_url.nil?
+      protected
 
-        result
+      def get_oembed_url
+        oembed_url = "https://api.instagram.com/oembed/?url=#{clean_url}"
       end
     end
   end

data/lib/onebox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Onebox
-  VERSION = "1.9.28.1"
+  VERSION = "1.9.28.2"
 end

data/onebox.gemspec

@@ -33,8 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'fakeweb', '~> 1.3'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'mocha', '~> 1.1'
-  spec.add_development_dependency 'rubocop', '~> 0.78.0'
-  spec.add_development_dependency 'rubocop-discourse', '~> 1.0.1'
+  spec.add_development_dependency 'rubocop-discourse', '~> 2.1.2'
   spec.add_development_dependency 'twitter', '~> 4.8'
   spec.add_development_dependency 'guard-rspec', '~> 4.2.8'
   spec.add_development_dependency 'sinatra', '~> 1.4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.9.28.1
+  version: 1.9.28.2
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -180,34 +180,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.78.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.78.0
 - !ruby/object:Gem::Dependency
   name: rubocop-discourse
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 2.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
@@ -434,7 +420,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A gem for generating embeddable HTML previews from URLs.