prismic.io 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8474490a3982e6d9d3b995b3a848f08ecc9dda67
-  data.tar.gz: da268f235d65b3bf88fef8a5fb8d18d37f3556fc
+  metadata.gz: af0cbe24e42c28896b268e59fdf8f0b197f04549
+  data.tar.gz: da04358f02966fd3a2b6149f8a39445d03a8070c
 SHA512:
-  metadata.gz: 8d4282305f84eb5ec333a80559ffe8691bd3ff3224e4042af1fe6f04cf4824f4b3c0f5595992af71eefc63c8f5b8f4b029ccf3bd6ba29e46d284392e29d5e29b
-  data.tar.gz: 9600c487806277d86ada6b55a02c3e86768ca5bc477dcd75310a03f2cb72f98faba2dc72cd33fe75d4e0d58467f0d6e25937edde7733cfd70455326041098284
+  metadata.gz: 6acd277f5532003856c9ac1a574d48b12a5af167123686353287ca2999afbec78a0bc6e2dc3ea988705b1514875049456de8eea360b77c24a735773228427622
+  data.tar.gz: a89fc85d61a78e888c1609a8a6ac55cb5c02151bd84956a7f7a007dd8721cc1b58e7dbac65e304e07c7bb2d82ef47ba9bbacdf0d5450ce04ad6cb21c1811b95a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    prismic.io (1.4.5)
+    prismic.io (1.5.0)
       hashery (~> 2.1.1)
 
 GEM
@@ -44,3 +44,6 @@ DEPENDENCIES
   rspec (~> 2.14)
   simplecov (~> 0.7)
   yajl-ruby
+
+BUNDLED WITH
+   1.16.0

data/lib/prismic/fragments/image.rb

@@ -53,7 +53,7 @@ module Prismic
 
         def as_html(link_resolver=nil)
           html = []
-          html << (link_to.nil? ? '' : link_to.start_html(link_resolver))
+          html << (link_to.nil? ? '' : link_to.start_html(link_resolver, link_to.target))
           html << %(<img src="#@url" alt="#@alt" width="#@width" height="#@height" />)
           html << (link_to.nil? ? '' : link_to.end_html)
           html.join

data/lib/prismic/fragments/link.rb

@@ -3,8 +3,12 @@ module Prismic
   module Fragments
     class Link < Fragment
 
-      def start_html(link_resolver = nil)
-        %(<a href="#{url(link_resolver)}">)
+      def start_html(link_resolver = nil, target = nil)
+        unless target.nil?
+          %(<a href="#{url(link_resolver)}" target="#{target}" rel="noopener">)
+        else 
+          %(<a href="#{url(link_resolver)}">)
+        end
       end
 
       def end_html
@@ -12,7 +16,7 @@ module Prismic
       end
 
       def as_html(link_resolver=nil)
-        %(#{start_html(link_resolver)}#{url(link_resolver)}#{end_html})
+        %(#{start_html(link_resolver, @target)}#{url(link_resolver)}#{end_html})
       end
 
       # Returns the URL of the link
@@ -27,10 +31,11 @@ module Prismic
     end
 
     class WebLink < Link
-      attr_accessor :url
+      attr_accessor :url, :target
 
-      def initialize(url)
+      def initialize(url, target = nil)
         @url = url
+        @target = target
       end
 
       # Returns the URL of the link
@@ -47,13 +52,14 @@ module Prismic
     end
 
     class FileLink < Link
-      attr_accessor :url, :name, :kind, :size
+      attr_accessor :url, :name, :kind, :size, :target
 
-      def initialize(url, name, kind, size)
+      def initialize(url, name, kind, size, target = nil)
         @url = url
         @name = name
         @kind = kind
         @size = size
+        @target = target
       end
 
       def as_html(link_resolver=nil)
@@ -75,10 +81,11 @@ module Prismic
     end
 
     class ImageLink < Link
-      attr_accessor :url
+      attr_accessor :url, :target
 
-      def initialize(url)
+      def initialize(url, target = nil)
         @url = url
+        @target = target
       end
 
       # Returns the URL of the link
@@ -96,9 +103,9 @@ module Prismic
 
     class DocumentLink < Link
       include Prismic::WithFragments
-      attr_accessor :id, :uid, :type, :tags, :slug, :lang, :fragments, :broken
+      attr_accessor :id, :uid, :type, :tags, :slug, :lang, :fragments, :broken, :target
 
-      def initialize(id, uid, type, tags, slug, lang, fragments, broken)
+      def initialize(id, uid, type, tags, slug, lang, fragments, broken, target = nil)
         @id = id
         @uid = uid
         @type = type
@@ -107,9 +114,10 @@ module Prismic
         @lang = lang
         @fragments = fragments
         @broken = broken
+        @target = target
       end
 
-      def start_html(link_resolver)
+      def start_html(link_resolver, target = nil)
         broken? ? %(<span>) : super
       end
 

data/lib/prismic/fragments/structured_text.rb

@@ -138,6 +138,8 @@ module Prismic
           def serialize(text, link_resolver = nil)
             if link.is_a? Prismic::Fragments::DocumentLink and link.broken
               "<span>#{text}</span>"
+            elsif !link.target.nil?
+              %(<a href="#{link.url(link_resolver)}" target="#{link.target}" rel="noopener">#{text}</a>)
             else
               %(<a href="#{link.url(link_resolver)}">#{text}</a>)
             end

data/lib/prismic/json_parsers.rb

@@ -50,15 +50,23 @@ module Prismic
           URI.unescape(doc['slug']),
           doc['lang'],
           fragments,
-          json['value']['isBroken'])
+          json['value']['isBroken'],
+          json['value']['target'] ? json['value']['target'] : nil)
       end
 
       def image_link_parser(json)
-        Prismic::Fragments::ImageLink.new(json['value']['image']['url'])
+        Prismic::Fragments::ImageLink.new(
+          json['value']['image']['url'],
+          json['value']['target'] ? json['value']['target'] : nil)
       end
 
       def file_link_parser(json)
-        Prismic::Fragments::FileLink.new(json['value']['file']['url'], json['value']['file']['name'], json['value']['file']['kind'], json['value']['file']['size'])
+        Prismic::Fragments::FileLink.new(
+          json['value']['file']['url'],
+          json['value']['file']['name'],
+          json['value']['file']['kind'],
+          json['value']['file']['size'],
+          json['value']['target'] ? json['value']['target'] : nil )
       end
 
       def text_parser(json)
@@ -74,7 +82,7 @@ module Prismic
       end
 
       def web_link_parser(json)
-        Prismic::Fragments::WebLink.new(json['value']['url'])
+        Prismic::Fragments::WebLink.new(json['value']['url'], json['value']['target'])
       end
 
       def date_parser(json)

data/lib/prismic/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Prismic
 
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 
 end

data/spec/fragments_spec.rb

@@ -11,6 +11,7 @@ end
 describe 'WebLink' do
   before do
       @web_link = Prismic::Fragments::WebLink.new('my_url')
+      @target_blank = Prismic::Fragments::WebLink.new('my_url', '_blank')
   end
   describe 'as_html' do
     it "returns an <a> HTML element" do
@@ -28,6 +29,14 @@ describe 'WebLink' do
     it "returns a HTML element whose content is the link" do
       Nokogiri::XML(@web_link.as_html).child.content.should == 'my_url'
     end
+
+    it "returns an <a> HTML element with a target attribute" do
+      Nokogiri::XML(@target_blank.as_html).child.has_attribute?('target').should be_true
+    end
+
+    it "returns an <a> HTML element with an target blank attribute" do
+      Nokogiri::XML(@target_blank.as_html).child.attribute('target').value.should == '_blank'
+    end
   end
 
   describe 'as_text' do
@@ -650,6 +659,8 @@ describe 'StructuredText::Hyperlink' do
     )
     @hyperlink = Prismic::Fragments::StructuredText::Span::Hyperlink.new(0, 0, @link)
     @link_resolver = Prismic.link_resolver("master"){|doc_link| "http://localhost/#{doc_link.id}" }
+    @target_blank = Prismic::Fragments::WebLink.new("link_url", "_blank")
+    @target_hyperlink = Prismic::Fragments::StructuredText::Span::Hyperlink.new(0, 0, @target_blank)
   end
 
   describe 'as_html' do
@@ -663,6 +674,9 @@ describe 'StructuredText::Hyperlink' do
       @link.broken = true
       @hyperlink.serialize('', @link_resolver).should == '<span></span>'
     end
+    it "can generate valid html for target blank" do
+      @target_hyperlink.serialize('', @link_resolver).should == '<a href="link_url" target="_blank" rel="noopener"></a>'
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prismic.io
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - "Étienne Vallette d'Osia"
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler