three-sixty 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8bb8285370ea960ab4d6b2f43ba4a3d3fdb0aad
-  data.tar.gz: df4ff45183e9adbd55306b037bbf7b5f0e9f1307
+  metadata.gz: 249e9939329744e7012a42acb0035ad05a09ee0c
+  data.tar.gz: 36127cabee883a90c097241dd65aa0cf27bb15e7
 SHA512:
-  metadata.gz: 73348a8ebf55b9c6f58b9b55a192273a1fc9546e03b4ba5a1ae38ebb1e25e256b7df69ad11d2e16cfd7c53905397fdf175bc09e867fade72e3d6e1de6752ad02
-  data.tar.gz: 5272e7069aa97df7dc8ee3d2d536af2a2b6c55081d5128da92d09f31bbb7827bc2ec79fe8cafb94d87aa0df876c5ecb1f8709305feaa4c2d5f6b3b3510b4b0e8
+  metadata.gz: f3bfcf513cb6aede86f1c0dc30271b5d97ae5b7d6e4e77de690f2a33d80769c48d4adb2208bb1da9ea85112d8687e21613d615eaafce5e8139550aec1d56cdda
+  data.tar.gz: bb09fce3963fe121905d235c2f7b93081443ece14e0bca8254618c8beda0ef5a60b7eee874445f55792318116fe404f01d01bf37f9690b50de0cd5c8cd2564e4

data/lib/three-sixty/core/account.rb

@@ -1,6 +1,9 @@
+require_relative 'client'
+
 module ThreeSixty
   module Core
     class Account
+      include ThreeSixty::Core::Client
 
       SERVICE_URL = 'account'
 
@@ -9,27 +12,27 @@ module ThreeSixty
       end
 
       def client_login(username, password)
-        @client.request(resource_url("clientLogin"), username: username, passwd: password)
+        client_request(@client, resource_url("clientLogin"), username: username, passwd: password)
       end
 
       def get_campaign_id_list
-        @client.request(resource_url("getCampaignIdList"))
+        client_request(@client, resource_url("getCampaignIdList"))
       end
 
       def get_info
-        @client.request(resource_url("getInfo"))
+        client_request(@client, resource_url("getInfo"))
       end
 
       def get_all_objects(campaign_ids)
-        @client.request(resource_url("getAllObjects"), idList: campaign_ids)
+        client_request(@client, resource_url("getAllObjects"), idList: campaign_ids)
       end
 
       def get_file_state(file_id)
-        @client.request(resource_url("getFileState"), fileId: file_id)
+        client_request(@client, resource_url("getFileState"), fileId: file_id)
       end
 
       def get_exclude_ip
-        @client.request(resource_url("getExcludeIp"))
+        client_request(@client, resource_url("getExcludeIp"))
       end
 
       private

data/lib/three-sixty/core/campaign.rb

@@ -1,6 +1,9 @@
+require_relative 'client'
+
 module ThreeSixty
   module Core
     class Campaign
+      include ThreeSixty::Core::Client
 
       SERVICE_URL = 'campaign'
 
@@ -9,11 +12,11 @@ module ThreeSixty
       end
 
       def get_info_by_id(campaign_id)
-        @client.request(resource_url("getInfoById"), id: campaign_id)
+        client_request(@client, resource_url("getInfoById"), id: campaign_id)
       end
 
       def get_info_by_id_list(campaign_ids)
-        @client.request(resource_url("getInfoByIdList"), idList: campaign_ids)
+        client_request(@client, resource_url("getInfoByIdList"), idList: campaign_ids)
       end
 
       private

data/lib/three-sixty/core/client.rb

@@ -0,0 +1,15 @@
+module ThreeSixty
+  module Core
+    module Client
+
+      def client_request(client, url, params = {})
+        response =  client.request(url, params)
+        raise ThreeSixtyResponseError.new("Invalid request: #{response['failures']}") if response.is_a?(Hash) && ! response['failures'].nil?
+        response
+      end
+
+      class ThreeSixtyResponseError < StandardError; end
+
+    end
+  end
+end

data/lib/three-sixty/core/creative.rb

@@ -1,6 +1,9 @@
+require_relative 'client'
+
 module ThreeSixty
   module Core
     class Creative
+      include ThreeSixty::Core::Client
 
       SERVICE_URL = 'creative'
 
@@ -10,23 +13,23 @@ module ThreeSixty
 
       def get_id_list_by_group_id(ad_group_id, opts = {})
         opts.merge!(groupId: ad_group_id)
-        @client.request(resource_url("getIdListByGroupId"), opts)
+        client_request(@client, resource_url("getIdListByGroupId"), opts)
       end
 
       def get_info_by_id(creative_id)
-        @client.request(resource_url("getInfoById"), id: creative_id)
+        client_request(@client, resource_url("getInfoById"), id: creative_id)
       end
 
       def get_info_by_id_list(creative_ids)
-        @client.request(resource_url("getInfoByIdList"), idList: creative_ids)
+        client_request(@client, resource_url("getInfoByIdList"), idList: creative_ids)
       end
 
       def get_status_by_id_list(creative_ids)
-        @client.request(resource_url("getStatusByIdList"), idList: creative_ids)
+        client_request(@client, resource_url("getStatusByIdList"), idList: creative_ids)
       end
 
       def get_changed_id_list(from_time)
-        @client.request(resource_url("getChangedIdList"), fromTime: from_time)
+        client_request(@client, resource_url("getChangedIdList"), fromTime: from_time)
       end
 
       private

data/lib/three-sixty/core/group.rb

@@ -1,6 +1,9 @@
+require_relative 'client'
+
 module ThreeSixty
   module Core
     class Group
+      include ThreeSixty::Core::Client
 
       SERVICE_URL = 'group'
 
@@ -10,15 +13,15 @@ module ThreeSixty
 
       def get_id_list_by_campaign_id(campaign_id, opts = {})
         opts.merge!(campaignId: campaign_id)
-        @client.request(resource_url("getIdListByCampaignId"), opts)
+        client_request(@client, resource_url("getIdListByCampaignId"), opts)
       end
 
       def get_info_by_id(adgroup_id)
-        @client.request(resource_url("getInfoById"), id: adgroup_id)
+        client_request(@client, resource_url("getInfoById"), id: adgroup_id)
       end
 
       def get_info_by_id_list(adgroup_ids)
-        @client.request(resource_url("getInfoByIdList"), idList: adgroup_ids)
+        client_request(@client, resource_url("getInfoByIdList"), idList: adgroup_ids)
       end
 
       private

data/lib/three-sixty/core/keyword.rb

@@ -1,6 +1,9 @@
+require_relative 'client'
+
 module ThreeSixty
   module Core
     class Keyword
+      include ThreeSixty::Core::Client
 
       SERVICE_URL = 'keyword'
 
@@ -10,23 +13,23 @@ module ThreeSixty
 
       def get_id_list_by_group_id(ad_group_id, opts = {})
         opts.merge!(groupId: ad_group_id)
-        @client.request(resource_url("getIdListByGroupId"), opts)
+        client_request(@client, resource_url("getIdListByGroupId"), opts)
       end
 
       def get_info_by_id(keyword_id)
-        @client.request(resource_url("getInfoById"), id: keyword_id)
+        client_request(@client, resource_url("getInfoById"), id: keyword_id)
       end
 
       def get_status_by_id_list(keyword_ids)
-        @client.request(resource_url("getStatusByIdList"), idList: keyword_ids)
+        client_request(@client, resource_url("getStatusByIdList"), idList: keyword_ids)
       end
 
       def get_info_by_id_list(keyword_ids)
-        @client.request(resource_url("getInfoByIdList"), idList: keyword_ids)
+        client_request(@client, resource_url("getInfoByIdList"), idList: keyword_ids)
       end
 
       def get_changed_id_list(from_time)
-        @client.request(resource_url("getChangedIdList"), fromTime: from_time)
+        client_request(@client, resource_url("getChangedIdList"), fromTime: from_time)
       end
 
       private

data/lib/three-sixty/core/report.rb

@@ -1,6 +1,9 @@
+require_relative 'client'
+
 module ThreeSixty
   module Core
     class Report
+      include ThreeSixty::Core::Client
 
       SERVICE_URL = 'report'
 
@@ -10,32 +13,32 @@ module ThreeSixty
 
       def keyword_count(start_date, level, opts = {})
         opts.merge!({startDate: start_date, level: level})
-        @client.request(resource_url("keywordCount"), opts)
+        client_request(@client, resource_url("keywordCount"), opts)
       end
 
       def keyword(start_date, level, opts = {})
         opts.merge!({startDate: start_date, level: level})
-        @client.request(resource_url("keyword"), opts)
+        client_request(@client, resource_url("keyword"), opts)
       end
 
       def creative_count(start_date, level, opts = {})
         opts.merge!({startDate: start_date, level: level})
-        @client.request(resource_url("creativeCount"), opts)
+        client_request(@client, resource_url("creativeCount"), opts)
       end
 
       def creative(start_date, level, opts = {})
         opts.merge!({startDate: start_date, level: level})
-        @client.request(resource_url("creative"), opts)
+        client_request(@client, resource_url("creative"), opts)
       end
 
       def region_count(start_date, level, opts = {})
         opts.merge!({startDate: start_date, level: level})
-        @client.request(resource_url("regionCount"), opts)
+        client_request(@client, resource_url("regionCount"), opts)
       end
 
       def region(start_date, level, opts = {})
         opts.merge!({startDate: start_date, level: level})
-        @client.request(resource_url("region"), opts)
+        client_request(@client, resource_url("region"), opts)
       end
 
       private

data/lib/three-sixty/version.rb

@@ -1,3 +1,3 @@
 module ThreeSixty
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: three-sixty
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Daniel Padden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies: []
 description: Connecting to the 360 api
 email:
@@ -17,7 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - README.md
 - lib/three-sixty.rb
 - lib/three-sixty/account.rb
@@ -26,6 +26,7 @@ files:
 - lib/three-sixty/configuration.rb
 - lib/three-sixty/core/account.rb
 - lib/three-sixty/core/campaign.rb
+- lib/three-sixty/core/client.rb
 - lib/three-sixty/core/creative.rb
 - lib/three-sixty/core/group.rb
 - lib/three-sixty/core/keyword.rb
@@ -46,17 +47,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Gathering data from the 360 api