article_json 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cb77fa8003fe6ff04b110471104c7f21c96f731c
-  data.tar.gz: 5ae20ac88f04384394cd27707fdabc98be653171
+SHA256:
+  metadata.gz: f34cc736d928d12ee64d0181a15d9b69b2bdfc6c89e76c35ffd79cb6a8acb8d5
+  data.tar.gz: 74c2c855413da0691866fe54d1927b4342bb5409a826807821866613203f3db9
 SHA512:
-  metadata.gz: 8fbbd7e0de9d4632cc4f491358b1f1c16edb2f0ad63c2be91899636ab6548473f51f35b63dd773f0c5ad0ceb9ea61d4cc5af9712c039cfa6b105cdfa1b55d6f1
-  data.tar.gz: 04be4accfb46e6c035252ca2be7154f7d2cc6794c1d0b24d09ce5ac1c3ac53ee47e79eca9fb1680dee27ee724a4fde76ee8c03846267d7523ec71f18dcbe2998
+  metadata.gz: ec2b0a1718c9f57dd278ce4e11bcca41a84353b3594be06599204b838701199ecaf5e21bb36921ea68c98c7fa7083d2cd8f939fb7253b07305aa4258bbf47c25
+  data.tar.gz: 381aad7bba231456aa45bf4f512bd2fa788dffa875b1eccf5a77d859cff28d5b061eb3b7a08c0e51b0915a57c9695c8113d07966b313be0d9ca00ad8759f2469

data/CHANGELOG.md

@@ -1,4 +1,12 @@
 # Changelog
+## 0.3.5 - 2018/12/12
+- **Improvements** to import and export image links from Google Docs
+- Import image `href`` from caption text using a custom tag
+- Export the image element href attribute as a link
+
+## 0.3.4 - 2018/5/10
+- **Fix:** Only include slug from the soundcloud URL in google doc parser
+
 ## 0.3.3 - 2018/4/12
 - Support embedding SoundCloud
 

data/lib/article_json/elements/image.rb

@@ -1,16 +1,18 @@
 module ArticleJSON
   module Elements
     class Image < Base
-      attr_reader :source_url, :caption, :float
+      attr_reader :source_url, :caption, :float, :href
 
       # @param [String] source_url
       # @param [Array[ArticleJSON::Elements::Text]] caption
       # @param [Symbol] float
-      def initialize(source_url:, caption:, float: nil)
+      # @param [String] href
+      def initialize(source_url:, caption:, float: nil, href: nil)
         @type = :image
         @source_url = source_url
         @caption = caption
         @float = float
+        @href = href
       end
 
       # Hash representation of this image element
@@ -21,6 +23,7 @@ module ArticleJSON
           source_url: source_url,
           float: float,
           caption: caption.map(&:to_h),
+          href: href,
         }
       end
 
@@ -31,7 +34,8 @@ module ArticleJSON
           new(
             source_url: hash[:source_url],
             caption: parse_hash_list(hash[:caption]),
-            float: hash[:float]&.to_sym
+            float: hash[:float]&.to_sym,
+            href: hash[:href]
           )
         end
       end

data/lib/article_json/export/common/html/elements/image.rb

@@ -7,24 +7,38 @@ module ArticleJSON
             include ArticleJSON::Export::Common::HTML::Elements::Shared::Caption
             include ArticleJSON::Export::Common::HTML::Elements::Shared::Float
 
-            # Generate the `<figure>` node containing the image and caption
+            # Generate the `<figure>` node containing the image and caption or
+            # an `<a>` node containing the `<figure>` node if href is present.
             # @return [Nokogiri::XML::Element]
             def export
+              figure_node
+            end
+
+            private
+
+            # @return [Nokogiri::XML::NodeSet]
+            def figure_node
               create_element(:figure, node_opts) do |figure|
-                figure.add_child(image_node)
+                node =  @element.href.present? ? href_node : image_node
+                figure.add_child(node)
                 if @element.caption&.any?
                   figure.add_child(caption_node(:figcaption))
                 end
               end
             end
 
-            private
-
             # @return [Nokogiri::XML::NodeSet]
             def image_node
               create_element(:img, src: @element.source_url)
             end
 
+            # @return [Nokogiri::XML::NodeSet]
+            def href_node
+              create_element(:a, href: @element.href) do |a|
+                a.add_child(image_node)
+              end
+            end
+
             # @return [Hash]
             def node_opts
               return if floating_class.nil?

data/lib/article_json/import/google_doc/html/embedded_soundcloud_parser.rb

@@ -17,7 +17,7 @@ module ArticleJSON
               %r{
                 ^\S*                    # all protocols & sub domains
                 soundcloud\.com/        # domain
-                (?<id>.+)               # the slug of the user / track
+                (?<id>[-/0-9a-z]+)      # the slug of the user / track
               }xi
             end
           end

data/lib/article_json/import/google_doc/html/image_parser.rb

@@ -12,6 +12,7 @@ module ArticleJSON
           def initialize(node:, caption_node:, css_analyzer:)
             @node = node
             @caption_node = caption_node
+            @href = href
             @css_analyzer = css_analyzer
 
             # Main node indicates the floating behavior
@@ -36,17 +37,42 @@ module ArticleJSON
             super if floatable_size?
           end
 
+          # Extracts an href from the tag [image-link-to: url]) if present
+          # in the caption node.
+          # @return [String]
+          def href
+            return if @caption_node.nil?
+            match = @caption_node.content.strip.match(href_regexp)
+            return if match.nil?
+            remove_image_link_tag
+            match[:url]
+          end
+
           # @return [ArticleJSON::Elements::Image]
           def element
             ArticleJSON::Elements::Image.new(
               source_url: source_url,
               float: float,
-              caption: caption
+              caption: caption,
+              href: @href
             )
           end
 
           private
 
+          # Removes the [image-link-to: url] tag from the caption node
+          def remove_image_link_tag
+            @caption_node
+              .children
+              .first
+              .content = @caption_node.content.sub(href_regexp, '').strip
+          end
+
+          # Regular expression to check if there's a [image-link-to: url] tag
+          # @return [Regexp]
+          def href_regexp
+            %r{\[image-link-to:\s+(?<url>.*?)\]}
+          end
           # Check if the image's width can be determined and is less than 500px
           # This is about 3/4 of the google document width...
           # @return [Boolean]

data/lib/article_json/version.rb

@@ -1,3 +1,3 @@
 module ArticleJSON
-  VERSION = '0.3.3'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: article_json
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Daniel Sager
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: JSON Format for News Articles & Ruby Gem