fog-google 0.1.3 → 0.2.0

data/lib/fog/{google/requests/compute → compute/google/requests}/validate_url_map.rb

@@ -2,8 +2,8 @@ module Fog
   module Compute
     class Google
       class Mock
-        def validate_url_map(url_map)
-          Fog::Mock::not_implemented
+        def validate_url_map(_url_map)
+          Fog::Mock.not_implemented
         end
       end
 
@@ -11,10 +11,10 @@ module Fog
         def validate_url_map(url_map)
           api_method = @compute.url_maps.validate
           parameters = {
-            'project' => @project,
-            'urlMap' => url_map.name
+            "project" => @project,
+            "urlMap" => url_map.name
           }
-          body = { 'resource' => url_map }
+          body = { "resource" => url_map }
 
           request(api_method, parameters, body_object = body)
         end

data/lib/fog/{google/dns.rb → dns/google.rb}

@@ -5,13 +5,13 @@ module Fog
       recognizes :app_name, :app_version, :google_client_email, :google_key_location, :google_key_string,
                  :google_client, :google_json_key_location, :google_json_key_string
 
-      GOOGLE_DNS_API_VERSION     = 'v1'
-      GOOGLE_DNS_BASE_URL        = 'https://www.googleapis.com/dns/'
+      GOOGLE_DNS_API_VERSION     = "v1"
+      GOOGLE_DNS_BASE_URL        = "https://www.googleapis.com/dns/"
       GOOGLE_DNS_API_SCOPE_URLS  = %w(https://www.googleapis.com/auth/ndev.clouddns.readwrite)
 
       ##
       # MODELS
-      model_path 'fog/google/models/dns'
+      model_path "fog/dns/google/models"
 
       # Zone
       model :zone
@@ -31,7 +31,7 @@ module Fog
 
       ##
       # REQUESTS
-      request_path 'fog/google/requests/dns'
+      request_path "fog/dns/google/requests"
 
       # Zone
       request :create_managed_zone
@@ -57,7 +57,7 @@ module Fog
           shared_initialize(options[:google_project], GOOGLE_DNS_API_VERSION, GOOGLE_DNS_BASE_URL)
         end
 
-        def self.data(api_version)
+        def self.data(_api_version)
           @data ||= {}
         end
 
@@ -65,11 +65,11 @@ module Fog
           @data = nil
         end
 
-        def data(project=@project)
+        def data(project = @project)
           self.class.data(api_version)[project] ||= {
             :managed_zones => {},
             :resource_record_sets => {},
-            :changes => {},
+            :changes => {}
           }
         end
 
@@ -86,9 +86,9 @@ module Fog
 
         def initialize(options)
           shared_initialize(options[:google_project], GOOGLE_DNS_API_VERSION, GOOGLE_DNS_BASE_URL)
-          options.merge!(:google_api_scope_url => GOOGLE_DNS_API_SCOPE_URLS.join(' '))
+          options.merge!(:google_api_scope_url => GOOGLE_DNS_API_SCOPE_URLS.join(" "))
           @client = initialize_google_client(options)
-          @dns = @client.discovered_api('dns', api_version)
+          @dns = @client.discovered_api("dns", api_version)
         end
       end
     end

data/lib/fog/{google/models/dns → dns/google/models}/change.rb

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module DNS
     class Google
@@ -11,20 +9,20 @@ module Fog
         identity :id
 
         attribute :kind
-        attribute :start_time, :aliases => 'startTime'
+        attribute :start_time, :aliases => "startTime"
         attribute :status
         attribute :additions
         attribute :deletions
 
-        DONE_STATE    = 'done'
-        PENDING_STATE = 'pending'
+        DONE_STATE    = "done"
+        PENDING_STATE = "pending"
 
         ##
         # Checks if the change operation is pending
         #
         # @return [Boolean] True if the change operation is pending; False otherwise
         def pending?
-          self.status == PENDING_STATE
+          status == PENDING_STATE
         end
 
         ##
@@ -32,7 +30,7 @@ module Fog
         #
         # @return [Boolean] True if the change operation is done; False otherwise
         def ready?
-          self.status == DONE_STATE
+          status == DONE_STATE
         end
       end
     end

data/lib/fog/{google/models/dns → dns/google/models}/changes.rb

@@ -1,6 +1,3 @@
-require 'fog/core/collection'
-require 'fog/google/models/dns/zone'
-
 module Fog
   module DNS
     class Google
@@ -16,7 +13,7 @@ module Fog
         def all
           requires :zone
 
-          data = service.list_changes(zone.identity).body['changes'] || []
+          data = service.list_changes(zone.identity).body["changes"] || []
           load(data)
         rescue Fog::Errors::NotFound
           []

data/lib/fog/{google/models/dns → dns/google/models}/project.rb

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module DNS
     class Google
@@ -27,7 +25,7 @@ module Fog
         #
         # @return [Integer] Maximum allowed number of managed zones in the project
         def managed_zones
-          self.quota['managedZones']
+          quota["managedZones"]
         end
 
         ##
@@ -35,7 +33,7 @@ module Fog
         #
         # @return [Integer] The maximum allowed number of ResourceRecordSets per zone in the project
         def rrsets_per_managed_zone
-          self.quota['rrsetsPerManagedZone']
+          quota["rrsetsPerManagedZone"]
         end
 
         ##
@@ -43,7 +41,7 @@ module Fog
         #
         # @return [Integer] The maximum allowed number of resource records per ResourceRecordSet
         def resource_records_per_rrset
-          self.quota['resourceRecordsPerRrset']
+          quota["resourceRecordsPerRrset"]
         end
 
         ##
@@ -51,7 +49,7 @@ module Fog
         #
         # @return [Integer] The maximum allowed number of ResourceRecordSets to add per Changes.create request
         def rrset_additions_per_change
-          self.quota['rrsetAdditionsPerChange']
+          quota["rrsetAdditionsPerChange"]
         end
 
         ##
@@ -59,7 +57,7 @@ module Fog
         #
         # @return [Integer] The maximum allowed number of ResourceRecordSets to delete per Changes.create request
         def rrset_deletions_per_change
-          self.quota['rrsetDeletionsPerChange']
+          quota["rrsetDeletionsPerChange"]
         end
 
         ##
@@ -67,7 +65,7 @@ module Fog
         #
         # @return [Integer] The maximum allowed size in bytes for the rrdata field in one Changes.create request
         def total_rrdatasize_per_change
-          self.quota['totalRrdataSizePerChange']
+          quota["totalRrdataSizePerChange"]
         end
       end
     end

data/lib/fog/{google/models/dns → dns/google/models}/projects.rb

@@ -1,6 +1,3 @@
-require 'fog/core/collection'
-require 'fog/google/models/dns/project'
-
 module Fog
   module DNS
     class Google

data/lib/fog/{google/models/dns → dns/google/models}/record.rb

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module DNS
     class Google
@@ -23,11 +21,9 @@ module Fog
         def destroy(async = true)
           requires :name, :type, :ttl, :rrdatas
 
-          data = service.create_change(self.zone.id, [], [resource_record_set_format])
-          change = Fog::DNS::Google::Changes.new(:service => service, :zone => zone).get(data.body['id'])
-          unless async
-            change.wait_for { ready? }
-          end
+          data = service.create_change(zone.id, [], [resource_record_set_format])
+          change = Fog::DNS::Google::Changes.new(:service => service, :zone => zone).get(data.body["id"])
+          change.wait_for { ready? } unless async
           true
         end
 
@@ -42,12 +38,10 @@ module Fog
           deletions = resource_record_set_format
           merge_attributes(new_attributes)
 
-          data = service.create_change(self.zone.id, [resource_record_set_format], [deletions])
-          change = Fog::DNS::Google::Changes.new(:service => service, :zone => zone).get(data.body['id'])
-          async = new_attributes.has_key?(:async) ? new_attributes[:async] : true
-          unless async
-            change.wait_for { ready? }
-          end
+          data = service.create_change(zone.id, [resource_record_set_format], [deletions])
+          change = Fog::DNS::Google::Changes.new(:service => service, :zone => zone).get(data.body["id"])
+          async = new_attributes.key?(:async) ? new_attributes[:async] : true
+          change.wait_for { ready? } unless async
           self
         end
 
@@ -58,7 +52,7 @@ module Fog
         def reload
           requires :name, :type
 
-          data = collection.get(self.name, self.type)
+          data = collection.get(name, type)
           merge_attributes(data.attributes)
           self
         end
@@ -70,8 +64,8 @@ module Fog
         def save
           requires :name, :type, :ttl, :rrdatas
 
-          data = service.create_change(self.zone.id, [resource_record_set_format], [])
-          change = Fog::DNS::Google::Changes.new(:service => service, :zone => zone).get(data.body['id'])
+          data = service.create_change(zone.id, [resource_record_set_format], [])
+          change = Fog::DNS::Google::Changes.new(:service => service, :zone => zone).get(data.body["id"])
           change.wait_for { !pending? }
           self
         end
@@ -80,9 +74,7 @@ module Fog
         # Returns the Managed Zone of the Resource Record Sets resource
         #
         # @return [Fog::DNS::Google::Zone] Managed Zone of the Resource Record Sets resource
-        def zone
-          @zone
-        end
+        attr_reader :zone
 
         private
 
@@ -90,20 +82,18 @@ module Fog
         # Assigns the Managed Zone of the Resource Record Sets resource
         #
         # @param [Fog::DNS::Google::Zone] new_zone Managed Zone of the Resource Record Sets resource
-        def zone=(new_zone)
-          @zone = new_zone
-        end
+        attr_writer :zone
 
         ##
         # Resource Record Sets resource representation
         #
         def resource_record_set_format
           {
-            'kind' => 'dns#resourceRecordSet',
-            'name' => self.name,
-            'type' => self.type,
-            'ttl'  => self.ttl,
-            'rrdatas' => self.rrdatas,
+            "kind" => 'dns#resourceRecordSet',
+            "name" => name,
+            "type" => type,
+            "ttl"  => ttl,
+            "rrdatas" => rrdatas
           }
         end
       end

data/lib/fog/{google/models/dns → dns/google/models}/records.rb

@@ -1,6 +1,3 @@
-require 'fog/core/collection'
-require 'fog/google/models/dns/record'
-
 module Fog
   module DNS
     class Google
@@ -16,7 +13,7 @@ module Fog
         def all
           requires :zone
 
-          data = service.list_resource_record_sets(zone.identity).body['rrsets'] || []
+          data = service.list_resource_record_sets(zone.identity).body["rrsets"] || []
           load(data)
         rescue Fog::Errors::NotFound
           []
@@ -31,7 +28,7 @@ module Fog
         def get(name, type)
           requires :zone
 
-          records = service.list_resource_record_sets(zone.identity, { :name => name, :type => type }).body['rrsets'] || []
+          records = service.list_resource_record_sets(zone.identity, :name => name, :type => type).body["rrsets"] || []
           records.any? ? new(records.first) : nil
         rescue Fog::Errors::NotFound
           nil

data/lib/fog/{google/models/dns → dns/google/models}/zone.rb

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module DNS
     class Google
@@ -10,12 +8,12 @@ module Fog
       class Zone < Fog::Model
         identity :id
 
-        attribute :creation_time, :aliases => 'creationTime'
+        attribute :creation_time, :aliases => "creationTime"
         attribute :description
-        attribute :domain, :aliases => 'dnsName'
+        attribute :domain, :aliases => "dnsName"
         attribute :kind
         attribute :name
-        attribute :nameservers, :aliases => 'nameServers'
+        attribute :nameservers, :aliases => "nameServers"
 
         ##
         # Enumerates the list of Changes for the Managed Zone
@@ -37,7 +35,7 @@ module Fog
         def destroy
           requires :identity
 
-          service.delete_managed_zone(self.identity)
+          service.delete_managed_zone(identity)
           true
         end
 
@@ -62,9 +60,9 @@ module Fog
         def save
           requires :name, :domain, :description
 
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
 
-          data = service.create_managed_zone(self.name, self.domain, self.description)
+          data = service.create_managed_zone(name, domain, description)
           merge_attributes(data.body)
           self
         end

data/lib/fog/{google/models/dns → dns/google/models}/zones.rb

@@ -1,6 +1,3 @@
-require 'fog/core/collection'
-require 'fog/google/models/dns/zone'
-
 module Fog
   module DNS
     class Google
@@ -12,7 +9,7 @@ module Fog
         #
         # @return [Array<Fog::DNS::Google::Zone>] List of Managed Zone resources
         def all
-          data = service.list_managed_zones.body['managedZones'] || []
+          data = service.list_managed_zones.body["managedZones"] || []
           load(data)
         end
 

data/lib/fog/{google/requests/dns → dns/google/requests}/create_change.rb

@@ -9,13 +9,13 @@ module Fog
         def create_change(zone_name_or_id, additions = [], deletions = [])
           api_method = @dns.changes.create
           parameters = {
-            'project' => @project,
-            'managedZone' => zone_name_or_id,
+            "project" => @project,
+            "managedZone" => zone_name_or_id
           }
 
           body = {
-            'additions' => additions,
-            'deletions' => deletions,
+            "additions" => additions,
+            "deletions" => deletions
           }
 
           request(api_method, parameters, body)
@@ -24,10 +24,10 @@ module Fog
 
       class Mock
         def create_change(zone_name_or_id, additions = [], deletions = [])
-          if self.data[:managed_zones].has_key?(zone_name_or_id)
-            zone = self.data[:managed_zones][zone_name_or_id]
+          if data[:managed_zones].key?(zone_name_or_id)
+            zone = data[:managed_zones][zone_name_or_id]
           else
-            zone = self.data[:managed_zones].values.find { |zone| zone['name'] = zone_name_or_id }
+            zone = data[:managed_zones].values.detect { |z| z["name"] = zone_name_or_id }
           end
 
           unless zone
@@ -35,26 +35,26 @@ module Fog
           end
 
           deletions.each do |del|
-            rrset = self.data[:resource_record_sets][zone['id']].reject! { |r| r['name'] == del['name'] && r['type'] == del['type'] }
+            rrset = data[:resource_record_sets][zone["id"]].reject! { |r| r["name"] == del["name"] && r["type"] == del["type"] }
             unless rrset
               raise Fog::Errors::NotFound, "The 'entity.change.deletions[0]' resource named '#{del['name']} ('#{del['type']})' does not exist."
             end
           end
 
           additions.each do |add|
-            self.data[:resource_record_sets][zone['id']] << add
+            data[:resource_record_sets][zone["id"]] << add
           end
 
-          id = self.data[:changes][zone['id']].max_by { |c| c['id'] }['id']
+          id = data[:changes][zone["id"]].max_by { |c| c["id"] }["id"]
           data = {
-            'kind' => 'dns#change',
-            'id' => (id.to_i + 1).to_s,
-            'startTime' => DateTime.now.strftime('%FT%T.%LZ'),
-            'status' => 'done',
-            'additions' => additions,
-            'deletions' => deletions,
+            "kind" => 'dns#change',
+            "id" => (id.to_i + 1).to_s,
+            "startTime" => DateTime.now.strftime("%FT%T.%LZ"),
+            "status" => "done",
+            "additions" => additions,
+            "deletions" => deletions
           }
-          self.data[:changes][zone['id']] << data
+          self.data[:changes][zone["id"]] << data
 
           build_excon_response(data)
         end