onebox 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 542e1d08ae3e97ddf61f8277d8328b8836a5785a
-  data.tar.gz: 02d39f351722e9020bff8669d1bbc6ff820bf06e
+  metadata.gz: 06db4c95569c90b9238b49e72e33e7f618545f99
+  data.tar.gz: 921ab7e92a62a4a43098a38d58baba0186233337
 SHA512:
-  metadata.gz: 639e272ae320e29103d3e2ef022cbac34e2ebbefedf5dc0e9e0955dafdb93098af1fda4dd3f2f674d486e2a6f9fc4f118d7d980fdd084d66bcc0ac71ac0284c9
-  data.tar.gz: b34ca56a4cba354ba0de3d614986325bb316f5e55a54a9a7b684cc55357d01e6050ee601304f6d2187e1d92a02c8726118014329e9baabf8c737579f051b2c79
+  metadata.gz: 40995c30495f6ef5352443154da5b3d068e970283dc89240e15559f453ac06164346e917129f38075c4c2b227cc5147ef4228f1ec71fe1ea6b74dc95c9c92cee
+  data.tar.gz: bb1f6ab98b37391687d21ed65c5683ea36541ade58ea08f9bc14a15ab0ac7508818723cedeac07a6576f88dbb01e7d5ac12d21b37f5009e7af1a35051033e9c5

data/lib/onebox/engine/github_pullrequest_onebox.rb

@@ -13,58 +13,12 @@ module Onebox
 
       private
 
-      #Make an api JSON request, will attempt to authenticate if provided in the engine options
-      # Author: Lidlanca
-      #: self.options[:github_auth_method]  = :basic | :oauth | nil
-      #  :oauth is the recommend way for authentication. when generating token you can control privileges, and you do not expose your password
-      #  :basic require username and password provided in options[:github_auth_user , :github_auth_pass]
-      #  nil or false will make a request without any authentication. request rate limit are lower.
-
-      def api_json_request url
-        box_options = self.options
-        case box_options[:github_auth_method] 
-          when :basic
-            auth = [box_options[:github_auth_user] , box_options[:github_auth_pass]] # user name and password
-          when :oauth
-            auth = [box_options[:github_auth_token] , "x-oauth-basic"] #oauth does not need password with token
-          else
-            #request without auth
-            return  ::MultiJson.load(open(url,"Accept"=>"application/vnd.github.v3.text+json",read_timeout: timeout))
-            
-        end
-          #Request with auth
-          return ::MultiJson.load(open(url,"Accept"=>"application/vnd.github.v3.text+json",http_basic_authentication:auth, read_timeout: timeout))
-      end
-
-      def raw 
-          @raw ||= api_json_request url
-      end
       def match
         @match ||= @url.match(%r{github\.com/(?<owner>[^/]+)/(?<repository>[^/]+)/pull/(?<number>[^/]+)})
       end
 
       def data
-        box_options =  self.options
         result = raw.clone
-
-        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         
-          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/standard_embed.rb

@@ -5,7 +5,6 @@ module Onebox
       def raw
         return @raw if @raw
         response = fetch_response(url)
-
         html_doc = Nokogiri::HTML(response.body)
 
         # Determine if we should use OEmbed or OpenGraph
@@ -61,7 +60,7 @@ module Onebox
         og
       end
 
-      def fetch_response(location, limit = 5, domain = nil)
+      def fetch_response(location, limit = 5, domain = nil,headers=nil)
         raise Net::HTTPError.new('HTTP redirect too deep', location) if limit == 0
 
         uri = URI(location)
@@ -75,11 +74,18 @@ module Onebox
           http.use_ssl = true
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end
-        response = http.request_get(uri.request_uri)
+
+        response = http.request_get(uri.request_uri,headers)
+
+        cookie = response.get_fields('set-cookie')
+        if (cookie)
+          header = {'cookie' => cookie.join("")}
+        end
+        header = nil unless header.is_a? Hash
 
         case response
         when Net::HTTPSuccess     then response
-        when Net::HTTPRedirection then fetch_response(response['location'], limit - 1, "#{uri.scheme}://#{uri.host}")
+        when Net::HTTPRedirection then fetch_response(response['location'], limit - 1, "#{uri.scheme}://#{uri.host}",header)
         else
           response.error!
         end

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -76,6 +76,7 @@ module Onebox
           mlb.com
           myspace.com
           nba.com
+          nytimes.com
           npr.org
           photobucket.com
           pinterest.com

data/lib/onebox/version.rb

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

data/templates/githubcommit.mustache

@@ -1,6 +1,6 @@
 {{#author.avatar_url}}
   <a href="{{author.html_url}}" target="_blank">
-    <img alt="{{author.login}}" src="{{author.avatar_url}}" class="thumbnail onebox-avatar">
+    <img alt="{{author.login}}" src="{{author.avatar_url}}" class="thumbnail onebox-avatar" width="90" height="90">
   </a>
 {{/author.avatar_url}}
 

data/templates/githubpullrequest.mustache

@@ -1,6 +1,6 @@
 {{#user.avatar_url}}
   <a href="{{user.html_url}}" target="_blank">
-    <img alt="{{user.login}}" src="{{user.avatar_url}}" class="thumbnail onebox-avatar">
+    <img alt="{{user.login}}" src="{{user.avatar_url}}" class="thumbnail onebox-avatar" width="90" height="90">
   </a>
 {{/user.avatar_url}}
 
@@ -8,66 +8,14 @@
   <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>
-
-
-
-
-  {{#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 github-content-right" {{#inline_css}}style='margin-left:100px;'{{/inline_css}}>
+<div class="date">
   by <a href="{{user.html_url}}" target="_blank">{{user.login}}</a>
   on <a href="{{html_url}}" target="_blank">{{created_at}}</a>
 </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;
-}
-}}
+<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>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-15 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.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A gem for turning URLs into previews.