cognitivebing 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04682a05db10c57761f663d1044f77da48fedc31
-  data.tar.gz: 746d54039a565bd7ac68be65e8a8aef46223b236
+  metadata.gz: e7169093b94a32bdd929b73f707921061ddb9cfe
+  data.tar.gz: c78d42fd181c5dac66fb3cb0f4aa44b6c3878ce4
 SHA512:
-  metadata.gz: e0e8d07da9c99e6bcc48da47e7ba065159f05e2ccc2e1defaa05c5a2bb1bcee61f111839eec8d5976b24aa8e4adc56e8cbbc62d67a342e3e3d3c9cf195a68b25
-  data.tar.gz: 5670cf02789d4b6cf21da2609e0165c784e5286fc12f5b2e8e2caae41810f87e1969e6e9fa6b55b156eb615944cfe7c0d05324581d5ae5634432b8cf744d83c3
+  metadata.gz: 01be164c702d717bec2765cf80c22ef054f063396c186ac61e94753ece85d45fb5b74d56a087ed8e76a4c80436db14daadd048c02784159756924b0fae779e7f
+  data.tar.gz: 4379df8a83e072e3e34b06fac3e13a15bdf5104a8efe3b8b61d0ba2f56bc0422e3c0b8a651a2deb1162fbbb6ac34111c2b730c18bbcef794f4060eb5e4763f8a

data/README.md

@@ -22,15 +22,16 @@ Or install it yourself as:
     $ gem install cognitivebing
 
 ## Usage
-
+```ruby
 require 'cognitivebing'
 
 bing = CognitiveBing.new(account_key)
 #call with params
 bing = CognitiveBing.new(account_key, :mkt => "en-US", :count => 10, :offset => 0, :safesearch => "Moderate")
+```
 
-
-(to see params details : https://dev.cognitive.microsoft.com/docs/services/56b43eeccf5ff8098cef3807/operations/56b4447dcf5ff8098cef380d) 
+(to see params details : https://dev.cognitive.microsoft.com/docs/services/56b43eeccf5ff8098cef3807/operations/56b4447dcf5ff8098cef380d)
+```ruby
 #web search
 result_set = bing.search(search_term)
 #Image search
@@ -44,6 +45,7 @@ bing = CognitiveBingNews.new(account_key)
 result_set = bing.search(search_term)
 #News trending 
 result_set = bing.trending
+```
 
 ## Development
 
@@ -53,7 +55,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/cognitivebing. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/cognitivebing. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](./CODE_OF_CONDUCT.md) code of conduct.
 
 
 ## License

data/lib/cognitivebing.rb

@@ -4,27 +4,30 @@ require 'open-uri'
 require 'net/http'
 
 class CognitiveBing
-  attr_accessor :account_key, :params 
-  
+  class BingUnavailableException < StandardError;
+  end
+
+  attr_accessor :account_key, :params
+
   def initialize(account_key, params = {})
-    @account_key = account_key    
+    @account_key = account_key
     @params = params
   end
-  
-  
+
+
   def search(search_term, type = 'web')
-    
-    
+
+
     query_string = '?q='
-    query_portion = URI.encode_www_form_component('\'' + search_term + '\'')
-    params = "&Ocp-Apim-Subscription-Key=#{@account_key}"
-    @params.each do |k,v|
+    query_portion = URI.encode_www_form_component(search_term)
+    params = ""
+    @params.each do |k, v|
       params << "&#{k.to_s}=#{v.to_s}"
-      
+
     end
-    
+
     web_search_url = ""
-    
+
     if type == "videos"
       web_search_url = "https://api.cognitive.microsoft.com/bing/v5.0/videos/search"
     elsif type == "image"
@@ -32,138 +35,140 @@ class CognitiveBing
     else
       web_search_url = "https://api.cognitive.microsoft.com/bing/v5.0/search"
     end
-    
+
     full_address = web_search_url + query_string + query_portion + params
-    
+
     uri = URI(full_address)
     req = Net::HTTP::Get.new(uri.request_uri)
     req.add_field("Ocp-Apim-Subscription-Key", @account_key)
-    
 
-    res = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https'){|http|
+
+    res = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https') { |http|
       http.request(req)
     }
 
+
     body = JSON.parse(res.body, :symbolize_names => true)
-        
-    
-    return body
+  rescue => e
+    if e.message.include?("Bing services aren't available right now")
+      raise(BingUnavailableException)
+    else
+      raise(e)
+    end
   end
-  
+
   def suggestions(search_term)
-    
-    
+
+
     query_string = '?q='
-    query_portion = URI.encode_www_form_component( search_term )
-    
-    
-    
+    query_portion = URI.encode_www_form_component(search_term)
+
+
     web_search_url = "https://api.cognitive.microsoft.com/bing/v5.0/suggestions"
-    
-    full_address = web_search_url + query_string + query_portion 
-    
+
+    full_address = web_search_url + query_string + query_portion
+
     uri = URI(full_address)
     req = Net::HTTP::Get.new(uri.request_uri)
     req.add_field("Ocp-Apim-Subscription-Key", @account_key)
-    
 
-    res = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https'){|http|
+
+    res = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https') { |http|
       http.request(req)
     }
 
     body = JSON.parse(res.body, :symbolize_names => true)
-        
-    
+
+
     return body
   end
+
 end
 
 
 class CognitiveBingNews
   attr_accessor :account_key
-  
+
   def initialize(account_key, params = {})
     @account_key = account_key
     @params = params
   end
-  
+
   def search(search_term)
-    
-    
+
+
     query_string = '?q='
-    query_portion = URI.encode_www_form_component('\'' + search_term + '\'')
+    query_portion = URI.encode_www_form_component(search_term)
     paramsbuilder = "&Ocp-Apim-Subscription-Key=#{@account_key}"
-    @params.each do |k,v|
+    @params.each do |k, v|
       paramsbuilder << "&#{k.to_s}=#{v.to_s}"
-      
-      
+
+
     end
-    
+
     web_search_url = "https://api.cognitive.microsoft.com/bing/v5.0/news/search"
-    
-    
-    full_address = web_search_url + query_string + query_portion + paramsbuilder   
-    puts full_address
-    
+
+
+    full_address = web_search_url + query_string + query_portion + paramsbuilder
+
+
     uri = URI(full_address)
     req = Net::HTTP::Get.new(uri.request_uri)
     req.add_field("Ocp-Apim-Subscription-Key", @account_key)
-    
 
-    res = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https'){|http|
+
+    res = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https') { |http|
       http.request(req)
     }
 
     body = JSON.parse(res.body, :symbolize_names => true)
-        
-    
+
+
     return body
   end
-  
-  
-  
+
+
   def category(category_term, params = {})
-      
+
     web_search_url = URI('https://api.cognitive.microsoft.com/bing/v5.0/news/')
-      web_search_url.query = URI.encode_www_form({
-          # Request parameters
-          'category' => '#{category_term}'
+    web_search_url.query = URI.encode_www_form({
+      # Request parameters
+      'category' => category_term.to_s
     })
-    
-    
-    
+
+
     uri = URI(web_search_url)
     req = Net::HTTP::Get.new(uri.request_uri)
     req.add_field("Ocp-Apim-Subscription-Key", @account_key)
-    
 
-    res = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https'){|http|
+
+    res = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https') { |http|
       http.request(req)
     }
 
     body = JSON.parse(res.body, :symbolize_names => true)
-        
-    
+
+
     return body
   end
-  
-  
+
+
   def trending
-    
+
     web_search_url = "https://api.cognitive.microsoft.com/bing/v5.0/news/trendingtopics"
-    
-    
+
+
     uri = URI(web_search_url)
     req = Net::HTTP::Get.new(uri.request_uri)
     req.add_field("Ocp-Apim-Subscription-Key", @account_key)
-    
 
-    res = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https'){|http|
+
+    res = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https') { |http|
       http.request(req)
     }
 
     body = JSON.parse(res.body, :symbolize_names => true)
-    
+
     return body
   end
 end

data/lib/cognitivebing/version.rb

@@ -1,3 +1,3 @@
 module Cognitivebing
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cognitivebing
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - aggounix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-04 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler