bwapi 11.0.1.pre.615 → 11.0.1.pre.617

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWQ5N2E2NmVhYjU2MTY3NzZkYjY2OTMzMzdjN2YyZTZhNzE5YTdmMQ==
+    NGYyMWU2ZTliZTRkODljZmZhZmM3NWZiYTI4MjFkNGY3NWEzYzVhNA==
   data.tar.gz: !binary |-
-    YWYwMmRiNjlkZTQyMjM2MWQ3ZDg2ODlkNzY1ZjU2NjhkZDczZmRkMw==
+    YmYxZGY2MjZhNjZiNTgzYTNjMTk1OGE2NjFlZTU1MWZiYWI5MmEzYg==
 SHA512:
   metadata.gz: !binary |-
-    YTg1NDA1YzkzNmE5OWQwZjAxZjBiNzdlOWVjZWIwMTQ0NzUzOGU2NzgxYTZh
-    Mzg4MDQyMzhjYzgxMTc1OTg1YzM0OWFiZTJiOTQ5NTlkYTY3NjRmYTVmYjJk
-    NjI4NDE0ZjhjOTVmNzhjNmVkZWY1NjJhMThhMDkxNmQ5NWMwYjQ=
+    ODg1NTdmMDI0ZDA5ZWMzNmE4NTA2YjczOWZlODlmNTk4MjdjMmRmZGIzYjVi
+    MDMxZTM3YzhiOTgwYTM4NGQ2ZGRhYmM5OWUxM2Y3M2JmNWIzN2FhNDQ4NmE0
+    NGZkM2Q1MzEyMDkyOTBlMjU4MTJkY2IwYTAwMjFmMmFiMzZlZTA=
   data.tar.gz: !binary |-
-    OGU0YjE2OTUyYTA2Njk3ODk3OWUzODlkN2Y1YmU4MDZiZjM2Y2JiZTg4Zjgw
-    OTNlMWYzZDg2M2RiMDhjNmYyZjhiMWJiMzIwMWJhZDdlODgxMTczN2YwZjIy
-    ZjY3MDMxODM5NWQyY2M5OTJjOWEwZWEyMGViYTdiNTlmNDkwZDU=
+    YTI1ZGI5NDQ0YTFjMTJiZGFmNmE3MDcyZjQ3OWUwNDFhZDc0NzI3NmU0ZjMw
+    MWZiYWFmMGFmNjBmYzYwMjAyZTFkMDkyMDY3YzA3MGY1MzExMTFkZjY5NWMy
+    NTc2Zjg1M2Y1NmFkYThkOGM3YWFiN2ZhMjEwODJmMjFmNGMyMTI=

data/lib/bwapi/client/admin/clients.rb

@@ -1,4 +1,3 @@
-require 'bwapi/client/admin/clients/sub_clients'
 require 'bwapi/client/admin/clients/users'
 require 'bwapi/client/admin/clients/user_groups'
 
@@ -21,7 +20,6 @@ module BWAPI
           get "admin/clients/#{client_id}/usage/daily", opts
         end
 
-        include BWAPI::Client::Admin::Clients::SubClients
         include BWAPI::Client::Admin::Clients::Users
         include BWAPI::Client::Admin::Clients::UserGroups
       end

data/lib/bwapi/client/client.rb

@@ -1,4 +1,5 @@
 require 'bwapi/client/client/grant_types'
+require 'bwapi/client/client/sub_clients'
 
 module BWAPI
   class Client
@@ -40,6 +41,7 @@ module BWAPI
       end
 
       include BWAPI::Client::Client::GrantTypes
+      include BWAPI::Client::Client::SubClients
     end
   end
 end

data/lib/bwapi/client/client/sub_clients.rb

@@ -0,0 +1,108 @@
+module BWAPI
+  class Client
+    module Client
+      # Subclients module for client/subclient endpoints
+      module SubClients
+        # Get all sub clients
+        #
+        # @param client_id [Integer] Id of the client
+        # @param opts [Hash] options hash of parameters
+        # @option opts [Integer] page Page of projects to retrieve
+        # @option opts [Integer] pageSize Results per page of results
+        # @return [Hash] All sub clients for client
+        def client_sub_clients(client_id, opts = {})
+          get "/client/#{client_id}/subclients", opts
+        end
+
+        # Get specific sub client of client
+        #
+        # @param client_id [Integer] Id of the client
+        # @param sub_client_id [Integer] Id of the sub client
+        # @return [Hash] Specific sub client for client
+        def get_client_sub_client(client_id, sub_client_id)
+          get "/client/#{client_id}/subclients/#{sub_client_id}"
+        end
+
+        # Create new subclient
+        #
+        # @param client_id [Integer] Id of the client
+        # @param opts [Hash] options hash of parameters
+        # @option opts [Date] startDate Start date of the client
+        # @option opts [String] contactTitle Contact title of the client
+        # @option opts [String] address1 Address line one of the client
+        # @option opts [String] address2 Address line two of the client
+        # @option opts [String] address3 Address line three of the client
+        # @option opts [String] pricingModel Pricing model of the client
+        # @option opts [Integer] mentionArchiveSize Mention archive size for the client
+        # @option opts [Integer] id Id of the sub client
+        # @option opts [Integer] parentId Parent id of the sub client
+        # @option opts [Integer] maxUsers Maxiumum number of users for the client
+        # @option opts [Boolean] isLegacy Legacy status of the client
+        # @option opts [String] name Name of the client
+        # @option opts [String] contactTelephone Telephone number of the client
+        # @option opts [Integer] priceStructureId Id of the price structure for client
+        # @option opts [Hash] tags Tags for the client
+        # @option opts [String] website The website for the client
+        # @option opts [String] contactEmail The contact email for the client
+        # @option opts [Date] expiryDate The expiry date for the client
+        # @option opts [String] theme The theme of the client
+        # @option opts [Integer] priceStructureLineId The level of the price structure for the client
+        # @option opts [Integer] mentionBasedPricingMatrixLevel The amount of mentions allowed
+        # @option opts [String] postcode The postcode of the client
+        # @option opts [String] country The country of the client
+        # @option opts [String] contactName The contact name of the client
+        # @option opts [Integer] maximumSubscribedBrands The maximum subscribed brands for the client
+        # @option opts [String] contactMobile The mobile number for the client
+        # @return [Hash] New sub client
+        def create_client_sub_client(client_id, opts = {})
+          post "/client/#{client_id}/subclients", opts
+        end
+
+        # Update new subclient
+        #
+        # @param client_id [Integer] Id of the client
+        # @param sub_client_id [Integer] Id of the sub client
+        # @param opts [Hash] options hash of parameters
+        # @option opts [Date] startDate Start date of the client
+        # @option opts [String] contactTitle Contact title of the client
+        # @option opts [String] address1 Address line one of the client
+        # @option opts [String] address2 Address line two of the client
+        # @option opts [String] address3 Address line three of the client
+        # @option opts [String] pricingModel Pricing model of the client
+        # @option opts [Integer] mentionArchiveSize Mention archive size for the client
+        # @option opts [Integer] id Id of the sub client
+        # @option opts [Integer] parentId Parent id of the sub client
+        # @option opts [Integer] maxUsers Maxiumum number of users for the client
+        # @option opts [Boolean] isLegacy Legacy status of the client
+        # @option opts [String] name Name of the client
+        # @option opts [String] contactTelephone Telephone number of the client
+        # @option opts [Integer] priceStructureId Id of the price structure for client
+        # @option opts [Hash] tags Tags for the client
+        # @option opts [String] website The website for the client
+        # @option opts [String] contactEmail The contact email for the client
+        # @option opts [Date] expiryDate The expiry date for the client
+        # @option opts [String] theme The theme of the client
+        # @option opts [Integer] priceStructureLineId The level of the price structure for the client
+        # @option opts [Integer] mentionBasedPricingMatrixLevel The amount of mentions allowed
+        # @option opts [String] postcode The postcode of the client
+        # @option opts [String] country The country of the client
+        # @option opts [String] contactName The contact name of the client
+        # @option opts [Integer] maximumSubscribedBrands The maximum subscribed brands for the client
+        # @option opts [String] contactMobile The mobile number for the client
+        # @return [Hash] Edited sub client
+        def update_client_sub_client(client_id, sub_client_id, opts = {})
+          put "/client/#{client_id}/subclients/#{sub_client_id}", opts
+        end
+
+        # Delete specific sub client of client
+        #
+        # @param client_id [Integer] Id of the client
+        # @param sub_client_id [Integer] Id of the sub client
+        # @return [Hash] Specific sub client for client
+        def delete_client_sub_client(client_id, sub_client_id)
+          delete "/client/#{client_id}/subclients/#{sub_client_id}"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bwapi
 version: !ruby/object:Gem::Version
-  version: 11.0.1.pre.615
+  version: 11.0.1.pre.617
 platform: ruby
 authors:
 - Jonathan Chrisp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -146,7 +146,6 @@ files:
 - lib/bwapi/client/admin/become.rb
 - lib/bwapi/client/admin/client.rb
 - lib/bwapi/client/admin/clients.rb
-- lib/bwapi/client/admin/clients/sub_clients.rb
 - lib/bwapi/client/admin/clients/user_groups.rb
 - lib/bwapi/client/admin/clients/users.rb
 - lib/bwapi/client/admin/clients/users/sharing.rb
@@ -180,6 +179,7 @@ files:
 - lib/bwapi/client/brandwatch/usage_report.rb
 - lib/bwapi/client/client.rb
 - lib/bwapi/client/client/grant_types.rb
+- lib/bwapi/client/client/sub_clients.rb
 - lib/bwapi/client/command_center.rb
 - lib/bwapi/client/command_center/category_colours.rb
 - lib/bwapi/client/command_center/client.rb

data/lib/bwapi/client/admin/clients/sub_clients.rb

@@ -1,110 +0,0 @@
-module BWAPI
-  class Client
-    module Admin
-      module Clients
-        # Subclients module for admin/subclient endpoints
-        module SubClients
-          # Get all sub clients
-          #
-          # @param client_id [Integer] Id of the client
-          # @param opts [Hash] options hash of parameters
-          # @option opts [Integer] page Page of projects to retrieve
-          # @option opts [Integer] pageSize Results per page of results
-          # @return [Hash] All sub clients for client
-          def client_sub_clients(client_id, opts = {})
-            get "admin/clients/#{client_id}/subclients", opts
-          end
-
-          # Get specific sub client of client
-          #
-          # @param client_id [Integer] Id of the client
-          # @param sub_client_id [Integer] Id of the sub client
-          # @return [Hash] Specific sub client for client
-          def get_client_sub_client(client_id, sub_client_id)
-            get "admin/clients/#{client_id}/subclients/#{sub_client_id}"
-          end
-
-          # Create new subclient
-          #
-          # @param client_id [Integer] Id of the client
-          # @param opts [Hash] options hash of parameters
-          # @option opts [Date] startDate Start date of the client
-          # @option opts [String] contactTitle Contact title of the client
-          # @option opts [String] address1 Address line one of the client
-          # @option opts [String] address2 Address line two of the client
-          # @option opts [String] address3 Address line three of the client
-          # @option opts [String] pricingModel Pricing model of the client
-          # @option opts [Integer] mentionArchiveSize Mention archive size for the client
-          # @option opts [Integer] id Id of the sub client
-          # @option opts [Integer] parentId Parent id of the sub client
-          # @option opts [Integer] maxUsers Maxiumum number of users for the client
-          # @option opts [Boolean] isLegacy Legacy status of the client
-          # @option opts [String] name Name of the client
-          # @option opts [String] contactTelephone Telephone number of the client
-          # @option opts [Integer] priceStructureId Id of the price structure for client
-          # @option opts [Hash] tags Tags for the client
-          # @option opts [String] website The website for the client
-          # @option opts [String] contactEmail The contact email for the client
-          # @option opts [Date] expiryDate The expiry date for the client
-          # @option opts [String] theme The theme of the client
-          # @option opts [Integer] priceStructureLineId The level of the price structure for the client
-          # @option opts [Integer] mentionBasedPricingMatrixLevel The amount of mentions allowed
-          # @option opts [String] postcode The postcode of the client
-          # @option opts [String] country The country of the client
-          # @option opts [String] contactName The contact name of the client
-          # @option opts [Integer] maximumSubscribedBrands The maximum subscribed brands for the client
-          # @option opts [String] contactMobile The mobile number for the client
-          # @return [Hash] New sub client
-          def create_client_sub_client(client_id, opts = {})
-            post "admin/clients/#{client_id}/subclients", opts
-          end
-
-          # Update new subclient
-          #
-          # @param client_id [Integer] Id of the client
-          # @param sub_client_id [Integer] Id of the sub client
-          # @param opts [Hash] options hash of parameters
-          # @option opts [Date] startDate Start date of the client
-          # @option opts [String] contactTitle Contact title of the client
-          # @option opts [String] address1 Address line one of the client
-          # @option opts [String] address2 Address line two of the client
-          # @option opts [String] address3 Address line three of the client
-          # @option opts [String] pricingModel Pricing model of the client
-          # @option opts [Integer] mentionArchiveSize Mention archive size for the client
-          # @option opts [Integer] id Id of the sub client
-          # @option opts [Integer] parentId Parent id of the sub client
-          # @option opts [Integer] maxUsers Maxiumum number of users for the client
-          # @option opts [Boolean] isLegacy Legacy status of the client
-          # @option opts [String] name Name of the client
-          # @option opts [String] contactTelephone Telephone number of the client
-          # @option opts [Integer] priceStructureId Id of the price structure for client
-          # @option opts [Hash] tags Tags for the client
-          # @option opts [String] website The website for the client
-          # @option opts [String] contactEmail The contact email for the client
-          # @option opts [Date] expiryDate The expiry date for the client
-          # @option opts [String] theme The theme of the client
-          # @option opts [Integer] priceStructureLineId The level of the price structure for the client
-          # @option opts [Integer] mentionBasedPricingMatrixLevel The amount of mentions allowed
-          # @option opts [String] postcode The postcode of the client
-          # @option opts [String] country The country of the client
-          # @option opts [String] contactName The contact name of the client
-          # @option opts [Integer] maximumSubscribedBrands The maximum subscribed brands for the client
-          # @option opts [String] contactMobile The mobile number for the client
-          # @return [Hash] Edited sub client
-          def update_client_sub_client(client_id, sub_client_id, opts = {})
-            put "admin/clients/#{client_id}/subclients/#{sub_client_id}", opts
-          end
-
-          # Delete specific sub client of client
-          #
-          # @param client_id [Integer] Id of the client
-          # @param sub_client_id [Integer] Id of the sub client
-          # @return [Hash] Specific sub client for client
-          def delete_client_sub_client(client_id, sub_client_id)
-            delete "admin/clients/#{client_id}/subclients/#{sub_client_id}"
-          end
-        end
-      end
-    end
-  end
-end