onebox 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d45ecfeb440c52d2c6d45aaec72669ad24f170b
-  data.tar.gz: 84c5f37f871a0e5a792f179d6d4983bc9c588e52
+  metadata.gz: 542e1d08ae3e97ddf61f8277d8328b8836a5785a
+  data.tar.gz: 02d39f351722e9020bff8669d1bbc6ff820bf06e
 SHA512:
-  metadata.gz: 9cc1a432d53eaa94625f3dcea777e8cfb3247770334ced74b91295832bffed4fdc584c33f4c786a954ced16ba1f7010d6799c5cc29232748f29c1a69e6972063
-  data.tar.gz: 2ce5bae6fa88b77fa5f9e6a2dd1f0c6395836e51bea065dff2c62b4e79ea1329c8b4e7319a4e436a63427c4d793d8b8c1b034f52f085d9ad33f36892113c1047
+  metadata.gz: 639e272ae320e29103d3e2ef022cbac34e2ebbefedf5dc0e9e0955dafdb93098af1fda4dd3f2f674d486e2a6f9fc4f118d7d980fdd084d66bcc0ac71ac0284c9
+  data.tar.gz: b34ca56a4cba354ba0de3d614986325bb316f5e55a54a9a7b684cc55357d01e6050ee601304f6d2187e1d92a02c8726118014329e9baabf8c737579f051b2c79

data/lib/onebox/engine/github_pullrequest_onebox.rb

@@ -47,23 +47,24 @@ module Onebox
         box_options =  self.options
         result = raw.clone
 
-        pull_status =  "Pull Status:" << {:closed=>"closed",:open=>"open"}[raw["state"].to_sym] << (raw["state"] == "closed" ? (raw["merged"] ? " & accepted" : " & declined") : "")  #closed , open
+        pull_status =  "" << {:closed=>"closed",:open=>"open"}[raw["state"].to_sym] << (raw["state"] == "closed" ? (raw["merged"] ? " & merged" : " & declined") : "")  #closed , open
         result['pull_status_str'] = pull_status
+        result['pull_status'] = raw["state"]
+        result['pull_status_str'] = pull_status
+        result['pull_status_str_open'] = raw["state"]=="open"
+        result['pull_status_closed_accepted'] = raw["state"]=="closed" && raw["merged"]
+        result['pull_status_closed_declined'] = raw["state"]=="closed" && !raw["merged"]
+        result['pull_status_class'] =  (raw["merged"] ? "merged": raw["state"] ) # open, merged, close
+        result['pull_status_bgcolor'] = {:open=>"#6cc644",:merged =>"6e5494", :closed=> "#bd2c00"}[result['pull_status_class'].to_sym]
+        result['inline_css'] = false  #set to true if you need basic styling and you don't have external css
         if box_options[:get_build_status]
           url2 = raw["statuses_url"]
-          raw2 =  api_json_request url2  #2nd api request to get build status 
-
-          result['pull_status'] = raw["state"]
-          result['pull_status_str'] = pull_status
-          result['pull_status_str_open'] = raw["state"]=="open"
-          result['pull_status_closed_accepted'] = raw["state"]=="closed" && raw["merged"] 
-          result['pull_status_closed_declined'] = raw["state"]=="closed" && !raw["merged"] 
+          raw2 =  api_json_request url2  #2nd api request to get build status         
           unless raw2.empty?
             result['build_status'] = "Build status: " +  raw2[0]["state"].to_s.capitalize  + " | " + raw2[0]["description"].to_s
           end
         end
 
-        
         result['link'] = link
         result['created_at'] = Time.parse(result['created_at']).strftime("%I:%M%p - %d %b %y")
         result

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -65,7 +65,6 @@ module Onebox
           instagr.am
           instagram.com
           itunes.apple.com
-          justin.tv
           khanacademy.org
           kickstarter.com
           kinomap.com
@@ -243,12 +242,44 @@ module Onebox
 
 
         if video_url
-          html = "<iframe src=\"#{video_url}\" frameborder=\"0\" title=\"#{data[:title]}\""
+          # opengraph support multiple elements (videos, images ,etc). 
+          # We attempt to find a video element with the type of video/mp4
+          # and generate a native <video> element for it.
 
-          append_attribute(:width, html, video)
-          append_attribute(:height, html, video)
+          if (@raw.metadata && @raw.metadata[:"video:type"])
+            video_type =  @raw.metadata[:"video:type"]
+            if video_type.include? "video/mp4"            #find if there is a video with type 
+              if video_type.size > 1                      #if more then one video item based on provided video_type
+                ind = video_type.find_index("video/mp4")  #get the first video index with type video/mp4
+                video_url  = @raw.metadata[:video][ind]   #update video_url 
+              end 
+              
+              attr = append_attribute(:width, attr, video) 
+              attr = append_attribute(:height, attr, video)
+              
+              # html_v1 = %Q(<video #{attr} title="#{data[:title]}" controls="" ><source src="#{video_url}"></video>)
 
-          html << "></iframe>"
+              site_name_and_title  =  ( ("<span style='color:#fff;background:#9B9B9B;border-radius:3px;padding:3px;margin-right: 5px;'>" + CGI::escapeHTML(@raw.metadata[:site_name][0].to_s) + '</span> ') + CGI::escapeHTML((@raw.title || @raw.description).to_s) )
+              
+              orig_url = @raw.url
+              html_v2 = %Q(
+                <div style='position:relative;padding-top:29px;'>
+                <span style='position: absolute;top:0px;z-index:2;color:#000;white-space:nowrap;text-overflow:ellipsis;word-wrap: break-word;overflow: hidden;display: inline-block;padding: 3px;border-radius: 4px;max-width: 100%;'><a href='#{orig_url}' target='_blank'>#{site_name_and_title}</a></span>
+                <video style='max-width:100%' #{attr} title="#{data[:title]}" controls="" ><source src="#{video_url}"></video>
+                </div>
+                )
+              html = html_v2
+
+            else 
+
+              html = "<iframe src=\"#{video_url}\" frameborder=\"0\" title=\"#{data[:title]}\""
+              append_attribute(:width, html, video)
+              append_attribute(:height, html, video)
+
+              html << "></iframe>"
+            end
+
+          end
           return html
         end
       end
@@ -261,4 +292,4 @@ module Onebox
       end
     end
   end
-end
+end

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

data/templates/githubpullrequest.mustache

@@ -8,35 +8,66 @@
   <a href="{{html_url}}" target="_blank">{{title}}</a>
 </h4>
 
+<div class='github-commit-status github-content-right' {{#inline_css}}style='margin-bottom:5px;padding: 10px;background: #F5F5F5;margin-left: 100px;border-radius: 5px;'{{/inline_css}}>
 
+<span class="status_tag {{pull_status_class}}" {{#inline_css}}style="background:{{pull_status_bgcolor}};color:#fff;display:inline-block;border-radius:3px;padding:1px 4px;font-weight:bold;margin-bottom:5px;"{{/inline_css}}> {{pull_status_str}} </span>
 
-<div class='github-commit-status' style='margin-bottom:3px;'>
-{{#pull_status_str_open}}
-<span style='background:#6cc644;color:#fff;display:inline-block;border-radius:3px;padding:2px;'>
-{{/pull_status_str_open}}
-{{#pull_status_closed_accepted}}
-<span style='background:#6e5494;color:#fff;display:inline-block;border-radius:3px;padding:2px;'>
-{{/pull_status_closed_accepted}}
-{{#pull_status_closed_declined}}
-<span style='background:#bd2c00;color:#fff;display:inline-block;border-radius:3px;padding:2px;'>
-{{/pull_status_closed_declined}}
 
-{{pull_status_str}} </span>
-</br>
 
-{{#build_status}}
-<span style='padding: 2px;background: #cfcfcf;'>{{build_status}}</span>
-{{/build_status}}
+
+  {{#build_status}}
+  <span class='build_status' {{#inline_css}}style='padding: 2px;font-size:12px'{{/inline_css}}>{{build_status}}</span>
+  {{/build_status}}
+
+  <div class="github-commit-stats">
+    <strong>{{commits}} commits</strong>
+    changed <strong>{{changed_files}} files</strong>
+    with <strong>{{additions}} additions</strong>
+    and <strong>{{deletions}} deletions</strong>.
+  </div>
 </div>
 
-<div class="date">
+<div class="date github-content-right" {{#inline_css}}style='margin-left:100px;'{{/inline_css}}>
   by <a href="{{user.html_url}}" target="_blank">{{user.login}}</a>
   on <a href="{{html_url}}" target="_blank">{{created_at}}</a>
 </div>
 
-<div class="github-commit-stats">
-  <strong>{{commits}} commits</strong>
-  changed <strong>{{changed_files}} files</strong>
-  with <strong>{{additions}} additions</strong>
-  and <strong>{{deletions}} deletions</strong>.
-</div>
+{{! // Sample Styling
+
+.onebox-body .github-commit-status {
+  background: #F5F5F5;
+  border-radius: 5px;
+  margin:0px 0px 5px 100px;
+  padding: 10px;
+}
+
+.onebox-body .status_tag {
+  display:inline-block;
+  color:#fff;
+  padding:1px 4px;
+  border-radius:3px;
+  font-weight:bold;
+  margin-bottom:5px;
+  text-transform:capitalize;
+}
+
+.onebox-body .build_status
+{
+  padding: 2px;
+  font-size:12px;
+}
+
+.onebox-body .status_tag.open {
+  background-color:#6cc644;
+}
+.onebox-body .status_tag.merged{
+  background-color:#6e5494; 
+}
+.onebox-body .status_tag.closed {
+  background-color:#bd2c00;
+}
+
+.onebox-body .github-content-right{
+  margin-left:100px;
+}
+}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -344,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A gem for turning URLs into previews.