lib/adwords4r/services.rb in adwords4r-0.7 vs lib/adwords4r/services.rb in adwords4r-11.0.2

@@ -1,37 +1,29 @@
 module AdWords
+  class Service
 
-    class Service
-        
-        @@services = {
-          4 => ['Creative', 'Keyword', 'Criterion', 'AdGroup', 'Campaign', 'TrafficEstimator', 'Report', 'Info', 'Account', 'KeywordTool'],
-          5 => ['Creative', 'Criterion', 'AdGroup', 'Campaign', 'TrafficEstimator', 'Report', 'Info', 'Account', 'KeywordTool'],
-          6 => ['Creative', 'Criterion', 'AdGroup', 'Campaign', 'TrafficEstimator', 'Report', 'Info', 'Account', 'KeywordTool']
-        }
-        
-        def Service.getVersions
-            @@services.keys
-        end
+    @services = {
+      10 => ["Account", "AdGroup", "Ad", "Campaign", "Criterion", "Info", "KeywordTool", "Report", "SiteSuggestion", "TrafficEstimator"],
+      11 => ["Account", "AdGroup", "Ad", "Campaign", "Criterion", "Info", "KeywordTool", "Report", "SiteSuggestion", "TrafficEstimator"]
+    }
 
-        def Service.getServices(version)
-            @@services[version]
-        end
-        
-        def Service.doRequire(version)
-            req = []
-            Service.getServices(version).each {|s| req << "require 'adwords4r/v#{version}/#{s}ServiceDriver'"} 
-            req.each {|r| eval(r)}
-        end
-        
-        def Service.getService(version, method)
-        
-        end
-        
-        def Service.getMethodMap(drivers)
-            #Service.getVersions.each do |v|
-            methodMap = Hash.new
-            drivers.each_value {|d| d.class::Methods.each {|m| methodMap[m[1]] = d}}
-            return methodMap
-        end
+    def self.getVersions
+      @services.keys
     end
-    
+
+    def self.getServices(version)
+      @services[version]
+    end
+
+    def self.doRequire(version)
+      getServices(version).each do |s|
+        eval("require 'adwords4r/v#{version}/#{s}ServiceDriver'")
+      end
+    end
+
+    def self.getMethodMap(drivers)
+      methodMap = Hash.new
+      drivers.each_value {|d| d.class::Methods.each {|m| methodMap[m[1]] = d}}
+      return methodMap
+    end
+  end
 end