jekyll-embeds 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43eb82570830b85e6dea276d8b0a9956efd21b1370870c18783c05fe340e8250
-  data.tar.gz: d8bcf3d6c1f5564e97889687a5e28ce53541870ae8ad4b484fd8b75582fa6970
+  metadata.gz: c943b31803d9024efed4ca59394ff1c80a4cdd600898397d7fd2b29ab9d5198c
+  data.tar.gz: 3f5bb583bfc775502782b329d3c5b0c299b343398471f9953c57e5712b0b1d10
 SHA512:
-  metadata.gz: f1701c04e809bc3a9a37b8441d70944c36938d6c72d8c3108435a65553f8bcef9c0e9422725477930d6a26609880e98d458374c36925312961be954da6a12cf5
-  data.tar.gz: cc703a411946369e4c7e8d1cf20c53a387df5ce84a15f0a848ce98735176bf19ff05e5b2d539f9749f999c7e073862652b95f23e28880e869c88ddcd0a0decad
+  metadata.gz: 8512b5f1a52df67ea31e7d8c364dc3c614899ad68af0e45ca6787b924f43ffa6bb10e6a03e0b0478415b753fbf7555c3706db8f83a3ef65b81a22c102914c276
+  data.tar.gz: 6bec222152af851b6963899674340b63c27af84228dcc4733234e1a0a58577e7a56bef28399adef0ef3cb064fa732797d119dbba0bdc9ec07633b311b0d78c47

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in jekyllcontentful.gemspec
+
 gemspec

data/jekyll-embeds.gemspec

@@ -4,11 +4,11 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-embeds"
-  spec.version       = "0.0.5"
+  spec.version       = "0.0.6"
   spec.authors       = ["SEBAS204"]
 
   spec.summary       = %q{Jekyll plugin for embedding diferent media elements.}
-  spec.description   = %q{Jekyll plugin to generate html snippets for embedding Youtube, VIMEO, Twitch channels (clips soon), SoundCloud.}
+  spec.description   = %q{Jekyll plugin to generate html snippets for embedding Youtube; VIMEO; Twitch channels, videos & clips; SoundCloud.}
   spec.homepage      = "https://github.com/ZEBAS204/Jekyll-Embeds"
   spec.license       = "MIT"
 

data/lib/jekyll-embeds.rb

@@ -3,28 +3,22 @@ require 'shellwords'
 
 class YouTubeEmbed < Liquid::Tag
 
-  def initialize(tagName, content, tokens)
+  def initialize(tag_name, markup, tokens)
     super
-    @content = content
+    params = Shellwords.shellwords markup
+    @items = { :url => params[0] }
   end
 
   def render(context)
-    youtube_url = "#{context[@content.strip]}"
+    youtube_url = "#{@items[:url].strip}"
     if youtube_url[/youtu\.be\/([^\?]*)/]
       @youtube_id = $1
     else
       youtube_url[/^.*((v\/)|(embed\/)|(watch\?))\??v?=?([^\&\?]*).*/]
       @youtube_id = $5
     end
-    
-    tmpl_path = File.join Dir.pwd, "_includes", "youtube.html"
-    if File.exist?(tmpl_path)
-      tmpl = File.read tmpl_path
-      site = context.registers[:site]
-      tmpl = (Liquid::Template.parse tmpl).render site.site_payload.merge!({"youtube_id" => @youtube_id})
-    else
-      %Q{<div class='embed-container'><iframe title="YouTube video player" width="640" height="390" src="//www.youtube.com/embed/#{ @youtube_id }" frameborder="0" allowfullscreen></iframe></div>}
-    end
+
+      %Q{<div class='embed-container'><iframe width="640" height="390" src="//www.youtube.com/embed/#{@youtube_id}" frameborder="0" allowfullscreen></iframe></div>}
   end
 
   Liquid::Template.register_tag "youtube", self
@@ -33,25 +27,45 @@ end
 
 class TwitchEmbed < Liquid::Tag
 
-    def initialize(tagName, content, tokens)
+    def initialize(tag_name, markup, tokens)
       super
-      @content = content
+      params = Shellwords.shellwords markup
+      @items = { :url => params[0], :type => params[1] || "channel", :aplay => params[2] || false }
     end
   
     def render(context)
-      twitch_url = "#{context[@content.strip]}"
-      if twitch_url[/twitch\.tv\/([^\?]*)/]
-        @twitch_id = $1
-      end
-      
-      tmpl_path = File.join Dir.pwd, "_includes", "twitch.html"
-      if File.exist?(tmpl_path)
-        tmpl = File.read tmpl_path
-        site = context.registers[:site]
-        tmpl = (Liquid::Template.parse tmpl).render site.site_payload.merge!({"twitch_id" => @twitch_id})
-      else
-        %Q{<div class='embed-container'><iframe src="https://player.twitch.tv/?channel=#{ @twitch_id }" frameborder="0" allowfullscreen="true" scrolling="no" autoplay="false" height="390" width="640"></iframe></div>}
-      end
+      tstr = "#{@items[:url].strip}"
+
+      case @items[:type]
+        when "channel" || "0"
+          if tstr[/twitch\.tv\/([^\?]*)/]
+            @twitch_url = $1
+          else
+            @twitch_url = "#{@items[:url]}"
+          end
+          %Q{<div class='embed-container'><iframe src="https://player.twitch.tv/?channel=#{@twitch_url}" frameborder="0" allowfullscreen="true" scrolling="no" autoplay="#{@items[:aplay]}" height="390" width="640"></iframe></div>}
+
+        when "video" || "1"
+          if tstr[/twitch\.tv\/videos\/([^\?]*)/]
+            @twitch_url = $1
+          else
+            @twitch_url = "#{@items[:url]}"
+          end
+          %Q{<div class='embed-container'><iframe src="https://player.twitch.tv/?video=#{@twitch_url}&autoplay=#{@items[:aplay]}" frameborder="0" allowfullscreen="true" scrolling="no" autoplay="#{@items[:aplay]}" height="390" width="640"></iframe></div>}
+
+        when "clip" || "2"
+          if tstr[/clips\.twitch\.tv\/([^\?]*)/]
+            @twitch_url = $1
+          elsif tstr[/twitch\.tv\/([^\?]*)\/clip\/([^\?]*)\?/]
+            @twitch_url = $2
+          else
+            @twitch_url = "#{@items[:url]}"
+          end
+          %Q{<div class='embed-container'><iframe src="https://clips.twitch.tv/embed?clip=#{@twitch_url}&autoplay=#{@items[:aplay]}" frameborder="0" allowfullscreen="true" scrolling="no" autoplay="#{@items[:aplay]}" height="390" width="640"></iframe></div>}
+
+        else
+          ""
+        end
     end
   
     Liquid::Template.register_tag "twitch", self
@@ -90,7 +104,7 @@ class SoundCloudEmbed < Liquid::Tag
   def initialize(tag_name, markup, tokens)
     super
     params = Shellwords.shellwords markup
-    @items = { :id => params[0], :color => params[1] || "ff7700", :aplay => params[2] || "false" }
+    @items = { :id => params[0], :color => params[1] || "ff7700", :aplay => params[2] || false }
   end
 
   def render(context)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-embeds
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - SEBAS204
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -52,8 +52,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Jekyll plugin to generate html snippets for embedding Youtube, VIMEO,
-  Twitch channels (clips soon), SoundCloud.
+description: Jekyll plugin to generate html snippets for embedding Youtube; VIMEO;
+  Twitch channels, videos & clips; SoundCloud.
 email: 
 executables: []
 extensions: []