cloudflair 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2a69b1e26a488661affa4013c362307968f083f6e688bc3d63519de57415b58
-  data.tar.gz: c3383bd0be796d11c49e11da606fbe4bbc6e2ae75c89a20c159b3479ebf9f629
+  metadata.gz: a94ec96903e9723de8176769d1ca3fa0a3d51fda907b6d53b17b7ad163cb73b0
+  data.tar.gz: 73d08b577e5c0bbd77d8f79afec19cb407882c03c6775aefa2da37ced0e60f22
 SHA512:
-  metadata.gz: 130d30780e3df7779780f9240371fe936e24e99c4ba5e97203a3b15af88a978d1ad85a39d1738786068d1431cd9cc93fb2ab49e186a342b231f8360bbca26c9b
-  data.tar.gz: 1d4737127f23eac7423dcf43f6be698e379d91fcd1402607477efd1fad7c6949897b3946962c6ca8803d8d28d2c0d3f0808ec3184d16ba593c741d886e587aca
+  metadata.gz: 521bc18990e5dd9d733da59353377385d95dc9c7e3d3342a9e79ff6dde48fa07ccc91be13420456fd4fc823c1bfdd92e1b1c20187cc9b76e7b1be865edc9415b
+  data.tar.gz: 76e763b2a0ad7614217b214ff19521af5c75b6ccfe4235a09450ce0878499632e32d172149fe6e1b855d90ff6db71b4338173ed3ff7e562bdeab38551280d893

data/.rubocop.yml

@@ -0,0 +1,38 @@
+require:
+  - rubocop-performance
+  - rubocop-rspec
+
+AllCops:
+  Exclude:
+    - 'bin/**/*'
+    - 'db/**/*'
+  TargetRubyVersion: 2.6.1
+
+Layout/AlignHash:
+  EnforcedColonStyle: table
+  EnforcedHashRocketStyle: table
+
+Metrics/BlockLength:
+  Exclude:
+    - Guardfile
+    - 'spec/**/*spec.rb'
+
+Metrics/LineLength:
+  Exclude:
+    - Guardfile
+  Max: 110
+
+Rails:
+  Enabled: true
+
+Rails/HttpPositionalArguments:
+  Exclude:
+
+Rails/SkipsModelValidations:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false

data/.ruby-gemset

@@ -0,0 +1 @@
+cloudflair

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in cloudflair.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.3.0

data/cloudflair.gemspec

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cloudflair/version'
 
@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'cloudflair'
   spec.version       = File.read('VERSION')
   spec.authors       = ['Christian Mäder']
-  spec.email         = %w(christian.maeder@nine.ch)
+  spec.email         = %w[christian.maeder@nine.ch]
 
   spec.summary       = "Wrapper to CloudFlare's v4 REST API."
   spec.description   = "Cloudflair aims to provide easy access to CloudFlare's public API."
@@ -22,15 +22,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
-  spec.add_runtime_dependency 'faraday', '>= 0.10.0'
-  spec.add_runtime_dependency 'faraday_middleware'
   spec.add_runtime_dependency 'dry-configurable', '~> 0.1'
+  spec.add_runtime_dependency 'faraday', '>= 0.10.0'
   spec.add_runtime_dependency 'faraday-detailed_logger'
+  spec.add_runtime_dependency 'faraday_middleware'
 
   spec.add_development_dependency 'bundler', '~> 2.0.0'
+  spec.add_development_dependency 'dotenv', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'dotenv', '~> 2.1'
   spec.add_development_dependency 'rubocop', '~> 0.48'
+  spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.15'
 end

data/lib/cloudflair.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/api'
 require 'cloudflair/version'
 require 'dry-configurable'

data/lib/cloudflair/api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/api/zone'
 require 'cloudflair/api/railguns'
 require 'cloudflair/communication'

data/lib/cloudflair/api/railguns.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/api/zone/analytics'
 require 'cloudflair/api/zone/available_plan'
 require 'cloudflair/api/zone/available_rate_plan'

data/lib/cloudflair/api/zone/analytics.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/available_plan.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/available_rate_plan.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/custom_hostname.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/dns_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair
@@ -6,6 +8,7 @@ module Cloudflair
 
     attr_reader :zone_id, :record_id
     deletable true
+    patchable_fields :content
     path 'zones/:zone_id/dns_records/:record_id'
 
     def initialize(zone_id, record_id)

data/lib/cloudflair/api/zone/purge_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/communication'
 
 module Cloudflair

data/lib/cloudflair/api/zone/railgun.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/api/zone/settings/advanced_ddos'
 require 'cloudflair/api/zone/settings/always_online'
 require 'cloudflair/api/zone/settings/browser_cache_ttl'
@@ -38,36 +40,36 @@ module Cloudflair
     end
 
     {
-      advanced_ddos: Cloudflair::AdvancedDdos,
-      always_online: Cloudflair::AlwaysOnline,
-      browser_cache_ttl: Cloudflair::BrowserCacheTtl,
-      browser_check: Cloudflair::BrowserCheck,
-      cache_level: Cloudflair::CacheLevel,
-      challenge_ttl: Cloudflair::ChallengeTtl,
-      development_mode: Cloudflair::DevelopmentMode,
-      email_obfuscation: Cloudflair::EmailObfuscation,
-      hotlink_protection: Cloudflair::HotlinkProtection,
-      ip_geolocation: Cloudflair::IpGeolocation,
-      ipv6: Cloudflair::Ipv6,
-      minify: Cloudflair::Minify,
-      mirage: Cloudflair::Mirage,
-      mobile_redirect: Cloudflair::MobileRedirect,
+      advanced_ddos:               Cloudflair::AdvancedDdos,
+      always_online:               Cloudflair::AlwaysOnline,
+      browser_cache_ttl:           Cloudflair::BrowserCacheTtl,
+      browser_check:               Cloudflair::BrowserCheck,
+      cache_level:                 Cloudflair::CacheLevel,
+      challenge_ttl:               Cloudflair::ChallengeTtl,
+      development_mode:            Cloudflair::DevelopmentMode,
+      email_obfuscation:           Cloudflair::EmailObfuscation,
+      hotlink_protection:          Cloudflair::HotlinkProtection,
+      ip_geolocation:              Cloudflair::IpGeolocation,
+      ipv6:                        Cloudflair::Ipv6,
+      minify:                      Cloudflair::Minify,
+      mirage:                      Cloudflair::Mirage,
+      mobile_redirect:             Cloudflair::MobileRedirect,
       origin_error_page_pass_thru: Cloudflair::OriginErrorPagePassThru,
-      polish: Cloudflair::Polish,
-      prefetch_preload: Cloudflair::PrefetchPreload,
-      response_buffering: Cloudflair::ResponseBuffering,
-      rocket_loader: Cloudflair::RocketLoader,
-      security_header: Cloudflair::SecurityHeader,
-      security_level: Cloudflair::SecurityLevel,
-      server_side_exclude: Cloudflair::ServerSideExclude,
+      polish:                      Cloudflair::Polish,
+      prefetch_preload:            Cloudflair::PrefetchPreload,
+      response_buffering:          Cloudflair::ResponseBuffering,
+      rocket_loader:               Cloudflair::RocketLoader,
+      security_header:             Cloudflair::SecurityHeader,
+      security_level:              Cloudflair::SecurityLevel,
+      server_side_exclude:         Cloudflair::ServerSideExclude,
       sort_query_string_for_cache: Cloudflair::SortQueryStringForCache,
-      ssl: Cloudflair::Ssl,
-      tls_client_auth: Cloudflair::TlsClientAuth,
-      tls_1_2_only: Cloudflair::Tls12Only,
-      tls_1_3: Cloudflair::Tls13,
-      true_client_ip_header: Cloudflair::TrueClientIpHeader,
-      waf: Cloudflair::Waf,
-      websockets: Cloudflair::Websockets,
+      ssl:                         Cloudflair::Ssl,
+      tls_client_auth:             Cloudflair::TlsClientAuth,
+      tls_1_2_only:                Cloudflair::Tls12Only,
+      tls_1_3:                     Cloudflair::Tls13,
+      true_client_ip_header:       Cloudflair::TrueClientIpHeader,
+      waf:                         Cloudflair::Waf,
+      websockets:                  Cloudflair::Websockets
     }.each do |method, klass|
       define_method method do
         klass.new @zone_id

data/lib/cloudflair/api/zone/settings/advanced_ddos.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/always_online.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/browser_cache_ttl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/browser_check.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/cache_level.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/challenge_ttl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/development_mode.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/email_obfuscation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/hotlink_protection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/ip_geolocation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/ipv6.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/minify.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/mirage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/mobile_redirect.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/origin_error_page_pass_thru.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/polish.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/prefetch_preload.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/response_buffering.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/rocket_loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/security_header.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/security_level.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/server_side_exclude.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/sort_query_string_for_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/ssl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/tls_1_2_only.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/tls_1_3.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/tls_client_auth.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/true_client_ip_header.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/waf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone/settings/websockets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/entity'
 
 module Cloudflair

data/lib/cloudflair/api/zone__available_plans.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/api/zone/available_plan'
 
 module Cloudflair

data/lib/cloudflair/api/zone__custom_hostnames.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/api/zone/custom_hostname'
 
 module Cloudflair

data/lib/cloudflair/api/zone__dns_records.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'cloudflair/api/zone/dns_record'
 
 module Cloudflair
   class Zone
     def dns_records(filter = {})
       raw_records = response connection.get("#{path}/dns_records", filter)
-
       raw_records.map { |raw_record| build_dns_record(raw_record) }
     end
 
@@ -14,7 +15,6 @@ module Cloudflair
 
     def new_dns_record(record_data)
       raw_record = response connection.post("#{path}/dns_records", record_data)
-
       build_dns_record raw_record
     end
 

data/lib/cloudflair/api/zone__railguns.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/api/zone/railgun'
 
 module Cloudflair

data/lib/cloudflair/communication.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/error/cloudflare_error'
 require 'cloudflair/error/cloudflair_error'
 require 'cloudflair/connection'
@@ -35,8 +37,9 @@ module Cloudflair
       body = response.body
 
       unless body['success']
-        fail Cloudflair::CloudflairError, "Unrecognized response format: '#{body}'" unless body['errors']
-        fail Cloudflair::CloudflareError, body['errors']
+        raise Cloudflair::CloudflairError, "Unrecognized response format: '#{body}'" unless body['errors']
+
+        raise Cloudflair::CloudflareError, body['errors']
       end
 
       body['result']
@@ -44,32 +47,32 @@ module Cloudflair
 
     def raise_on_http_error(status)
       case status
-      when 200..399 then
-      when 400..499 then
+      when 200..399
+      when 400..499
         raise_on_http_client_error status
-      when 500..599 then
-        fail Cloudflair::CloudflairError, "#{status} Remote Error"
+      when 500..599
+        raise Cloudflair::CloudflairError, "#{status} Remote Error"
       else
-        fail Cloudflair::CloudflairError, "#{status} Unknown Error Code"
+        raise Cloudflair::CloudflairError, "#{status} Unknown Error Code"
       end
     end
 
     def raise_on_http_client_error(status)
       case status
-      when 400 then
-        fail Cloudflair::CloudflairError, '400 Bad Request'
-      when 401 then
-        fail Cloudflair::CloudflairError, '401 Unauthorized'
-      when 403 then
-        fail Cloudflair::CloudflairError, '403 Forbidden'
-      when 405 then
-        fail Cloudflair::CloudflairError, '405 Method Not Allowed'
-      when 415 then
-        fail Cloudflair::CloudflairError, '415 Unsupported Media Type'
-      when 429 then
-        fail Cloudflair::CloudflairError, '429 Too Many Requests'
+      when 400
+        raise Cloudflair::CloudflairError, '400 Bad Request'
+      when 401
+        raise Cloudflair::CloudflairError, '401 Unauthorized'
+      when 403
+        raise Cloudflair::CloudflairError, '403 Forbidden'
+      when 405
+        raise Cloudflair::CloudflairError, '405 Method Not Allowed'
+      when 415
+        raise Cloudflair::CloudflairError, '415 Unsupported Media Type'
+      when 429
+        raise Cloudflair::CloudflairError, '429 Too Many Requests'
       else
-        fail Cloudflair::CloudflairError, "#{status} Request Error"
+        raise Cloudflair::CloudflairError, "#{status} Request Error"
       end
     end
 

data/lib/cloudflair/connection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'faraday'
 require 'faraday_middleware'
 require 'faraday/detailed_logger'
@@ -7,25 +9,32 @@ module Cloudflair
   class Connection
     def self.new
       config = Cloudflair.config
-
       new_faraday_from config
     end
 
-    def self.headers
-      headers = {}
+    def self.headers # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       cloudflare_auth_config = Cloudflair.config.cloudflare.auth
-      if !(cloudflare_auth_config.key.nil? || cloudflare_auth_config.email.nil?)
-        headers['X-Auth-Key'] = cloudflare_auth_config.key
-        headers['X-Auth-Email'] = cloudflare_auth_config.email
-      elsif !cloudflare_auth_config.user_service_key.nil?
-        headers['X-Auth-User-Service-Key'] = cloudflare_auth_config.user_service_key
-      else
-        raise CloudflairError, 'Neither email & key nor user_service_key have been defined.'
+
+      if !cloudflare_auth_config.key.nil? && !cloudflare_auth_config.email.nil?
+        return({
+          'X-Auth-Key'   => cloudflare_auth_config.key,
+          'X-Auth-Email' => cloudflare_auth_config.email
+        })
       end
-      headers
+
+      unless cloudflare_auth_config.user_service_key.nil?
+        return({
+          'Authorization' => "Bearer #{cloudflare_auth_config.user_service_key}"
+        })
+      end
+
+      raise(
+        CloudflairError,
+        'Neither email & key nor user_service_key have been defined.'
+      )
     end
 
-    private_class_method def self.new_faraday_from(config)
+    private_class_method def self.new_faraday_from(config) # rubocop:disable Metrics/AbcSize
       Faraday.new(url: config.cloudflare.api_base_url, headers: headers) do |faraday|
         faraday.request :json
         faraday.response config.faraday.logger if config.faraday.logger

data/lib/cloudflair/entity.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cloudflair/communication'
 
 module Cloudflair
@@ -16,13 +18,14 @@ module Cloudflair
       def patchable_fields(*fields)
         return @patchable_fields if @patchable_fields
 
-        if fields.nil?
-          @patchable_fields = []
-        elsif fields.is_a?(Array)
-          @patchable_fields = fields.map(&:to_s)
-        else
-          @patchable_fields = [fields.to_s]
-        end
+        @patchable_fields =
+          if fields.nil?
+            []
+          elsif fields.is_a?(Array)
+            fields.map(&:to_s)
+          else
+            [fields.to_s]
+          end
       end
 
       def deletable(deletable = false)
@@ -34,7 +37,7 @@ module Cloudflair
       def path(path = nil)
         return @path if @path
 
-        fail ArgumentError, 'path is not defined' if path.nil?
+        raise ArgumentError, 'path is not defined' if path.nil?
 
         @path = path
       end
@@ -42,11 +45,12 @@ module Cloudflair
       def object_fields(*fields)
         return @object_fields if @object_fields
 
-        if fields.nil? || fields.empty?
-          @object_fields = []
-        else
-          @object_fields = fields.map(&:to_s)
-        end
+        @object_fields =
+          if fields.nil? || fields.empty?
+            []
+          else
+            fields.map(&:to_s)
+          end
       end
 
       # allowed values:
@@ -69,17 +73,17 @@ module Cloudflair
       end
 
       def turn_all_items_into_a_single_hash(fields_to_class_map)
-        fields_map = {}
-        fields_to_class_map.each do |field_definition|
-          if field_definition.is_a?(Hash)
-            fields_to_class_map[0].each do |field, klass_or_proc|
-              fields_map[field.to_s] = klass_or_proc
+        {}.tap do |fields_map|
+          fields_to_class_map.each do |field_definition|
+            if field_definition.is_a?(Hash)
+              fields_to_class_map[0].each do |field, klass_or_proc|
+                fields_map[field.to_s] = klass_or_proc
+              end
+            else
+              fields_map[field_definition.to_s] = nil
             end
-          else
-            fields_map[field_definition.to_s] = nil
           end
         end
-        fields_map
       end
     end
 
@@ -102,7 +106,7 @@ module Cloudflair
     end
 
     def delete
-      fail Cloudflair::CloudflairError, "Can't delete unless deletable=true" unless deletable
+      raise Cloudflair::CloudflairError, "Can't delete unless deletable=true" unless deletable
       return self if @deleted
 
       @data = response connection.delete path
@@ -126,27 +130,23 @@ module Cloudflair
     def method_missing(name_as_symbol, *args, &block)
       name = normalize_accessor name_as_symbol
 
-      return data if :_raw_data! == name_as_symbol
+      return data if name_as_symbol == :_raw_data!
 
       if name.end_with?('=')
         if patchable_fields.include?(name[0..-2])
           dirty_data[name[0..-2]] = args[0]
           return
-        else
-          super
         end
-      end
 
-      # allow access to the unmodified data using 'zone.always_string!' or 'zone._name!'
-      if name.end_with?('!') && data.keys.include?(name[0..-2])
-        return data[name[0..2]]
+        super
       end
 
+      # allow access to the unmodified data using 'zone.always_string!' or 'zone._name!'
+      return data[name[0..2]] if name.end_with?('!') && data.key?(name[0..-2])
       return objectify(name) if object_fields.include? name
-      return arrayify(name, array_object_fields[name]) if array_object_fields.keys.include? name
-
-      return dirty_data[name] if dirty_data.keys.include? name
-      return data[name] if data.is_a?(Hash) && data.keys.include?(name)
+      return arrayify(name, array_object_fields[name]) if array_object_fields.key?(name)
+      return dirty_data[name] if dirty_data.key?(name)
+      return data[name] if data.is_a?(Hash) && data.key?(name)
 
       super
     end
@@ -154,16 +154,13 @@ module Cloudflair
     def respond_to_missing?(name_as_symbol, *args)
       name = normalize_accessor name_as_symbol
 
-      return true if :_raw_data! == name_as_symbol
-
+      return true if name_as_symbol == :_raw_data!
       return true if name.end_with?('=') && patchable_fields.include?(name[0..-2])
-      return true if name.end_with?('!') && data.keys.include?(name[0..-2])
-
+      return true if name.end_with?('!') && data.key?(name[0..-2])
       return true if object_fields.include? name
-      return true if array_object_fields.keys.include? name
-
-      return true if dirty_data.keys.include? name
-      return true if data.is_a?(Hash) && data.keys.include?(name)
+      return true if array_object_fields.key?(name)
+      return true if dirty_data.key?(name)
+      return true if data.is_a?(Hash) && data.key?(name)
 
       super
     end
@@ -235,9 +232,11 @@ module Cloudflair
 
     def replace_path_variables_in(path)
       interpreted_path = path.clone
+
       path.scan(/:([a-zA-Z_][a-zA-Z0-9_]+[!?=]?)/) do |match, *|
-        interpreted_path.gsub! ":#{match}", send(match).to_s
+        interpreted_path = interpreted_path.gsub ":#{match}", send(match).to_s
       end
+
       interpreted_path
     end
 

data/lib/cloudflair/error/cloudflair_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cloudflair
   class CloudflairError < StandardError
   end

data/lib/cloudflair/error/cloudflare_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cloudflair
   class CloudflareError < StandardError
     attr_reader :cloudflare_errors

data/lib/cloudflair/version.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module Cloudflair
 end

metadata

@@ -1,59 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: cloudflair
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Christian Mäder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: dry-configurable
+  name: faraday-detailed_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday-detailed_logger
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,33 +123,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.48'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.48'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +173,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile