lib/sendgrid4r/rest/ips/pools.rb in sendgrid4r-1.8.1 vs lib/sendgrid4r/rest/ips/pools.rb in sendgrid4r-1.10.0

@@ -1,70 +1,59 @@
 # -*- encoding: utf-8 -*-
 
-module SendGrid4r
-  module REST
+module SendGrid4r::REST
+  #
+  # SendGrid Web API v3 Ip Management
+  #
+  module Ips
     #
-    # SendGrid Web API v3 Ip Management
+    # SendGrid Web API v3 Ip Management - Pools
     #
-    module Ips
-      #
-      # SendGrid Web API v3 Ip Management - Pools
-      #
-      module Pools
-        include SendGrid4r::REST::Request
+    module Pools
+      include Request
 
-        Pool = Struct.new(:pool_name, :name, :ips)
+      Pool = Struct.new(:pool_name, :name, :ips)
 
-        def self.create_pools(resp)
-          return resp if resp.nil?
-          pools = []
-          resp.each do |pool|
-            pools.push(SendGrid4r::REST::Ips::Pools.create_pool(pool))
-          end
-          pools
-        end
+      def self.create_pools(resp)
+        return resp if resp.nil?
+        resp.map { |pool| Ips::Pools.create_pool(pool) }
+      end
 
-        def self.create_pool(resp)
-          return resp if resp.nil?
-          ips = []
-          Array(resp['ips']).each { |ip| ips.push(ip) }
-          Pool.new(resp['pool_name'], resp['name'], ips)
-        end
+      def self.create_pool(resp)
+        return resp if resp.nil?
+        Pool.new(resp['pool_name'], resp['name'], resp['ips'])
+      end
 
-        def self.url(name = nil, ips = nil, ip = nil)
-          url = "#{BASE_URL}/ips/pools"
-          url = "#{url}/#{name}" unless name.nil?
-          url = "#{url}/#{ips}" unless ips.nil?
-          url = "#{url}/#{ip}" unless ip.nil?
-          url
-        end
+      def self.url(name = nil, ips = nil, ip = nil)
+        url = "#{BASE_URL}/ips/pools"
+        url = "#{url}/#{name}" unless name.nil?
+        url = "#{url}/#{ips}" unless ips.nil?
+        url = "#{url}/#{ip}" unless ip.nil?
+        url
+      end
 
-        def post_pool(name:, &block)
-          endpoint = SendGrid4r::REST::Ips::Pools.url
-          resp = post(@auth, endpoint, name: name, &block)
-          SendGrid4r::REST::Ips::Pools.create_pool(resp)
-        end
+      def post_pool(name:, &block)
+        resp = post(@auth, Ips::Pools.url, name: name, &block)
+        Ips::Pools.create_pool(resp)
+      end
 
-        def get_pools(&block)
-          resp = get(@auth, SendGrid4r::REST::Ips::Pools.url, &block)
-          SendGrid4r::REST::Ips::Pools.create_pools(resp)
-        end
+      def get_pools(&block)
+        resp = get(@auth, Ips::Pools.url, &block)
+        Ips::Pools.create_pools(resp)
+      end
 
-        def get_pool(name:, &block)
-          endpoint = SendGrid4r::REST::Ips::Pools.url(name)
-          resp = get(@auth, endpoint, &block)
-          SendGrid4r::REST::Ips::Pools.create_pool(resp)
-        end
+      def get_pool(name:, &block)
+        resp = get(@auth, Ips::Pools.url(name), &block)
+        Ips::Pools.create_pool(resp)
+      end
 
-        def put_pool(name:, new_name:, &block)
-          endpoint = SendGrid4r::REST::Ips::Pools.url(name)
-          resp = put(@auth, endpoint, name: new_name, &block)
-          SendGrid4r::REST::Ips::Pools.create_pool(resp)
-        end
+      def put_pool(name:, new_name:, &block)
+        resp = put(@auth, Ips::Pools.url(name), name: new_name, &block)
+        Ips::Pools.create_pool(resp)
+      end
 
-        def delete_pool(name:, &block)
-          delete(@auth, SendGrid4r::REST::Ips::Pools.url(name), &block)
-        end
+      def delete_pool(name:, &block)
+        delete(@auth, Ips::Pools.url(name), &block)
       end
     end
   end
 end