convert 0.1.2 → 0.1.3

data/lib/converters/unescape_html.rb

@@ -1,11 +1,13 @@
-module Converters
+module Convert
+  module Converters
 
-  def unescape_html(string, options = {})
-    @regex = /(<.*?[a-z]{0,12}?>)+/i
+    def unescape_html(string, options = {})
+      @regex = /(<.*?[a-z]{0,12}?>)+/i
 
-    string.gsub(@regex) do |tag|
-      tag.gsub("&lt;", "<").gsub("&gt;", ">")
+      string.gsub(@regex) do |tag|
+        tag.gsub("&lt;", "<").gsub("&gt;", ">")
+      end
     end
-  end
 
+  end
 end

data/lib/converters/video_embed.rb

@@ -1,24 +1,26 @@
-module Converters
+module Convert
+  module Converters
 
-  # Vimeo and Youtube embed markdown extension
-  def video_embed(string, options = {})
-    @regex = /\?\[(youtube|vimeo)\]\(https?:\/\/(www\.)?(vimeo\.com\/|youtu\.be\/|youtube\.com\/watch\?v=)(\S+)\)/
+    # Vimeo and Youtube embed markdown extension
+    def video_embed(string, options = {})
+      @regex = /\?\[(youtube|vimeo)\]\(https?:\/\/(www\.)?(vimeo\.com\/|youtu\.be\/|youtube\.com\/watch\?v=)(\S+)\)/
 
-    string.scan(@regex).each do |type, prefix, url, id|
-      r = if('vimeo' == type)
-        vimeo_embed(options)
-      elsif('youtube' == type)
-        youtube_embed(options)
-      else
-        nil
+      string.scan(@regex).each do |type, prefix, url, id|
+        r = if('vimeo' == type)
+          vimeo_embed(options)
+        elsif('youtube' == type)
+          youtube_embed(options)
+        else
+          nil
+        end
+        # Substitute the original text with the embedded version
+        # OLD, optional https not supported:
+        # @text.gsub!("?[#{type}](https://#{prefix}#{url}#{id})", r) if r
+        x = %r{\?\[#{type}\]\(https?:\/\/#{Regexp.escape(prefix)}#{Regexp.escape(url)}#{id}\)}i
+        string.gsub!(x, r) if r
       end
-      # Substitute the original text with the embedded version
-      # OLD, optional https not supported:
-      # @text.gsub!("?[#{type}](https://#{prefix}#{url}#{id})", r) if r
-      x = %r{\?\[#{type}\]\(https?:\/\/#{Regexp.escape(prefix)}#{Regexp.escape(url)}#{id}\)}i
-      string.gsub!(x, r) if r
+      string
     end
-    string
-  end
 
+  end
 end

data/lib/converters/vimeo.rb

@@ -1,33 +1,35 @@
-module Converters
+module Convert
+  module Converters
 
-  # Convert vimeo movie URL to embedded iframe
-  def vimeo(string, options = {})
-    # Original: 440 248
-    options = {
-      :width => 590,
-      :height => 335,
-      :show_title => false,
-      :show_byline => false,
-      :show_portrait => false,
-      :allow_fullscreen => true
-    }.merge(options)
+    # Convert vimeo movie URL to embedded iframe
+    def vimeo(string, options = {})
+      # Original: 440 248
+      options = {
+        :width => 590,
+        :height => 335,
+        :show_title => false,
+        :show_byline => false,
+        :show_portrait => false,
+        :allow_fullscreen => true
+      }.merge(options)
 
-    @regex = /https?:\/\/(www.)?vimeo\.com\/([A-Za-z0-9._%-]*)((\?|#)\S+)?/
+      @regex = /https?:\/\/(www.)?vimeo\.com\/([A-Za-z0-9._%-]*)((\?|#)\S+)?/
 
-    string.gsub(@regex) do
-      vimeo_id = $2
-      width = options[:width]
-      height = options[:height]
-      show_title = "title=0"    unless options[:show_title]
-      show_byline = "byline=0"   unless options[:show_byline]
-      show_portrait = "portrait=0" unless options[:show_portrait]
-      allow_fullscreen = " allowfullscreen" if options[:allow_fullscreen]
-      frameborder = options[:frameborder] || 0
-      query_string_variables = [show_title, show_byline, show_portrait].compact.join("&")
-      query_string = "?" + query_string_variables unless query_string_variables.empty?
+      string.gsub(@regex) do
+        vimeo_id = $2
+        width = options[:width]
+        height = options[:height]
+        show_title = "title=0"    unless options[:show_title]
+        show_byline = "byline=0"   unless options[:show_byline]
+        show_portrait = "portrait=0" unless options[:show_portrait]
+        allow_fullscreen = " allowfullscreen" if options[:allow_fullscreen]
+        frameborder = options[:frameborder] || 0
+        query_string_variables = [show_title, show_byline, show_portrait].compact.join("&")
+        query_string = "?" + query_string_variables unless query_string_variables.empty?
 
-      %{<iframe src="//player.vimeo.com/video/#{vimeo_id}#{query_string}" width="#{width}" height="#{height}" frameborder="#{frameborder}"#{allow_fullscreen}></iframe>}
+        %{<iframe src="//player.vimeo.com/video/#{vimeo_id}#{query_string}" width="#{width}" height="#{height}" frameborder="#{frameborder}"#{allow_fullscreen}></iframe>}
+      end
     end
-  end
 
+  end
 end

data/lib/converters/vimeo_embed.rb

@@ -1,10 +1,12 @@
-module Converters
+module Convert
+  module Converters
 
-  # Embed vimeo by id
-  def vimeo_embed(string, options = {})
-    {:width => 590, :height => 335}.merge(options)
+    # Embed vimeo by id
+    def vimeo_embed(string, options = {})
+      {:width => 590, :height => 335}.merge(options)
 
-    %{<iframe src="https://player.vimeo.com/video/#{string}?title=0&byline=0&portrait=0" width="#{options[:width]}" height="#{options[:height]}"></iframe>}
-  end
+      %{<iframe src="https://player.vimeo.com/video/#{string}?title=0&byline=0&portrait=0" width="#{options[:width]}" height="#{options[:height]}"></iframe>}
+    end
 
+  end
 end

data/lib/converters/worldstar.rb

@@ -1,18 +1,20 @@
-module Converters
+module Convert
+  module Converters
 
-  # Convert worldstar movie URL to embedded html
-  def worldstar(string, options = {})
-    # Original: 448 374
-    options = {:width => 590, :height => 335}.merge(options)
+    # Convert worldstar movie URL to embedded html
+    def worldstar(string, options = {})
+      # Original: 448 374
+      options = {:width => 590, :height => 335}.merge(options)
 
-    @regex = /http:\/\/www\.worldstarhiphop\.com\/videos\/video\.php\?v\=(wshh[A-Za-z0-9]+)/
+      @regex = /http:\/\/www\.worldstarhiphop\.com\/videos\/video\.php\?v\=(wshh[A-Za-z0-9]+)/
 
-    string.gsub(@regex) do
-      video_id = $1
-      width  = options[:width]
-      height = options[:height]
-      %{<object width="#{width}" height="#{height}"><param name="movie" value="http://www.worldstarhiphop.com/videos/e/16711680/#{video_id}"><param name="allowFullScreen" value="true"></param><embed src="http://www.worldstarhiphop.com/videos/e/16711680/#{video_id}" type="application/x-shockwave-flash" allowFullscreen="true" width="#{width}" height="#{height}"></embed></object>}
+      string.gsub(@regex) do
+        video_id = $1
+        width  = options[:width]
+        height = options[:height]
+        %{<object width="#{width}" height="#{height}"><param name="movie" value="http://www.worldstarhiphop.com/videos/e/16711680/#{video_id}"><param name="allowFullScreen" value="true"></param><embed src="http://www.worldstarhiphop.com/videos/e/16711680/#{video_id}" type="application/x-shockwave-flash" allowFullscreen="true" width="#{width}" height="#{height}"></embed></object>}
+      end
     end
-  end
 
+  end
 end

data/lib/converters/youtube.rb

@@ -1,42 +1,44 @@
-module Converters
-
-  # Convert youtube movie URL to embedded iframe
-  def youtube(string, options = {})
-    # Original: 420 315
-    options = {
-      :width => 590,
-      :height => 335,
-      :frameborder => 0,
-      :wmode => 'transparent',
-      :autoplay => false,
-      :hide_related => true,
-      :fs => true,
-      :modestbranding => true,
-      :allow_fullscreen => true
-    }.merge(options)
-
-    @regex = /(https?:\/\/)?(www.)?(youtube\.com\/watch\?v=|youtu\.be\/|youtube\.com\/watch\?feature=player_embedded&v=)([A-Za-z0-9_-]*)(\&\S+)?(\?\S+)?/
-
-    string.gsub(@regex) do
-      youtube_id = $4
-      src = "https://www.youtube.com/embed/#{youtube_id}"
-      width = options[:width]
-      height = options[:height]
-      allow_fullscreen = " allowfullscreen" if options[:allow_fullscreen]
-      frameborder = options[:frameborder]
-
-      a = []
-      a << "wmode=#{options[:wmode]}" if options[:wmode]
-      a << "autoplay=1" if options[:autoplay]
-      a << "rel=0" if options[:hide_related]
-      a << "modestbranding=1" if options[:modestbranding]
-      a << "fs=1" if options[:fs]
-
-      src += "?#{a.join '&'}" unless a.empty?
-
-      %{<iframe width="#{width}" height="#{height}" src="#{src}" frameborder="#{frameborder}"#{allow_fullscreen}></iframe>}
+module Convert
+  module Converters
+
+    # Convert youtube movie URL to embedded iframe
+    def youtube(string, options = {})
+      # Original: 420 315
+      options = {
+        :width => 590,
+        :height => 335,
+        :frameborder => 0,
+        :wmode => 'transparent',
+        :autoplay => false,
+        :hide_related => true,
+        :fs => true,
+        :modestbranding => true,
+        :allow_fullscreen => true
+      }.merge(options)
+
+      @regex = /(https?:\/\/)?(www.)?(youtube\.com\/watch\?v=|youtu\.be\/|youtube\.com\/watch\?feature=player_embedded&v=)([A-Za-z0-9_-]*)(\&\S+)?(\?\S+)?/
+
+      string.gsub(@regex) do
+        youtube_id = $4
+        src = "https://www.youtube.com/embed/#{youtube_id}"
+        width = options[:width]
+        height = options[:height]
+        allow_fullscreen = " allowfullscreen" if options[:allow_fullscreen]
+        frameborder = options[:frameborder]
+
+        a = []
+        a << "wmode=#{options[:wmode]}" if options[:wmode]
+        a << "autoplay=1" if options[:autoplay]
+        a << "rel=0" if options[:hide_related]
+        a << "modestbranding=1" if options[:modestbranding]
+        a << "fs=1" if options[:fs]
+
+        src += "?#{a.join '&'}" unless a.empty?
+
+        %{<iframe width="#{width}" height="#{height}" src="#{src}" frameborder="#{frameborder}"#{allow_fullscreen}></iframe>}
+      end
     end
+
   end
 
 end
-

data/lib/converters/youtube_embed.rb

@@ -1,10 +1,12 @@
-module Converters
+module Convert
+  module Converters
 
-  # Embed youtube by id
-  def youtube_embed(string, options = {})
-    options = {:width => 590, :height => 335}.merge(options)
+    # Embed youtube by id
+    def youtube_embed(string, options = {})
+      options = {:width => 590, :height => 335}.merge(options)
 
-    %{<iframe src="https://www.youtube.com/embed/#{string}?wmode=transparent&modestbranding=1&fs=1&rel=0" allowfullscreen="1" webkitallowfullscreen="1" mozallowfullscreen="1" width="#{options[:width]}" height="#{options[:height]}" frameborder="0"></iframe>}
-  end
+      %{<iframe src="https://www.youtube.com/embed/#{string}?wmode=transparent&modestbranding=1&fs=1&rel=0" allowfullscreen="1" webkitallowfullscreen="1" mozallowfullscreen="1" width="#{options[:width]}" height="#{options[:height]}" frameborder="0"></iframe>}
+    end
 
+  end
 end

data/lib/converters/youtube_image.rb

@@ -1,35 +1,37 @@
-module Converters
+module Convert
+  module Converters
 
-  def youtube_image(string, options = {})
-    options = {
-      :width => 320,
-      :height => 315,
-      :style => 'medium',
-      :target => 'blank',
-      :border => '0'
-    }.merge(options)
+    def youtube_image(string, options = {})
+      options = {
+        :width => 320,
+        :height => 315,
+        :style => 'medium',
+        :target => 'blank',
+        :border => '0'
+      }.merge(options)
 
-    styles = {
-      'default' => 'default',
-      'high' => 'hqdefault',
-      'medium' => 'mqdefault',
-      'normal' => 'sddefault',
-      'max' => 'maxresdefault'
-    }
+      styles = {
+        'default' => 'default',
+        'high' => 'hqdefault',
+        'medium' => 'mqdefault',
+        'normal' => 'sddefault',
+        'max' => 'maxresdefault'
+      }
 
-    @regex = /(https?:\/\/)?(www.)?(youtube\.com\/watch\?v=|youtu\.be\/|youtube\.com\/watch\?feature=player_embedded&v=)([A-Za-z0-9_-]*)(\&\S+)?(\?\S+)?/
+      @regex = /(https?:\/\/)?(www.)?(youtube\.com\/watch\?v=|youtu\.be\/|youtube\.com\/watch\?feature=player_embedded&v=)([A-Za-z0-9_-]*)(\&\S+)?(\?\S+)?/
 
-    string.gsub(@regex) do
-      youtube_id = $4
-      video_url = "https://www.youtube.com/watch?v=#{youtube_id}"
-      target = options[:target]
-      width = options[:width]
-      height = options[:height]
-      border = options[:border]
-      style = styles[options[:style]] rescue styles['default']
-      src = "//img.youtube.com/vi/#{youtube_id}/#{style}.jpg"
-      %{<div class="thumbnail youtube"><a href="#{video_url}" target="_#{target}"><img src="#{src}" width="#{width}" height="#{height}" border="#{border}"></a></div>}
+      string.gsub(@regex) do
+        youtube_id = $4
+        video_url = "https://www.youtube.com/watch?v=#{youtube_id}"
+        target = options[:target]
+        width = options[:width]
+        height = options[:height]
+        border = options[:border]
+        style = styles[options[:style]] rescue styles['default']
+        src = "//img.youtube.com/vi/#{youtube_id}/#{style}.jpg"
+        %{<div class="thumbnail youtube"><a href="#{video_url}" target="_#{target}"><img src="#{src}" width="#{width}" height="#{height}" border="#{border}"></a></div>}
+      end
     end
-  end
 
+  end
 end

data/lib/converters/youtube_js_api.rb

@@ -1,18 +1,20 @@
-module Converters
+module Convert
+  module Converters
 
-  def youtube_js_api(string, options = {})
-    # Original: 390 250
-    options = {:width => 590, :height => 335}.merge(options)
+    def youtube_js_api(string, options = {})
+      # Original: 390 250
+      options = {:width => 590, :height => 335}.merge(options)
 
-    @regex = /https?:\/\/(www.)?youtube\.com\/watch\?v=([A-Za-z0-9._%-]*)(\&\S+)?/
+      @regex = /https?:\/\/(www.)?youtube\.com\/watch\?v=([A-Za-z0-9._%-]*)(\&\S+)?/
 
-    string.gsub(@regex) do
-      youtube_id = $2
-      width = options[:width]
-      height = options[:height]
+      string.gsub(@regex) do
+        youtube_id = $2
+        width = options[:width]
+        height = options[:height]
 
-      %{<object width="#{width}" height="#{height}"><param name="movie" value="//www.youtube.com/v/#{youtube_id}?enablejsapi=1&playerapiid=ytplayer"></param><param name="wmode" value="transparent"></param><param name="allowscriptaccess" value="always"></param><embed src="//www.youtube.com/v/#{youtube_id}?enablejsapi=1&playerapiid=ytplayer" type="application/x-shockwave-flash" wmode="transparent" width="#{width}" height="#{height}" allowscriptaccess="always"></embed></object>}
+        %{<object width="#{width}" height="#{height}"><param name="movie" value="//www.youtube.com/v/#{youtube_id}?enablejsapi=1&playerapiid=ytplayer"></param><param name="wmode" value="transparent"></param><param name="allowscriptaccess" value="always"></param><embed src="//www.youtube.com/v/#{youtube_id}?enablejsapi=1&playerapiid=ytplayer" type="application/x-shockwave-flash" wmode="transparent" width="#{width}" height="#{height}" allowscriptaccess="always"></embed></object>}
+      end
     end
-  end
 
+  end
 end

data/mod.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+Dir['./lib/converters/*.rb'].each do |c|
+	
+	tmp = ['module Convert']
+	f = File.readlines(c)
+	f.each do |line|
+		tmp << "  #{line}"
+	end
+	tmp << 'end'
+	
+	File.open(c, 'w'){|f| f.write(tmp.join)}
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convert
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Fugroup Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -161,7 +161,7 @@ files:
 - lib/sanitizers/full.rb
 - lib/sanitizers/linebreaks.rb
 - lib/sanitizers/simple.rb
-- test.rb
+- mod.rb
 homepage: https://github.com/fugroup/convert
 licenses:
 - MIT

data/test.rb

@@ -1,16 +0,0 @@
-class Flat
-	def	initialize
-		self.class.t
-	end
-
-	def self.t
-		puts "TEEEE"
-	end
-end
-
-f = Flat.new
-
-
-
-
-