embedrb 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb13bb8367d8bc1b9e74342cc6ef9f115e60b0b7
-  data.tar.gz: 6e1e6f4c6abf459605d3a61f3186375b5f422f40
+  metadata.gz: 29a1c1027ae50d6fb90093dc118e01fb4c6a8930
+  data.tar.gz: d59b3a1453772ac11d5e4dc4efe6e647b03b2ef9
 SHA512:
-  metadata.gz: adffaeebd9425607c766fddac9ad8410f3a36ed282b1eb9840973668d5adcef9a606fae5325d41763b89e3a64df4dba6d787a57e326305dd8c991075822d7fa7
-  data.tar.gz: bff09245e87ff5290e06dd93638b73fb1bae082759cf5e750957f7d84999b3039f5a698b04e8c99bae3ae8cd624bd685846cd959362045052a2844599bc9ff9e
+  metadata.gz: 323db49baac4ffd1bb6dd04f537d5342ec35880014095b7cadfafe1e84596e15990fe5459b14c59051e0bbfefb148d646552c01b575e30cabeccde870f540ae1
+  data.tar.gz: 2cbe816d5f8777ff7e10fd8ea7bf020fac78999a5b11903dec77c43669d0a5153ca58174fc0b1cd8c682d266552bcc51d70a50db528747d0056212ab3f5388cd

data/embedrb.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: embedrb 0.2.1 ruby lib
+# stub: embedrb 0.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "embedrb"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["liris"]
-  s.date = "2016-02-17"
+  s.date = "2016-02-22"
   s.description = "a ruby port of Embed.js"
   s.email = "liris.pp@gmail.com"
   s.extra_rdoc_files = [

data/lib/embedrb/audio/embed_audio.rb

@@ -11,6 +11,7 @@ module EmbedRb
       @embeds = embeds
       @options = options
       @regex = /((?:https?):\/\/\S*\.(?:wav|mp3|ogg))/mi
+      @service = :audio
     end
 
     private

data/lib/embedrb/base.rb

@@ -9,7 +9,7 @@ module EmbedRb
     def embed()
       @input.scan(@regex) {|match|
         url = match[0]
-        if !@options[:served].include? url
+        if !@options[:served].include? url && EmbedRb.process_more?(@options, @service, @embeds)
           text = url_to_text match
           if text
             @options[:served] << url

data/lib/embedrb/embed.rb

@@ -26,6 +26,8 @@ PROCESSORS = {
 }
 
 DEFAULT_OPTIONS = {
+  :maxEmbed => 0,
+  :maxEmbedExcludes => [],
   :link => true,
   :linkOptions => {
     :target => 'self',
@@ -76,8 +78,8 @@ module EmbedRb
       output = ''
 
       PROCESSORS.each {|key, klass|
-        if @options[key]
-          output = klass.new(input, output, @options, embeds).process()
+        if @options[key] && EmbedRb.process_more?(@options, key, embeds)
+          output = klass.new(input, output, @options, embeds).process
         end
       }
 

data/lib/embedrb/embed_open_graph.rb

@@ -25,7 +25,7 @@ module  EmbedRb
       @input.scan(@url_regex) {|match|
         url = match[2]
         short_url = shorten(url)
-        if !exclude?(url) && !@options[:served].include?(short_url)
+        if !exclude?(url) && !@options[:served].include?(short_url) && EmbedRb.process_more?(@options, :openGraphEndpoint, @embeds)
           p short_url
           data = fetch(url)
           if data

data/lib/embedrb/image/embed_flickr.rb

@@ -11,6 +11,7 @@ module EmbedRb
       @embeds = embeds
       @options = options
       @regex = /(flickr.com\/[a-z]+\/[a-zA-Z0-9@_\-]+\/[\d]+)/mi
+      @service = :flickr
     end
 
     private

data/lib/embedrb/image/embed_images.rb

@@ -11,6 +11,7 @@ module EmbedRb
       @embeds = embeds
       @options = options
       @regex = /((?:https?):\/\/\S*\.(?:gif|jpg|jpeg|tiff|png|svg|webp))/mi
+      @service = :image
     end
 
     private

data/lib/embedrb/image/embed_instagram.rb

@@ -11,6 +11,7 @@ module EmbedRb
       @embeds = embeds
       @options = options
       @regex = /(instagram.com\/p\/[a-zA-Z0-9_\/\?\-\=]+)/mi
+      @service = :instagram
     end
 
     private

data/lib/embedrb/utils.rb

@@ -28,6 +28,14 @@ module EmbedRb
     options[key] ? options[key] : {}
   end
 
+  def process_more?(options, key, embeds)
+    max_num = options[:maxEmbed]
+    if max_num == 0
+      return true
+    end
+    embeds.length < max_num || options[:maxEmbedExcludes].include?(key)
+  end
+
   def create_text(str, embeds)
     # TODO: sort embeds
     embeds_str = embeds.map {|embed|

data/lib/embedrb/version.rb

@@ -1,4 +1,4 @@
 
 module EmbedRb
-  VERSION="0.2.1"
+  VERSION="0.2.2"
 end

data/lib/embedrb/video/embed_ted.rb

@@ -11,6 +11,7 @@ module EmbedRb
       @embeds = embeds
       @options = options
       @regex = /(ted.com\/talks\/([a-zA-Z0-9_]+))/mi
+      @service = :ted
     end
 
     private

data/lib/embedrb/video/embed_ustream.rb

@@ -11,6 +11,7 @@ module EmbedRb
       @embeds = embeds
       @options = options
       @regex = /(ustream.tv\/([a-z\/0-9%]*))/mi
+      @service = :ustream
     end
 
     private

data/lib/embedrb/video/embed_video.rb

@@ -11,6 +11,7 @@ module EmbedRb
       @embeds = embeds
       @options = options
       @regex = /((?:https?):\/\/\S*\.(?:ogv|webm|mp4))/mi
+      @service = :video
     end
 
     private

data/lib/embedrb/video/embed_youtube.rb

@@ -11,6 +11,7 @@ module EmbedRb
       @embeds = embeds
       @options = options
       @regex = /(https?:\/\/(?:[0-9A-Z-]+\.)?(?:youtu\.be\/|youtube\.com(?:\/embed\/|\/v\/|\/watch\?v=|\/ytscreeningroom\?v=|\/feeds\/api\/videos\/|\/user\S*[^\w\-\s]|\S*[^\w\-\s]))([\w\-]{11})[?=&+%\w-]*)/mi
+      @service = :youtube
     end
 
     private
@@ -22,8 +23,8 @@ module EmbedRb
     def render(url)
       dims = EmbedRb.get_dimensions(@options)
       return <<EOF
-      <div class="ejs-video-player ejs-embed">
-        <iframe src="#{url}" frameBorder="0" width="#{dims[:width]}" height="#{dims[:height]}" ></iframe>
+      <div class="ejs-video-player ejs-embed" style="width: #{dims[:width]}px; height: #{dims[:height]}px;">
+        <iframe src="#{url}" frameBorder="0" width="#{dims[:width]}px" height="#{dims[:height]}px" ></iframe>
       </div>
 EOF
     end

data/lib/embedrb.rb

@@ -7,6 +7,7 @@ if $0 == __FILE__
    http://www.google.com/
    the following is geocode
    @(東京駅)
+   @(東京駅)
    http://hoge.fuga.com/xxx/yyy.png
    https://www.flickr.com/photos/parismadrid/5573484679/in/photolist-9uvyPr-7TD5uZ-jYwbo8-qeZLRe-odzeYC-n8x6Xn-dzq2Ws-oRNMGp-68DxGi-c4DxV7-bnmwjN-nqZDVD-kF39se-rXJWT4-nTTR4S-7YLgdX-apPuvi-q1DhYc-kFWFjG-a2c9kr-aPGmhK-oqB5cQ-ziBGRr-oBkGxp-pEFgd8-jY9diK-mDTbpD-jzSaXQ-cuCWwN-pzK88U-9HvHVt-dBPTZV-nKdYRM-oEDGkL-bTygzn-o3CxjL-rhtanH-oXpW1i-s4Jdat-p8N1RJ-fhpghZ-dX2tPC-v8R2LX-x7M7j1-xFACNe-cAWLSf-A6FvqE-adcNyU-t2N6Hh-j1TaxV
 
@@ -23,6 +24,8 @@ if $0 == __FILE__
 EOF
 
   opts = {
+    :maxEmbed => 0,
+    :maxEmbedExcludes => [ :youtube ],
     :openGraphEndpoint => 'http://opengraph.io/api/1.0/site/',
     :gmap => true,
     :gmapOptions => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embedrb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - liris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda