lalala 4.1.0.dev.381 → 4.1.0.dev.384

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8764cd0786893dc37826cb7d31941532285b6536
-  data.tar.gz: b4d5aa8796973c79357dbeeef7c8d80bfb24737d
+  metadata.gz: fe3056fed6713b152c0a8719dd21fb59c98d4966
+  data.tar.gz: 8c9aada46697bd4b0b57a2979e4c914082cb5b4d
 SHA512:
-  metadata.gz: a375ae172222a1dc0056c3f37c86b82899ff133ccfe5c02b7ed8e0b6042a359336a283349f0ff770b1ebcf89aaeff4c67840aae81619fadedfef83bc4a8e61e4
-  data.tar.gz: 7ef0041e9c7bfaef93f9b2f310ee113ce1c303c26c7b7907bc8cd9d3531e7ee63acf715f42cd5fd371b8f5c0386e6929b570f118359a9d7fb486b1a3a0c142a2
+  metadata.gz: 2f7901f2dd9e2cc5aebc9b1002c640ce3e096fff7b4039562294c9ad500a1e08a2cbe0dbbab69930f57818482437dfe527035c89319408250ea5a2bbb3c2a50c
+  data.tar.gz: e74f7095163d70e192bc6a7f77c161c63454bfcec542c521f3890aec10aa2cf425d0b15724ee99ce0d9aa21af6bbaa2013fa885f96ef33ec3946d8e43af0ddd4

data/lib/lalala/markdown/handlers/vimeo.rb

@@ -23,16 +23,18 @@ class Lalala::Markdown::Handlers::Vimeo < Lalala::Markdown::Handlers::Base
 
     id = $1
 
-    helpers.content_tag(
-      :iframe,
-      "",
-      width:           @options[:width],
-      height:          @options[:height],
-      src:             "//player.vimeo.com/video/#{id}?portrait=#{@options[:show_portrait]}&title=#{@options[:show_title]}&badge=#{@options[:show_badge]}&byline=#{@options[:show_byline]}&color=#{@options[:color]}&wmode=transparent",
-
-      frameborder:     0,
-      allowfullscreen: true
-    )
+    helpers.content_tag :span, class: "embed-container" do
+      helpers.content_tag(
+        :iframe,
+        "",
+        width:           @options[:width],
+        height:          @options[:height],
+        src:             "//player.vimeo.com/video/#{id}?portrait=#{@options[:show_portrait]}&title=#{@options[:show_title]}&badge=#{@options[:show_badge]}&byline=#{@options[:show_byline]}&color=#{@options[:color]}&wmode=transparent",
+
+        frameborder:     0,
+        allowfullscreen: true
+      )
+    end
   end
 
 end

data/lib/lalala/markdown/handlers/youtube.rb

@@ -18,15 +18,19 @@ class Lalala::Markdown::Handlers::YouTube < Lalala::Markdown::Handlers::Base
 
     id = $1
 
-    helpers.content_tag(
-      :iframe,
-      "",
-      width:           @options[:width],
-      height:          @options[:height],
-      src:             "http://www.youtube.com/embed/#{id}?rel=0",
-      frameborder:     0,
-      allowfullscreen: true
-    )
+    helpers.content_tag :span, class: "embed-container" do
+      helpers.content_tag(
+        :iframe,
+        "",
+        width:           @options[:width],
+        height:          @options[:height],
+        src:             "http://www.youtube.com/embed/#{id}?rel=0",
+        frameborder:     0,
+        allowfullscreen: true
+      )
+    end
+
+
   end
 
 end

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.1.0"
-  BUILD   = "381"
+  BUILD   = "384"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

data/test/dummy/app/models/article.rb

@@ -15,7 +15,8 @@ class Article < ActiveRecord::Base
   # Markdown columns
   markdown :body, tables: true, link_schemes: {
     "youtube" => Lalala::Markdown::Handlers::YouTube.new(width: 520, height: 292),
-    "asset" => Lalala::Markdown::Handlers::LazyAsset.new
+    "asset" => Lalala::Markdown::Handlers::LazyAsset.new,
+    "vimeo"   => Lalala::Markdown::Handlers::Vimeo.new(color: "5c2d91", show_title: 1)
   }
 
   # Scopes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.1.0.dev.381
+  version: 4.1.0.dev.384
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin