Merge pull request #40 from forward3d/version6

Version 6.0.0
forward3d · Aug 24, 2020 · a60a141 · a60a141
2 parents 8c29000 + 929bd16
commit a60a141
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 353 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+* 6.0.0
+  Remove curb in favor of httparty
+  BREAKING CHANGE: Remove InsightService
+
 * 5.0.0
   Fully using API V13
   BREAKING CHANGE: AdInsightService class removed, use ReportingService instead

diff --git a/README.md b/README.md
@@ -31,72 +31,9 @@ service = BingAdsReporting::BulkService.new({
 })
 ```
 
-#### Insight Service(actual AdInsight Serive) - [Bing Ads API reference for Bulk Service](https://docs.microsoft.com/en-us/advertising/ad-insight-service/ad-insight-service-reference?view=bingads-13)
-
-```ruby
-service = BingAdsReporting::InsightService.new(auth_settings, logger, request_class)
-```
-
-##### Request Class example
-
-For which report in AdInsightService API, which one has different SOAP request.
-
-Bellow an example of the request for [Auction Insight report](https://docs.microsoft.com/en-us/advertising/ad-insight-service/getauctioninsightdata?view=bingads-13#request-soap).
-
-```ruby
-class AuctionInsightRequest
-  attr_reader :period, :options
-
-  def initialize(period, options)
-    @period = period
-    @options = options
-  end
-
-  def self.message(period, options)
-    new(period, options).message
-  end
-
-  def message
-    {
-      'EntityType' => options[:entity_type],
-      'SearchParameters' => {
-        'SearchParameter' => {
-          'EndDate' => {
-            'Day' => '10',
-            'Month' => '02',
-            'Year' => '2018'
-          },
-          'StartDate' => {
-            'Day' => '10',
-            'Month' => '01',
-            'Year' => '2018'
-          },
-          '@i:type' => 'tns:DateRangeSearchParameter'
-        }
-      },
-      '@xsi:type' => 'tns:DateRangeSearchParameter'
-    }
-  end
-end
-```
-
-#### AdInsight Service(DEPRECATED)
-
-Use `ReportingService` instead.
-
-```ruby
-service = BingAdsReporting::AdInsightService.new({
-  developerToken: '',
-  applicationToken: '',
-  authenticationToken: '',
-  :accountId: '',
-  customerId: ''
-})
-```
-
 ## Create report and get it's ID
 
-### Ad Reporting Service
+### Reporting Service
 
 ```ruby
 period = Datebox::Period.new('2013-07-01', '2013-07-03')
@@ -117,7 +54,6 @@ id = service.generate_report({report_type: 'DownloadCampaignsByAccountIds'
                               download_entities: ['Keywords']},
                               {})
 ```
-
 ### Get Report
 
 Get report URL for download by report ID if it's ready
@@ -131,17 +67,3 @@ or get its content by ID (also once ready)
 ```ruby
 service.report_body(id) if service.report_ready?(id)
 ```
-
-## InsightService
-
-### Get Auction Insight Results
-
-```ruby
-result = service.generate_report({report_type: AuctionInsightData, entity_type: 'Account'})
-```
-
-### Get Auction Insight Results for Keywords
-
-```ruby
-result = service.generate_report({report_type: AuctionInsightData, entity_type: 'Account', entity_ids: [1, 2, 3]})
-```
diff --git a/bing-ads-reporting.gemspec b/bing-ads-reporting.gemspec
@@ -16,10 +16,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = [] # gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'curb',    '~> 0.9.10'
-  gem.add_dependency 'datebox', '~> 0.5.0'
-  gem.add_dependency 'oauth2',  '~> 1.4.1'
-  gem.add_dependency 'savon',   '~> 2.12.0'
+  gem.add_dependency 'httparty', '~> 0.17.0'
+  gem.add_dependency 'datebox',  '~> 0.5.0'
+  gem.add_dependency 'oauth2',   '~> 1.4.1'
+  gem.add_dependency 'savon',    '~> 2.12.0'
 
   gem.add_development_dependency 'reek', '~> 5.4.0'
   gem.add_development_dependency 'rspec', '~> 3.4.0'

diff --git a/lib/bing-ads-reporting/downloader.rb b/lib/bing-ads-reporting/downloader.rb
@@ -14,14 +14,8 @@ def self.fetch_report(report_url)
 
     def fetch_report
       logger.debug "Downloading Bing report from: #{report_url}"
-      curl.perform
-      curl.body_str
-    end
-
-    private
-
-    def curl
-      @curl ||= Curl::Easy.new(report_url)
+      response = HTTParty.get(report_url)
+      response.body
     end
   end
 end
diff --git a/lib/bing-ads-reporting/insight_service.rb b/lib/bing-ads-reporting/insight_service.rb
diff --git a/lib/bing-ads-reporting/version.rb b/lib/bing-ads-reporting/version.rb
@@ -1,3 +1,3 @@
 module BingAdsReporting
-  VERSION = '5.0.0'.freeze
+  VERSION = '6.0.0'.freeze
 end
diff --git a/lib/bing_ads_reporting.rb b/lib/bing_ads_reporting.rb
@@ -1,7 +1,6 @@
 require_relative 'bing-ads-reporting/bing_helper'
 require_relative 'bing-ads-reporting/bing_settings'
 require_relative 'bing-ads-reporting/soap_error_helper'
-require_relative 'bing-ads-reporting/insight_service'
 require_relative 'bing-ads-reporting/bulk_service'
 require_relative 'bing-ads-reporting/reporting_service'
 require_relative 'bing-ads-reporting/version'