blacklight-oembed 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c5f0dcab275875e50d436e29e825e8a3f97fc7b
-  data.tar.gz: 28c6ba94fed961104b93b5231785d4ead1b1ab68
+  metadata.gz: b22bb6adfd4ab4c7b6a77bd59618f52180622792
+  data.tar.gz: 521256885dbd5e26363f8023d85ec57aa226220a
 SHA512:
-  metadata.gz: f3409a00f0b28fe9b0f50468c63808cb32a73e245436772a727803486c2245b436c27fdce182475824c88fe823c3c63dbee9a9be06e354db6c90d953c98fef48
-  data.tar.gz: e9cfa06132ee45d72f3cd17e2711957486dd25466d7d2698f92ce0edc5042f8f71ab9c1809c75604b39893fdfc2638b25e6b5ec679f3b1313b9a7600becc1ce8
+  metadata.gz: 1ac3306498bb9acfe9cc2928e13444810309b8811a1452d9432cc749cca1b27d284acd3f6d1cb2c0746d12d955b4c1a5320b619775043afc9b07bb1228c378fa
+  data.tar.gz: 714124f783cbe9665afa71cbdb1afba0f9ff4fd1ba430b60c7dd9d63c6e14831180a0221c3434f780bea760fd542c3693ba63ade72919ef6306ea39c95ee7fb4

data/app/controllers/blacklight/oembed/embed_controller.rb

@@ -1,8 +1,8 @@
 module Blacklight::Oembed
   class EmbedController < ActionController::Metal 
     def show
-      self.content_type = "application/json"
-      self.response_body =  { html: get_embed_content(params[:url]) }.to_json
+      self.content_type  = "application/json"
+      self.response_body = { html: get_embed_content(params[:url]) }.to_json
     end
 
     private
@@ -11,7 +11,8 @@ module Blacklight::Oembed
       begin
         OEmbed::Providers.get(url).html.html_safe
       rescue OEmbed::NotFound
-        link_to I18n.t(:'blacklight_oembed.catalog.view'), url
+        self.status = 400
+        ""
       end
     end
   end

data/app/helpers/blacklight/oembed/oembed_helper.rb

@@ -1,11 +1,14 @@
 module Blacklight::Oembed
   module OembedHelper
 
-    def render_oembed_tag document
+    def render_oembed_solr_document_tag document
       url = document.first(blacklight_config.show.oembed_field)
-
       return if url.blank?
 
+      render_oembed_tag url
+    end
+
+    def render_oembed_tag url
       send Blacklight::Oembed::Engine.config.render_helper, url
     end
 

data/lib/blacklight/oembed/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Oembed
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/controllers/embed_controller_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Blacklight::Oembed::EmbedController do
+  routes { Blacklight::Oembed::Engine.routes }
+  describe "show" do
+    before do
+      Blacklight::Oembed::Engine.config.render_helper = :render_oembed_tag_embed
+    end
+
+    let :oembed_obj do
+      double(html: "some-markup")
+    end
+
+    it "should fetch oembed markup for a url" do
+      allow(OEmbed::Providers).to receive(:get).with('http://some/uri').and_return oembed_obj
+      get :show, url: 'http://some/uri'
+      json = JSON.parse(response.body)
+      expect(json["html"]).to eq "some-markup"
+    end
+
+    it "should gracefully fail to a view link" do
+      get :show, url: 'http://some/uri'
+      expect(response.status).to eq 400
+      json = JSON.parse(response.body)
+      expect(json["html"]).to be_blank
+    end
+  end
+end

data/spec/helpers/oembed_helper_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe Blacklight::Oembed::OembedHelper do
+  before :all do
+    @original_value = Blacklight::Oembed::Engine.config.render_helper
+  end
+
+  after :all do
+    Blacklight::Oembed::Engine.config.render_helper = @original_value
+  end
+
+  let :document do
+    SolrDocument.new
+  end
+
+  let :blacklight_config do
+    Blacklight::Configuration.new do |config|
+      config.show.oembed_field = :oembed_url_ssm
+    end
+  end
+
+  before do
+    allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
+  end
+
+  it "should render nothing if no oembed url is available" do
+    expect(helper.render_oembed_solr_document_tag(document)).to be_blank
+  end
+
+  describe "async" do
+    before do
+      Blacklight::Oembed::Engine.config.render_helper = :render_oembed_tag_async
+    end
+
+    let :document do
+      SolrDocument.new oembed_url_ssm: 'http://some/uri'
+    end
+
+    it "should render a placeholder for oembed data" do
+      rendered = helper.render_oembed_solr_document_tag document
+      expect(rendered).to have_css "[data-embed-url]"
+      expect(rendered).to have_css "[data-embed-url='#{blacklight_oembed_engine.embed_url(url: "http://some/uri")}']"
+    end
+  end
+
+  describe "embed" do
+    before do
+      Blacklight::Oembed::Engine.config.render_helper = :render_oembed_tag_embed
+    end
+
+    let :document do
+      SolrDocument.new oembed_url_ssm: 'http://some/uri'
+    end
+
+    let :oembed_obj do
+      double(html: "some-markup")
+    end
+
+    it "should fetch oembed markup for a url" do
+      allow(OEmbed::Providers).to receive(:get).with('http://some/uri').and_return oembed_obj
+      rendered = helper.render_oembed_solr_document_tag document
+      expect(rendered).to eq "some-markup"
+    end
+
+    it "should gracefully fail to a view link" do
+      rendered = helper.render_oembed_solr_document_tag document
+      expect(rendered).to have_link "View", href: "http://some/uri"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-oembed
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Chris Beer
@@ -234,6 +234,8 @@ files:
 - lib/generators/blacklight_oembed/templates/blacklight_oembed.css.scss
 - lib/generators/blacklight_oembed/templates/blacklight_oembed.js
 - lib/generators/blacklight_oembed/templates/oembed_providers.rb
+- spec/controllers/embed_controller_spec.rb
+- spec/helpers/oembed_helper_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 homepage: https://github.com/sul-dlss/blacklight-oembed
@@ -261,5 +263,7 @@ signing_key:
 specification_version: 4
 summary: Oembed display for Blacklight
 test_files:
+- spec/controllers/embed_controller_spec.rb
+- spec/helpers/oembed_helper_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb