convert 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 801baa051b323492f08661c4974bdcbcb7d74cc8
-  data.tar.gz: 4ed88e46bdb61689d748b3ec710515311627c90b
+  metadata.gz: a22241a31ca94ae8d3a66c4ade462391d65be420
+  data.tar.gz: e0f125711a785f1a5b85247c8fe5dde78ff84487
 SHA512:
-  metadata.gz: 87f7bb5c719508441109fcb41deddd9a061308099a47dc10d5a38adaf0209f449d7339ae8789fa80838c22f57886c56e5dc92bbcc029eb9de2dfd7a4497647b7
-  data.tar.gz: 3d552b2eed413435ef9df66ec6e04bfb19f2d2733da2a4fb47c2ecc55a851b9a760451c6678df9f3bfe88e99c5b0e4e788d076571b8310f73d4b2c031177d766
+  metadata.gz: 074a8650dd8e2e300f471eca8cbeb29c35b0964ba4e5c0305b8d3b3a8d7be2fd07f7bb0687fd326eb467568b3a7f044e1bea662db8485f804569bb3a2042de9e
+  data.tar.gz: 9e20b6614dc40bb7e7e851b828d6f60c3a6330f47308d6392a245c5ec27914cac0f42b007ae909979e32fd570a9ba15de54396661abcf44305debafd4a74a943

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+**Version 0.1.2** - *2016-05-01*
+
+- Fixed gem files not being included
+
 **Version 0.1.1** - *2016-05-01*
 
 - Fixed gemspec issues

data/convert.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'convert'
-  s.version     = '0.1.2'
-  s.date        = '2017-01-05'
+  s.version     = '0.1.3'
+  s.date        = '2017-01-12'
   s.summary     = "Convert strings and HTML to links and embedded content"
   s.description = "Easily convert any string and replace with links and embedded content from a long list of providers and libraries."
   s.authors     = ["Fugroup Limited"]

data/lib/convert.rb

@@ -6,27 +6,21 @@ Dir["#{root}/lib/converters/*.rb"].each{|f| require f}
 # Require the sanitizers
 Dir["#{root}/lib/sanitizers/*.rb"].each{|f| require f}
 
-# Autoload for faster loading
-module Converters
-  autoload :Redcarpet, 'redcarpet'
-  autoload :Kramdown, 'kramdown'
-  autoload :Rinku, 'rinku'
-  autoload :Sanitize, 'sanitize'
-  autoload :HTMLEntities, 'htmlentities'
-end
-autoload :Nokogiri, 'nokogiri'
-
-# # # # # #
-# The Convert module is responsible for converting strings
-#
-class Convert
-
-  # # # # # #
-  # Convert strings and HTML from a long list of converters
-  # @homepage: https://github.com/fugroup/convert
-  # @author:   Vidar <vidar@fugroup.net>, Fugroup Ltd.
-  # @license:  MIT, contributions are welcome.
-  # # # # # #
+# Convert strings and HTML from a long list of converters
+# @homepage: https://github.com/fugroup/convert
+# @author:   Vidar <vidar@fugroup.net>, Fugroup Ltd.
+# @license:  MIT, contributions are welcome.
+module Convert
+
+  # Autoload for faster loading
+  module Converters
+    autoload :Redcarpet, 'redcarpet'
+    autoload :Kramdown, 'kramdown'
+    autoload :Rinku, 'rinku'
+    autoload :Sanitize, 'sanitize'
+    autoload :HTMLEntities, 'htmlentities'
+  end
+  autoload :Nokogiri, 'nokogiri'
 
   # Some of the matchers are taken from https://github.com/dejan/auto_html
 

data/lib/converters/auto_link.rb

@@ -1,19 +1,21 @@
-module Converters
+module Convert
+  module Converters
 
-  # Convert URL to html link
-  def auto_link(string, options = {})
-    options = {
-      :mode => :all,
-      :link_attr => nil,
-      :skip_tags => nil,
-      :strip => false
-    }.merge(options)
+    # Convert URL to html link
+    def auto_link(string, options = {})
+      options = {
+        :mode => :all,
+        :link_attr => nil,
+        :skip_tags => nil,
+        :strip => false
+      }.merge(options)
 
-    Rinku.auto_link(string, options[:mode], options[:link_attr], options[:skip_tags]) do |url|
-      # Remove query options (default false)
-      url = strip_params(url) if options[:strip]
-      url
+      Rinku.auto_link(string, options[:mode], options[:link_attr], options[:skip_tags]) do |url|
+        # Remove query options (default false)
+        url = strip_params(url) if options[:strip]
+        url
+      end
     end
-  end
 
+  end
 end

data/lib/converters/dailymotion.rb

@@ -1,17 +1,19 @@
-module Converters
+module Convert
+  module Converters
 
-  def dailymotion(string, options = {})
-    # http://www.dailymotion.com/video/x3gpxwp_first-person-view-of-a-downhill-ice-cross-course-red-bull-crashed-ice-2015_sport
+    def dailymotion(string, options = {})
+      # http://www.dailymotion.com/video/x3gpxwp_first-person-view-of-a-downhill-ice-cross-course-red-bull-crashed-ice-2015_sport
 
-    # Original 480 360
-    options = {:width => 590, :height => 335}.merge(options)
+      # Original 480 360
+      options = {:width => 590, :height => 335}.merge(options)
 
-    @regex = /http:\/\/www\.dailymotion\.com.*\/video\/(.+)_*/
+      @regex = /http:\/\/www\.dailymotion\.com.*\/video\/(.+)_*/
 
-    string.gsub(@regex) do
-      video_id = $1
-      %{<object type="application/x-shockwave-flash" data="http://www.dailymotion.com/swf/#{video_id}&related=0" width="#{options[:width]}" height="#{options[:height]}"><param name="movie" value="http://www.dailymotion.com/swf/#{video_id}&related=0"></param><param name="allowFullScreen" value="true"></param><param name="allowScriptAccess" value="always"></param><a href="http://www.dailymotion.com/video/#{video_id}?embed=1"><img src="http://www.dailymotion.com/thumbnail/video/#{video_id}" width="#{options[:width]}" height="#{options[:height]}"/></a></object>}
+      string.gsub(@regex) do
+        video_id = $1
+        %{<object type="application/x-shockwave-flash" data="http://www.dailymotion.com/swf/#{video_id}&related=0" width="#{options[:width]}" height="#{options[:height]}"><param name="movie" value="http://www.dailymotion.com/swf/#{video_id}&related=0"></param><param name="allowFullScreen" value="true"></param><param name="allowScriptAccess" value="always"></param><a href="http://www.dailymotion.com/video/#{video_id}?embed=1"><img src="http://www.dailymotion.com/thumbnail/video/#{video_id}" width="#{options[:width]}" height="#{options[:height]}"/></a></object>}
+      end
     end
-  end
 
+  end
 end

data/lib/converters/decode.rb

@@ -1,7 +1,9 @@
-module Converters
+module Convert
+  module Converters
 
-  def decode(string, options = {})
-    HTMLEntities.new.decode(string)
-  end
+    def decode(string, options = {})
+      HTMLEntities.new.decode(string)
+    end
 
+  end
 end

data/lib/converters/email_escape.rb

@@ -1,20 +1,22 @@
-module Converters
+module Convert
+  module Converters
 
-  # Remove stuff from email body that is going to be stripped anyway.
-  def email_escape(string, options = {})
+    # Remove stuff from email body that is going to be stripped anyway.
+    def email_escape(string, options = {})
 
-    # No options at the moment
-    options = {}.merge(options)
+      # No options at the moment
+      options = {}.merge(options)
 
-    # Youtube videos
-    @regex = /<iframe.+src=['"].+\/embed\/(.+)[?].+['"].+iframe>/
-    string = string.gsub(@regex, "https://youtu.be/#{'\1'}")
+      # Youtube videos
+      @regex = /<iframe.+src=['"].+\/embed\/(.+)[?].+['"].+iframe>/
+      string = string.gsub(@regex, "https://youtu.be/#{'\1'}")
 
-    # Vimeo videos
-    # Example: https://vimeo.com/59437462
-    @regex = /<iframe.+src=['"]\/\/player\.vimeo.com\/video\/(.+)[?]{1}.+['"].+iframe>/
-    string = string.gsub(@regex, "https://vimeo.com/#{'\1'}")
-    string
-  end
+      # Vimeo videos
+      # Example: https://vimeo.com/59437462
+      @regex = /<iframe.+src=['"]\/\/player\.vimeo.com\/video\/(.+)[?]{1}.+['"].+iframe>/
+      string = string.gsub(@regex, "https://vimeo.com/#{'\1'}")
+      string
+    end
 
+  end
 end

data/lib/converters/encode.rb

@@ -1,7 +1,9 @@
-module Converters
+module Convert
+  module Converters
 
-  def encode(string, options = {})
-    HTMLEntities.new.encode(string)
-  end
+    def encode(string, options = {})
+      HTMLEntities.new.encode(string)
+    end
 
+  end
 end

data/lib/converters/flickr.rb

@@ -1,23 +1,25 @@
-module Converters
+module Convert
+  module Converters
 
-  def flickr(string, options = {})
-    # https://www.flickr.com/photos/fotokunstsusanne/23160248869
+    def flickr(string, options = {})
+      # https://www.flickr.com/photos/fotokunstsusanne/23160248869
 
-    {:maxwidth => nil, :maxheight => nil, :link_options => {}}.merge(options)
-    @regex = %r{https?://(www\.)?flickr\.com/photos/[^\s<]*}
+      {:maxwidth => nil, :maxheight => nil, :link_options => {}}.merge(options)
+      @regex = %r{https?://(www\.)?flickr\.com/photos/[^\s<]*}
 
-    string.gsub(@regex) do |match|
-      params = { :url => match, :format => "json" }
-      [:maxwidth, :maxheight].each{|p| params[p] = options[p] unless options[p].nil? or !options[p] > 0}
+      string.gsub(@regex) do |match|
+        params = { :url => match, :format => "json" }
+        [:maxwidth, :maxheight].each{|p| params[p] = options[p] unless options[p].nil? or !options[p] > 0}
 
-      uri = URI("http://www.flickr.com/services/oembed")
-      uri.query = URI.encode_www_form(params)
+        uri = URI("http://www.flickr.com/services/oembed")
+        uri.query = URI.encode_www_form(params)
 
-      response = JSON.parse(Net::HTTP.get(uri))
+        response = JSON.parse(Net::HTTP.get(uri))
 
-      link_options = Array(options[:link_options]).reject { |k,v| v.nil? }.map { |k, v| %{#{k}="#{REXML::Text::normalize(v)}"} }.join(' ')
-      %{<a href="#{match}"#{ ' ' + link_options unless link_options.empty? }><img src="#{response["url"]}" alt="#{response["title"]}" title="#{response["title"]}" /></a>}
+        link_options = Array(options[:link_options]).reject { |k,v| v.nil? }.map { |k, v| %{#{k}="#{REXML::Text::normalize(v)}"} }.join(' ')
+        %{<a href="#{match}"#{ ' ' + link_options unless link_options.empty? }><img src="#{response["url"]}" alt="#{response["title"]}" title="#{response["title"]}" /></a>}
+      end
     end
-  end
 
+  end
 end

data/lib/converters/gist.rb

@@ -1,17 +1,19 @@
-module Converters
+module Convert
+  module Converters
 
-  def gist(string, options = {})
-    # https://gist.github.com/1710276
+    def gist(string, options = {})
+      # https://gist.github.com/1710276
 
-    # No options at the moment
-    options = {}.merge(options)
+      # No options at the moment
+      options = {}.merge(options)
 
-    @regex = %r{https?://gist\.github\.com/(\w+/)?(\d+)}
+      @regex = %r{https?://gist\.github\.com/(\w+/)?(\d+)}
 
-    string.gsub(@regex) do
-      gist_id = $2
-      %{<script src="https://gist.github.com/#{gist_id}.js"></script>}
+      string.gsub(@regex) do
+        gist_id = $2
+        %{<script src="https://gist.github.com/#{gist_id}.js"></script>}
+      end
     end
-  end
 
+  end
 end

data/lib/converters/google_maps.rb

@@ -1,35 +1,37 @@
-module Converters
+module Convert
+  module Converters
 
-  def google_maps(string, options = {})
-    options = {
-      :width => 420,
-      :height => 315,
-      :style => "color:#000;text-align:left",
-      :link_text => "View Larger Map",
-      :show_info => true,
-      :type => :normal,
-      :zoom => 18,
-      :more => ''
-    }.merge(options)
+    def google_maps(string, options = {})
+      options = {
+        :width => 420,
+        :height => 315,
+        :style => "color:#000;text-align:left",
+        :link_text => "View Larger Map",
+        :show_info => true,
+        :type => :normal,
+        :zoom => 18,
+        :more => ''
+      }.merge(options)
 
-    map_type = {:normal => '&t=m', :satellite => '&t=k', :terrain => '&t=p', :hybrid => '&t=h'}
+      map_type = {:normal => '&t=m', :satellite => '&t=k', :terrain => '&t=p', :hybrid => '&t=h'}
 
-    @regex = /(https?):\/\/maps\.google\.([a-z\.]+)\/maps\?(.*)/
+      @regex = /(https?):\/\/maps\.google\.([a-z\.]+)\/maps\?(.*)/
 
-    string.gsub(@regex) do
-      domain_country = $2
-      map_query = $3
-      width = options[:width]
-      height = options[:height]
-      style = options[:style]
-      link_text = options[:link_text]
-      type = options[:type].to_sym
-      map_options = (options[:show_info] ? '' : '&iwloc=near')
-      map_options << map_type[type] if map_type.has_key?(type)
-      map_options << "&z=#{options[:zoom]}"
-      map_options << options[:more]
-      %{<iframe width="#{width}" height="#{height}" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="//maps.google.#{domain_country}/maps?f=q&source=s_q&#{map_query}&output=embed#{map_options}"></iframe><br><small><a href="//maps.google.#{domain_country}/maps?f=q&source=embed&#{map_query}" style="#{style}">#{link_text}</a></small>}
+      string.gsub(@regex) do
+        domain_country = $2
+        map_query = $3
+        width = options[:width]
+        height = options[:height]
+        style = options[:style]
+        link_text = options[:link_text]
+        type = options[:type].to_sym
+        map_options = (options[:show_info] ? '' : '&iwloc=near')
+        map_options << map_type[type] if map_type.has_key?(type)
+        map_options << "&z=#{options[:zoom]}"
+        map_options << options[:more]
+        %{<iframe width="#{width}" height="#{height}" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="//maps.google.#{domain_country}/maps?f=q&source=s_q&#{map_query}&output=embed#{map_options}"></iframe><br><small><a href="//maps.google.#{domain_country}/maps?f=q&source=embed&#{map_query}" style="#{style}">#{link_text}</a></small>}
+      end
     end
-  end
 
+  end
 end

data/lib/converters/hashtag.rb

@@ -1,14 +1,16 @@
-module Converters
+module Convert
+  module Converters
 
-  def hashtag(string, options = {})
-    options = {:source => :twitter}.merge(options)
-    @regex = /#([^\s]+)/
+    def hashtag(string, options = {})
+      options = {:source => :twitter}.merge(options)
+      @regex = /#([^\s]+)/
 
-    if options[:source] == :twitter
-      string.gsub(@regex, '<a href="http://twitter.com/search?q=%23\1&f=realtime" class="hashtag" target="_blank">#\1</a>')
-    elsif options[:source] == :facebook
-      string.gsub(@regex, '<a href="https://www.facebook.com/hashtag/\1" class="hashtag" target="_blank">#\1</a>')
+      if options[:source] == :twitter
+        string.gsub(@regex, '<a href="http://twitter.com/search?q=%23\1&f=realtime" class="hashtag" target="_blank">#\1</a>')
+      elsif options[:source] == :facebook
+        string.gsub(@regex, '<a href="https://www.facebook.com/hashtag/\1" class="hashtag" target="_blank">#\1</a>')
+      end
     end
-  end
 
+  end
 end

data/lib/converters/html_escape.rb

@@ -1,11 +1,13 @@
-module Converters
+module Convert
+  module Converters
 
-  # Escape html
-  def escape_html(string, options = {})
-    options = {:map => {'&' => '&amp;', '>' => '&gt;', '<' => '&lt;', '"' => '&quot;' }}.merge(options)
+    # Escape html
+    def escape_html(string, options = {})
+      options = {:map => {'&' => '&amp;', '>' => '&gt;', '<' => '&lt;', '"' => '&quot;' }}.merge(options)
 
-    @regex = /[&"><]/
-    string.gsub(@regex){|m| options[:map][m]}
-  end
+      @regex = /[&"><]/
+      string.gsub(@regex){|m| options[:map][m]}
+    end
 
+  end
 end

data/lib/converters/iframe_embed.rb

@@ -1,10 +1,12 @@
-module Converters
+module Convert
+  module Converters
 
-  # Iframe embed code
-  def iframe_embed(url, options = {})
-    options = {:width => 231, :height => 436, :scrolling => 'no', :frameborder => 0}.merge(options)
+    # Iframe embed code
+    def iframe_embed(url, options = {})
+      options = {:width => 231, :height => 436, :scrolling => 'no', :frameborder => 0}.merge(options)
 
-    %{<iframe frameborder="#{options[:frameborder]}" scrolling="#{options[:scrolling]}" height="#{options[:height]}" width="#{options[:width]}" src="#{url}"></iframe>}
-  end
+      %{<iframe frameborder="#{options[:frameborder]}" scrolling="#{options[:scrolling]}" height="#{options[:height]}" width="#{options[:width]}" src="#{url}"></iframe>}
+    end
 
+  end
 end

data/lib/converters/image_tag.rb

@@ -1,9 +1,11 @@
-module Converters
+module Convert
+  module Converters
 
-  # Convert image to img html tag
-  def image_tag(src, options = {})
-    options = {:alt => ''}.merge(options)
-    %{<img src="#{src}" alt="#{options[:alt]}">}
-  end
+    # Convert image to img html tag
+    def image_tag(src, options = {})
+      options = {:alt => ''}.merge(options)
+      %{<img src="#{src}" alt="#{options[:alt]}">}
+    end
 
+  end
 end

data/lib/converters/instagram.rb

@@ -1,13 +1,15 @@
-module Converters
+module Convert
+  module Converters
 
-  def instagram(string, options = {})
-    options = {:height => 714, :width => 616}.merge(options)
-    @regex = %r{https?:\/\/(www.)?instagr(am\.com|\.am)/p/.+}
+    def instagram(string, options = {})
+      options = {:height => 714, :width => 616}.merge(options)
+      @regex = %r{https?:\/\/(www.)?instagr(am\.com|\.am)/p/.+}
 
-    string.gsub(@regex) do
-      string += '/' unless string.end_with?('/')
-      %{<iframe src="#{string}embed" height="#{options[:height]}" width="#{options[:width]}" frameborder="0" scrolling="no"></iframe>}
+      string.gsub(@regex) do
+        string += '/' unless string.end_with?('/')
+        %{<iframe src="#{string}embed" height="#{options[:height]}" width="#{options[:width]}" frameborder="0" scrolling="no"></iframe>}
+      end
     end
-  end
 
+  end
 end