embedrb 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c256a78cf26ed5babfab6d258e45a176c2470fda
-  data.tar.gz: 37d8582854f41fa5451598f6461b6a7a863e6676
+  metadata.gz: 6afc8f7b083bd1446840d0d60f1d713f6a5de885
+  data.tar.gz: 60ede3795c33339ae744ca65955da456c12917f4
 SHA512:
-  metadata.gz: 3a8996bb934f3bb5428068811f81fa7c41cb71da76b2d9058644352550ab3feccd559cdb08cf4cd809fc34935e43307944fd6ce2a2bd53cdbca414925382e1b3
-  data.tar.gz: e2a672d70e7c211daef9c75893bb953cee93da41aec88158bbd4b0e9a829d01a99e182a052d2b8d8bf0dace303ae0da04dfb7fc03a29ef3698ee5c94c63f6320
+  metadata.gz: 3bc25f852ee9d57ff6b50062dc5e32132a20a4e4b37116382b5638016c2ed09f5890998b10dda22b11bc04cd4407cff5ec26e8d67e5cb033b425849e30c994f3
+  data.tar.gz: 3d02666ac1e9835b2d25573ed2b7d54aed3af6c51f69e3be9a29e7145491a997c6993bfeac49264973194dd68a88d57dc67c28c6dfd1060baccbacf167bca9ba

data/Gemfile

@@ -3,6 +3,8 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
+gem "opengraph_parser"
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/Gemfile.lock

@@ -49,6 +49,9 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
+    opengraph_parser (0.2.3)
+      addressable
+      nokogiri
     rack (1.6.4)
     rake (10.5.0)
     rdoc (3.12.2)
@@ -74,6 +77,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0)
   jeweler (~> 2.0.1)
+  opengraph_parser
   rdoc (~> 3.12)
   shoulda
   simplecov

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.3 ruby lib
+# stub: embedrb 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "embedrb"
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   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-23"
+  s.date = "2016-02-25"
   s.description = "a ruby port of Embed.js"
   s.email = "liris.pp@gmail.com"
   s.extra_rdoc_files = [
@@ -56,12 +56,14 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<opengraph_parser>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
+      s.add_dependency(%q<opengraph_parser>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -69,6 +71,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
+    s.add_dependency(%q<opengraph_parser>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

data/lib/embedrb/embed.rb

@@ -22,7 +22,7 @@ PROCESSORS = {
   :flickr => EmbedRb::Flickr,
   :instagram => EmbedRb::Instagram,
   :audio => EmbedRb::BasicAudio,
-  :openGraphEndpoint => EmbedRb::OpenGraph,
+  :openGraph => EmbedRb::OpenGraph_,
 }
 
 DEFAULT_OPTIONS = {
@@ -35,7 +35,8 @@ DEFAULT_OPTIONS = {
     :rel => '',
   },
 
-  :openGraphEndpoint => nil, # http://opengraph.io/api/1.0/site/${url_encoded_site_url}
+  # :openGraphEndpoint => nil, # http://opengraph.io/api/1.0/site/${url_encoded_site_url}
+  :openGraph => true,
   :openGraphOptions => {
     :apiKey => nil,
     :excluded_regex => nil,

data/lib/embedrb/embed_open_graph.rb

@@ -1,10 +1,9 @@
-require 'erb'
-require 'json'
+require 'opengraph_parser'
 require_relative 'base'
 require_relative 'utils'
 
 module  EmbedRb
-  class OpenGraph
+  class OpenGraph_
     include EmbedRb::Base
 
     def initialize(input, output, options, embeds)
@@ -26,7 +25,6 @@ module  EmbedRb
         url = match[2]
         short_url = shorten(url)
         if !exclude?(url) && !@options[:served].include?(short_url) && EmbedRb.process_more?(@options, :openGraphEndpoint, @embeds)
-          p short_url
           data = fetch(url)
           if data
             @options[:served] << short_url
@@ -43,29 +41,26 @@ module  EmbedRb
 
     private
     def fetch(url)
-      endpoint = @options[:openGraphEndpoint]
-      api = endpoint + ERB::Util.url_encode(url)
       begin
-        data = JSON.parse EmbedRb.get_response(api)
-        if data && !data["error"]
-          return data
-        end
-      rescue
+        OpenGraph.new(url)
+      rescue StandardError => e
         # error handling
+        p e
+        return nil
       end
     end
 
     def render(data)
       return <<EOF
         <div class="ejs-embed ejs-ogp">
-		      <div class="ejs-ogp-thumb" style="background-image:url(#{data["hybridGraph"]['image']})" ></div>
+		      <div class="ejs-ogp-thumb" style="background-image:url(#{data.images ? data.images[0] : ''})" ></div>
 		      <div class="ejs-ogp-details">
 		        <div class="ejs-ogp-title">
-              <a href="#{data['url']}" target="#{@options[:linkOptions][:target]}">
-                #{data["hybridGraph"]['title']}
+              <a href="#{data.url}" target="#{@options[:linkOptions][:target]}">
+                #{data.title}
               </a>
             </div>
-		        <div class="ejs-ogb-details">#{data["hybridGraph"]["description"]}</div>
+		        <div class="ejs-ogb-details">#{data.description}</div>
           </div>
         </div>
 EOF

data/lib/embedrb/version.rb

@@ -1,4 +1,4 @@
 
 module EmbedRb
-  VERSION="0.2.3"
+  VERSION="0.3.0"
 end

data/lib/embedrb.rb

@@ -19,6 +19,7 @@ if $0 == __FILE__
    http://www.ustream.tv/embed/5832768?html5ui
 
    http://www.example.com/a.mp3
+   http://www.salesone.co.jp/
 
    ---------------------
 EOF
@@ -26,7 +27,7 @@ EOF
   opts = {
     :maxEmbed => 0,
     :maxEmbedExcludes => [ :youtube ],
-    :openGraphEndpoint => 'http://opengraph.io/api/1.0/site/',
+    :openGraph => true,
     :gmap => true,
     :gmapOptions => {
       :googleAuthKey => ENV['GOOGLE_AUTH_KEY'],

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: embedrb
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - liris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: opengraph_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement