embeditor-rails 2.0.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab39f41f2cff708e76aa03ba6a04a8868e2f1df1
-  data.tar.gz: 5d1e1afa80d9ef2b0cb5f940459ac566d7ac5dfe
+  metadata.gz: d607da8783df9c2ff9085e183d2cd6eace3af3b4
+  data.tar.gz: ae361d188a8b63167100a0f8ec9ddf9c1cbae81f
 SHA512:
-  metadata.gz: 628a1ffecfe6cc703b785d8118e988edfd1151e0edf247817f826c1ba7ade757311aee788087d62fc3e25ac16fa9fe228370de2ef411b126c45d7ffbce014582
-  data.tar.gz: 09a46fbf31bea8ea82afc1d4e927aecc250e2e7d79b675742f38ef1772c0be75d6d01b929c1375e6fe749252a04e6618bbd98e3fc7dcc3c021896673be2aec16
+  metadata.gz: 5d7415c6c964db5ad3725a7060438fde54b2a59958d4e70df9e72abe5c621afbb7087d9af3908667620b7b6829afca45dd2b87d837478ce6208dfa2692656b4b
+  data.tar.gz: 877fca3a1141536f0bbb73dbc379063e966fe6205c5704ca5678b5918a38667e858006e7537e2402bc36efec4a58bc8efd355929bc1287be8b752975989cacb4

data/app/assets/javascripts/embeditor/adapter.js.coffee

@@ -66,7 +66,7 @@ class Embeditor.Adapter
 
     _buildDisplayOptions: (data) ->
         @_defaultsWithoutEmptyStrings(data, # What the user wants
-            @options[@adapter]?['display'], # What the developer wants
+            @options[@className]?['display'], # What the developer wants
             @options['display'], # What the developer wants globally
             @adapter.DisplayDefaults # What Embeditor wants
         )
@@ -80,7 +80,7 @@ class Embeditor.Adapter
     # 4. This adapter's default options (fallback options).
     _buildQueryParams: (data) ->
         @_defaultsWithoutEmptyStrings(data,
-            @options[@adapter]?['query'],
+            @options[@className]?['query'],
             @options['query'],
             @adapter.QueryDefaults
         )
@@ -95,6 +95,6 @@ class Embeditor.Adapter
             continue if !source
 
             for prop,value of source
-                obj[prop] = source[prop] if !obj[prop]
+                obj[prop] = source[prop] if !obj[prop] and value
 
         obj

data/app/assets/javascripts/embeditor/adapters/document_cloud.js.coffee

@@ -1,2 +1,7 @@
-class Embeditor.Adapters.DocumentCloud extends Embeditor.Adapter
+class Embeditor.Adapters.DocumentCloud extends Embeditor.Adapters.Oembed
     className: "DocumentCloud"
+    @Endpoint = "http://www.documentcloud.org/api/oembed.json"
+
+    @QueryDefaults =
+        maxheight   : 700
+        responsive  : true

data/app/assets/javascripts/embeditor/adapters/embedly.js.coffee

@@ -1,7 +1,7 @@
 class Embeditor.Adapters.Embedly extends Embeditor.Adapters.Oembed
     className: "Embedly"
 
-    @Endpoint = "http://api.embed.ly/1/oembed"
+    @Endpoint = "https://api.embed.ly/1/oembed"
 
     # This object should hold any keys that we want to
     # send to the API. Any key not in this object will

data/app/assets/javascripts/embeditor/adapters/ranker.js.coffee

@@ -0,0 +1,19 @@
+class Embeditor.Adapters.Ranker extends Embeditor.Adapters.Oembed
+    className: "Ranker"
+    @Endpoint = "http://widget.ranker.com/oembed"
+
+    swap: ->
+      matcher = /\/(\d+)/
+      id = matcher.exec(@href)[1]
+
+      $.ajax
+          url         : "#{@adapter.Endpoint}/#{id}"
+          type        : 'GET'
+          dataType    : 'json'
+          data        :  _.extend(@queryParams)
+
+          success: (data, textStatus, jqXHR) =>
+              @embedData(data)
+
+          error: (jqXHR, textStatus, errorThrown) =>
+              console.log('[embeditor oembed] error.', jqXHR)

data/app/assets/javascripts/embeditor/adapters/youtube.js.coffee

@@ -0,0 +1,28 @@
+class Embeditor.Adapters.YouTube extends Embeditor.Adapters.StaticTemplate
+    className: "YouTube"
+
+    @VideoTemplate    = Embeditor.Template('youtube')
+    @PlaylistTemplate = Embeditor.Template('youtube_playlist')
+
+    @QueryDefaults =
+        maxwidth  : 560
+        maxheight : 315
+
+    @Matchers = [
+        /(youtu\.be\/|youtube\.com\/(watch\?(.*&)?v=|(embed|v)\/))([^\?&"'>]+)/i,
+        /(youtu\.be\/|youtube\.com\/(watch\?(.*&)?list=|(embed|v)\/))([^\?&"'>]+)/i
+    ]
+
+    swap: ->
+        match = @_parseUrl()
+        return false if not match
+
+        id  = match[5]
+
+        template = if id.length > 11 then YouTube.PlaylistTemplate else YouTube.VideoTemplate
+
+        @embed template
+            maxheight   : @queryParams.maxheight
+            maxwidth    : @queryParams.maxwidth
+            id          : id
+

data/app/assets/javascripts/embeditor/embeditor.js.coffee

@@ -2,7 +2,7 @@ window.Embeditor = {
     Adapters : {}
 
     DefaultAdapters :
-        'youtube'       : 'Embedly'
+        'youtube'       : 'YouTube'
         'vimeo'         : 'Embedly'
         'brightcove'    : 'Brightcove'
         'ustream'       : 'Embedly'
@@ -11,7 +11,7 @@ window.Embeditor = {
         'googlemaps'    : 'Embedly'
         'googlefusion'  : 'GoogleFusion'
         'scribd'        : 'Embedly'
-        # 'documentcloud' : 'DocumentCloud'
+        'documentcloud' : 'DocumentCloud'
         'polldaddy'     : 'Polldaddy'
         'facebook'      : 'Embedly'
         'storify'       : 'Storify'
@@ -22,6 +22,7 @@ window.Embeditor = {
         'instagram'     : 'Instagram'
         'soundcloud'    : 'Embedly'
         'spotify'       : 'Embedly'
+        'ranker'        : 'Ranker'
         'other'         : 'Embedly'
 
     TemplatePath : 'embeditor/templates/'

data/app/assets/javascripts/embeditor/templates/youtube.jst.eco

@@ -0,0 +1 @@
+<iframe width="<%=@maxwidth%>" height="<%=@maxheight%>" src="https://www.youtube.com/embed/<%=@id%>" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>

data/app/assets/javascripts/embeditor/templates/youtube_playlist.jst.eco

@@ -0,0 +1 @@
+<iframe width="<%=@maxwidth%>" height="<%=@maxheight%>" src="https://www.youtube.com/embed/videoseries?list=<%=@listid%>" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>

data/lib/embeditor-rails/version.rb

@@ -1,5 +1,5 @@
 module Embeditor
   module Rails
-    VERSION = "2.0.1"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embeditor-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Bryan Ricker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -102,10 +102,12 @@ files:
 - app/assets/javascripts/embeditor/adapters/instagram.js.coffee
 - app/assets/javascripts/embeditor/adapters/oembed.js.coffee
 - app/assets/javascripts/embeditor/adapters/polldaddy.js.coffee
+- app/assets/javascripts/embeditor/adapters/ranker.js.coffee
 - app/assets/javascripts/embeditor/adapters/rebel_mouse.js.coffee
 - app/assets/javascripts/embeditor/adapters/static_template.js.coffee
 - app/assets/javascripts/embeditor/adapters/storify.js.coffee
 - app/assets/javascripts/embeditor/adapters/twitter.js.coffee
+- app/assets/javascripts/embeditor/adapters/youtube.js.coffee
 - app/assets/javascripts/embeditor/embeditor.js.coffee
 - app/assets/javascripts/embeditor/templates.js
 - app/assets/javascripts/embeditor/templates/brightcove.jst.eco
@@ -117,6 +119,8 @@ files:
 - app/assets/javascripts/embeditor/templates/rebel_mouse.jst.eco
 - app/assets/javascripts/embeditor/templates/storify.jst.eco
 - app/assets/javascripts/embeditor/templates/twitter.jst.eco
+- app/assets/javascripts/embeditor/templates/youtube.jst.eco
+- app/assets/javascripts/embeditor/templates/youtube_playlist.jst.eco
 - app/assets/javascripts/embeditor/utility.js.coffee
 - lib/embeditor-rails.rb
 - lib/embeditor-rails/version.rb
@@ -140,8 +144,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Embeditor plugin for Rails.
 test_files: []
+has_rdoc: