cloudflair 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5544a93b5a42bf842ac8e55baa5d7fcb4bc19702
-  data.tar.gz: 7664480c03564666fb4ab299aa8c75a51357cddd
+  metadata.gz: e0026c99261c0b4e103318525b4ae84d4a355ee3
+  data.tar.gz: ea221bddb6dad9ff7d3a34c6e9c7c4d5950d9c8c
 SHA512:
-  metadata.gz: 48a1afcdf0395bf0fe4c71e298861ab67f2b1435dde27f8b4653f3bd53941a8720e3a4c52ffacfe9adafab3e0f0eb14f197479495b530dd4c91e2a1fb294f8e0
-  data.tar.gz: 13f6ad242a69ad4991ea15e39382c38e26b1e0f0219e4435025925ffaeff81d9e633b343ad87e75eb021394a296f7e8821f297c60450cd4b50430cc227146a2c
+  metadata.gz: c00fb8e18dcd6fb0ffd246782a4cd814d7d0bf09a1c67a12deceab171b5c0b9ad0948b31d2371e5bc9440d8e8f19eed8558fc2370d9f99cb1404346ba0765894
+  data.tar.gz: 887e4a0fd254b061c1777c73d505a4a0588e8b86c2e623a70a9bcbc5b5c3b6e5f9c6bf60b90aafc735633bb7641a87b826db9c4777a6d68918864fa31968b8dc

data/README.md

@@ -93,3 +93,11 @@ The gem is available as open source under the terms of the [MIT License](http://
 * Metrics reporting
 * Rate Limit Tracking
 * (Global) Rate Limit Tracking (redis?)
+
+## About
+
+This gem is currently maintained and funded by [nine.ch](https://nine.ch).
+
+[![nine.ch Logo](https://blog.nine.ch/assets/logo.png)](https://nine.ch)
+
+We run your Linux server infrastructure – without interruptions, around the clock.

data/Rakefile

@@ -3,4 +3,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/cloudflair.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'faraday', '~> 0.9.0'
   spec.add_runtime_dependency 'faraday_middleware', '~> 0.10.0'
   spec.add_runtime_dependency 'dry-configurable', '~> 0.1'
-  spec.add_runtime_dependency 'faraday-detailed_logger', '~> 2.1.0'
+  spec.add_runtime_dependency 'faraday-detailed_logger', '~> 2.1'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'

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

@@ -12,6 +12,5 @@ module Cloudflair
     def initialize(zone_id)
       @zone_id = zone_id
     end
-
   end
 end

data/lib/cloudflair/api.rb

@@ -1,7 +1,20 @@
 require 'cloudflair/api/zone'
+require 'cloudflair/communication'
 
 module Cloudflair
+  extend Cloudflair::Communication
+
   def self.zone(zone_id)
     Zone.new zone_id
   end
+
+  def self.zones(filter = {})
+    json_hashes = response connection.get('zones', filter)
+
+    json_hashes.map do |json|
+      zone = Zone.new(json['id'])
+      zone.data = json
+      zone
+    end
+  end
 end

data/lib/cloudflair/communication.rb

@@ -7,9 +7,9 @@ module Cloudflair
     def response(response)
       return nil if response.status == 304
 
-      http_error? response.status
+      raise_on_http_error response.status
 
-      parse response
+      read response
     end
 
     def connection
@@ -18,7 +18,7 @@ module Cloudflair
 
     private
 
-    def parse(response)
+    def read(response)
       body = response.body
 
       unless body['success']
@@ -29,28 +29,34 @@ module Cloudflair
       body['result']
     end
 
-    def http_error?(status)
+    def raise_on_http_error(status)
       case status
       when 200..399 then
-        return
+      when 400..499 then
+        raise_on_http_client_error status
+      when 500..599 then
+        fail Cloudflair::CloudflairError, "#{status} Remote Error"
+      else
+        fail 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 429 then
-        fail Cloudflair::CloudflairError, '429 Too Many Requests'
       when 405 then
         fail Cloudflair::CloudflairError, '405 Method Not Allowed'
       when 415 then
         fail Cloudflair::CloudflairError, '415 Unsupported Media Type'
-      when 400..499 then
-        fail Cloudflair::CloudflairError, "#{status} Request Error"
-      when 500..599 then
-        fail Cloudflair::CloudflairError, "#{status} Remote Error"
+      when 429 then
+        fail Cloudflair::CloudflairError, '429 Too Many Requests'
       else
-        fail Cloudflair::CloudflairError, "#{status} Unknown Error Code"
+        fail Cloudflair::CloudflairError, "#{status} Request Error"
       end
     end
   end

data/lib/cloudflair/connection.rb

@@ -7,13 +7,7 @@ module Cloudflair
     def self.new
       config = Cloudflair.config
 
-      Faraday.new(url: config.cloudflare.api_base_url, headers: headers) do |faraday|
-        faraday.request :json
-        faraday.response config.faraday.adapter if config.faraday.logger
-        faraday.response :json, content_type: /\bjson$/
-
-        faraday.adapter config.faraday.adapter || Faraday.default_adapter
-      end
+      new_faraday_from config
     end
 
     def self.headers
@@ -27,5 +21,15 @@ module Cloudflair
       end
       headers
     end
+
+    private_class_method def self.new_faraday_from(config)
+      Faraday.new(url: config.cloudflare.api_base_url, headers: headers) do |faraday|
+        faraday.request :json
+        faraday.response config.faraday.logger if config.faraday.logger
+        faraday.response :json, content_type: /\bjson$/
+
+        faraday.adapter config.faraday.adapter || Faraday.default_adapter
+      end
+    end
   end
 end

data/lib/cloudflair/entity.rb

@@ -111,6 +111,12 @@ module Cloudflair
       super
     end
 
+    ##
+    # :internal: Used to pre-populate an entity
+    def data=(data)
+      @data = data
+    end
+
     alias get! reload
     alias save patch
 
@@ -143,12 +149,15 @@ module Cloudflair
     def path
       return @path if @path
 
-      path = self.class.path
+      @path = replace_path_variables_in self.class.path
+    end
+
+    def replace_path_variables_in(path)
       interpreted_path = path.clone
-      path.scan /:([a-zA-Z_][a-zA-Z0-9_]+[!?=]?)/ do |match, *|
+      path.scan(/:([a-zA-Z_][a-zA-Z0-9_]+[!?=]?)/) do |match, *|
         interpreted_path.gsub! ":#{match}", send(match).to_s
       end
-      @path = interpreted_path
+      interpreted_path
     end
 
     def dirty

data/lib/cloudflair/version.rb

@@ -1,3 +1,3 @@
 module Cloudflair
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudflair
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Christian Mäder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement